Hello community,
here is the log from the commit of package xorg-x11-server for openSUSE:Factory
checked in at Mon Nov 15 15:34:40 CET 2010.
--------
--- xorg-x11-server/xorg-x11-server.changes 2010-11-02 00:57:44.000000000 +0100
+++ /mounts/work_src_done/STABLE/xorg-x11-server/xorg-x11-server.changes 2010-11-14 10:23:29.000000000 +0100
@@ -1,0 +2,36 @@
+Sun Nov 14 09:15:22 UTC 2010 - sndirsch@novell.com
+
+- xorg-server 1.9.2.901 (1.9.3 RC1)
+ * many buildfixes and bugfixes
+
+-------------------------------------------------------------------
+Fri Nov 12 12:52:01 UTC 2010 - sndirsch@novell.com
+
+- xorg-docs 1.5.99.901 (1.6 RC1)
+- adjusted xorg-x11-doc.diff
+
+-------------------------------------------------------------------
+Fri Nov 12 12:06:22 UTC 2010 - sndirsch@novell.com
+
+- xorg-docs-1.5
+- adjusted xorg-docs.diff
+
+-------------------------------------------------------------------
+Tue Nov 9 23:49:23 UTC 2010 - sndirsch@novell.com
+
+- disabled again vnc build due to immediate assertion during
+ startup of Xvnc
+
+-------------------------------------------------------------------
+Tue Nov 9 23:46:17 UTC 2010 - sndirsch@novell.com
+
+- uncommented non-existing
+ xorg-server-xf4vnc-bug605015-vnc-umlauts.diff
+
+-------------------------------------------------------------------
+Tue Nov 9 18:40:57 UTC 2010 - mhopf@novell.com
+
+- xorg-server-xf4vnc-fixes_1_9.diff:
+ Fix build of vnc server for 1.9 Xserver series.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
xorg-docs-1.4.tar.bz2
xorg-server-1.9.2.tar.bz2
New:
----
xorg-docs-1.5.99.901.tar.bz2
xorg-server-1.9.2.901.tar.bz2
xorg-server-xf4vnc-fixes_1_9.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-server.spec ++++++
--- /var/tmp/diff_new_pack.9bfoDH/_old 2010-11-15 15:33:56.000000000 +0100
+++ /var/tmp/diff_new_pack.9bfoDH/_new 2010-11-15 15:33:56.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package xorg-x11-server (Version 7.5_1.9.2)
+# spec file for package xorg-x11-server (Version 7.5_1.9.2.901)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -20,7 +20,7 @@
%define moblin 0
Name: xorg-x11-server
-%define dirsuffix 1.9.2
+%define dirsuffix 1.9.2.901
%define vnc 0
BuildRequires: Mesa-devel bison flex fontconfig-devel freetype2-devel ghostscript-library libdrm-devel libopenssl-devel pkgconfig xorg-x11 xorg-x11-devel xorg-x11-fonts-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel
### udev support (broken on openSUSE 11.2, see also bnc #589997)
@@ -53,7 +53,7 @@
Source3: README.updates
Source4: xorgcfg.tar.bz2
Source5: modprobe.nvidia
-Source7: xorg-docs-1.4.tar.bz2
+Source7: xorg-docs-1.5.99.901.tar.bz2
Source8: xorg-backtrace
Patch1: fpic.diff
Patch2: p_default-module-path.diff
@@ -78,6 +78,8 @@
Patch47: xorg-server-xf4vnc-clientTimeout.diff
Patch48: xorg-server-xf4vnc-fix.diff
Patch49: xorg-server-xf4vnc-fixes_1_8.diff
+Patch50: xorg-server-xf4vnc-fixes_1_9.diff
+#Patch51: xorg-server-xf4vnc-bug605015-vnc-umlauts.diff
%endif
Patch45: bug-197858_dpms.diff
Patch67: xorg-docs.diff
@@ -199,6 +201,8 @@
%patch47 -p1
%patch48 -p1
%patch49 -p0
+%patch50 -p1
+#%patch51 -p1
chmod 755 hw/vnc/symlink-vnc.sh
%endif
%patch45 -p0
++++++ xorg-docs-1.4.tar.bz2 -> xorg-docs-1.5.99.901.tar.bz2 ++++++
xorg-x11-server/xorg-docs-1.4.tar.bz2 /mounts/work_src_done/STABLE/xorg-x11-server/xorg-docs-1.5.99.901.tar.bz2 differ: byte 11, line 1
++++++ xorg-docs.diff ++++++
--- /var/tmp/diff_new_pack.9bfoDH/_old 2010-11-15 15:33:57.000000000 +0100
+++ /var/tmp/diff_new_pack.9bfoDH/_new 2010-11-15 15:33:57.000000000 +0100
@@ -1,34 +1,29 @@
-Index: Makefile.am
-================================================================================
---- Makefile.am
-+++ Makefile.am
-@@ -20,11 +20,9 @@
- #
- # Process this file with autoconf to create configure.
-
--SUBDIRS = hardcopy man sgml
-+SUBDIRS = man
- x11docdir = @X11DOCDIR@
-
--dist_x11doc_DATA = MAINTAINERS
--
- EXTRA_DIST = \
- MAINTAINERS \
- misc/xlogo.epsi \
---- man/general/Makefile.am
-+++ man/general/Makefile.am
-@@ -23,13 +23,8 @@
+--- man/Makefile.am.orig 2010-09-14 01:25:46.000000000 +0200
++++ man/Makefile.am 2010-11-12 13:28:31.000000000 +0100
+@@ -23,12 +23,8 @@
miscmandir = $(MISC_MAN_DIR)
- miscman_PRE = \
-- Consortium.man \
- security.man \
-- Standards.man \
-- X.man \
-- XOrgFoundation.man \
-- Xprint.man \
+ miscman_PRE = \
+- Consortium.man \
+ Xsecurity.man \
+- Standards.man \
+- X.man \
+- XOrgFoundation.man \
- XProjectTeam.man
+ X.man
miscman_DATA = $(miscman_PRE:man=@MISC_MAN_SUFFIX@)
+--- Makefile.am.orig 2010-11-12 13:45:19.000000000 +0100
++++ Makefile.am 2010-11-12 13:45:32.000000000 +0100
+@@ -20,9 +20,7 @@
+ #
+ # Process this file with autoconf to create configure.
+
+-SUBDIRS = general man specs
+-
+-dist_doc_DATA = MAINTAINERS
++SUBDIRS = man
+
+ MAINTAINERCLEANFILES = ChangeLog INSTALL
+ EXTRA_DIST = \
++++++ xorg-server-1.9.2.tar.bz2 -> xorg-server-1.9.2.901.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.9.2/aclocal.m4 new/xorg-server-1.9.2.901/aclocal.m4
--- old/xorg-server-1.9.2/aclocal.m4 2010-10-31 20:10:25.000000000 +0100
+++ new/xorg-server-1.9.2.901/aclocal.m4 2010-11-14 01:04:50.000000000 +0100
@@ -11185,32 +11185,28 @@
AC_SUBST([CHANGELOG_CMD])
]) # XORG_CHANGELOG
-dnl $XdotOrg: lib/xtrans/xtrans.m4,v 1.6 2005/07/26 18:59:11 alanc Exp $
dnl
-dnl Copyright 2005 Sun Microsystems, Inc. All rights reserved.
-dnl
-dnl Permission to use, copy, modify, distribute, and sell this software and its
-dnl documentation for any purpose is hereby granted without fee, provided that
-dnl the above copyright notice appear in all copies and that both that
-dnl copyright notice and this permission notice appear in supporting
-dnl documentation.
-dnl
-dnl The above copyright notice and this permission notice shall be included
-dnl in all copies or substantial portions of the Software.
-dnl
-dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-dnl OTHER DEALINGS IN THE SOFTWARE.
-dnl
-dnl Except as contained in this notice, the name of the copyright holders shall
-dnl not be used in advertising or otherwise to promote the sale, use or
-dnl other dealings in this Software without prior written authorization
-dnl from the copyright holders.
-dnl
+dnl Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+dnl
+dnl Permission is hereby granted, free of charge, to any person obtaining a
+dnl copy of this software and associated documentation files (the "Software"),
+dnl to deal in the Software without restriction, including without limitation
+dnl the rights to use, copy, modify, merge, publish, distribute, sublicense,
+dnl and/or sell copies of the Software, and to permit persons to whom the
+dnl Software is furnished to do so, subject to the following conditions:
+dnl
+dnl The above copyright notice and this permission notice (including the next
+dnl paragraph) shall be included in all copies or substantial portions of the
+dnl Software.
+dnl
+dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+dnl IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+dnl FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+dnl THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+dnl LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+dnl FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+dnl DEALINGS IN THE SOFTWARE.
+dnl
# XTRANS_TCP_FLAGS()
# ------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.9.2/ChangeLog new/xorg-server-1.9.2.901/ChangeLog
--- old/xorg-server-1.9.2/ChangeLog 2010-10-31 20:24:41.000000000 +0100
+++ new/xorg-server-1.9.2.901/ChangeLog 2010-11-14 01:06:10.000000000 +0100
@@ -1,3 +1,381 @@
+commit 723c82347c141d298ff82a9605d7455e84c050f8
+Author: Jeremy Huddleston
+Date: Sat Nov 13 15:33:32 2010 -0800
+
+ Version bumped to 1.9.2.901 (1.9.3 RC1)
+
+ Signed-off-by: Jeremy Huddleston
+
+commit 42a3747f0f694ff918ab719594eefd0a6bbfab0c
+Author: Jeremy Huddleston
+Date: Sat Nov 13 16:04:10 2010 -0800
+
+ XQuartz: Fix make distcheck
+
+ Signed-off-by: Jeremy Huddleston
+
+commit d75a33d47a89bf7668e05fadbc8a154ac492b113
+Author: Jeremy Huddleston
+Date: Sat Nov 13 15:46:16 2010 -0800
+
+ dix: Fix make distcheck
+
+ Signed-off-by: Jeremy Huddleston
+
+commit f9f381c48a87b700cc9429dce5ddbac74a774803
+Author: Cyril Brulebois
+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
+ Signed-off-by: Peter Hutterer
+ (cherry picked from commit c481dae0dc89d8d50cac23210023d75bfaf6012b)
+
+commit 2715529d6b1da1e7b0266e66eba1aa50027c7c86
+Author: Jeremy Huddleston
+Date: Tue Nov 9 13:33:55 2010 -0800
+
+ DOC: Only build dtrace documentation with --enable-docs
+
+ Signed-off-by: Jeremy Huddleston
+ Reviewed-by: Alan Coopersmith
+ Signed-off-by: Keith Packard
+ (cherry picked from commit 291c39dfef84d1b204d7f5e63e925dee2dbdaca7)
+
+commit 4a7b5a33e1f9e53c9cd19d6790d0d48f05cb54d4
+Author: Adam Jackson
+Date: Sat Sep 11 17:55:57 2010 -0400
+
+ shadow: Optimize shadowUpdatePacked(). (#26973)
+
+ Signed-off-by: Matt Turner
+ Reviewed-by: Soren Sandmann
+ Reviewed-by: Matt Turner
+ Signed-off-by: Keith Packard
+ (cherry picked from commit f0b4df99486066ad0e638b3b5debc905bc8ef1c4)
+
+commit a0895a219027e0a52a5a02db903d662562e02dda
+Author: Kristian Høgsberg
+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
+ Reviewed-by: Keith Packard
+ (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
+ (cherry picked from commit 333b6ed26e36735ef72f314a3f8c4ec565af223f)
+
+commit dfda3c696dd72ecc5cc4fa69d8bb4521ba554cf3
+Author: Eric Anholt
+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
+ Reviewed-by: Keith Packard
+ Signed-off-by: Keith Packard
+ (cherry picked from commit f36153e3ef6b13a87d016caab09cc9be274b0dd5)
+
+commit 2e08f1d4b7c0c43c90042a71825992f40388c1fb
+Author: Aaron Plattner
+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
+ Reviewed-by: Adam Jackson
+ Signed-off-by: Keith Packard
+ (cherry picked from commit c80c41767eb101e9dbd8393d8cca7764b4e248a4)
+
+commit 8452392c4bffd424458a82a381ea2496e6556e7e
+Author: Siddhesh Poyarekar
+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
+ Reviewed-by: Keith Packard
+ Signed-off-by: Keith Packard
+ (cherry picked from commit be7cf14c365c8ee0d69c4335e01316bcfcba69a4)
+
+commit b4bb374cc356be0a416f1d7f52dbb2adb6e512d3
+Author: Julien Cristau
+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
+ Acked-by: Peter Hutterer
+ Signed-off-by: Peter Hutterer
+ (cherry picked from commit 69e8e1b0b95a325da3e3a2d76d092e7131baa9ad)
+
+commit f51f1de995f0e3f0983c873ae51f7c6ae11699cf
+Author: Samuel Thibault
+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
+ Signed-off-by: Samuel Thibault
+ (cherry picked from commit f72aadd38b730c46c0a027dacbbb57f03068383d)
+
+commit 0daba1a91a8b601f5168411f2bc123c5346bdb8d
+Author: Aaron Plattner
+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
+ Signed-off-by: Keith Packard
+ (cherry picked from commit 1a0d9324b3d9fd93e685066e0e5cea0611878c0d)
+
+commit 4c85d94bf70cea583f15d60be5c9127caae3a79f
+Author: Michał Górny
+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
+ Reviewed-by: Daniel Stone
+ Signed-off-by: Keith Packard
+ (cherry picked from commit 8806a04f7f028dd9f6a7ff5c36e460d3895c7deb)
+
+commit 43020e1ac923fb3a7ef792722bcf9d30874f5bfe
+Author: Michał Górny
+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
+ Reviewed-by: Daniel Stone
+ Signed-off-by: Keith Packard
+ (cherry picked from commit c7e436e9987a6fb0876c63e96f59ff4c20b4bef0)
+
+commit 46314e1e7ad05d6ff6a2f722b09a76f2931db7f5
+Author: Paulius Zaleckas
+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
+ Reviewed-by: Daniel Stone
+ Reviewed-by: Keith Packard
+ Signed-off-by: Peter Hutterer
+ (cherry picked from commit 8990b31214bcbc08090604147287455bfde91c11)
+
+commit 97915c06d10544d47ca69bd3610fd114d70e071f
+Author: Tiago Vignatti
+Date: Tue Oct 26 20:50:13 2010 +0300
+
+ dix: advance parent window pointer when no node is found
+
+ Signed-off-by: Tiago Vignatti
+ Signed-off-by: Pauli Nieminen
+ Reviewed-by: Peter Hutterer
+ Signed-off-by: Peter Hutterer
+ (cherry picked from commit a210068c5222acbdb04db17cb8cef314735bf977)
+
+commit 4a2caa287d36128d4f7bf10ced7ecb0e505011b2
+Author: Joe Shaw
+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
+ Reviewed-by: Chase Douglas
+ Reviewed-by: Peter Hutterer
+ Signed-off-by: Peter Hutterer
+ (cherry picked from commit e354ccac36a8ee3a23bdc845833c16a5646cc200)
+
+commit 0f29d3a09dd96b5c124642f7cb939d48597b228c
+Author: Peter Hutterer
+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
+ Reviewed-by: Daniel Stone
+ (cherry picked from commit ca21a266224b6eff4fd817c2082d2e144f1ea58c)
+
+commit 8ff9b495e09b378d615cfd17e17f98d269713dd6
+Author: Peter Hutterer
+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
+ Reviewed-by: Peter Hutterer
+ Signed-off-by: Peter Hutterer
+ (cherry picked from commit fe8d122b133a43125cc961d2c3c811fa776f29c8)
+
+commit b144c0f4c72977671a39fa6368cbfea142444096
+Author: Peter Hutterer
+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
+ 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
+ Tested-by: Andrew Randrianasulu
+ Tested-by: Andy Furniss
+ Reviewed-by: Daniel Stone
+ (cherry picked from commit 9872e0f0115cd7d0543e55a1831facddf3aff90c)
+
+commit 79f2a58c323bd1ad373f1f929207b5af98031b95
+Author: Peter Hutterer
+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
+ Signed-off-by: Peter Hutterer
+ Tested-by: Bartosz Brachaczek
+ (cherry picked from commit de8be07cc0a8163b6ef04455706fd5ca2cebe587)
+
commit e3769c20d5f656f76e2c475a722db97c58089260
Author: Jeremy Huddleston
Date: Sat Oct 30 19:49:42 2010 -0700
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.9.2/compile new/xorg-server-1.9.2.901/compile
--- old/xorg-server-1.9.2/compile 2010-10-31 06:47:44.000000000 +0100
+++ new/xorg-server-1.9.2.901/compile 2010-11-14 00:34:49.000000000 +0100
@@ -43,7 +43,7 @@
export ASCIIDOC=/opt/local/bin/asciidoc
export DOXYGEN=/opt/local/bin/doxygen
export FOP=/opt/local/bin/fop
- export FOP_OPTS="-Xmx2048m"
+ export FOP_OPTS="-Xmx2048m -Djava.awt.headless=true"
export GROFF=/opt/local/bin/groff
export PS2PDF=/opt/local/bin/ps2pdf
fi
@@ -62,7 +62,7 @@
autoreconf -fvi || die
${SCAN_BUILD} ./configure --prefix=${PREFIX} ${CONFOPT} --disable-dependency-tracking --enable-maintainer-mode --enable-xcsecurity --enable-record --disable-xevie "${@}" || die "Could not configure xserver"
${MAKE} clean || die "Unable to make clean"
-# ${SCAN_BUILD} ${MAKE} ${MAKE_OPTS} || die "Could not make xserver"
+ ${SCAN_BUILD} ${MAKE} ${MAKE_OPTS} || die "Could not make xserver"
}
doinst() {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.9.2/composite/compalloc.c new/xorg-server-1.9.2.901/composite/compalloc.c
--- old/xorg-server-1.9.2/composite/compalloc.c 2010-06-06 23:37:03.000000000 +0200
+++ new/xorg-server-1.9.2.901/composite/compalloc.c 2010-11-14 00:17:58.000000000 +0100
@@ -238,7 +238,7 @@
DamageRegister (&pWin->drawable, cw->damage);
cw->damageRegistered = TRUE;
pWin->redirectDraw = RedirectDrawAutomatic;
- DamageRegionAppend(&pWin->drawable, &pWin->borderSize);
+ DamageDamageRegion(&pWin->drawable, &pWin->borderSize);
}
if (wasMapped && !pWin->mapped)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.9.2/composite/compwindow.c new/xorg-server-1.9.2.901/composite/compwindow.c
--- old/xorg-server-1.9.2/composite/compwindow.c 2010-09-11 23:20:51.000000000 +0200
+++ new/xorg-server-1.9.2.901/composite/compwindow.c 2010-11-14 00:17:58.000000000 +0100
@@ -519,7 +519,7 @@
RegionTranslate(prgnSrc,
pWin->drawable.x - ptOldOrg.x,
pWin->drawable.y - ptOldOrg.y);
- DamageRegionAppend(&pWin->drawable, prgnSrc);
+ DamageDamageRegion(&pWin->drawable, prgnSrc);
}
cs->CopyWindow = pScreen->CopyWindow;
pScreen->CopyWindow = compCopyWindow;
@@ -598,7 +598,7 @@
/*
* Report that as damaged so it will be redrawn
*/
- DamageRegionAppend(&pWin->drawable, &damage);
+ DamageDamageRegion(&pWin->drawable, &damage);
RegionUninit(&damage);
/*
* Save the new border clip region
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.9.2/configure new/xorg-server-1.9.2.901/configure
--- old/xorg-server-1.9.2/configure 2010-10-31 20:10:27.000000000 +0100
+++ new/xorg-server-1.9.2.901/configure 2010-11-14 01:04:52.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for xorg-server 1.9.2.
+# Generated by GNU Autoconf 2.68 for xorg-server 1.9.2.901.
#
# Report bugs to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg.
#
@@ -631,8 +631,8 @@
# Identity of this package.
PACKAGE_NAME='xorg-server'
PACKAGE_TARNAME='xorg-server'
-PACKAGE_VERSION='1.9.2'
-PACKAGE_STRING='xorg-server 1.9.2'
+PACKAGE_VERSION='1.9.2.901'
+PACKAGE_STRING='xorg-server 1.9.2.901'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
PACKAGE_URL=''
@@ -986,6 +986,8 @@
XMLTO
ENABLE_DEVEL_DOCS_FALSE
ENABLE_DEVEL_DOCS_TRUE
+ENABLE_DOCS_FALSE
+ENABLE_DOCS_TRUE
BUILDDOCS_FALSE
BUILDDOCS_TRUE
INT10_STUB_FALSE
@@ -1312,6 +1314,7 @@
enable_ipv6
enable_local_transport
enable_secure_rpc
+enable_docs
enable_devel_docs
with_xmlto
with_fop
@@ -1960,7 +1963,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xorg-server 1.9.2 to adapt to many kinds of systems.
+\`configure' configures xorg-server 1.9.2.901 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -2030,7 +2033,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xorg-server 1.9.2:";;
+ short | recursive ) echo "Configuration of xorg-server 1.9.2.901:";;
esac
cat <<\_ACEOF
@@ -2129,6 +2132,7 @@
--enable-local-transport
Enable os-specific local transport
--enable-secure-rpc Enable Secure RPC
+ --enable-docs Enable building the documentation (yes: yes)
--enable-devel-docs Enable building the developer documentation
(default: yes)
@@ -2418,7 +2422,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xorg-server configure 1.9.2
+xorg-server configure 1.9.2.901
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -3122,7 +3126,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xorg-server $as_me 1.9.2, which was
+It was created by xorg-server $as_me 1.9.2.901, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -3470,7 +3474,7 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-RELEASE_DATE="2010-10-30"
+RELEASE_DATE="2010-11-13"
am__api_version='1.11'
@@ -3939,7 +3943,7 @@
# Define the identity of the package.
PACKAGE='xorg-server'
- VERSION='1.9.2'
+ VERSION='1.9.2.901'
cat >>confdefs.h <<_ACEOF
@@ -18426,6 +18430,29 @@
+# Check whether --enable-docs was given.
+if test "${enable_docs+set}" = set; then :
+ enableval=$enable_docs; build_docs=$enableval
+else
+ build_docs=yes
+fi
+
+
+ if test x$build_docs = xyes; then
+ ENABLE_DOCS_TRUE=
+ ENABLE_DOCS_FALSE='#'
+else
+ ENABLE_DOCS_TRUE='#'
+ ENABLE_DOCS_FALSE=
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build documentation" >&5
+$as_echo_n "checking whether to build documentation... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $build_docs" >&5
+$as_echo "$build_docs" >&6; }
+
+
+
# Check whether --enable-devel-docs was given.
if test "${enable_devel_docs+set}" = set; then :
enableval=$enable_devel_docs; build_devel_docs=$enableval
@@ -24719,7 +24746,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ts_ts_open" >&5
$as_echo "$ac_cv_lib_ts_ts_open" >&6; }
if test "x$ac_cv_lib_ts_ts_open" = xyes; then :
- HAVE_TSLIB="yes"
+
+ HAVE_TSLIB="yes"
+ TSLIB_LIBS="-lts"
+
fi
fi
@@ -24926,7 +24956,7 @@
KDRIVE_LOCAL_LIBS="$MAIN_LIB $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB"
KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS"
KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB"
- KDRIVE_LIBS="$TSLIB_LIBS $KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS"
+ KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS $TSLIB_LIBS"
@@ -25298,6 +25328,10 @@
as_fn_error $? "conditional \"BUILDDOCS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${ENABLE_DOCS_TRUE}" && test -z "${ENABLE_DOCS_FALSE}"; then
+ as_fn_error $? "conditional \"ENABLE_DOCS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${ENABLE_DEVEL_DOCS_TRUE}" && test -z "${ENABLE_DEVEL_DOCS_FALSE}"; then
as_fn_error $? "conditional \"ENABLE_DEVEL_DOCS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -26023,7 +26057,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xorg-server $as_me 1.9.2, which was
+This file was extended by xorg-server $as_me 1.9.2.901, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -26089,7 +26123,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-xorg-server config.status 1.9.2
+xorg-server config.status 1.9.2.901
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.9.2/configure.ac new/xorg-server-1.9.2.901/configure.ac
--- old/xorg-server-1.9.2/configure.ac 2010-10-31 20:07:12.000000000 +0100
+++ new/xorg-server-1.9.2.901/configure.ac 2010-11-14 01:04:32.000000000 +0100
@@ -26,8 +26,8 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.9.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2010-10-30"
+AC_INIT([xorg-server], 1.9.2.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2010-11-13"
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
@@ -718,6 +718,7 @@
dnl Handle building documentation
AM_CONDITIONAL(BUILDDOCS, test "x$BUILDDOCS" = xyes)
+XORG_ENABLE_DOCS
XORG_ENABLE_DEVEL_DOCS
XORG_WITH_XMLTO(0.0.20)
XORG_WITH_FOP
@@ -2037,7 +2038,10 @@
PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"])
if test "x$HAVE_TSLIB" = xno; then
- AC_CHECK_LIB(ts, ts_open, [HAVE_TSLIB="yes"])
+ AC_CHECK_LIB(ts, ts_open, [
+ HAVE_TSLIB="yes"
+ TSLIB_LIBS="-lts"
+ ])
fi
if test "xTSLIB" = xauto; then
@@ -2122,7 +2126,7 @@
KDRIVE_LOCAL_LIBS="$MAIN_LIB $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB"
KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS"
KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB"
- KDRIVE_LIBS="$TSLIB_LIBS $KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS"
+ KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS $TSLIB_LIBS"
AC_SUBST([XEPHYR_LIBS])
AC_SUBST([XEPHYR_INCS])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.9.2/damageext/damageext.c new/xorg-server-1.9.2.901/damageext/damageext.c
--- old/xorg-server-1.9.2/damageext/damageext.c 2010-08-13 10:02:40.000000000 +0200
+++ new/xorg-server-1.9.2.901/damageext/damageext.c 2010-11-14 00:25:28.000000000 +0100
@@ -223,7 +223,7 @@
if (pDrawable->type == DRAWABLE_WINDOW)
{
pRegion = &((WindowPtr) pDrawable)->borderClip;
- DamageRegionAppend(pDrawable, pRegion);
+ DamageDamageRegion(pDrawable, pRegion);
}
return Success;
@@ -293,7 +293,7 @@
* screen coordinates like damage expects.
*/
RegionTranslate(pRegion, pDrawable->x, pDrawable->y);
- DamageRegionAppend(pDrawable, pRegion);
+ DamageDamageRegion(pDrawable, pRegion);
RegionTranslate(pRegion, -pDrawable->x, -pDrawable->y);
return Success;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.9.2/dix/eventconvert.c new/xorg-server-1.9.2.901/dix/eventconvert.c
--- old/xorg-server-1.9.2/dix/eventconvert.c 2010-10-30 11:16:38.000000000 +0200
+++ new/xorg-server-1.9.2.901/dix/eventconvert.c 2010-11-10 07:26:52.000000000 +0100
@@ -102,6 +102,15 @@
switch(event->any.type)
{
case ET_Motion:
+ {
+ DeviceEvent *e = &event->device_event;
+ /* Don't create core motion event if neither x nor y are
+ * present */
+ if (!BitIsOn(e->valuators.mask, 0) &&
+ !BitIsOn(e->valuators.mask, 1))
+ return BadMatch;
+ }
+ /* fallthrough */
case ET_ButtonPress:
case ET_ButtonRelease:
case ET_KeyPress:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.9.2/dix/getevents.c new/xorg-server-1.9.2.901/dix/getevents.c
--- old/xorg-server-1.9.2/dix/getevents.c 2010-08-20 04:45:33.000000000 +0200
+++ new/xorg-server-1.9.2.901/dix/getevents.c 2010-11-10 07:26:52.000000000 +0100
@@ -210,7 +210,7 @@
}
memcpy(&event->valuators.data[first_valuator],
- valuators, num_valuators * sizeof(uint32_t));
+ valuators, num_valuators * sizeof(int32_t));
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.9.2/dix/Makefile.am new/xorg-server-1.9.2.901/dix/Makefile.am
--- old/xorg-server-1.9.2/dix/Makefile.am 2010-06-06 23:37:03.000000000 +0200
+++ new/xorg-server-1.9.2.901/dix/Makefile.am 2010-11-14 00:52:55.000000000 +0100
@@ -1,5 +1,6 @@
noinst_LTLIBRARIES = libdix.la libmain.la
+AM_CPPFLAGS = -I$(top_srcdir)/include
AM_CFLAGS = $(DIX_CFLAGS)
libmain_la_SOURCES = \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.9.2/dix/Makefile.in new/xorg-server-1.9.2.901/dix/Makefile.in
--- old/xorg-server-1.9.2/dix/Makefile.in 2010-10-31 20:10:30.000000000 +0100
+++ new/xorg-server-1.9.2.901/dix/Makefile.in 2010-11-14 01:04:55.000000000 +0100
@@ -447,6 +447,7 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
noinst_LTLIBRARIES = libdix.la libmain.la
+AM_CPPFLAGS = -I$(top_srcdir)/include
AM_CFLAGS = $(DIX_CFLAGS)
libmain_la_SOURCES = \
main.c
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.9.2/dix/window.c new/xorg-server-1.9.2.901/dix/window.c
--- old/xorg-server-1.9.2/dix/window.c 2010-08-20 04:45:33.000000000 +0200
+++ new/xorg-server-1.9.2.901/dix/window.c 2010-11-10 07:26:52.000000000 +0100
@@ -3660,9 +3660,9 @@
&pParentNode, &pParentPrev))
{
/* if there is a node in the list, the win has a dev cursor */
- if (!pParentNode->cursor) /* inherited. loop needs to cont. */
- {
- } else if (pParentNode->cursor == pCursor) /* inherit */
+ if (!pParentNode->cursor) /* inherited. */
+ pParent = pParent->parent;
+ else if (pParentNode->cursor == pCursor) /* inherit */
return TRUE;
else /* different cursor */
return FALSE;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.9.2/doc/xml/dtrace/Makefile.am new/xorg-server-1.9.2.901/doc/xml/dtrace/Makefile.am
--- old/xorg-server-1.9.2/doc/xml/dtrace/Makefile.am 2010-08-02 08:07:37.000000000 +0200
+++ new/xorg-server-1.9.2.901/doc/xml/dtrace/Makefile.am 2010-11-14 00:26:56.000000000 +0100
@@ -25,11 +25,13 @@
include ../xmlrules.in
+if ENABLE_DOCS
if XSERVER_DTRACE
doc_DATA = $(BUILT_DOC_FILES)
else
noinst_DATA = $(BUILT_DOC_FILES)
endif
+endif
CLEANFILES = $(CLEAN_DOC_FILES)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.9.2/doc/xml/dtrace/Makefile.in new/xorg-server-1.9.2.901/doc/xml/dtrace/Makefile.in
--- old/xorg-server-1.9.2/doc/xml/dtrace/Makefile.in 2010-10-31 20:10:30.000000000 +0100
+++ new/xorg-server-1.9.2.901/doc/xml/dtrace/Makefile.in 2010-11-14 01:04:55.000000000 +0100
@@ -473,8 +473,8 @@
XML_ENT_DIR = $(abs_top_builddir)/doc/xml
XMLTO_FLAGS = --searchpath $(XML_ENT_DIR) $(am__append_1)
CLEAN_DOC_FILES = $(TXT_FILES) $(HTML_FILES) $(PDF_FILES) xorg.css
-@XSERVER_DTRACE_TRUE@doc_DATA = $(BUILT_DOC_FILES)
-@XSERVER_DTRACE_FALSE@noinst_DATA = $(BUILT_DOC_FILES)
+@ENABLE_DOCS_TRUE@@XSERVER_DTRACE_TRUE@doc_DATA = $(BUILT_DOC_FILES)
+@ENABLE_DOCS_TRUE@@XSERVER_DTRACE_FALSE@noinst_DATA = $(BUILT_DOC_FILES)
CLEANFILES = $(CLEAN_DOC_FILES)
EXTRA_DIST = $(XML_FILES)
all: all-am
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.9.2/exa/exa.c new/xorg-server-1.9.2.901/exa/exa.c
--- old/xorg-server-1.9.2/exa/exa.c 2010-07-17 21:36:54.000000000 +0200
+++ new/xorg-server-1.9.2.901/exa/exa.c 2010-11-14 00:17:57.000000000 +0100
@@ -159,8 +159,7 @@
return;
RegionInit(®ion, &box, 1);
- DamageRegionAppend(&pPix->drawable, ®ion);
- DamageRegionProcessPending(&pPix->drawable);
+ DamageDamageRegion(&pPix->drawable, ®ion);
RegionUninit(®ion);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.9.2/glx/glxdri.c new/xorg-server-1.9.2.901/glx/glxdri.c
--- old/xorg-server-1.9.2/glx/glxdri.c 2010-07-17 21:36:54.000000000 +0200
+++ new/xorg-server-1.9.2.901/glx/glxdri.c 2010-11-14 00:17:57.000000000 +0100
@@ -834,9 +834,7 @@
RegionInit(®ion, (BoxPtr) rects, num_rects);
RegionTranslate(®ion, pDraw->x, pDraw->y);
- DamageRegionAppend(pDraw, ®ion);
- /* This is wrong, this needs a seperate function. */
- DamageRegionProcessPending(pDraw);
+ DamageDamageRegion(pDraw, ®ion);
RegionUninit(®ion);
__glXleaveServer(GL_FALSE);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.9.2/hw/kdrive/linux/tslib.c new/xorg-server-1.9.2.901/hw/kdrive/linux/tslib.c
--- old/xorg-server-1.9.2/hw/kdrive/linux/tslib.c 2010-05-13 05:16:31.000000000 +0200
+++ new/xorg-server-1.9.2.901/hw/kdrive/linux/tslib.c 2010-11-10 07:26:52.000000000 +0100
@@ -117,15 +117,22 @@
pi->path = strdup("/dev/input/touchscreen0");
ErrorF("[tslib/TslibEnable] no device path given, trying %s\n", pi->path);
}
+
private->tsDev = ts_open(pi->path, 0);
- private->fd = ts_fd(private->tsDev);
- if (!private->tsDev || ts_config(private->tsDev) || private->fd < 0) {
+ if (!private->tsDev) {
ErrorF("[tslib/TslibEnable] failed to open %s\n", pi->path);
- if (private->fd >= 0)
- close(private->fd);
return BadAlloc;
}
+ if (ts_config(private->tsDev)) {
+ ErrorF("[tslib/TslibEnable] failed to load configuration\n");
+ ts_close(private->tsDev);
+ private->tsDev = NULL;
+ return BadValue;
+ }
+
+ private->fd = ts_fd(private->tsDev);
+
KdRegisterFd(private->fd, TsRead, pi);
return Success;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.9.2/hw/xfree86/common/xf86DGA.c new/xorg-server-1.9.2.901/hw/xfree86/common/xf86DGA.c
--- old/xorg-server-1.9.2/hw/xfree86/common/xf86DGA.c 2010-09-28 19:17:31.000000000 +0200
+++ new/xorg-server-1.9.2.901/hw/xfree86/common/xf86DGA.c 2010-11-10 07:26:52.000000000 +0100
@@ -1133,6 +1133,10 @@
ev.root_x = event->dx;
ev.root_y = event->dy;
ev.corestate = event->state;
+ /* DGA is core only, so valuators.data doesn't actually matter.
+ * Mask must be set for EventToCore to create motion events. */
+ SetBit(ev.valuators.mask, 0);
+ SetBit(ev.valuators.mask, 1);
DeliverGrabbedEvent ((InternalEvent*)&ev, mouse, FALSE);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.9.2/hw/xfree86/modes/xf86Rotate.c new/xorg-server-1.9.2.901/hw/xfree86/modes/xf86Rotate.c
--- old/xorg-server-1.9.2/hw/xfree86/modes/xf86Rotate.c 2010-06-06 23:37:03.000000000 +0200
+++ new/xorg-server-1.9.2.901/hw/xfree86/modes/xf86Rotate.c 2010-11-14 00:17:58.000000000 +0100
@@ -168,7 +168,7 @@
if (damage_box.x2 > pScreen->width) damage_box.x2 = pScreen->width;
if (damage_box.y2 > pScreen->height) damage_box.y2 = pScreen->height;
RegionInit(&damage_region, &damage_box, 1);
- DamageRegionAppend (&(*pScreen->GetScreenPixmap)(pScreen)->drawable,
+ DamageDamageRegion (&(*pScreen->GetScreenPixmap)(pScreen)->drawable,
&damage_region);
RegionUninit(&damage_region);
crtc->shadowClear = TRUE;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.9.2/hw/xfree86/os-support/hurd/hurd_mmap.c new/xorg-server-1.9.2.901/hw/xfree86/os-support/hurd/hurd_mmap.c
--- old/xorg-server-1.9.2/hw/xfree86/os-support/hurd/hurd_mmap.c 2008-11-14 23:35:16.000000000 +0100
+++ new/xorg-server-1.9.2.901/hw/xfree86/os-support/hurd/hurd_mmap.c 2010-11-13 21:08:59.000000000 +0100
@@ -39,8 +39,8 @@
int
xf86ReadBIOS(unsigned long Base,unsigned long Offset,unsigned char *Buf,int Len)
{
- mach_port_t device,iopl_dev;
- memory_object_t iopl_mem;
+ mach_port_t device,mem_dev;
+ memory_object_t mem_obj;
vm_address_t addr = (vm_address_t)0; /* serach starting address */
kern_return_t err;
@@ -51,14 +51,14 @@
errno = err;
FatalError("xf86ReadBIOS() can't get_privileged_ports. (%s)\n",strerror(errno));
}
- err = device_open(device,D_READ|D_WRITE,"iopl",&iopl_dev);
+ err = device_open(device,D_READ|D_WRITE,"mem",&mem_dev);
mach_port_deallocate (mach_task_self (), device);
if( err )
{
errno = err;
FatalError("xf86ReadBIOS() can't device_open. (%s)\n",strerror(errno));
}
- err = device_map(iopl_dev,VM_PROT_READ|VM_PROT_WRITE, Base , BIOS_SIZE ,&iopl_mem,0);
+ err = device_map(mem_dev,VM_PROT_READ|VM_PROT_WRITE, Base , BIOS_SIZE ,&mem_obj,0);
if( err )
{
errno = err;
@@ -69,13 +69,13 @@
BIOS_SIZE,
0,
TRUE,
- iopl_mem,
+ mem_obj,
Base,
FALSE,
VM_PROT_READ|VM_PROT_WRITE,
VM_PROT_READ|VM_PROT_WRITE,
VM_INHERIT_SHARE);
- mach_port_deallocate(mach_task_self(),iopl_mem);
+ mach_port_deallocate(mach_task_self(),mem_obj);
if( err )
{
errno = err;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.9.2/hw/xfree86/os-support/hurd/hurd_video.c new/xorg-server-1.9.2.901/hw/xfree86/os-support/hurd/hurd_video.c
--- old/xorg-server-1.9.2/hw/xfree86/os-support/hurd/hurd_video.c 2009-09-28 08:24:28.000000000 +0200
+++ new/xorg-server-1.9.2.901/hw/xfree86/os-support/hurd/hurd_video.c 2010-11-13 21:08:59.000000000 +0100
@@ -44,8 +44,8 @@
static pointer
mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int Flags)
{
- mach_port_t device,iopl_dev;
- memory_object_t iopl_mem;
+ mach_port_t device,mem_dev;
+ memory_object_t mem_obj;
kern_return_t err;
vm_address_t addr=(vm_address_t)0;
@@ -55,7 +55,7 @@
errno = err;
FatalError("xf86MapVidMem() can't get_privileged_ports. (%s)\n",strerror(errno));
}
- err = device_open(device,D_READ|D_WRITE,"iopl",&iopl_dev);
+ err = device_open(device,D_READ|D_WRITE,"mem",&mem_dev);
mach_port_deallocate (mach_task_self(), device);
if( err )
{
@@ -63,7 +63,7 @@
FatalError("xf86MapVidMem() can't device_open. (%s)\n",strerror(errno));
}
- err = device_map(iopl_dev,VM_PROT_READ|VM_PROT_WRITE, Base , Size ,&iopl_mem,0);
+ err = device_map(mem_dev,VM_PROT_READ|VM_PROT_WRITE, Base , Size ,&mem_obj,0);
if( err )
{
errno = err;
@@ -74,23 +74,23 @@
Size,
0, /* mask */
TRUE, /* anywhere */
- iopl_mem,
+ mem_obj,
(vm_offset_t)Base,
FALSE, /* copy on write */
VM_PROT_READ|VM_PROT_WRITE,
VM_PROT_READ|VM_PROT_WRITE,
VM_INHERIT_SHARE);
- mach_port_deallocate(mach_task_self(),iopl_mem);
+ mach_port_deallocate(mach_task_self(),mem_obj);
if( err )
{
errno = err;
- FatalError("xf86MapVidMem() can't vm_map.(iopl_mem) (%s)\n",strerror(errno));
+ FatalError("xf86MapVidMem() can't vm_map.(mem_obj) (%s)\n",strerror(errno));
}
- mach_port_deallocate(mach_task_self(),iopl_dev);
+ mach_port_deallocate(mach_task_self(),mem_dev);
if( err )
{
errno = err;
- FatalError("xf86MapVidMem() can't mach_port_deallocate.(iopl_dev) (%s)\n",strerror(errno));
+ FatalError("xf86MapVidMem() can't mach_port_deallocate.(mem_dev) (%s)\n",strerror(errno));
}
return (pointer)addr;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.9.2/hw/xquartz/bundle/Makefile.am new/xorg-server-1.9.2.901/hw/xquartz/bundle/Makefile.am
--- old/xorg-server-1.9.2/hw/xquartz/bundle/Makefile.am 2010-05-13 05:16:18.000000000 +0200
+++ new/xorg-server-1.9.2.901/hw/xquartz/bundle/Makefile.am 2010-11-14 01:04:32.000000000 +0100
@@ -12,7 +12,7 @@
$(srcdir)/mk_bundke.sh $(srcdir) $(builddir) $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app install
uninstall-hook:
- $(RM) -rf $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app
+ $(RM) -rf $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/{Resources,Info.plist,PkgInfo}
noinst_PRE = Info.plist.cpp
noinst_DATA = $(noinst_PRE:plist.cpp=plist)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.9.2/hw/xquartz/bundle/Makefile.in new/xorg-server-1.9.2.901/hw/xquartz/bundle/Makefile.in
--- old/xorg-server-1.9.2/hw/xquartz/bundle/Makefile.in 2010-10-31 20:10:37.000000000 +0100
+++ new/xorg-server-1.9.2.901/hw/xquartz/bundle/Makefile.in 2010-11-14 01:05:03.000000000 +0100
@@ -736,7 +736,7 @@
$(srcdir)/mk_bundke.sh $(srcdir) $(builddir) $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app install
uninstall-hook:
- $(RM) -rf $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app
+ $(RM) -rf $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/{Resources,Info.plist,PkgInfo}
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.9.2/include/eventstr.h new/xorg-server-1.9.2.901/include/eventstr.h
--- old/xorg-server-1.9.2/include/eventstr.h 2010-05-13 05:16:31.000000000 +0200
+++ new/xorg-server-1.9.2.901/include/eventstr.h 2010-11-10 07:26:52.000000000 +0100
@@ -99,7 +99,7 @@
struct {
uint8_t mask[(MAX_VALUATORS + 7)/8]; /**< Valuator mask */
uint8_t mode[(MAX_VALUATORS + 7)/8]; /**< Valuator mode (Abs or Rel)*/
- uint32_t data[MAX_VALUATORS]; /**< Valuator data */
+ int32_t data[MAX_VALUATORS]; /**< Valuator data */
int32_t data_frac[MAX_VALUATORS]; /**< Fractional part for data */
} valuators;
struct {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.9.2/mi/miwideline.c new/xorg-server-1.9.2.901/mi/miwideline.c
--- old/xorg-server-1.9.2/mi/miwideline.c 2010-06-11 08:10:22.000000000 +0200
+++ new/xorg-server-1.9.2.901/mi/miwideline.c 2010-11-14 00:16:25.000000000 +0100
@@ -403,7 +403,7 @@
i = top;
j = StepAround (top, -1, count);
- if (slopes[j].dy * slopes[i].dx > slopes[i].dy * slopes[j].dx)
+ if ((int64_t)slopes[j].dy * slopes[i].dx > (int64_t)slopes[i].dy * slopes[j].dx)
{
clockwise = -1;
slopeoff = -1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.9.2/miext/shadow/shpacked.c new/xorg-server-1.9.2.901/miext/shadow/shpacked.c
--- old/xorg-server-1.9.2/miext/shadow/shpacked.c 2010-06-06 23:37:03.000000000 +0200
+++ new/xorg-server-1.9.2.901/miext/shadow/shpacked.c 2010-11-14 00:26:37.000000000 +0100
@@ -102,8 +102,8 @@
width -= i;
scr += i;
#define PickBit(a,i) (((a) >> (i)) & 1)
- while (i--)
- *win++ = *sha++;
+ memcpy(win, sha, i * sizeof(FbBits));
+ sha += i;
}
shaLine += shaStride;
y++;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.9.2/os/io.c new/xorg-server-1.9.2.901/os/io.c
--- old/xorg-server-1.9.2/os/io.c 2010-09-29 03:54:55.000000000 +0200
+++ new/xorg-server-1.9.2.901/os/io.c 2010-11-14 00:17:05.000000000 +0100
@@ -410,16 +410,29 @@
else
needed = sizeof(xReq);
}
- oci->lenLastReq = needed;
/* If there are bytes to ignore, ignore them now. */
if (oci->ignoreBytes > 0) {
assert(needed == oci->ignoreBytes || needed == oci->size);
- oci->ignoreBytes -= gotnow;
- needed = gotnow = 0;
+ /*
+ * The _XSERVTransRead call above may return more or fewer bytes than we
+ * want to ignore. Ignore the smaller of the two sizes.
+ */
+ if (gotnow < needed) {
+ oci->ignoreBytes -= gotnow;
+ oci->bufptr += gotnow;
+ gotnow = 0;
+ } else {
+ oci->ignoreBytes -= needed;
+ oci->bufptr += needed;
+ gotnow -= needed;
+ }
+ needed = 0;
}
+ oci->lenLastReq = needed;
+
/*
* Check to see if client has at least one whole request in the
* buffer beyond the request we're returning to the caller.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.9.2/os/strlcat.c new/xorg-server-1.9.2.901/os/strlcat.c
--- old/xorg-server-1.9.2/os/strlcat.c 2009-09-28 03:57:02.000000000 +0200
+++ new/xorg-server-1.9.2.901/os/strlcat.c 2010-11-13 21:10:37.000000000 +0100
@@ -15,8 +15,8 @@
*/
-#ifdef HAVE_XORG_CONFIG_H
-#include
+#ifdef HAVE_DIX_CONFIG_H
+#include
#endif
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.9.2/os/strlcpy.c new/xorg-server-1.9.2.901/os/strlcpy.c
--- old/xorg-server-1.9.2/os/strlcpy.c 2010-06-11 08:10:22.000000000 +0200
+++ new/xorg-server-1.9.2.901/os/strlcpy.c 2010-11-13 21:10:37.000000000 +0100
@@ -14,8 +14,8 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_XORG_CONFIG_H
-#include
+#ifdef HAVE_DIX_CONFIG_H
+#include
#endif
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.9.2/test/xi2/protocol-common.c new/xorg-server-1.9.2.901/test/xi2/protocol-common.c
--- old/xorg-server-1.9.2/test/xi2/protocol-common.c 2010-06-11 08:10:22.000000000 +0200
+++ new/xorg-server-1.9.2.901/test/xi2/protocol-common.c 2010-11-14 00:27:36.000000000 +0100
@@ -28,6 +28,7 @@
#include
#include "extinit.h" /* for XInputExtensionInit */
#include "exglobals.h"
+#include "xkbsrv.h" /* for XkbInitPrivates */
#include
#include "protocol-common.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.9.2/Xi/listdev.c new/xorg-server-1.9.2.901/Xi/listdev.c
--- old/xorg-server-1.9.2/Xi/listdev.c 2010-06-11 08:10:22.000000000 +0200
+++ new/xorg-server-1.9.2.901/Xi/listdev.c 2010-11-10 07:26:52.000000000 +0100
@@ -180,10 +180,10 @@
dev->use = IsXKeyboard;
else if (IsMaster(d) && IsPointerDevice(d))
dev->use = IsXPointer;
- else if (d->key && d->kbdfeed)
- dev->use = IsXExtensionKeyboard;
else if (d->valuator && d->button)
dev->use = IsXExtensionPointer;
+ else if (d->key && d->kbdfeed)
+ dev->use = IsXExtensionKeyboard;
else
dev->use = IsXExtensionDevice;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.9.2/xkb/xkb.c new/xorg-server-1.9.2.901/xkb/xkb.c
--- old/xorg-server-1.9.2/xkb/xkb.c 2010-09-28 19:17:31.000000000 +0200
+++ new/xorg-server-1.9.2.901/xkb/xkb.c 2010-11-10 07:26:52.000000000 +0100
@@ -2343,8 +2343,8 @@
XkbDescPtr xkb;
int error;
int nTypes = 0, nActions;
- CARD8 mapWidths[XkbMaxLegalKeyCode + 1];
- CARD16 symsPerKey[XkbMaxLegalKeyCode + 1];
+ CARD8 mapWidths[XkbMaxLegalKeyCode + 1] = {0};
+ CARD16 symsPerKey[XkbMaxLegalKeyCode + 1] = {0};
xkbi= dev->key->xkbInfo;
xkb = xkbi->desc;
++++++ xorg-server-xf4vnc-fixes_1_9.diff ++++++
Index: xorg-server-1.9.2/hw/vnc/rfb.h
===================================================================
--- xorg-server-1.9.2.orig/hw/vnc/rfb.h
+++ xorg-server-1.9.2/hw/vnc/rfb.h
@@ -189,8 +189,8 @@ typedef struct
CloseScreenProcPtr CloseScreen;
CreateGCProcPtr CreateGC;
- PaintWindowBackgroundProcPtr PaintWindowBackground;
- PaintWindowBorderProcPtr PaintWindowBorder;
+// PaintWindowBackgroundProcPtr PaintWindowBackground;
+// PaintWindowBorderProcPtr PaintWindowBorder;
CopyWindowProcPtr CopyWindow;
ClearToBackgroundProcPtr ClearToBackground;
RestoreAreasProcPtr RestoreAreas;
Index: xorg-server-1.9.2/hw/vnc/draw.c
===================================================================
--- xorg-server-1.9.2.orig/hw/vnc/draw.c
+++ xorg-server-1.9.2/hw/vnc/draw.c
@@ -217,8 +217,8 @@ rfbCloseScreen (int i, ScreenPtr pScreen
pScreen->CloseScreen = pVNC->CloseScreen;
pScreen->CreateGC = pVNC->CreateGC;
- pScreen->PaintWindowBackground = pVNC->PaintWindowBackground;
- pScreen->PaintWindowBorder = pVNC->PaintWindowBorder;
+// pScreen->PaintWindowBackground = pVNC->PaintWindowBackground;
+// pScreen->PaintWindowBorder = pVNC->PaintWindowBorder;
pScreen->CopyWindow = pVNC->CopyWindow;
pScreen->ClearToBackground = pVNC->ClearToBackground;
pScreen->RestoreAreas = pVNC->RestoreAreas;
@@ -252,7 +252,7 @@ rfbEnableDisableFBAccess (int index, Boo
* control even when switched away.
*/
if (!enable) {
- WindowPtr pWin = WindowTable[index];
+ WindowPtr pWin = pScrn->pScreen->root;
ScreenPtr pScreen = pWin->drawable.pScreen;
GCPtr pGC;
xRectangle rect;
@@ -268,7 +268,7 @@ rfbEnableDisableFBAccess (int index, Boo
CARD32 attributes[2];
attributes[0] = pScreen->whitePixel;
attributes[1] = pScreen->blackPixel;
- (void)ChangeGC(pGC, GCForeground | GCBackground, attributes);
+ (void)ChangeGC(NullClient, pGC, GCForeground | GCBackground, attributes);
ValidateGC((DrawablePtr)pWin, pGC);
@@ -317,6 +317,7 @@ rfbCreateGC (GCPtr pGC)
return ret;
}
+#if 0
/*
* PaintWindowBackground - the region being modified is just the given region.
*/
@@ -356,6 +357,7 @@ rfbPaintWindowBorder (WindowPtr pWin, Re
SCREEN_EPILOGUE(PaintWindowBorder,rfbPaintWindowBorder);
}
+#endif
#ifdef CHROMIUM
Bool
Index: xorg-server-1.9.2/hw/vnc/init.c
===================================================================
--- xorg-server-1.9.2.orig/hw/vnc/init.c
+++ xorg-server-1.9.2/hw/vnc/init.c
@@ -670,8 +670,8 @@ rfbScreenInit(index, pScreen, argc, argv
prfb->CloseScreen = pScreen->CloseScreen;
prfb->WakeupHandler = pScreen->WakeupHandler;
prfb->CreateGC = pScreen->CreateGC;
- prfb->PaintWindowBackground = pScreen->PaintWindowBackground;
- prfb->PaintWindowBorder = pScreen->PaintWindowBorder;
+// prfb->PaintWindowBackground = pScreen->PaintWindowBackground;
+// prfb->PaintWindowBorder = pScreen->PaintWindowBorder;
prfb->CopyWindow = pScreen->CopyWindow;
prfb->ClearToBackground = pScreen->ClearToBackground;
prfb->RestoreAreas = pScreen->RestoreAreas;
@@ -691,8 +691,8 @@ rfbScreenInit(index, pScreen, argc, argv
pScreen->CloseScreen = rfbCloseScreen;
pScreen->WakeupHandler = rfbWakeupHandler;
pScreen->CreateGC = rfbCreateGC;
- pScreen->PaintWindowBackground = rfbPaintWindowBackground;
- pScreen->PaintWindowBorder = rfbPaintWindowBorder;
+// pScreen->PaintWindowBackground = rfbPaintWindowBackground;
+// pScreen->PaintWindowBorder = rfbPaintWindowBorder;
pScreen->CopyWindow = rfbCopyWindow;
pScreen->ClearToBackground = rfbClearToBackground;
pScreen->RestoreAreas = rfbRestoreAreas;
Index: xorg-server-1.9.2/hw/vnc/sprite.c
===================================================================
--- xorg-server-1.9.2.orig/hw/vnc/sprite.c
+++ xorg-server-1.9.2/hw/vnc/sprite.c
@@ -96,8 +96,10 @@ static void rfbSpriteInstallColormap
static void rfbSpriteStoreColors(ColormapPtr pMap, int ndef,
xColorItem *pdef);
+#if 0
static void rfbSpritePaintWindowBackground(WindowPtr pWin,
RegionPtr pRegion, int what);
+#endif
static void rfbSpritePaintWindowBorder(WindowPtr pWin,
RegionPtr pRegion, int what);
static void rfbSpriteCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg,
@@ -329,7 +331,7 @@ rfbSpriteInitialize (pScreen, cursorFunc
rfbSpriteScreenPtr pPriv;
VisualPtr pVisual;
- if (!dixRequestPrivate(rfbSpriteGCKey, sizeof(rfbSpriteGCRec)))
+ if (!dixRegisterPrivateKey(rfbSpriteGCKey, PRIVATE_CLIENT, sizeof(rfbSpriteGCRec)))
return FALSE;
pPriv = (rfbSpriteScreenPtr) xalloc (sizeof (rfbSpriteScreenRec));
@@ -357,8 +359,8 @@ rfbSpriteInitialize (pScreen, cursorFunc
pPriv->StoreColors = pScreen->StoreColors;
pPriv->DisplayCursor = pScreen->DisplayCursor;
- pPriv->PaintWindowBackground = pScreen->PaintWindowBackground;
- pPriv->PaintWindowBorder = pScreen->PaintWindowBorder;
+// pPriv->PaintWindowBackground = pScreen->PaintWindowBackground;
+// pPriv->PaintWindowBorder = pScreen->PaintWindowBorder;
pPriv->CopyWindow = pScreen->CopyWindow;
pPriv->ClearToBackground = pScreen->ClearToBackground;
@@ -393,8 +395,8 @@ rfbSpriteInitialize (pScreen, cursorFunc
pScreen->InstallColormap = rfbSpriteInstallColormap;
pScreen->StoreColors = rfbSpriteStoreColors;
- pScreen->PaintWindowBackground = rfbSpritePaintWindowBackground;
- pScreen->PaintWindowBorder = rfbSpritePaintWindowBorder;
+// pScreen->PaintWindowBackground = rfbSpritePaintWindowBackground;
+// pScreen->PaintWindowBorder = rfbSpritePaintWindowBorder;
pScreen->CopyWindow = rfbSpriteCopyWindow;
pScreen->ClearToBackground = rfbSpriteClearToBackground;
@@ -435,8 +437,8 @@ rfbSpriteCloseScreen (i, pScreen)
pScreen->InstallColormap = pScreenPriv->InstallColormap;
pScreen->StoreColors = pScreenPriv->StoreColors;
- pScreen->PaintWindowBackground = pScreenPriv->PaintWindowBackground;
- pScreen->PaintWindowBorder = pScreenPriv->PaintWindowBorder;
+// pScreen->PaintWindowBackground = pScreenPriv->PaintWindowBackground;
+// pScreen->PaintWindowBorder = pScreenPriv->PaintWindowBorder;
pScreen->CopyWindow = pScreenPriv->CopyWindow;
pScreen->ClearToBackground = pScreenPriv->ClearToBackground;
@@ -809,6 +811,7 @@ rfbSpriteRestoreAreas (pWin, prgnExposed
* Window wrappers
*/
+#if 0
static void
rfbSpritePaintWindowBackground (pWin, pRegion, what)
WindowPtr pWin;
@@ -866,6 +869,7 @@ rfbSpritePaintWindowBorder (pWin, pRegio
SCREEN_EPILOGUE (pScreen, PaintWindowBorder, rfbSpritePaintWindowBorder);
}
+#endif
static void
rfbSpriteCopyWindow (pWin, ptOldOrg, pRegion)
Index: xorg-server-1.9.2/hw/vnc/spritest.h
===================================================================
--- xorg-server-1.9.2.orig/hw/vnc/spritest.h
+++ xorg-server-1.9.2/hw/vnc/spritest.h
@@ -70,8 +70,8 @@ typedef struct {
ScreenBlockHandlerProcPtr BlockHandler;
InstallColormapProcPtr InstallColormap;
StoreColorsProcPtr StoreColors;
- PaintWindowBackgroundProcPtr PaintWindowBackground;
- PaintWindowBorderProcPtr PaintWindowBorder;
+// PaintWindowBackgroundProcPtr PaintWindowBackground;
+// PaintWindowBorderProcPtr PaintWindowBorder;
CopyWindowProcPtr CopyWindow;
ClearToBackgroundProcPtr ClearToBackground;
SaveDoomedAreasProcPtr SaveDoomedAreas;
Index: xorg-server-1.9.2/hw/vnc/cutpaste.c
===================================================================
--- xorg-server-1.9.2.orig/hw/vnc/cutpaste.c
+++ xorg-server-1.9.2/hw/vnc/cutpaste.c
@@ -54,7 +54,7 @@ rfbSetXCutText(char *str, int len)
Selection *pSel;
inSetXCutText = TRUE;
- ChangeWindowProperty(WindowTable[0], XA_CUT_BUFFER0, XA_STRING,
+ ChangeWindowProperty(screenInfo.screens[0]->root, XA_CUT_BUFFER0, XA_STRING,
8, PropModeReplace, len,
(pointer)str, TRUE);
Index: xorg-server-1.9.2/hw/vnc/dispcur.c
===================================================================
--- xorg-server-1.9.2.orig/hw/vnc/dispcur.c
+++ xorg-server-1.9.2/hw/vnc/dispcur.c
@@ -340,7 +340,7 @@ rfbDCRealize (ScreenPtr pScreen, CursorP
0, 0, pCursor->bits->width, pCursor->bits->height,
0, XYPixmap, (char *)pCursor->bits->source);
gcvals[0] = GXand;
- ChangeGC (pGC, GCFunction, gcvals);
+ ChangeGCXIDs (NullClient, pGC, GCFunction, gcvals);
ValidateGC ((DrawablePtr)pPriv->sourceBits, pGC);
(*pGC->ops->PutImage) ((DrawablePtr)pPriv->sourceBits, pGC, 1,
0, 0, pCursor->bits->width, pCursor->bits->height,
@@ -348,13 +348,13 @@ rfbDCRealize (ScreenPtr pScreen, CursorP
/* mask bits -- pCursor->mask & ~pCursor->source */
gcvals[0] = GXcopy;
- ChangeGC (pGC, GCFunction, gcvals);
+ ChangeGCXIDs (NullClient, pGC, GCFunction, gcvals);
ValidateGC ((DrawablePtr)pPriv->maskBits, pGC);
(*pGC->ops->PutImage) ((DrawablePtr)pPriv->maskBits, pGC, 1,
0, 0, pCursor->bits->width, pCursor->bits->height,
0, XYPixmap, (char *)pCursor->bits->mask);
gcvals[0] = GXandInverted;
- ChangeGC (pGC, GCFunction, gcvals);
+ ChangeGCXIDs (NullClient, pGC, GCFunction, gcvals);
ValidateGC ((DrawablePtr)pPriv->maskBits, pGC);
(*pGC->ops->PutImage) ((DrawablePtr)pPriv->maskBits, pGC, 1,
0, 0, pCursor->bits->width, pCursor->bits->height,
@@ -396,7 +396,7 @@ rfbDCPutBits (DrawablePtr pDrawable, rfb
if (sourceGC->fgPixel != source)
{
gcvals[0] = source;
- DoChangeGC (sourceGC, GCForeground, gcvals, 0);
+ ChangeGCXIDs (NullClient, sourceGC, GCForeground, gcvals);
}
if (sourceGC->serialNumber != pDrawable->serialNumber)
ValidateGC (pDrawable, sourceGC);
@@ -404,7 +404,7 @@ rfbDCPutBits (DrawablePtr pDrawable, rfb
if (maskGC->fgPixel != mask)
{
gcvals[0] = mask;
- DoChangeGC (maskGC, GCForeground, gcvals, 0);
+ ChangeGCXIDs (NullClient, maskGC, GCForeground, gcvals);
}
if (maskGC->serialNumber != pDrawable->serialNumber)
ValidateGC (pDrawable, maskGC);
@@ -451,7 +451,7 @@ rfbDCPutUpCursor (pScreen, pCursor, x, y
}
pScreenPriv = (rfbDCScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
rfbDCScreenKey);
- pWin = WindowTable[pScreen->myNum];
+ pWin = pScreen->root;
#ifdef ARGB_CURSOR
if (pPriv->pPicture)
{
@@ -498,7 +498,7 @@ rfbDCSaveUnderCursor (pScreen, x, y, w,
pScreenPriv = (rfbDCScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
rfbDCScreenKey);
pSave = pScreenPriv->pSave;
- pWin = WindowTable[pScreen->myNum];
+ pWin = pScreen->root;
if (!pSave || pSave->drawable.width < w || pSave->drawable.height < h)
{
if (pSave)
@@ -531,7 +531,7 @@ rfbDCRestoreUnderCursor (pScreen, x, y,
pScreenPriv = (rfbDCScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
rfbDCScreenKey);
pSave = pScreenPriv->pSave;
- pWin = WindowTable[pScreen->myNum];
+ pWin = pScreen->root;
if (!pSave)
return FALSE;
if (!EnsureGC(pScreenPriv->pRestoreGC, pWin))
@@ -558,7 +558,7 @@ rfbDCChangeSave (pScreen, x, y, w, h, dx
pScreenPriv = (rfbDCScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
rfbDCScreenKey);
pSave = pScreenPriv->pSave;
- pWin = WindowTable[pScreen->myNum];
+ pWin = pScreen->root;
/*
* restore the bits which are about to get trashed
*/
@@ -702,7 +702,7 @@ rfbDCMoveCursor (pScreen, pCursor, x, y,
}
pScreenPriv = (rfbDCScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
rfbDCScreenKey);
- pWin = WindowTable[pScreen->myNum];
+ pWin = pScreen->root;
pTemp = pScreenPriv->pTemp;
if (!pTemp ||
pTemp->drawable.width != pScreenPriv->pSave->drawable.width ||
Index: xorg-server-1.9.2/hw/vnc/kbdptr.c
===================================================================
--- xorg-server-1.9.2.orig/hw/vnc/kbdptr.c
+++ xorg-server-1.9.2/hw/vnc/kbdptr.c
@@ -153,7 +153,7 @@ KbdAddEvent(Bool down, KeySym keySym, rf
#ifdef CORBA
if (cl) {
CARD32 clientId = cl->sock;
- ChangeWindowProperty(WindowTable[0], VNC_LAST_CLIENT_ID, XA_INTEGER,
+ ChangeWindowProperty(screenInfo.screens[0]->root, VNC_LAST_CLIENT_ID, XA_INTEGER,
32, PropModeReplace, 1, (pointer)&clientId, TRUE);
}
#endif
@@ -310,7 +310,7 @@ PtrAddEvent(int buttonMask, int x, int y
#ifdef CORBA
if (cl) {
CARD32 clientId = cl->sock;
- ChangeWindowProperty(WindowTable[0], VNC_LAST_CLIENT_ID, XA_INTEGER,
+ ChangeWindowProperty(screenInfo.screens[0]->root, VNC_LAST_CLIENT_ID, XA_INTEGER,
32, PropModeReplace, 1, (pointer)&clientId, TRUE);
}
#endif
Index: xorg-server-1.9.2/hw/vnc/rfbserver.c
===================================================================
--- xorg-server-1.9.2.orig/hw/vnc/rfbserver.c
+++ xorg-server-1.9.2/hw/vnc/rfbserver.c
@@ -82,7 +82,7 @@ void
rfbRootPropertyChange(ScreenPtr pScreen)
{
PropertyPtr pProp;
- WindowPtr pWin = WindowTable[pScreen->myNum];
+ WindowPtr pWin = pScreen->root;
pProp = wUserProps (pWin);
@@ -1068,7 +1068,7 @@ rfbProcessClientNormalMessage(cl)
GenerateVncChromiumConnectedEvent(cl->sock);
if (enc == rfbEncodingChromium) {
/* Generate exposures for all windows */
- WindowPtr pWin = WindowTable[cl->pScreen->myNum];
+ WindowPtr pWin = cl->pScreen->root;
rfbSetClip(pWin, 1);
}
else {
@@ -1866,13 +1866,13 @@ rfbSendSetColourMapEntries(cl, firstColo
/* PseudoColor */
#if XFREE86VNC
- if (miInstalledMaps[cl->pScreen->myNum]->class == PseudoColor) {
+ if (GetInstalledmiColormap(cl->pScreen)->class == PseudoColor) {
#else
if (pVNC->rfbInstalledColormap->class == PseudoColor) {
#endif
scme->firstColour = Swap16IfLE(firstColour);
#if XFREE86VNC
- pent = (EntryPtr)&miInstalledMaps[cl->pScreen->myNum]->red[firstColour];
+ pent = (EntryPtr)&GetInstalledmiColormap(cl->pScreen)->red[firstColour];
#else
pent = (EntryPtr)&pVNC->rfbInstalledColormap->red[firstColour];
#endif
@@ -1894,12 +1894,12 @@ rfbSendSetColourMapEntries(cl, firstColo
/* Break the DirectColor pixel into its r/g/b components */
#if XFREE86VNC
- redPart = (firstColour & miInstalledMaps[cl->pScreen->myNum]->pVisual->redMask)
- >> miInstalledMaps[cl->pScreen->myNum]->pVisual->offsetRed;
- greenPart = (firstColour & miInstalledMaps[cl->pScreen->myNum]->pVisual->greenMask)
- >> miInstalledMaps[cl->pScreen->myNum]->pVisual->offsetGreen;
- bluePart = (firstColour & miInstalledMaps[cl->pScreen->myNum]->pVisual->blueMask)
- >> miInstalledMaps[cl->pScreen->myNum]->pVisual->offsetBlue;
+ redPart = (firstColour & GetInstalledmiColormap(cl->pScreen)->pVisual->redMask)
+ >> GetInstalledmiColormap(cl->pScreen)->pVisual->offsetRed;
+ greenPart = (firstColour & GetInstalledmiColormap(cl->pScreen)->pVisual->greenMask)
+ >> GetInstalledmiColormap(cl->pScreen)->pVisual->offsetGreen;
+ bluePart = (firstColour & GetInstalledmiColormap(cl->pScreen)->pVisual->blueMask)
+ >> GetInstalledmiColormap(cl->pScreen)->pVisual->offsetBlue;
#else
redPart = (firstColour & pVNC->rfbInstalledColormap->pVisual->redMask)
>> pVNC->rfbInstalledColormap->pVisual->offsetRed;
@@ -1918,9 +1918,9 @@ rfbSendSetColourMapEntries(cl, firstColo
scme->firstColour = Swap16IfLE((greenPart << 8) | bluePart);
#if XFREE86VNC
- redEntry = (EntryPtr)&miInstalledMaps[cl->pScreen->myNum]->red[redPart];
- greenEntry = (EntryPtr)&miInstalledMaps[cl->pScreen->myNum]->green[greenPart];
- blueEntry = (EntryPtr)&miInstalledMaps[cl->pScreen->myNum]->blue[bluePart];
+ redEntry = (EntryPtr)&GetInstalledmiColormap(cl->pScreen)->red[redPart];
+ greenEntry = (EntryPtr)&GetInstalledmiColormap(cl->pScreen)->green[greenPart];
+ blueEntry = (EntryPtr)&GetInstalledmiColormap(cl->pScreen)->blue[bluePart];
#else
redEntry = (EntryPtr)&pVNC->rfbInstalledColormap->red[redPart];
greenEntry = (EntryPtr)&pVNC->rfbInstalledColormap->green[greenPart];
Index: xorg-server-1.9.2/hw/vnc/tabletranstemplate.c
===================================================================
--- xorg-server-1.9.2.orig/hw/vnc/tabletranstemplate.c
+++ xorg-server-1.9.2/hw/vnc/tabletranstemplate.c
@@ -67,7 +67,7 @@ rfbTranslateWithSingleTableINtoOUT (Scre
OUT_T *op = (OUT_T *)optr;
OUT_T *opLineEnd;
OUT_T *t = (OUT_T *)table;
- DrawablePtr pDraw = (DrawablePtr)WindowTable[pScreen->myNum];
+ DrawablePtr pDraw = (DrawablePtr)pScreen->root;
int truewidth = PixmapBytePad(width, in->bitsPerPixel);
unsigned char *iptr = malloc(truewidth * height * in->bitsPerPixel / 8);
int ipextra = truewidth - width;
@@ -107,7 +107,7 @@ rfbTranslateWithRGBTablesINtoOUT (Screen
OUT_T *redTable = (OUT_T *)table;
OUT_T *greenTable = redTable + in->redMax + 1;
OUT_T *blueTable = greenTable + in->greenMax + 1;
- DrawablePtr pDraw = (DrawablePtr)WindowTable[pScreen->myNum];
+ DrawablePtr pDraw = (DrawablePtr)pScreen->root;
int truewidth = PixmapBytePad(width, in->bitsPerPixel);
unsigned char *iptr = malloc(truewidth * height * in->bitsPerPixel / 8);
int ipextra = truewidth - width;
Index: xorg-server-1.9.2/hw/vnc/translate.c
===================================================================
--- xorg-server-1.9.2.orig/hw/vnc/translate.c
+++ xorg-server-1.9.2/hw/vnc/translate.c
@@ -167,7 +167,7 @@ rfbTranslateNone(ScreenPtr pScreen, char
int width, int height, int x, int y)
{
VNCSCREENPTR(pScreen);
- DrawablePtr pDraw = (DrawablePtr)WindowTable[pScreen->myNum];
+ DrawablePtr pDraw = (DrawablePtr)pScreen->root;
int truewidth = PixmapBytePad(width, in->bitsPerPixel);
if ((x + width > pVNC->width) || truewidth != width * in->bitsPerPixel / 8) {
@@ -227,7 +227,7 @@ rfbSetTranslateFunction(cl)
if (!pVNC->rfbServerFormat.trueColour &&
(pVNC->rfbServerFormat.bitsPerPixel != 8) &&
#if XFREE86VNC
- (miInstalledMaps[cl->pScreen->myNum]->class == PseudoColor)) {
+ (GetInstalledmiColormap(cl->pScreen)->class == PseudoColor)) {
#else
(pVNC->rfbInstalledColormap->class == PseudoColor)) {
#endif
@@ -241,7 +241,7 @@ rfbSetTranslateFunction(cl)
if (!cl->format.trueColour &&
(cl->format.bitsPerPixel != 8) &&
#if XFREE86VNC
- (miInstalledMaps[cl->pScreen->myNum]->class == PseudoColor)) {
+ (GetInstalledmiColormap(cl->pScreen)->class == PseudoColor)) {
#else
(pVNC->rfbInstalledColormap->class == PseudoColor) ) {
#endif
@@ -265,7 +265,7 @@ rfbSetTranslateFunction(cl)
/* colour map -> colour map */
#if XFREE86VNC
- if (miInstalledMaps[cl->pScreen->myNum]->class == DirectColor) {
+ if (GetInstalledmiColormap(cl->pScreen)->class == DirectColor) {
#else
if (pVNC->rfbInstalledColormap->class == DirectColor) {
#endif
@@ -433,7 +433,7 @@ rfbSetClientColourMap(cl, firstColour, n
if (nColours == 0) {
#if XFREE86VNC
- nColours = miInstalledMaps[cl->pScreen->myNum]->pVisual->ColormapEntries;
+ nColours = GetInstalledmiColormap(cl->pScreen)->pVisual->ColormapEntries;
#else
nColours = pVNC->rfbInstalledColormap->pVisual->ColormapEntries;
#endif
Index: xorg-server-1.9.2/hw/dmx/vnc/vncint.h
===================================================================
--- xorg-server-1.9.2.orig/hw/dmx/vnc/vncint.h
+++ xorg-server-1.9.2/hw/dmx/vnc/vncint.h
@@ -114,8 +114,8 @@ typedef struct {
CloseScreenProcPtr CloseScreen;
CreateGCProcPtr CreateGC;
- PaintWindowBackgroundProcPtr PaintWindowBackground;
- PaintWindowBorderProcPtr PaintWindowBorder;
+// PaintWindowBackgroundProcPtr PaintWindowBackground;
+// PaintWindowBorderProcPtr PaintWindowBorder;
CopyWindowProcPtr CopyWindow;
ClearToBackgroundProcPtr ClearToBackground;
RestoreAreasProcPtr RestoreAreas;
Index: xorg-server-1.9.2/hw/xfree86/vnc/vncint.h
===================================================================
--- xorg-server-1.9.2.orig/hw/xfree86/vnc/vncint.h
+++ xorg-server-1.9.2/hw/xfree86/vnc/vncint.h
@@ -112,8 +112,8 @@ typedef struct {
CloseScreenProcPtr CloseScreen;
CreateGCProcPtr CreateGC;
- PaintWindowBackgroundProcPtr PaintWindowBackground;
- PaintWindowBorderProcPtr PaintWindowBorder;
+// PaintWindowBackgroundProcPtr PaintWindowBackground;
+// PaintWindowBorderProcPtr PaintWindowBorder;
CopyWindowProcPtr CopyWindow;
ClearToBackgroundProcPtr ClearToBackground;
RestoreAreasProcPtr RestoreAreas;
Index: xorg-server-1.9.2/hw/vnc/vncext.c
===================================================================
--- xorg-server-1.9.2.orig/hw/vnc/vncext.c
+++ xorg-server-1.9.2/hw/vnc/vncext.c
@@ -763,7 +763,7 @@ VncExtensionInit(void)
vncExtGeneration = serverGeneration;
// no allocation needed for screen privates
- if (!dixRequestPrivate(rfbGCKey, sizeof(rfbGCRec)))
+ if (!dixRegisterPrivateKey(rfbGCKey, PRIVATE_CLIENT, sizeof(rfbGCRec)))
return;
#if XFREE86VNC
Index: xorg-server-1.9.2/hw/vnc/tableinitcmtemplate.c
===================================================================
--- xorg-server-1.9.2.orig/hw/vnc/tableinitcmtemplate.c
+++ xorg-server-1.9.2/hw/vnc/tableinitcmtemplate.c
@@ -61,7 +61,7 @@ rfbInitColourMapSingleTableOUT (ScreenPt
t = (OUT_T *)*table;
#if XFREE86VNC
- pent = (EntryPtr)&miInstalledMaps[pScreen->myNum]->red[0];
+ pent = (EntryPtr)&GetInstalledmiColormap(pScreen)->red[0];
#else
pent = (EntryPtr)&pVNC->rfbInstalledColormap->red[0];
#endif
Index: xorg-server-1.9.2/hw/xfree86/vnc/vncInit.c
===================================================================
--- xorg-server-1.9.2.orig/hw/xfree86/vnc/vncInit.c
+++ xorg-server-1.9.2/hw/xfree86/vnc/vncInit.c
@@ -286,8 +286,8 @@ VNCInit(ScreenPtr pScreen, unsigned char
pScreenPriv->CloseScreen = pScreen->CloseScreen;
pScreenPriv->CreateGC = pScreen->CreateGC;
- pScreenPriv->PaintWindowBackground = pScreen->PaintWindowBackground;
- pScreenPriv->PaintWindowBorder = pScreen->PaintWindowBorder;
+// pScreenPriv->PaintWindowBackground = pScreen->PaintWindowBackground;
+// pScreenPriv->PaintWindowBorder = pScreen->PaintWindowBorder;
pScreenPriv->CopyWindow = pScreen->CopyWindow;
pScreenPriv->ClearToBackground = pScreen->ClearToBackground;
pScreenPriv->RestoreAreas = pScreen->RestoreAreas;
@@ -313,8 +313,8 @@ VNCInit(ScreenPtr pScreen, unsigned char
#endif
pScreen->CloseScreen = rfbCloseScreen;
pScreen->CreateGC = rfbCreateGC;
- pScreen->PaintWindowBackground = rfbPaintWindowBackground;
- pScreen->PaintWindowBorder = rfbPaintWindowBorder;
+// pScreen->PaintWindowBackground = rfbPaintWindowBackground;
+// pScreen->PaintWindowBorder = rfbPaintWindowBorder;
pScreen->CopyWindow = rfbCopyWindow;
pScreen->ClearToBackground = rfbClearToBackground;
pScreen->RestoreAreas = rfbRestoreAreas;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org