 @@ -48,47 +48,55 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "mi.h"
 #include <X11/extensions/XKB.h>
 #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 */
 #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 += 1000000; \
 		    (tv1).tv_sec -= 1; \
 		} \
 		(tv).tv_usec = (tv1).tv_usec - (tv2).tv_usec; \
 		(tv).tv_sec = (tv1).tv_sec - (tv2).tv_sec;
 #define tvplus(tv, tv1, tv2)    /* tv = tv1 + tv2 */ \
 		(tv).tv_sec = (tv1).tv_sec + (tv2).tv_sec; \
 		(tv).tv_usec = (tv1).tv_usec + (tv2).tv_usec; \
 		if ((tv).tv_usec > 1000000) { \
 		    (tv).tv_usec -= 1000000; \
 		    (tv).tv_sec += 1; \
+		}
 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);
 static void pseudoKey(DeviceIntPtr, Bool, KeyCode);
 static void DoLEDs(DeviceIntPtr, KeybdCtrl *, sunKbdPrivPtr);
 DeviceIntPtr	sunKeyboardDevice = NULL;
 static void
 sunKbdHandlerNotify(int fd __unused, int ready __unused, void *data __unused)
+{
+}
 @@ -595,62 +603,55 @@ sunInitKbdNames(XkbRMLVOSet *rmlvo, sunK
  *-----------------------------------------------------------------------
  * sunKbdProc --
  *	Handle the initialization, etc. of a keyboard.
+ *
  * Results:
  *	None.
+ *
  *-----------------------------------------------------------------------
  */
 int
 sunKbdProc(DeviceIntPtr device, int what)
+{
     int i;
     DevicePtr pKeyboard = (DevicePtr) device;
     sunKbdPrivPtr pPriv;
     KeybdCtrl*	ctrl = &device->kbdfeed->ctrl;
     XkbRMLVOSet rmlvo;
     CARD8 workingModMap[MAP_LENGTH];
     static CARD8 *workingModMap = NULL;
     static KeySymsRec *workingKeySyms;
     switch (what) {
     case DEVICE_INIT:
 	if (pKeyboard != (DevicePtr)sunKeyboardDevice) {
 	    ErrorF ("Cannot open non-system keyboard\n");
 	    return (!Success);
+	}
 	if (!workingKeySyms) {
 	    workingKeySyms = &sunKeySyms[sunKbdPriv.type];
 	    if (sunKbdPriv.type == KB_SUN4 && sunSwapLkeys)
 		SwapLKeys(workingKeySyms);
 	    if (workingKeySyms->minKeyCode < MIN_KEYCODE) {
 		workingKeySyms->minKeyCode += MIN_KEYCODE;
 		workingKeySyms->maxKeyCode += MIN_KEYCODE;
+	    }
 	    if (workingKeySyms->maxKeyCode > MAX_KEYCODE)
 		workingKeySyms->maxKeyCode = MAX_KEYCODE;
-	if (!workingModMap) {
+	    sunInitModMap(workingKeySyms, 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;
+	}
 	pKeyboard->devicePrivate = (void *)&sunKbdPriv;
 	pKeyboard->on = FALSE;
 	sunInitKbdNames(&rmlvo, pKeyboard->devicePrivate);
 #if 0 /* XXX needs more work for Xorg xkb */
 	InitKeyboardDeviceStruct(device, rmlvo,
 				 sunBell, sunKbdCtrl);
 #else
 	InitKeyboardDeviceStruct(device, NULL,
 				 sunBell, sunKbdCtrl);
 	XkbApplyMappingChange(device, workingKeySyms,
 @@ -686,26 +687,93 @@ sunKbdProc(DeviceIntPtr device, int what
 	 * Restore original keyboard directness and translation.
 	 */
 	if (sunChangeKbdTranslation(pPriv->fd,FALSE) == -1)
 	    FatalError("Can't reset keyboard translation\n");
 	RemoveNotifyFd(pPriv->fd);
 	pKeyboard->on = FALSE;
 	break;
     default:
 	FatalError("Unknown keyboard operation\n");
+    }
     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 --
  *	Return the events waiting in the wings for the given keyboard.
+ *
  * Results:
  *	A pointer to an array of Firm_events or (Firm_event *)0 if no events
  *	The number of events contained in the array.
  *	A boolean as to whether more events might be available.
+ *
  * Side Effects:
  *	None.
  *-----------------------------------------------------------------------

 @@ -101,41 +101,26 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define	XK_R9	NoSymbol
 #define	XK_L7	XK_Execute
 #define	XK_L8	XK_Print
 #define	XK_R10	XK_Left
 #define	XK_R11	XK_Home
 #define	XK_R12	XK_Right
 #define	XK_L9	XK_Find
 #define	XK_L10	XK_Help
 #define	XK_R13	NoSymbol
 #define	XK_R14	XK_Down
 #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 Meta_Mask Mod1Mask
 #define Mode_switch_Mask Mod2Mask
 #define Num_Lock_Mask Mod3Mask
 #define Alt_Mask Mod4Mask
 #else
 /* but this set is compatible with what we shipped in R6. */
 #define Meta_Mask Mod1Mask
 #define Mode_switch_Mask Mod2Mask
 #define Alt_Mask Mod3Mask
 #define Num_Lock_Mask Mod4Mask
 #endif
 #ifdef US2
 static KeySym US2Keymap[] = {
 	XK_L1,		NoSymbol,		/* 0x1 */
 	NoSymbol,	NoSymbol,		/* 0x2 */
 	XK_L2,		NoSymbol,		/* 0x3 */
 	NoSymbol,	NoSymbol,		/* 0x4 */
 	XK_F1,		NoSymbol,		/* 0x5 */
 	XK_F2,		NoSymbol,		/* 0x6 */
 	NoSymbol,	NoSymbol,		/* 0x7 */
 	XK_F3,		NoSymbol,		/* 0x8 */
 	NoSymbol,	NoSymbol,		/* 0x9 */
 	XK_F4,		NoSymbol,		/* 0xa */