rpm/xorg-x11-server
SHA256
1
0
Fork 0
forked from pool/xorg-x11-server
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=67

Browse Source
This commit is contained in:
OBS User unknown 2008-03-21 01:44:35 +00:00 committed by Git OBS Bridge
parent 4754f86508
commit 25629a77ff
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
xorg-server-1.4-vnc.patch
View File

@ -6821,7 +6821,7 @@ diff -pNur xorg-server-1.4.orig/hw/vnc/httpd.c xorg-server-1.4/hw/vnc/httpd.c
diff -pNur xorg-server-1.4.orig/hw/vnc/init.c xorg-server-1.4/hw/vnc/init.c
--- xorg-server-1.4.orig/hw/vnc/init.c 1969-12-31 16:00:00.000000000 -0800
+++ xorg-server-1.4/hw/vnc/init.c 2007-09-06 16:09:45.000000000 -0700
@@ -0,0 +1,1075 @@
@@ -0,0 +1,1077 @@
+/*
+ * init.c
+ *
@ -7636,7 +7636,7 @@ diff -pNur xorg-server-1.4.orig/hw/vnc/init.c xorg-server-1.4/hw/vnc/init.c
+ switch (onoff)
+ {
+ case DEVICE_INIT:
+ vncSetKeyboardDevice(pDevice);
+ vncSetKeyboardDevice(pDevice);
+ KbdDeviceInit(pDevice, &keySyms, modMap);
+ InitKeyboardDeviceStruct(pDev, &keySyms, modMap,
+ (BellProcPtr)rfbSendBell,
@ -7651,6 +7651,7 @@ diff -pNur xorg-server-1.4.orig/hw/vnc/init.c xorg-server-1.4/hw/vnc/init.c
+ KbdDeviceOff();
+ break;
+ case DEVICE_CLOSE:
+ vncSetKeyboardDevice(NULL);
+ if (pDev->on)
+ KbdDeviceOff();
+ break;
@ -7679,7 +7680,7 @@ diff -pNur xorg-server-1.4.orig/hw/vnc/init.c xorg-server-1.4/hw/vnc/init.c
+ GetMotionHistory,
+ PtrDeviceControl,
+ GetMaximumEventsNum(), 2 /* numAxes */);
+ vncSetPointerDevice(pDevice);
+ vncSetPointerDevice(pDevice);
+ break;
+
+ case DEVICE_ON:
@ -7693,6 +7694,7 @@ diff -pNur xorg-server-1.4.orig/hw/vnc/init.c xorg-server-1.4/hw/vnc/init.c
+ break;
+
+ case DEVICE_CLOSE:
+ vncSetPointerDevice(NULL);
+ if (pDev->on)
+ PtrDeviceOff();
+ break;
@ -10149,7 +10151,7 @@ diff -pNur xorg-server-1.4.orig/hw/vnc/rfbkeyb.c xorg-server-1.4/hw/vnc/rfbkeyb.
+ switch (onoff)
+ {
+ case DEVICE_INIT:
+ vncSetKeyboardDevice(device);
+ vncSetKeyboardDevice(device);
+ KbdDeviceInit(device, &keySyms, modMap);
+#ifdef XKB
+ if (noXkbExtension) {
@ -10202,7 +10204,7 @@ diff -pNur xorg-server-1.4.orig/hw/vnc/rfbkeyb.c xorg-server-1.4/hw/vnc/rfbkeyb.
+ KbdDeviceOff();
+ break;
+ case DEVICE_CLOSE:
+ vncSetKeyboardDevice(NULL);
+ vncSetKeyboardDevice(NULL);
+ if (pDev->on)
+ KbdDeviceOff();
+ break;
@ -10528,7 +10530,7 @@ diff -pNur xorg-server-1.4.orig/hw/vnc/rfbmouse.c xorg-server-1.4/hw/vnc/rfbmous
+ switch (onoff)
+ {
+ case DEVICE_INIT:
+ vncSetPointerDevice(device);
+ vncSetPointerDevice(device);
+ PtrDeviceInit();
+ map[1] = 1;
+ map[2] = 2;
@ -10552,7 +10554,7 @@ diff -pNur xorg-server-1.4.orig/hw/vnc/rfbmouse.c xorg-server-1.4/hw/vnc/rfbmous
+ break;
+
+ case DEVICE_CLOSE:
+ vncSetPointerDevice(NULL);
+ vncSetPointerDevice(NULL);
+ if (pDev->on)
+ PtrDeviceOff();
+ break;

5
xorg-x11-server.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Mar 19 20:11:26 CET 2008 - schwab@suse.de
- Fix vnc server memory corruption.
-------------------------------------------------------------------
Fri Mar 7 11:59:54 CET 2008 - sndirsch@suse.de

4
xorg-x11-server.spec
View File

@ -22,7 +22,7 @@ BuildRequires: libjpeg-devel
Url: http://xorg.freedesktop.org/
%define EXPERIMENTAL 0
Version: 7.3
Release: 73
Release: 77
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@ -544,6 +544,8 @@ exit 0
%endif
%changelog
* Wed Mar 19 2008 schwab@suse.de
- Fix vnc server memory corruption.
* Fri Mar 07 2008 sndirsch@suse.de
- commit-a6a7fad.diff
* Don't break grab and focus state for a window when redirecting