Commit graph

5131 commits

Author SHA1 Message Date
Adam Jackson
c6ce2f6b3f int10: Remove useless check.
If you have more than one PCI device with the same d/b/d/f, you're
already in trouble.
(cherry picked from commit a65e36a873)
2008-10-08 11:16:48 -04:00
Eamon Walsh
8ef37c194f 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).

(cherry picked from commit b6ab114212)
2008-10-08 11:15:27 -04:00
Peter Hutterer
e88df87851 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.
(cherry picked from commit 30c3c13f10)
2008-10-08 11:15:21 -04:00
Peter Hutterer
be3b3cb970 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>
(cherry picked from commit ae986d1c73)
2008-10-08 11:15:13 -04:00
Kim Woelders
3bf826f590 xkb: fix use of uninitialized variable.
And some cosmetic changes to use stuff->change consistently.

Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
(cherry picked from commit 8c46505d7d)
2008-10-08 11:15:05 -04:00
Alan Coopersmith
88ebde608d Remove usage of mfbChangeWindowAttributes missed in e4d11e58c... 2008-10-06 20:10:25 -07:00
Alan Hourihane
af8cef461c only build dri2 when DRI2 is enabled 2008-09-24 14:24:36 +01:00
Adam Jackson
97f688f2b4 xserver 1.5.1 2008-09-23 14:51:33 -04:00
Adam Jackson
68c575cb73 Move RELEASE_DATE below AC_INIT.
Doing it the other way around clobbers the setting, which means you get
a null release date string in the log.  Thanks autoconf!
2008-09-23 11:05:44 -04:00
Peter Harris
dba26368e5 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
(cherry picked from commit 2b266eda6e)
2008-09-23 10:36:20 -04:00
Julien Cristau
ce6424853c exa: disable shared pixmaps
They got re-enabled in ee7c684f21
("Reimplement ShmPutImage.")
(cherry picked from commit b4762c0245)
2008-09-23 10:36:02 -04:00
Aaron Plattner
3787660295 Conditionalize Composite-based backing store on pScreen->backingStoreSupport. 2008-09-17 15:48:56 -07:00
Adam Jackson
05fb2f9e12 xserver 1.5.0
Drinkin' island is inside each of us, my son.
2008-09-03 19:14:22 -04:00
Adam Jackson
f385303cd0 Fix strict-aliasing silliness in XAA.
(cherry picked from commit 613ce09550)
2008-09-03 18:58:43 -04:00
Adam Jackson
6cb7f595b9 Disable DRI2 by default. 2008-09-03 14:59:24 -04:00
Adam Jackson
ed2248f673 Disable XTrap build by default. 2008-09-03 14:58:43 -04:00
Julien Cristau
9bb4990c91 Xevie: swap replies as necessary
(cherry picked from commit b5cdcfa55c)
2008-09-03 13:05:45 -04:00
Thorvald Natvig
bcea1095da 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)
(cherry picked from commit d3ae193f4a)
2008-09-03 13:05:44 -04:00
Julien Cristau
67ed1f23fe Add swapped dispatch for randr 1.2 requests
(cherry picked from commit 01264f1792)
2008-09-03 13:04:19 -04:00
Thomas Bodzar
62524d9d76 Xorg.man: typo (the the).
(cherry picked from commit 229e60db8f)
2008-09-02 17:57:46 -04:00
Matthieu Herrb
57fa9fd4a5 Xserver.man: Typo (the the).
(cherry picked from commit d01c5ca793)
2008-09-02 17:57:34 -04:00
Daniel Drake
7f42ed6ca9 Don't try to destroy a NULL pixmap.
(cherry picked from commit 4e1f9f51a9)
2008-09-02 17:33:21 -04:00
Maarten Maathuis
48744d20b1 xf86Crtc: Set mode to NULL, so nothing bad happens if crtc == NULL.
- Fix is courtesy of math_b.
2008-08-31 18:14:57 +02:00
Xavier Bestel
580e96d6d4 Cosmetic fix to EDID decoding.
(cherry picked from commit bb2cacd33e)
2008-08-29 14:48:40 -04:00
Fredrik Höglund
d0ef934305 Fix the tile offset in miPaintWindow for ParentRelative windows.
(cherry picked from commit 244a635fcd)
2008-08-29 14:39:05 -04:00
Daniel Drake
05472534cf 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.
(cherry picked from commit eff25430b4)
2008-08-29 14:38:43 -04:00
Adam Jackson
4652c51e92 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.

(cherry picked from commit ee7c684f21)
2008-08-29 14:36:43 -04:00
Eamon Walsh
ef0780b738 Attempt getpeercon() on remote sockets as well as local ones.
(cherry picked from commit 60ad8d5d05)
2008-08-28 23:50:20 -04:00
Kristian Høgsberg
78f50cd575 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.
2008-08-26 10:58:35 -04:00
Maarten Maathuis
c662381a14 exa: fix assert logic thinko from 361a9eb953
- I guess failing PrepareAccess is rare, since this a 3 year old bug.
2008-08-17 23:20:45 +02:00
Peter Hutterer
582f1381ae 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.
(cherry picked from commit c06e27b2f6)
2008-08-13 16:59:02 +09:30
Peter Hutterer
07e922a257 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.
(cherry picked from commit d9ca9819e9)
2008-08-13 16:57:28 +09:30
Peter Hutterer
245fecf7cd 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.
(cherry picked from commit 5ba87c3327)
2008-08-13 16:56:05 +09:30
Peter Hutterer
a5c4b9db12 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.
(cherry picked from commit 7e45c80204)

Includes follow-up fix d684f5760f.
2008-08-13 16:55:04 +09:30
Peter Hutterer
8d4004b092 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.
(cherry picked from commit a609dbed7c)
2008-08-13 16:52:55 +09:30
Peter Hutterer
8a18475848 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.
(cherry picked from commit e8c2a3d7c9)

Conflicts:

	xkb/xkb.c
2008-08-13 16:52:03 +09:30
Peter Hutterer
5b3eb0a3af 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.
(cherry picked from commit 3c7740aa8f)

Conflicts:

	xkb/xkb.c
2008-08-13 16:49:33 +09:30
Peter Hutterer
2fa7edd30d 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.
(cherry picked from commit 31afd51dd4)
2008-08-13 16:43:22 +09:30
Alan Coopersmith
50382652af Fix --disable/--enable-kbd_mode configure flag 2008-08-12 14:53:14 -07:00
Dave Miller
5930aeb45e glx: fix crash in driGetConfigAttribIndex
Don't access GLboolean via int pointers
2008-08-09 16:47:49 +10:00
Alan Coopersmith
b61ee18b72 Make xstrcasestr prototype return value match the implementation
(cherry picked from 3b687ffe16 commit)
2008-08-06 16:12:59 -07:00
Daniel Stone
b5932f176c DIX: Add strcasestr from FreeBSD
Add strcasestr for use on systems which don't have it.
(cherry picked from ad87c72edc commit)
2008-08-06 16:12:06 -07:00
Daniel Stone
ce10b41f1b 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 ...
(cherry picked from 69b57dc651 commit)
2008-08-06 16:08:42 -07:00
Daniel Stone
8a319335fa 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.
(cherry picked from dcf6293030 commit)
2008-08-06 16:05:45 -07:00
Daniel Stone
5a5030af9b 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.
(cherry picked from 11f9e35202 commit)
2008-08-06 16:05:32 -07:00
Peter Hutterer
f7ee776de2 config: protect against potential out-of-bounds indexing.
(cherry picked from commit 3c6a9c531f)
2008-08-06 10:34:35 +09:30
Peter Hutterer
7d508f783c config: support type strlist for XkbOptions property.
For backwards compatibility with server 1.4.
(cherry picked from commit 92c51b183c)
2008-08-06 10:34:35 +09:30
Peter Hutterer
2f6b270e48 config: add parsing for input.x11_options.XkbOptions. #16874
X.Org Bug 16874 <http://bugs.freedesktop.org/show_bug.cgi?id=16784>
(cherry picked from commit 35b14519b4)
2008-08-06 10:34:35 +09:30
Daniel Stone
0788adb9a6 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.
(cherry picked from commit b8dd07f855)
2008-08-06 10:34:35 +09:30
Julien Cristau
db918ea2b0 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.
(cherry picked from commit 2eaed4a10f)
2008-08-06 10:34:35 +09:30