Module Name: xsrc
Committed By: tsutsui
Date: Thu Aug 13 19:52:23 UTC 2020
Modified Files:
xsrc/external/mit/xorg-server.old/dist/hw/sun: sun.h sunInit.c sunIo.c
sunKbd.c sunMouse.c
Log Message:
More cherry-picks to sync with xorg-server:
Remove more redundant command option arg checks.
Avoid dumb DevicePtr casts.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xorg-server.old/dist/hw/sun/sun.h \
xsrc/external/mit/xorg-server.old/dist/hw/sun/sunIo.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xorg-server.old/dist/hw/sun/sunInit.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xorg-server.old/dist/hw/sun/sunKbd.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/external/mit/xorg-server.old/dist/hw/sun/sunMouse.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server.old/dist/hw/sun/sun.h
diff -u xsrc/external/mit/xorg-server.old/dist/hw/sun/sun.h:1.3 xsrc/external/mit/xorg-server.old/dist/hw/sun/sun.h:1.4
--- xsrc/external/mit/xorg-server.old/dist/hw/sun/sun.h:1.3 Sun Aug 9 16:01:19 2020
+++ xsrc/external/mit/xorg-server.old/dist/hw/sun/sun.h Thu Aug 13 19:52:23 2020
@@ -300,6 +300,7 @@ extern fbFd sunFbs[];
extern Bool sunSwapLkeys;
extern Bool sunForceMono;
extern Bool sunDebug;
+extern char *sunDeviceList;
extern Bool sunFlipPixels;
extern Bool sunFbInfo;
extern Bool sunCG4Frob;
Index: xsrc/external/mit/xorg-server.old/dist/hw/sun/sunIo.c
diff -u xsrc/external/mit/xorg-server.old/dist/hw/sun/sunIo.c:1.3 xsrc/external/mit/xorg-server.old/dist/hw/sun/sunIo.c:1.4
--- xsrc/external/mit/xorg-server.old/dist/hw/sun/sunIo.c:1.3 Sun Aug 9 16:01:19 2020
+++ xsrc/external/mit/xorg-server.old/dist/hw/sun/sunIo.c Thu Aug 13 19:52:23 2020
@@ -170,9 +170,10 @@ AbortDDX(void)
#else
(void) OsSignal (SIGIO, SIG_IGN);
#endif
- devPtr = (DevicePtr)sunKeyboardDevice;
- if (devPtr)
+ if (sunKeyboardDevice) {
+ devPtr = &sunKeyboardDevice->public;
(void) sunChangeKbdTranslation (((sunKbdPrivPtr)(devPtr->devicePrivate))->fd, FALSE);
+ }
#if defined(SVR4) || defined(CSRG_BASED)
sunNonBlockConsoleOff ();
#else
@@ -209,7 +210,9 @@ ddxProcessArgument(int argc, char *argv[
return 1;
}
if (strcmp (argv[i], "-dev") == 0) { /* -dev /dev/mumble */
- if (++i >= argc) UseMsg ();
+ if (++i >= argc)
+ UseMsg();
+ sunDeviceList = argv[i];
return 2;
}
if (strcmp (argv[i], "-mono") == 0) { /* -mono */
@@ -228,14 +231,6 @@ ddxProcessArgument(int argc, char *argv[
sunFbInfo = TRUE;
return 1;
}
- if (strcmp (argv[i], "-kbd") == 0) { /* -kbd */
- if (++i >= argc) UseMsg();
- return 2;
- }
- if (strcmp (argv[i], "-protect") == 0) { /* -protect */
- if (++i >= argc) UseMsg();
- return 2;
- }
if (strcmp (argv[i], "-cg4frob") == 0) {
sunCG4Frob = TRUE;
return 1;
Index: xsrc/external/mit/xorg-server.old/dist/hw/sun/sunInit.c
diff -u xsrc/external/mit/xorg-server.old/dist/hw/sun/sunInit.c:1.4 xsrc/external/mit/xorg-server.old/dist/hw/sun/sunInit.c:1.5
--- xsrc/external/mit/xorg-server.old/dist/hw/sun/sunInit.c:1.4 Sun Aug 9 16:01:19 2020
+++ xsrc/external/mit/xorg-server.old/dist/hw/sun/sunInit.c Thu Aug 13 19:52:23 2020
@@ -132,6 +132,7 @@ EventList *sunEvents = NULL;
Bool sunSwapLkeys = FALSE;
Bool sunDebug = FALSE;
+char *sunDeviceList = NULL;
Bool sunForceMono = FALSE;
Bool sunFlipPixels = FALSE;
Bool sunFbInfo = FALSE;
@@ -403,14 +404,9 @@ GetDeviceList(int argc, char **argv)
{
int i;
char *envList = NULL;
- char *cmdList = NULL;
+ char *cmdList = sunDeviceList;
char **deviceList = (char **)NULL;
- for (i = 1; i < argc; i++)
- if (strcmp (argv[i], "-dev") == 0 && i+1 < argc) {
- cmdList = argv[i + 1];
- break;
- }
if (!cmdList)
envList = getenv ("XDEVICE");
Index: xsrc/external/mit/xorg-server.old/dist/hw/sun/sunKbd.c
diff -u xsrc/external/mit/xorg-server.old/dist/hw/sun/sunKbd.c:1.2 xsrc/external/mit/xorg-server.old/dist/hw/sun/sunKbd.c:1.3
--- xsrc/external/mit/xorg-server.old/dist/hw/sun/sunKbd.c:1.2 Sat Aug 1 13:40:55 2020
+++ xsrc/external/mit/xorg-server.old/dist/hw/sun/sunKbd.c Thu Aug 13 19:52:23 2020
@@ -607,7 +607,7 @@ sunInitKbdNames(XkbRMLVOSet *rmlvo, sunK
int
sunKbdProc(DeviceIntPtr device, int what)
{
- DevicePtr pKeyboard = (DevicePtr) device;
+ DevicePtr pKeyboard = &device->public;
sunKbdPrivPtr pPriv;
KeybdCtrl* ctrl = &device->kbdfeed->ctrl;
XkbRMLVOSet rmlvo;
@@ -617,7 +617,7 @@ sunKbdProc(DeviceIntPtr device, int what
switch (what) {
case DEVICE_INIT:
- if (pKeyboard != (DevicePtr)sunKeyboardDevice) {
+ if (pKeyboard != &sunKeyboardDevice->public) {
ErrorF ("Cannot open non-system keyboard\n");
return (!Success);
}
Index: xsrc/external/mit/xorg-server.old/dist/hw/sun/sunMouse.c
diff -u xsrc/external/mit/xorg-server.old/dist/hw/sun/sunMouse.c:1.1 xsrc/external/mit/xorg-server.old/dist/hw/sun/sunMouse.c:1.2
--- xsrc/external/mit/xorg-server.old/dist/hw/sun/sunMouse.c:1.1 Wed Jul 22 19:17:04 2020
+++ xsrc/external/mit/xorg-server.old/dist/hw/sun/sunMouse.c Thu Aug 13 19:52:23 2020
@@ -119,7 +119,7 @@ sunMouseCtrl(DeviceIntPtr device, PtrCtr
int
sunMouseProc(DeviceIntPtr device, int what)
{
- DevicePtr pMouse = (DevicePtr) device;
+ DevicePtr pMouse = &device->public;
int format;
static int oformat;
BYTE map[4];
@@ -128,7 +128,7 @@ sunMouseProc(DeviceIntPtr device, int wh
switch (what) {
case DEVICE_INIT:
- if (pMouse != (DevicePtr)sunPointerDevice) {
+ if (pMouse != &sunPointerDevice->public) {
ErrorF ("Cannot open non-system mouse");
return !Success;
}
