CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun
Module Name:xsrc
Committed By: tsutsui
Date: Thu Mar 11 13:12:34 UTC 2021
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sunKbd.c
Log Message:
Avoid polluting console on non-fatal errors.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.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/dist/hw/sun/sunKbd.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.8 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.9
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.8 Thu Mar 11 11:54:41 2021
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c Thu Mar 11 13:12:34 2021
@@ -191,7 +191,7 @@ SetLights(KeybdCtrl* ctrl, int fd)
#endif
};
if (ioctl (fd, KIOCSLED, (caddr_t)_tab[ctrl->leds & SUN_LED_MASK]) == -1)
- ErrorF("Failed to set keyboard lights\n");
+ LogMessage(X_ERROR, "Failed to set keyboard lights\n");
#endif
}
@@ -218,13 +218,13 @@ bell(int fd, int duration)
kbdCmd = KBD_CMD_BELL;
if (ioctl (fd, KIOCCMD, ) == -1) {
- ErrorF("Failed to activate bell\n");
+ LogMessage(X_ERROR, "Failed to activate bell\n");
return;
}
if (duration) usleep (duration);
kbdCmd = KBD_CMD_NOBELL;
if (ioctl (fd, KIOCCMD, ) == -1)
- ErrorF("Failed to deactivate bell\n");
+ LogMessage(X_ERROR, "Failed to deactivate bell\n");
}
static void
@@ -394,7 +394,7 @@ sunKbdCtrl(DeviceIntPtr device, KeybdCtr
pPriv->click = ctrl->click;
kbdClickCmd = pPriv->click ? KBD_CMD_CLICK : KBD_CMD_NOCLICK;
if (ioctl (pPriv->fd, KIOCCMD, ) == -1)
- ErrorF("Failed to set keyclick\n");
+ LogMessage(X_ERROR, "Failed to set keyclick\n");
}
if ((pPriv->type == KB_SUN4) && (pPriv->leds != (ctrl->leds & SUN_LED_MASK)))
DoLEDs(device, ctrl, pPriv);
CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun
Module Name:xsrc
Committed By: tsutsui
Date: Thu Mar 11 11:54:41 UTC 2021
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sunCfb.c sunFbs.c sunInit.c
sunKbd.c sunMouse.c
Log Message:
ErrorF() doesn't append newlines at the end of messages.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.c \
xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.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/dist/hw/sun/sunCfb.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.6 xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.7
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.6 Sun Aug 9 07:35:42 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c Thu Mar 11 11:54:41 2021
@@ -120,7 +120,7 @@ CGUpdateColormap(ScreenPtr pScreen, int
sunCmap.blue = [dex];
if (ioctl(sunFbs[pScreen->myNum].fd, FBIOPUTCMAP, ) < 0) {
- ErrorF("CGUpdateColormap");
+ ErrorF("CGUpdateColormap\n");
FatalError( "CGUpdateColormap: FBIOPUTCMAP failed\n" );
}
}
@@ -137,7 +137,7 @@ CGGetColormap(ScreenPtr pScreen, int dex
sunCmap.blue = [dex];
if (ioctl(sunFbs[pScreen->myNum].fd, FBIOGETCMAP, ) < 0) {
- ErrorF("CGGetColormap");
+ ErrorF("CGGetColormap\n");
FatalError( "CGGetColormap: FBIOGETCMAP failed\n" );
}
}
Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.c:1.3 xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.c:1.4
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.c:1.3 Sun Jul 26 07:35:37 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.c Thu Mar 11 11:54:41 2021
@@ -99,7 +99,7 @@ sunMemoryMap(size_t len, off_t off, int
#if !defined(__bsdi__) && !defined(_MAP_NEW) && !defined(__NetBSD__) && !defined(__OpenBSD__)
if ((addr = (caddr_t) valloc (mapsize)) == NULL) {
- ErrorF("Couldn't allocate frame buffer memory");
+ ErrorF("Couldn't allocate frame buffer memory\n");
(void) close (fd);
return NULL;
}
@@ -121,7 +121,7 @@ sunMemoryMap(size_t len, off_t off, int
PROT_READ | PROT_WRITE, MAP_SHARED,
fd, off);
if (mapaddr == (void *) -1) {
- ErrorF("mapping frame buffer memory");
+ ErrorF("mapping frame buffer memory\n");
(void) close (fd);
mapaddr = NULL;
}
@@ -134,7 +134,7 @@ sunScreenAllocate(ScreenPtr pScreen)
sunScreenPtrpPrivate;
if (!dixRegisterPrivateKey(, PRIVATE_SCREEN, 0)) {
- ErrorF("dixRegisterPrivateKey failed");
+ ErrorF("dixRegisterPrivateKey failed\n");
return FALSE;
}
pPrivate = calloc(1, sizeof (sunScreenRec));
Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c:1.3 xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c:1.4
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c:1.3 Sat Nov 21 03:02:09 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c Thu Mar 11 11:54:41 2021
@@ -133,7 +133,7 @@ sunMouseProc(DeviceIntPtr device, int wh
switch (what) {
case DEVICE_INIT:
if (pMouse != >public) {
- ErrorF ("Cannot open non-system mouse");
+ ErrorF ("Cannot open non-system mouse\n");
return !Success;
}
if (sunPtrPriv.fd == -1)
@@ -156,12 +156,12 @@ sunMouseProc(DeviceIntPtr device, int wh
case DEVICE_ON:
if (ioctl (sunPtrPriv.fd, VUIDGFORMAT, ) == -1) {
- ErrorF("sunMouseProc ioctl VUIDGFORMAT");
+ ErrorF("sunMouseProc ioctl VUIDGFORMAT\n");
return !Success;
}
format = VUID_FIRM_EVENT;
if (ioctl (sunPtrPriv.fd, VUIDSFORMAT, ) == -1) {
- ErrorF("sunMouseProc ioctl VUIDSFORMAT");
+ ErrorF("sunMouseProc ioctl VUIDSFORMAT\n");
return !Success;
}
sunPtrPriv.bmask = 0;
@@ -173,7 +173,7 @@ sunMouseProc(DeviceIntPtr device, int wh
case DEVICE_CLOSE:
pMouse->on = FALSE;
if (ioctl (sunPtrPriv.fd, VUIDSFORMAT, ) == -1)
- ErrorF("sunMouseProc ioctl VUIDSFORMAT");
+ ErrorF("sunMouseProc ioctl VUIDSFORMAT\n");
break;
case DEVICE_OFF:
@@ -210,7 +210,7 @@ sunMouseGetEvents(int fd, Bool on, int *
*pNumEvents = 0;
*pAgain = FALSE;
} else {
- ErrorF("sunMouseGetEvents read");
+ ErrorF("sunMouseGetEvents read\n");
FatalError ("Could not read from mouse");
}
} else {
Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.9 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.10
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.9 Tue Aug 11 06:49:09 2020
+++
CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun
Module Name:xsrc Committed By: tsutsui Date: Sat Nov 21 03:02:09 UTC 2020 Modified Files: xsrc/external/mit/xorg-server/dist/hw/sun: sunMouse.c Log Message: valuator_mask_zero() is enough for mouse button events. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xorg-server/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/dist/hw/sun/sunMouse.c diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c:1.2 xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c:1.3 --- xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c:1.2 Thu Aug 13 05:12:35 2020 +++ xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c Sat Nov 21 03:02:09 2020 @@ -283,7 +283,7 @@ sunMouseEnqueueEvent(DeviceIntPtr device } } flag = POINTER_RELATIVE; - valuator_mask_set_range(, 0, 0, NULL); + valuator_mask_zero(); QueuePointerEvents(device, type, buttons, flag, ); break; case LOC_X_DELTA:
CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun
Module Name:xsrc
Committed By: tsutsui
Date: Thu Aug 13 05:12:35 UTC 2020
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sunIo.c sunKbd.c sunMouse.c
Log Message:
Avoid dumb DevicePtr casts.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c
cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/xorg-server/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/dist/hw/sun/sunIo.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.4 xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.5
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.4 Tue Aug 11 06:49:09 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c Thu Aug 13 05:12:35 2020
@@ -170,9 +170,10 @@ AbortDDX(enum ExitCode error)
#else
(void) OsSignal (SIGIO, SIG_IGN);
#endif
-devPtr = (DevicePtr)sunKeyboardDevice;
-if (devPtr)
+if (sunKeyboardDevice) {
+devPtr = >public;
(void) sunChangeKbdTranslation (((sunKbdPrivPtr)(devPtr->devicePrivate))->fd, FALSE);
+}
#if defined(SVR4) || defined(CSRG_BASED)
sunNonBlockConsoleOff ();
#else
Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.6 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.7
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.6 Sat Aug 1 13:15:57 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c Thu Aug 13 05:12:35 2020
@@ -613,7 +613,7 @@ sunInitKbdNames(XkbRMLVOSet *rmlvo, sunK
int
sunKbdProc(DeviceIntPtr device, int what)
{
-DevicePtr pKeyboard = (DevicePtr) device;
+DevicePtr pKeyboard = >public;
sunKbdPrivPtr pPriv;
KeybdCtrl* ctrl = >kbdfeed->ctrl;
XkbRMLVOSet rmlvo;
@@ -623,7 +623,7 @@ sunKbdProc(DeviceIntPtr device, int what
switch (what) {
case DEVICE_INIT:
- if (pKeyboard != (DevicePtr)sunKeyboardDevice) {
+ if (pKeyboard != >public) {
ErrorF ("Cannot open non-system keyboard\n");
return (!Success);
}
Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c:1.1 xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c:1.1 Wed Jul 22 20:38:29 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c Thu Aug 13 05:12:35 2020
@@ -123,7 +123,7 @@ sunMouseCtrl(DeviceIntPtr device, PtrCtr
int
sunMouseProc(DeviceIntPtr device, int what)
{
-DevicePtr pMouse = (DevicePtr) device;
+DevicePtr pMouse = >public;
int format;
static int oformat;
BYTE map[4];
@@ -132,7 +132,7 @@ sunMouseProc(DeviceIntPtr device, int wh
switch (what) {
case DEVICE_INIT:
- if (pMouse != (DevicePtr)sunPointerDevice) {
+ if (pMouse != >public) {
ErrorF ("Cannot open non-system mouse");
return !Success;
}
CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun
Module Name:xsrc
Committed By: tsutsui
Date: Tue Aug 11 06:49:09 UTC 2020
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sun.h sunInit.c sunIo.c
Log Message:
Remove more redundant command option arg checks.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xorg-server/dist/hw/sun/sun.h
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.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/dist/hw/sun/sun.h
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sun.h:1.6 xsrc/external/mit/xorg-server/dist/hw/sun/sun.h:1.7
--- xsrc/external/mit/xorg-server/dist/hw/sun/sun.h:1.6 Sun Aug 9 07:35:42 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sun.h Tue Aug 11 06:49:09 2020
@@ -298,6 +298,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/dist/hw/sun/sunInit.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.8 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.9
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.8 Sun Aug 9 11:51:31 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c Tue Aug 11 06:49:09 2020
@@ -131,6 +131,7 @@ static Bool sunDevsInited = FALSE;
Bool sunSwapLkeys = FALSE;
Bool sunDebug = FALSE;
+char *sunDeviceList = NULL;
Bool sunForceMono = FALSE;
Bool sunFlipPixels = FALSE;
Bool sunFbInfo = FALSE;
@@ -402,14 +403,9 @@ GetDeviceList(int argc, char **argv)
{
int i;
char *envList = NULL;
-char *cmdList = NULL;
+char *cmdList = sunDeviceList;
char **deviceList = 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/dist/hw/sun/sunIo.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.3 xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.4
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.3 Sun Aug 9 07:35:42 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c Tue Aug 11 06:49:09 2020
@@ -209,7 +209,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 +230,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;
CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun
Module Name:xsrc
Committed By: tsutsui
Date: Sun Aug 9 11:51:31 UTC 2020
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sunInit.c
Log Message:
Put probed framebuffer info to a log file by default.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.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/dist/hw/sun/sunInit.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.7 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.8
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.7 Sun Aug 9 07:35:42 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c Sun Aug 9 11:51:31 2020
@@ -307,6 +307,11 @@ OpenFrameBuffer(
}
}
if (ret) {
+ int verb = 1;
+
+ if (sunFbInfo)
+ verb = -1;
+
devFbUsed = TRUE;
if (fbattr) {
if (fbattr->fbtype.fb_type >= XFBTYPE_LASTPLUSONE) {
@@ -325,16 +330,14 @@ OpenFrameBuffer(
if (sunFbData[fbattr->emu_types[_i]].init) {
sunFbs[screen].info.fb_type = fbattr->emu_types[_i];
ret = TRUE;
- if (sunFbInfo)
- ErrorF ("%s is emulating a %s\n", device,
-sunFbData[fbattr->fbtype.fb_type].name);
+ LogMessageVerb(X_INFO, verb, "%s is emulating a %s\n",
+ device, sunFbData[fbattr->fbtype.fb_type].name);
break;
}
}
}
- if (sunFbInfo)
- ErrorF ("%s is really a %s\n", device,
- sunFbData[fbattr ? fbattr->fbtype.fb_type : sunFbs[screen].info.fb_type].name);
+ LogMessageVerb(X_INFO, verb, "%s is really a %s\n", device,
+ sunFbData[fbattr ? fbattr->fbtype.fb_type : sunFbs[screen].info.fb_type].name);
}
}
if (!ret)
CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun
Module Name:xsrc
Committed By: tsutsui
Date: Sun Aug 9 07:35:42 UTC 2020
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sun.h sunCfb.c sunInit.c
sunIo.c
Log Message:
Remove redundant command option arg checks.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xorg-server/dist/hw/sun/sun.h \
xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.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/dist/hw/sun/sun.h
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sun.h:1.5 xsrc/external/mit/xorg-server/dist/hw/sun/sun.h:1.6
--- xsrc/external/mit/xorg-server/dist/hw/sun/sun.h:1.5 Sun Aug 9 07:29:32 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sun.h Sun Aug 9 07:35:42 2020
@@ -296,6 +296,8 @@ typedef struct {
extern sunFbDataRec sunFbData[];
extern fbFd sunFbs[];
extern Bool sunSwapLkeys;
+extern Bool sunForceMono;
+extern Bool sunDebug;
extern Bool sunFlipPixels;
extern Bool sunFbInfo;
extern Bool sunCG4Frob;
Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.5 xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.6
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.5 Sun Jul 26 07:20:50 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c Sun Aug 9 07:35:42 2020
@@ -98,7 +98,7 @@ static void CGSaveColormap(ScreenPtr);
static void CGRestoreColormap(ScreenPtr);
static void CGScreenInitCommon(ScreenPtr);
static void CGScreenInit(ScreenPtr);
-static void checkMono(int, char **);
+static void checkMono(void);
#ifdef INCLUDE_CG2_HEADER
static void CG2UpdateColormap(ScreenPtr, int, int, u_char *, u_char *, u_char *);
static void CG2GetColormap(ScreenPtr, int, int, u_char *, u_char *, u_char *);
@@ -308,13 +308,11 @@ CGScreenInit(ScreenPtr pScreen)
}
static void
-checkMono(int argc, char** argv)
+checkMono(void)
{
-int i;
-for (i = 1; i < argc; i++)
- if (strcmp (argv[i], "-mono") == 0)
- ErrorF ("-mono not appropriate for CG3/CG4/CG6\n");
+if (sunForceMono)
+ ErrorF("-mono not appropriate for CG3/CG4/CG6\n");
}
/*
@@ -336,7 +334,7 @@ sunCG3Init(
{
int screen = pScreen->myNum;
-checkMono (argc, argv);
+checkMono();
sunFbs[screen].EnterLeave = (void (*)(ScreenPtr, int))NoopDDA;
return sunInitCommon (screen, pScreen, (off_t) CG3_MMAP_OFFSET,
sunCfbScreenInit, CGScreenInit,
@@ -352,7 +350,7 @@ sunTCXInit(
{
int screen = pScreen->myNum;
-checkMono (argc, argv);
+checkMono();
sunFbs[screen].EnterLeave = (void (*)(ScreenPtr, int))NoopDDA;
return sunInitCommon (screen, pScreen, (off_t) 0,
sunCfbScreenInit, CGScreenInit,
@@ -457,18 +455,12 @@ sunCG2Init(
)
{
int screen = pScreen->myNum;
-int i;
Bool ret;
-Bool mono = FALSE;
-
-for (i = 1; i < argc; i++)
- if (strcmp (argv[i], "-mono") == 0)
- mono = TRUE;
sunFbs[screen].EnterLeave = (void (*)(ScreenPtr, int))NoopDDA;
pScreen->SaveScreen = CG2SaveScreen;
#ifndef LOWMEMFTPT
-if (mono) {
+if (sunForceMono) {
pScreen->whitePixel = 0;
pScreen->blackPixel = 1;
sunFbs[screen].info.fb_depth = 1;
@@ -518,7 +510,7 @@ sunCG4Init(
{
int screen = pScreen->myNum;
-checkMono (argc, argv);
+checkMono();
if (sunCG4Frob)
sunFbs[screen].EnterLeave = (void (*)(ScreenPtr, int))NoopDDA;
else
@@ -543,7 +535,7 @@ sunCG6Init(
void *fb;
int screen = pScreen->myNum;
-checkMono (argc, argv);
+checkMono();
if (!sunScreenAllocate (pScreen))
return FALSE;
if (!sunFbs[screen].fb) {
Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.6 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.7
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.6 Sun Aug 9 07:29:32 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c Sun Aug 9 07:35:42 2020
@@ -130,6 +130,8 @@ static void sunCfbGetImage(DrawablePtr,
static Bool sunDevsInited = FALSE;
Bool sunSwapLkeys = FALSE;
+Bool sunDebug = FALSE;
+Bool sunForceMono = FALSE;
Bool sunFlipPixels = FALSE;
Bool sunFbInfo = FALSE;
Bool sunCG4Frob = FALSE;
@@ -589,10 +591,8 @@ InitOutput(ScreenInfo *pScreenInfo, int
monitorResolution = 90;
if (RunFromSigStopParent)
nonBlockConsole = 1;
-for (i = 1; i < argc; i++) {
- if (!strcmp(argv[i],"-debug"))
- nonBlockConsole = 0;
-}
+if (sunDebug)
+ nonBlockConsole = 0;
/*
* Writes to /dev/console can block - causing an
Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.2
CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun
Module Name:xsrc
Committed By: tsutsui
Date: Sun Aug 9 07:29:32 UTC 2020
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sun.h sunInit.c
Log Message:
Remove a leftover variable for non-XKB autorepeat.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xorg-server/dist/hw/sun/sun.h
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.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/dist/hw/sun/sun.h
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sun.h:1.4 xsrc/external/mit/xorg-server/dist/hw/sun/sun.h:1.5
--- xsrc/external/mit/xorg-server/dist/hw/sun/sun.h:1.4 Thu Jul 30 14:32:52 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sun.h Sun Aug 9 07:29:32 2020
@@ -293,7 +293,6 @@ typedef struct {
} sunFbDataRec;
/* sunInit.c */
-extern Bool sunAutoRepeatHandlersInstalled;
extern sunFbDataRec sunFbData[];
extern fbFd sunFbs[];
extern Bool sunSwapLkeys;
Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.5 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.6
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.5 Sun Aug 9 06:30:46 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c Sun Aug 9 07:29:32 2020
@@ -129,7 +129,6 @@ static void sunCfbGetImage(DrawablePtr,
static Bool sunDevsInited = FALSE;
-Bool sunAutoRepeatHandlersInstalled; /* FALSE each time InitOutput called */
Bool sunSwapLkeys = FALSE;
Bool sunFlipPixels = FALSE;
Bool sunFbInfo = FALSE;
CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun
Module Name:xsrc
Committed By: tsutsui
Date: Sun Aug 9 06:30:46 UTC 2020
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sunInit.c
Log Message:
Inform detected keyboard type and layout via LogMessage().
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.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/dist/hw/sun/sunInit.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.4 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.5
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.4 Tue Aug 4 14:31:04 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c Sun Aug 9 06:30:46 2020
@@ -526,7 +526,13 @@ OsVendorInit(void)
if (sunPtrPriv.fd < 0)
FatalError ("Cannot open /dev/mouse, error %d\n", errno);
getKbdType ();
- if (sunKbdPriv.type == KB_SUN4) {
+ switch (sunKbdPriv.type) {
+ case KB_SUN2:
+ case KB_SUN3:
+ LogMessage(X_INFO, "Sun type %d Keyboard\n", sunKbdPriv.type);
+ break;
+ case KB_SUN4:
+#define LAYOUT_US5 33
(void) ioctl (sunKbdPriv.fd, KIOCLAYOUT, );
if (sunKbdPriv.layout < 0 ||
sunKbdPriv.layout > sunMaxLayout ||
@@ -534,6 +540,12 @@ OsVendorInit(void)
FatalError ("Unsupported keyboard type 4 layout %d\n",
sunKbdPriv.layout);
sunKeySyms[KB_SUN4].map = sunType4KeyMaps[sunKbdPriv.layout];
+ LogMessage(X_INFO, "Sun type %d Keyboard, layout %d\n",
+ sunKbdPriv.layout >= LAYOUT_US5 ? 5 : 4, sunKbdPriv.layout);
+ break;
+ default:
+ LogMessage(X_INFO, "Unknown keyboard type\n");
+ break;
}
inited = 1;
}
CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun
Module Name:xsrc
Committed By: tsutsui
Date: Tue Aug 4 14:31:04 UTC 2020
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sunInit.c sunIo.c
Log Message:
Call LogInit() for logging to /var/log/Xsun.%s.log as Xorg server.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c
cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.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/dist/hw/sun/sunInit.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.3 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.4
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.3 Thu Jul 30 14:32:52 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c Tue Aug 4 14:31:04 2020
@@ -52,6 +52,14 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include"fb.h"
#include"extinit.h"
+/* default log file paths */
+#ifndef DEFAULT_LOGDIR
+#define DEFAULT_LOGDIR "/var/log"
+#endif
+#ifndef DEFAULT_LOGPREFIX
+#define DEFAULT_LOGPREFIX "Xsun."
+#endif
+
/* maximum pixmap depth */
#ifndef SUNMAXDEPTH
#define SUNMAXDEPTH 8
@@ -481,6 +489,8 @@ OsVendorInit(void)
{
static int inited;
if (!inited) {
+ const char *logfile;
+ char *lf;
#ifndef i386
struct rlimit rl;
@@ -495,6 +505,20 @@ OsVendorInit(void)
(void) setrlimit (RLIMIT_NOFILE, );
}
#endif
+
+#define LOGSUFFIX ".log"
+#define LOGOLDSUFFIX ".old"
+
+ logfile = DEFAULT_LOGDIR "/" DEFAULT_LOGPREFIX;
+ if (asprintf(, "%s%%s" LOGSUFFIX, logfile) == -1)
+ FatalError("Cannot allocate space for the log file name\n");
+ LogInit(lf, LOGOLDSUFFIX);
+
+#undef LOGSUFFIX
+#undef LOGOLDSUFFIX
+
+ free(lf);
+
sunKbdPriv.fd = open ("/dev/kbd", O_RDWR, 0);
if (sunKbdPriv.fd < 0)
FatalError ("Cannot open /dev/kbd, error %d\n", errno);
Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.1 xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.1 Wed Jul 22 20:38:29 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c Tue Aug 4 14:31:04 2020
@@ -186,6 +186,7 @@ AbortDDX(enum ExitCode error)
sunDisableCursor (pScreen);
#endif
}
+LogClose(error);
}
/* Called by GiveUp(). */
CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun
Module Name:xsrc
Committed By: tsutsui
Date: Sat Aug 1 13:15:57 UTC 2020
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sunKbd.c
Log Message:
Trailing whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.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/dist/hw/sun/sunKbd.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.5 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.6
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.5 Sat Aug 1 01:49:58 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c Sat Aug 1 13:15:57 2020
@@ -716,7 +716,7 @@ sunInitModMap(
{
KeySym *k;
int i, min, max, width;
-
+
for (i = 0; i < MAP_LENGTH; i++)
ModMap[i] = NoSymbol;
CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun
Module Name:xsrc Committed By: tsutsui Date: Sat Aug 1 01:49:58 UTC 2020 Modified Files: xsrc/external/mit/xorg-server/dist/hw/sun: sunKbd.c Log Message: Use "empty" for rmlvo model and layout to avoid lingering default settings. Now all modifier keys (CTRL, SHIFT, and NumLock) work as expected. It seems XkbApplyMappingChange() doesn't update some XKB modifier settings even if new modmap data is specified. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.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/dist/hw/sun/sunKbd.c diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.4 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.5 --- xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.4 Thu Jul 30 14:15:49 2020 +++ xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c Sat Aug 1 01:49:58 2020 @@ -592,8 +592,8 @@ sunInitKbdNames(XkbRMLVOSet *rmlvo, sunK } #else rmlvo->rules = "base"; -rmlvo->model = NULL; -rmlvo->layout = NULL; +rmlvo->model = "empty"; +rmlvo->layout = "empty"; rmlvo->variant = NULL; rmlvo->options = NULL; #endif @@ -649,9 +649,10 @@ sunKbdProc(DeviceIntPtr device, int what sunInitKbdNames(, pKeyboard->devicePrivate); #if 0 /* XXX needs more work for Xorg xkb */ - InitKeyboardDeviceStruct(device, rmlvo, + InitKeyboardDeviceStruct(device, , sunBell, sunKbdCtrl); #else + XkbSetRulesDflts(); InitKeyboardDeviceStruct(device, NULL, sunBell, sunKbdCtrl); XkbApplyMappingChange(device, workingKeySyms,
CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun
Module Name:xsrc
Committed By: tsutsui
Date: Thu Jul 30 14:32:52 UTC 2020
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sun.h sunInit.c sunKeyMap.c
Log Message:
Remove now unused ModMap data for each keyboard.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xorg-server/dist/hw/sun/sun.h
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c \
xsrc/external/mit/xorg-server/dist/hw/sun/sunKeyMap.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/dist/hw/sun/sun.h
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sun.h:1.3 xsrc/external/mit/xorg-server/dist/hw/sun/sun.h:1.4
--- xsrc/external/mit/xorg-server/dist/hw/sun/sun.h:1.3 Wed Jul 29 17:29:53 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sun.h Thu Jul 30 14:32:52 2020
@@ -304,10 +304,8 @@ extern Bool sunNoGX;
/* sunKeyMap.c */
extern KeySymsRec sunKeySyms[];
-extern const SunModmapRec *sunModMaps[];
extern const int sunMaxLayout;
extern KeySym *sunType4KeyMaps[];
-extern const SunModmapRec *sunType4ModMaps[];
/* sunKbd.c */
extern long sunAutoRepeatInitiate;
Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.2 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.3
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.2 Fri Jul 24 02:20:20 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c Thu Jul 30 14:32:52 2020
@@ -510,7 +510,6 @@ OsVendorInit(void)
FatalError ("Unsupported keyboard type 4 layout %d\n",
sunKbdPriv.layout);
sunKeySyms[KB_SUN4].map = sunType4KeyMaps[sunKbdPriv.layout];
- sunModMaps[KB_SUN4] = sunType4ModMaps[sunKbdPriv.layout];
}
inited = 1;
}
Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunKeyMap.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunKeyMap.c:1.2 xsrc/external/mit/xorg-server/dist/hw/sun/sunKeyMap.c:1.3
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunKeyMap.c:1.2 Thu Jul 30 14:15:49 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunKeyMap.c Thu Jul 30 14:32:52 2020
@@ -243,19 +243,9 @@ static KeySym US2Keymap[] = {
NoSymbol, NoSymbol, /* 0x7f */
};
-static const SunModmapRec US2Modmap[] = {
- { 99, ShiftMask },
- { 110, ShiftMask },
- { 76, ControlMask },
- { 120, Meta_Mask },
- { 122, Meta_Mask },
- { 0, 0 }
-};
-
#else
#define US2Keymap NULL
-#define US2Modmap NULL
#endif /* US2 */
@@ -391,20 +381,9 @@ static KeySym US3Keymap[] = {
NoSymbol, NoSymbol, /* 0x7f */
};
-static const SunModmapRec US3Modmap[] = {
- { 99, ShiftMask },
- { 110, ShiftMask },
- { 76, ControlMask },
- { 119, LockMask },
- { 120, Meta_Mask },
- { 122, Meta_Mask },
- { 0, 0 }
-};
-
#else
#define US3Keymap NULL
-#define US3Modmap NULL
#endif /* US3 */
@@ -417,78 +396,6 @@ KeySymsRec sunKeySyms[] = {
{ NULL, 1, 0x7d, 4 }
};
-const SunModmapRec *sunModMaps[] = {
-NULL,
-NULL,
-US2Modmap,
-US3Modmap,
-NULL
-};
-
-static const SunModmapRec Generic5Modmap[] = {
- { 99, ShiftMask },
- { 110, ShiftMask },
- { 119, LockMask },
- { 76, ControlMask },
- { 120, Meta_Mask },
- { 122, Meta_Mask },
- { 13, Mode_switch_Mask },
- { 98, Num_Lock_Mask },
- { 19, Alt_Mask },
- { 0, 0}
-};
-
-#if defined(DEN4) || defined(SWEDFIN4) || defined(SWFR4) || defined(SWGE4)
-
-static const SunModmapRec DenSwedFinSw4Modmap[] = {
-{ 99, ShiftMask },
-{ 110, ShiftMask },
-{ 76, LockMask },
-{ 119, ControlMask },
-{ 120, Meta_Mask },
-{ 122, Meta_Mask },
-{ 67, Mode_switch_Mask },
-{ 98, Num_Lock_Mask },
-{ 19, Alt_Mask },
-{ 0, 0 }
-};
-
-#endif
-
-#if defined(FRBE4) || defined(NETH4)
-
-static const SunModmapRec FrBeNeth4Modmap[] = {
- { 99, ShiftMask },
- { 110, ShiftMask },
- { 13, LockMask },
- { 76, ControlMask },
- { 120, Meta_Mask },
- { 122, Meta_Mask },
- { 119, Mode_switch_Mask },
- { 98, Num_Lock_Mask },
- { 19, Alt_Mask },
- { 0, 0 }
-};
-
-#endif
-
-#if defined(ITALY4) || defined(NORW4) || defined(PORT4) || defined(SPAINLATAM4)
-
-static const SunModmapRec ItNorPortSp4Modmap[] = {
- { 99, ShiftMask },
- { 110, ShiftMask },
- { 76, LockMask },
- { 119, ControlMask },
- { 120, Meta_Mask },
- { 122, Meta_Mask },
- { 13, Mode_switch_Mask },
- { 98, Num_Lock_Mask },
- { 19, Alt_Mask },
- { 0, 0 }
-};
-
-#endif
-
#ifdef CAN4
static KeySym Canada4Keymap[] = {
@@ -619,23 +526,9 @@ static KeySym Canada4Keymap[] = {
XK_KP_Add, NoSymbol, NoSymbol, NoSymbol, /*125*/
};
-static const SunModmapRec Canada4Modmap[] = {
- { 99, ShiftMask },
- { 110, ShiftMask },
- { 76, LockMask },
- { 13, ControlMask },
- { 120, Meta_Mask },
- { 122, Meta_Mask },
- { 119, Mode_switch_Mask },
- { 98, Num_Lock_Mask },
- { 19, Alt_Mask },
- { 0, 0}
-};
-
CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun
Module Name:xsrc
Committed By: tsutsui
Date: Thu Jul 30 14:15:49 UTC 2020
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sunKbd.c sunKeyMap.c
Log Message:
Initialize ModMap dynamically using keymap data per each keyboard.
Now ScrollLock LED works properly.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/sun/sunKeyMap.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/dist/hw/sun/sunKbd.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.3 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.4
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.3 Wed Jul 29 17:29:53 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c Thu Jul 30 14:15:49 2020
@@ -58,10 +58,17 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#endif
#define MIN_KEYCODE 7 /* necessary to avoid the mouse buttons */
#define MAX_KEYCODE 255 /* limited by the protocol */
+#define NUM_KEYCODES (MAX_KEYCODE - MIN_KEYCODE + 1)
#ifndef KB_SUN4
#define KB_SUN4 4
#endif
+#define Meta_Mask Mod1Mask
+#define Mode_switch_Mask Mod2Mask
+#define Alt_Mask Mod3Mask
+#define Num_Lock_Mask Mod4Mask
+#define ScrollLockMask Mod5Mask
+
#define tvminus(tv, tv1, tv2) /* tv = tv1 - tv2 */ \
if ((tv1).tv_usec < (tv2).tv_usec) { \
(tv1).tv_usec += 100; \
@@ -79,6 +86,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
}
static void sunKbdHandlerNotify(int, int, void *);
+static void sunInitModMap(const KeySymsRec *, CARD8 *);
static void SwapLKeys(KeySymsRec *);
static void SetLights(KeybdCtrl *, int);
static KeyCode LookupKeyCode(KeySym, XkbDescPtr, KeySymsPtr);
@@ -605,13 +613,12 @@ sunInitKbdNames(XkbRMLVOSet *rmlvo, sunK
int
sunKbdProc(DeviceIntPtr device, int what)
{
-int i;
DevicePtr pKeyboard = (DevicePtr) device;
sunKbdPrivPtr pPriv;
KeybdCtrl* ctrl = >kbdfeed->ctrl;
XkbRMLVOSet rmlvo;
+CARD8 workingModMap[MAP_LENGTH];
-static CARD8 *workingModMap = NULL;
static KeySymsRec *workingKeySyms;
switch (what) {
@@ -633,14 +640,8 @@ sunKbdProc(DeviceIntPtr device, int what
}
if (workingKeySyms->maxKeyCode > MAX_KEYCODE)
workingKeySyms->maxKeyCode = MAX_KEYCODE;
- }
- if (!workingModMap) {
- workingModMap = malloc(MAP_LENGTH);
- (void) memset(workingModMap, 0, MAP_LENGTH);
- for(i=0; sunModMaps[sunKbdPriv.type][i].key != 0; i++)
- workingModMap[sunModMaps[sunKbdPriv.type][i].key + MIN_KEYCODE] =
- sunModMaps[sunKbdPriv.type][i].modifiers;
+ sunInitModMap(workingKeySyms, workingModMap);
}
pKeyboard->devicePrivate = (void *)
@@ -696,6 +697,73 @@ sunKbdProc(DeviceIntPtr device, int what
return Success;
}
+/*-
+ * sunInitModMap --
+ * Initialize ModMap per specified KeyMap table.
+ *
+ * Results:
+ * None.
+ *
+ * Side Effects:
+ * None.
+ *---*/
+static void
+sunInitModMap(
+const KeySymsRec *KeySyms, /* KeyMap data to set ModMap */
+CARD8 *ModMap /* ModMap to be initialized */
+)
+{
+KeySym *k;
+int i, min, max, width;
+
+for (i = 0; i < MAP_LENGTH; i++)
+ModMap[i] = NoSymbol;
+
+min = KeySyms->minKeyCode;
+max = KeySyms->maxKeyCode;
+width = KeySyms->mapWidth;
+for (i = min, k = KeySyms->map; i < max; i++, k += width) {
+ switch (*k) {
+
+ case XK_Shift_L:
+ case XK_Shift_R:
+ ModMap[i] = ShiftMask;
+ break;
+
+ case XK_Control_L:
+ case XK_Control_R:
+ ModMap[i] = ControlMask;
+ break;
+
+ case XK_Caps_Lock:
+ ModMap[i] = LockMask;
+ break;
+
+ case XK_Alt_L:
+ case XK_Alt_R:
+ ModMap[i] = Alt_Mask;
+ break;
+
+ case XK_Num_Lock:
+ ModMap[i] = Num_Lock_Mask;
+ break;
+
+ case XK_Scroll_Lock:
+ ModMap[i] = ScrollLockMask;
+ break;
+
+ case XK_Meta_L:
+ case XK_Meta_R:
+ ModMap[i] = Meta_Mask;
+ break;
+
+ case SunXK_AltGraph:
+ ModMap[i] = Mode_switch_Mask;
+ break;
+}
+}
+}
+
/*-
*---
* sunKbdGetEvents --
Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunKeyMap.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunKeyMap.c:1.1 xsrc/external/mit/xorg-server/dist/hw/sun/sunKeyMap.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunKeyMap.c:1.1 Wed Jul 22 20:38:29 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunKeyMap.c Thu Jul 30 14:15:49 2020
@@ -111,21 +111,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define XK_R15 NoSymbol
#endif
-/* twm and Motif have hard-coded dependencies on Meta being Mod1 :-( */
-#if 0
-/* This set has optimal characteristics for use in the Toolkit... */
-#define
CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun
Module Name:xsrc
Committed By: tsutsui
Date: Wed Jul 29 17:29:53 UTC 2020
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sun.h sunKbd.c
Log Message:
Remove unused functions required to handle non-XKB autorepeat.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xorg-server/dist/hw/sun/sun.h \
xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.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/dist/hw/sun/sun.h
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sun.h:1.2 xsrc/external/mit/xorg-server/dist/hw/sun/sun.h:1.3
--- xsrc/external/mit/xorg-server/dist/hw/sun/sun.h:1.2 Sun Jul 26 07:20:50 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sun.h Wed Jul 29 17:29:53 2020
@@ -359,8 +359,6 @@ extern Firm_event* sunKbdGetEvents(int,
extern void sunKbdEnqueueEvent(DeviceIntPtr, Firm_event *);
extern int sunKbdProc(DeviceIntPtr, int);
extern void sunKbdWait(void);
-void sunBlockHandler(int, void *, void *, void *);
-void sunWakeupHandler(int, void *, unsigned long, void *);
/* sunMouse.c */
extern Firm_event* sunMouseGetEvents(int, Bool, int *, Bool *);
Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.2 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.3
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.2 Wed Jul 29 17:27:44 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c Wed Jul 29 17:29:53 2020
@@ -839,15 +839,3 @@ LegalModifier(unsigned int key, DeviceIn
{
return TRUE;
}
-
-/*ARGSUSED*/
-void
-sunBlockHandler(int nscreen, void *pbdata, void *pTimeout, void *pReadmask)
-{
-}
-
-/*ARGSUSED*/
-void
-sunWakeupHandler(int nscreen, void *pbdata, unsigned long err, void *pReadmask)
-{
-}
CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun
Module Name:xsrc
Committed By: tsutsui
Date: Wed Jul 29 17:27:44 UTC 2020
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sunKbd.c
Log Message:
Fix LED defintions to match xkb/xkbInit.c.
Now CapsLock and NumLock LEDs work correctly.
XXX: No ScrollLock LED
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.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/dist/hw/sun/sunKbd.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.1 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.1 Wed Jul 22 20:38:29 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c Wed Jul 29 17:27:44 2020
@@ -51,7 +51,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "xkbsrv.h"
#include "xkbstr.h"
+#ifdef __sun
#define SUN_LED_MASK 0x0f
+#else
+#define SUN_LED_MASK 0x07
+#endif
#define MIN_KEYCODE 7 /* necessary to avoid the mouse buttons */
#define MAX_KEYCODE 255 /* limited by the protocol */
#ifndef KB_SUN4
@@ -144,6 +148,7 @@ SetLights(KeybdCtrl* ctrl, int fd)
#ifdef KIOCSLED
static unsigned char led_tab[16] = {
0,
+#ifdef __sun
LED_NUM_LOCK,
LED_SCROLL_LOCK,
LED_SCROLL_LOCK | LED_NUM_LOCK,
@@ -159,8 +164,25 @@ SetLights(KeybdCtrl* ctrl, int fd)
LED_CAPS_LOCK | LED_COMPOSE | LED_NUM_LOCK,
LED_CAPS_LOCK | LED_COMPOSE | LED_SCROLL_LOCK,
LED_CAPS_LOCK | LED_COMPOSE | LED_SCROLL_LOCK | LED_NUM_LOCK
+#else
+ LED_CAPS_LOCK,
+ LED_NUM_LOCK,
+ LED_NUM_LOCK | LED_CAPS_LOCK,
+ LED_SCROLL_LOCK,
+ LED_SCROLL_LOCK | LED_CAPS_LOCK,
+ LED_SCROLL_LOCK | LED_NUM_LOCK,
+ LED_SCROLL_LOCK | LED_NUM_LOCK | LED_CAPS_LOCK,
+ LED_COMPOSE,
+ LED_COMPOSE | LED_CAPS_LOCK,
+ LED_COMPOSE | LED_NUM_LOCK,
+ LED_COMPOSE | LED_NUM_LOCK | LED_CAPS_LOCK,
+ LED_COMPOSE | LED_SCROLL_LOCK,
+ LED_COMPOSE | LED_SCROLL_LOCK | LED_CAPS_LOCK,
+ LED_COMPOSE | LED_SCROLL_LOCK | LED_NUM_LOCK,
+ LED_COMPOSE | LED_SCROLL_LOCK | LED_NUM_LOCK | LED_CAPS_LOCK,
+#endif
};
-if (ioctl (fd, KIOCSLED, (caddr_t)_tab[ctrl->leds & 0x0f]) == -1)
+if (ioctl (fd, KIOCSLED, (caddr_t)_tab[ctrl->leds & SUN_LED_MASK]) == -1)
ErrorF("Failed to set keyboard lights");
#endif
}
@@ -223,10 +245,17 @@ DDXRingBell(int volume, int pitch, int d
}
+#ifdef __sun
#define XLED_NUM_LOCK0x1
#define XLED_COMPOSE 0x4
#define XLED_SCROLL_LOCK 0x2
#define XLED_CAPS_LOCK 0x8
+#else
+#define XLED_NUM_LOCK0x2
+#define XLED_COMPOSE 0x8
+#define XLED_SCROLL_LOCK 0x4
+#define XLED_CAPS_LOCK 0x1
+#endif
static KeyCode
LookupKeyCode(KeySym keysym, XkbDescPtr xkb, KeySymsPtr syms)
@@ -324,7 +353,7 @@ DoLEDs(
pseudoKey(device, FALSE,
LookupKeyCode(SunXK_Compose, xkb, syms));
-pPriv->leds = ctrl->leds & 0x0f;
+pPriv->leds = ctrl->leds & SUN_LED_MASK;
SetLights (ctrl, pPriv->fd);
free(syms->map);
free(syms);
@@ -359,7 +388,7 @@ sunKbdCtrl(DeviceIntPtr device, KeybdCtr
if (ioctl (pPriv->fd, KIOCCMD, ) == -1)
ErrorF("Failed to set keyclick");
}
-if ((pPriv->type == KB_SUN4) && (pPriv->leds != (ctrl->leds & 0x0f)))
+if ((pPriv->type == KB_SUN4) && (pPriv->leds != (ctrl->leds & SUN_LED_MASK)))
DoLEDs(device, ctrl, pPriv);
}
CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun
Module Name:xsrc Committed By: tsutsui Date: Sun Jul 26 07:35:37 UTC 2020 Modified Files: xsrc/external/mit/xorg-server/dist/hw/sun: sunFbs.c Log Message: Explicitly initialize origColormapValid for readability. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.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/dist/hw/sun/sunFbs.c diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.c:1.2 xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.c:1.3 --- xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.c:1.2 Sun Jul 26 07:20:50 2020 +++ xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.c Sun Jul 26 07:35:37 2020 @@ -141,6 +141,7 @@ sunScreenAllocate(ScreenPtr pScreen) if (!pPrivate) return FALSE; +pPrivate->origColormapValid = FALSE; sunSetScreenPrivate(pScreen, pPrivate); return TRUE; }
CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun
Module Name:xsrc
Committed By: tsutsui
Date: Sun Jul 26 07:20:50 UTC 2020
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sun.h sunCfb.c sunFbs.c
Log Message:
Implement functions to restore palette settings on exiting Xserver.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/xorg-server/dist/hw/sun/sun.h \
xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.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/dist/hw/sun/sun.h
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sun.h:1.1 xsrc/external/mit/xorg-server/dist/hw/sun/sun.h:1.2
--- xsrc/external/mit/xorg-server/dist/hw/sun/sun.h:1.1 Wed Jul 22 20:38:29 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sun.h Sun Jul 26 07:20:50 2020
@@ -247,11 +247,21 @@ typedef struct {
CursorPtr pCursor; /* current cursor */
} sunCursorRec, *sunCursorPtr;
+#define NCMAP 256
+typedef struct {
+u_char origRed[NCMAP];
+u_char origGreen[NCMAP];
+u_char origBlue[NCMAP];
+} sunCmapRec, *sunCmapPtr;
+
typedef struct {
ColormapPtr installedMap;
CloseScreenProcPtr CloseScreen;
void (*UpdateColormap)(ScreenPtr, int, int, u_char *, u_char *, u_char *);
void (*GetColormap)(ScreenPtr, int, int, u_char *, u_char *, u_char *);
+Bool origColormapValid;
+sunCmapRec origColormap;
+void (*RestoreColormap)(ScreenPtr);
sunCursorRechardwareCursor;
Bool hasHardwareCursor;
} sunScreenRec, *sunScreenPtr;
Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.c:1.1 xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.c:1.1 Wed Jul 22 20:38:29 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.c Sun Jul 26 07:20:50 2020
@@ -137,7 +137,7 @@ sunScreenAllocate(ScreenPtr pScreen)
ErrorF("dixRegisterPrivateKey failed");
return FALSE;
}
-pPrivate = malloc (sizeof (sunScreenRec));
+pPrivate = calloc(1, sizeof (sunScreenRec));
if (!pPrivate)
return FALSE;
@@ -171,6 +171,8 @@ closeScreen(ScreenPtr pScreen)
#if 0 /* XXX GX is disabled for now */
sunDisableCursor (pScreen);
#endif
+if (pPrivate->origColormapValid)
+ (*pPrivate->RestoreColormap)(pScreen);
pScreen->CloseScreen = pPrivate->CloseScreen;
ret = (*pScreen->CloseScreen) (pScreen);
(void) (*pScreen->SaveScreen) (pScreen, SCREEN_SAVER_OFF);
Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.4 xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.5
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.4 Sun Jul 26 07:19:09 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c Sun Jul 26 07:20:50 2020
@@ -94,11 +94,15 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
static void CGUpdateColormap(ScreenPtr, int, int, u_char *, u_char *, u_char *);
static void CGGetColormap(ScreenPtr, int, int, u_char *, u_char *, u_char *);
static void CGStoreColors(ColormapPtr, int, xColorItem *);
+static void CGSaveColormap(ScreenPtr);
+static void CGRestoreColormap(ScreenPtr);
+static void CGScreenInitCommon(ScreenPtr);
static void CGScreenInit(ScreenPtr);
static void checkMono(int, char **);
#ifdef INCLUDE_CG2_HEADER
static void CG2UpdateColormap(ScreenPtr, int, int, u_char *, u_char *, u_char *);
static void CG2GetColormap(ScreenPtr, int, int, u_char *, u_char *, u_char *);
+static void CG2RestoreColormap(ScreenPtr);
static Bool CG2SaveScreen(ScreenPtr, int);
static void CG2ScreenInit(ScreenPtr pScreen);
#endif
@@ -246,22 +250,61 @@ CGStoreColors(ColormapPtr pmap, int ndef
}
static void
-CGScreenInit(ScreenPtr pScreen)
+CGSaveColormap(ScreenPtr pScreen)
{
-#ifndef STATIC_COLOR /* { */
sunScreenPtr pPrivate = sunGetScreenPrivate(pScreen);
+sunCmapPtr origColormap;
+u_char *rmap, *gmap, *bmap;
+
+origColormap = >origColormap;
+rmap = origColormap->origRed;
+gmap = origColormap->origGreen;
+bmap = origColormap->origBlue;
+(*pPrivate->GetColormap)(pScreen, 0, NCMAP, rmap, gmap, bmap);
+}
+
+static void
+CGRestoreColormap(ScreenPtr pScreen)
+{
+sunScreenPtr pPrivate = sunGetScreenPrivate(pScreen);
+sunCmapPtr origColormap;
+u_char *rmap, *gmap, *bmap;
+
+if (pPrivate->origColormapValid) {
+ origColormap = >origColormap;
+ rmap = origColormap->origRed;
+ gmap = origColormap->origGreen;
+ bmap = origColormap->origBlue;
+ (*pPrivate->UpdateColormap)(pScreen, 0, NCMAP, rmap, gmap, bmap);
+}
+}
+
+static void
+CGScreenInitCommon(ScreenPtr pScreen)
+{
pScreen->InstallColormap = sunInstallColormap;
pScreen->UninstallColormap = sunUninstallColormap;
CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun
Module Name:xsrc Committed By: tsutsui Date: Sun Jul 26 07:19:09 UTC 2020 Modified Files: xsrc/external/mit/xorg-server/dist/hw/sun: sunCfb.c Log Message: Add prototype declarations for CG2 functions. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.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/dist/hw/sun/sunCfb.c diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.3 xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.4 --- xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.3 Fri Jul 24 03:57:21 2020 +++ xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c Sun Jul 26 07:19:09 2020 @@ -96,6 +96,12 @@ static void CGGetColormap(ScreenPtr, int static void CGStoreColors(ColormapPtr, int, xColorItem *); static void CGScreenInit(ScreenPtr); static void checkMono(int, char **); +#ifdef INCLUDE_CG2_HEADER +static void CG2UpdateColormap(ScreenPtr, int, int, u_char *, u_char *, u_char *); +static void CG2GetColormap(ScreenPtr, int, int, u_char *, u_char *, u_char *); +static Bool CG2SaveScreen(ScreenPtr, int); +static void CG2ScreenInit(ScreenPtr pScreen); +#endif static void CG4Switch(ScreenPtr, int); static void
CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun
Module Name:xsrc
Committed By: tsutsui
Date: Fri Jul 24 03:57:21 UTC 2020
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sunCfb.c
Log Message:
Use proper args for dixLookupResourceByType() to get defcolormap.
Botched in mechanical 1.20 updates.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.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/dist/hw/sun/sunCfb.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.2 xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.3
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.2 Thu Jul 23 18:14:36 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c Fri Jul 24 03:57:21 2020
@@ -197,7 +197,7 @@ sunUninstallColormap(ColormapPtr cmap)
if (cmap->mid != defMapID) {
ColormapPtr defMap;
dixLookupResourceByType((void **), defMapID, RT_COLORMAP,
-NullClient, DixUnknownAccess);
+serverClient, DixUseAccess);
if (defMap)
(*cmap->pScreen->InstallColormap)(defMap);
CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun
Module Name:xsrc
Committed By: tsutsui
Date: Fri Jul 24 02:20:20 UTC 2020
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sunInit.c
Log Message:
Apply upstream "free the EQ allocated memory on shutdown" fixes.
This should be updated before 1.20 import:
https://cgit.freedesktop.org/xorg/xserver/commit/?id=87d4f90bfcb509471ac9e7886e14a92b33223fd7
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.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/dist/hw/sun/sunInit.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.1 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.1 Wed Jul 22 20:38:29 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c Fri Jul 24 02:20:20 2020
@@ -664,6 +664,7 @@ InitInput(int argc, char **argv)
void
CloseInput(void)
{
+mieqFini();
}
#if SUNMAXDEPTH == 8
CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun
Module Name:xsrc
Committed By: tsutsui
Date: Thu Jul 23 18:14:36 UTC 2020
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sunCfb.c
Log Message:
Use proper ANSI offsetof(3) to specify framebuffer offset in struct.
Fixes build error on sparc64. No binary change on sun3.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.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/dist/hw/sun/sunCfb.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.1 xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.1 Wed Jul 22 20:38:29 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c Thu Jul 23 18:14:36 2020
@@ -418,7 +418,7 @@ sunCG2Init(
ret = sunInitCommon (screen, pScreen, (off_t) 0,
sunCfbScreenInit, CG2ScreenInit,
fbCreateDefColormap, CG2SaveScreen,
- (int) &((struct cg2memfb *) 0)->pixplane);
+ offsetof(struct cg2memfb, pixplane));
((CG2Ptr) sunFbs[screen].fb)->regs.ppmask.reg = 0xFF;
#ifndef LOWMEMFTPT
}
@@ -436,7 +436,7 @@ typedef struct {
u_char mpixel[CG4_MELEN]; /* bit-per-pixel memory */
u_char epixel[CG4_MELEN]; /* enable plane */
u_char cpixel[CG4_HEIGHT][CG4_WIDTH]; /* byte-per-pixel memory */
-} *CG4Ptr;
+} *CG4Ptr, CG4Rec;
static void
CG4Switch(ScreenPtr pScreen, int select)
@@ -462,7 +462,7 @@ sunCG4Init(
sunFbs[screen].EnterLeave = CG4Switch;
return sunInitCommon (screen, pScreen, (off_t) 0,
sunCfbScreenInit, CGScreenInit,
- fbCreateDefColormap, sunSaveScreen, (int) ((CG4Ptr) 0)->cpixel);
+ fbCreateDefColormap, sunSaveScreen, offsetof(CG4Rec, cpixel));
}
#ifdef FBTYPE_SUNFAST_COLOR /* { */
