OpenIndiana and Solaris port

cde/programs/dtwm/Imakefile

@@ -11,6 +11,7 @@ MWMDEFINES = $(VFORK_DEFINE) -DLARGECURSORS -DR2_COMPAT -DOPAQUE -DSHAPE \
 
 DTWMDEFINES = -DWSM -DPANELIST
 
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES = $(MWMDEFINES) $(DTWMDEFINES) -DMULTIBYTE -DMINIMAL_DT
 
 DEPLIBS = DepDtClientLibs
@@ -21,12 +22,6 @@ SYS_LIBRARIES = DtClientSysLibs DtClientExtraLibs
 EXTRA_DEFINES = -D_HPUX_SOURCE 
 #endif	/* HPArchitecture */	
 
-#if defined (SunArchitecture)
-/* The OpenWindows AllPlanes extension is not in vanilla X11R6. */
-EXTRA_CCOPTIONS = -xF
-dtwm := LOCAL_LDFLAGS = -M mapfile.reorder
-#endif
-
 SRCSXM = \
         WmCDInfo.c      WmCDecor.c      WmCEvent.c \
         WmCPlace.c      WmColormap.c    WmError.c \

cde/programs/dtwm/WmFunction.c

@@ -109,7 +109,8 @@ static unsigned int GetEventInverseMask(XEvent *event);
 
 #ifdef WSM
 
-#if (defined(USL) || defined(__uxp__) || defined(linux) || defined(CSRG_BASED)) && !defined(_NFILE)
+#if (defined(USL) || defined(__uxp__) || defined(linux) || \
+     defined(sun) || defined(CSRG_BASED)) && !defined(_NFILE)
 #define _NFILE FOPEN_MAX
 #endif
 #define CLOSE_FILES_ON_EXEC() \

cde/programs/dtwm/WmResCvt.c

@@ -1083,7 +1083,11 @@ void WmCvtStringToKFocus (XrmValue *args, Cardinal numArgs, XrmValue *fromVal, X
 
     if (!fHit)
     {
+#if defined(sun)
+	cval =  KEYBOARD_FOCUS_POINTER;
+#else
 	cval =  KEYBOARD_FOCUS_EXPLICIT;
+#endif
     }
 
 

cde/programs/dtwm/WmResource.c

@@ -852,7 +852,11 @@ XtResource wmGlobalResources[] =
 	sizeof (int),
         XtOffsetOf(WmGlobalData, keyboardFocusPolicy),
 	XtRImmediate,
+#if defined(sun)
+	(XtPointer)KEYBOARD_FOCUS_POINTER
+#else
 	(XtPointer)KEYBOARD_FOCUS_EXPLICIT
+#endif
     },
 
     {