Commits · 3bdf36476179257561b9409c3f49a77640fbb9f9 · Adam Jackson / xserver

16 Sep, 2009 9 commits

Work around sporadic segfault on resume with intel/KMS due to cursor->bits == NULL. · 3bdf3647
Matthias Hopf authored Sep 16, 2009
```
Apparently SavedCursor is sometime tried to be set while already being set.
```
3bdf3647

Change xf86dristr.h includes to use xf86driproto.h instead · fe31f9c6

Alan Coopersmith authored Sep 14, 2009

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>

fe31f9c6

dmx: don't include panoramiXsrv.h if building w/o Xinerama · 159e0320

Peter Hutterer authored Sep 15, 2009

Reported-by: Marvin Schmidt
Tested-by: Marvin Schmidt
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

159e0320

dix: append "built-ins" to the font path in SetDefaultFontPath · f56cbe1e

Rémi Cardona authored Sep 14, 2009

49b93df8 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>

f56cbe1e

Fix num_masks/length overflow test for XiSelectEvents · 139368f7

Alan Coopersmith authored Sep 15, 2009

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>

139368f7

test_convert_XIRawEvent: Don't write more data than the struct holds · 13decf5e

Alan Coopersmith authored Sep 15, 2009

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>

13decf5e

Remove stray semi-colon in protocol-common.c · 38a61e9a

Alan Coopersmith authored Sep 15, 2009

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>

38a61e9a

Fix module path in xorg.conf man page · e320736c

Alan Coopersmith authored Sep 14, 2009

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

e320736c

xfree86: vgaarb: rework wrapping function · 49b98d09

Tiago Vignatti authored Sep 10, 2009

No semantical changes.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

49b98d09

14 Sep, 2009 8 commits

XQuartz: pbproxy: Remove debugging XBell() · 422cd7a6
Jeremy Huddleston authored Sep 14, 2009
```
(cherry picked from commit 1fd7c1fd)
```
422cd7a6
xserver 1.6.99.901 (xserver 1.7 RC1) · 663807ce
Peter Hutterer authored Sep 14, 2009
```
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
```
663807ce
Add xoff and yoff to drawable->x and drawable->y in create_bits_picture(). · f450be99
Soeren Sandmann authored Sep 11, 2009
```
These are 0, except when the drawable is a redirected window.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
```
f450be99

Update xorg.conf man page & sample for changes in Xorg 1.7 · 2b00afec

Alan Coopersmith authored Sep 14, 2009

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 d52fddef

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 76f18b94
- DRI2 option added in April 2008
  by 35982bc1

Remove xorg.conf options that were removed from the code:
- XkbDisable option was removed in January 2009
  by commit 40877c66
- PciProbe/Config options were removed in August 2008
  by commit fdf7c747
- EstimateSizesAggressively was removed in August 2008
  by commit cd1e8f26
- loadable font modules were removed in July 2008
  by commit affec106
- ModInDev options were removed in December 2008
  by commit 6de6ffff

(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>

2b00afec

xfree86: Change default font path to match configure.ac's --default-font-path. · b6f5c54f
Alan Coopersmith authored Sep 14, 2009
```
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
```
b6f5c54f

dmx: use top_builddir, not top_srcdir to get libxfixes.la · 23dc4678

Peter Hutterer authored Sep 14, 2009

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Byeong-ryeol Kim <brofkims@gmail.com>

23dc4678

xkb: drop key presses for already repeating keys. (#23889) · 4650e6eb

Peter Hutterer authored Sep 14, 2009

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>

4650e6eb

xfree86: fix VT_WAITACTIVE control flow (#11477) · c626a557

Peter Hutterer authored Sep 13, 2009

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>

c626a557

13 Sep, 2009 20 commits
- dix: FindChildForEvent needs init child to None. · d3c66d6b
  Peter Hutterer authored Sep 14, 2009
```
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>
```
  d3c66d6b
- Include <X11/extensions/dmx.h> and remove _DMX_SERVER_ define. · e85775aa
  Kevin E Martin authored Sep 14, 2009
```
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>
```
  e85775aa
- dmx: Make description match default option. · 232d4351
  Kevin E Martin authored Sep 14, 2009
```
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
```
  232d4351
- shave: use CC tag variable on libtool · 6389a190
  Tiago Vignatti authored Sep 12, 2009
```
This fix scratchbox compilation.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
```
  6389a190
- configure: re-enable dmx build (default=auto) · dfb106c8
  Peter Hutterer authored Sep 08, 2009
```
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
```
  dfb106c8
- dmx: Remove some dead code. · 72607960
  Peter Hutterer authored Sep 09, 2009
```
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
```
  72607960
- dmx: purge DMX EQ leftovers · 88187ad8
  Peter Hutterer authored Sep 09, 2009
```
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
```
  88187ad8
- dmx: formatting fix to improve readability · f3aaa46f
  Peter Hutterer authored Sep 09, 2009
```
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
```
  f3aaa46f
- dmx: Default rules are now base, not xfree86 · 7a588c83
  Peter Hutterer authored Sep 08, 2009
```
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
```
  7a588c83
- dmx: include xfixes lib, reshuffle include order to resolve linker errors. · 33243ae9
  Peter Hutterer authored Aug 04, 2009
```
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
```
  33243ae9
- dmx: remove dmx-internal event queue. · 2d466787
  Peter Hutterer authored Sep 08, 2009
```
The EQ is in the DIX now.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
```
  2d466787
- dmx: compiler warning fix (mixed declarations + code) · 545f1113
  Peter Hutterer authored Sep 08, 2009
```
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
```
  545f1113
- dmx: get the state from XKB for dmxCheckSpecialKeys · 7d703af7
  Peter Hutterer authored Sep 08, 2009
```
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
```
  7d703af7
- dmx: fix dmxKeySymToKeyCode to work with mandatory XKB. · 6e52f923
  Peter Hutterer authored Sep 08, 2009
```
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>
```
  6e52f923
- dmx: fix up dmxKeyCodeToKeySym for XKB-only. · 61ae0a5c
  Peter Hutterer authored Sep 08, 2009
```
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
```
  61ae0a5c
- dmx: fix two calls to InitKeyboardDeviceStruct. · 9caba3e2
  Peter Hutterer authored Aug 04, 2009
```
Takes RMLVO now instead of the keysyms directly.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
```
  9caba3e2
- dmx: XkbComponentNamesRec doesn't have a keymap field anymore. · 29b9a10d
  Peter Hutterer authored Aug 04, 2009
```
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
```
  29b9a10d
- dmx: switch lnx-input and usb-input over to xkb-only. · a6f3f6a6
  Peter Hutterer authored Sep 08, 2009
```
kbd*Convert are nearly identical, it just asks for merging. Not today
though.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
```
  a6f3f6a6
- dmx: include xkbsrv.h to silence compiler. · 5d81aee5
  Peter Hutterer authored Aug 04, 2009
```
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
```
  5d81aee5
- xkb: split effectiveGroup calculation into separate utility function. · 4da59f47
  Peter Hutterer authored Sep 08, 2009
```
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
```
  4da59f47
11 Sep, 2009 2 commits
- compiler.h: include <string.h> before using memmove() · 8fb3fa28
  Alan Coopersmith authored Sep 11, 2009
```
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
```
  8fb3fa28
- Revert "Make sys.c use compiler.h unaligned access functions" · d908ee6e
  Tiago Vignatti authored Sep 10, 2009
```
This reverts commit 1b30545c.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
```
  d908ee6e
10 Sep, 2009 1 commit

xfree86: vgaarb: close and cleanup vga arbiter · 281ebb45

Tiago Vignatti authored Sep 10, 2009

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>

281ebb45