external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

Remove all optional compile flags from dtwm that are not referenced anywhere, and are unlikely to ever be used

Browse source
This commit is contained in:
wmoxam 2019-10-14 00:31:57 -04:00 • committed by Jon Trulson
parent ab863f212d
commit 14e385d175
23 changed files with 0 additions and 519 deletions
Download patch file Download diff file Expand all files Collapse all files

1
cde/config/cf/Motif.tmpl
View file

@ -95,7 +95,6 @@ XCOMM $TOG: Motif.tmpl /main/6 1999/05/19 17:00:05 mgreess $
# define XmDefines /**/ # define XmDefines /**/
#endif #endif
/* To compile without SHAPE extension, set this to -DNO_SHAPE */
#ifndef MwmDefines #ifndef MwmDefines
# define MwmDefines /**/ # define MwmDefines /**/
#endif #endif

100
cde/programs/dtwm/README
View file

@ -5,26 +5,6 @@ The following is a listing of the conditional compilation switches that
are "not obvious." Excluded are hardware or OS identifiers (e.g. __ultrix), are "not obvious." Excluded are hardware or OS identifiers (e.g. __ultrix),
header file include flags, and macros (e.g. ABS). header file include flags, and macros (e.g. ABS).
ALTERNATE_POSTMENU
This turns on menu posting by a simple call to XtManageChild.
Normally, some underbar routines are called.
DT_LEFT_JUSTIFY_TITLE
This causes the text in the window titles to be left justified
instead of centered. NOTE that WSM must also be turned on for
this to take effect.
CONCAT_TEXTLIST
If turned on, then all members of compound text window
properties (WM_NAME, WM_ICON_NAME) are converted to XmStrings
and concatenated together. Normally, only the first member
is taken.
CONFIG_RELATIVE_TO_CLIENT
If defined, then programmatic window configurations are
absolute. Normally, the window frame offset is taken into
account if it would have been during a user-driven config.
DEBUG DEBUG
Turns on code that prints out error messages (specifically Turns on code that prints out error messages (specifically
protocol errors). protocol errors).
@ -44,19 +24,6 @@ header file include flags, and macros (e.g. ABS).
If defined, the session hints property is left on the root If defined, the session hints property is left on the root
window after being read. Normally, it is deleted. window after being read. Normally, it is deleted.
DISALLOW_DEEP_ICONS
Turns off code that allows icon pixmaps of depth greater than
one.
DONT_FILTER_ICON_WINDOWS
This disables code that tries to prevent an icon window from being
managed as a normal toplevel window.
FUTURE
This appears to enable code that will allow item help to work
over window icons. I suspect that this is not completely
implemented.
ICCC_COMPLIANT ICCC_COMPLIANT
This enables stricter ICCCM compliance. Specifically, some This enables stricter ICCCM compliance. Specifically, some
clients didn't get WM_PROTOCOLS quite right. clients didn't get WM_PROTOCOLS quite right.
@ -68,89 +35,22 @@ header file include flags, and macros (e.g. ABS).
LARGECURSORS LARGECURSORS
Allows cursors larger than 16x16. Allows cursors larger than 16x16.
MCCABE
Conditional compile for McCabe complexity metrics.
MESSAGE_CAT MESSAGE_CAT
Enables message catalog code for local language support. Enables message catalog code for local language support.
MOTIF_DEFAULT_ICON MOTIF_DEFAULT_ICON
Enables the default window icon with four buttons. Enables the default window icon with four buttons.
NO
Vestigal/experimental code for position help dialog (WmHelp.c).
NO_OL_COMPAT
If defined, then code to read and interpret Open Look window
manager hints is removed.
NO_SETPGRP
If defined, then child processes started by f.exec are not
put into their own process group.
NO_SHAPE
If defined, then the shape extension is not supported.
NO_WMQUERY
If defined, the code to provide the WM_QUERY functionality is
removed.
NO_DT
If defined, then code that references the Dt library is removed.
OLD
Vestigal code in WmHelp.c
OLD_CODE OLD_CODE
Vestigal code. Vestigal code.
OLD_COLORMAP
Vestigal code.
OLD_TAKE_FOCUS
Vestigal code.
PANACOMM
HP Panacom division modification to support clients running
in their X terminals.
PARANOID
If enabled, the a server grab is done around a property read.
(This is probably not necessary.)
PORT_NOVFORK PORT_NOVFORK
Enable for systems that don't have the vfork() call. Enable for systems that don't have the vfork() call.
PORT_OLDXLIB
Enables code that works around an old bug in XGetClassHint().
R2_COMPAT R2_COMPAT
Enables support for old clients that still pass window geometry Enables support for old clients that still pass window geometry
hint information in WM_NORMAL_HINTS. hint information in WM_NORMAL_HINTS.
ROOT_ICON_MENU
Experimental code to provide MS Windows-like traversal of focus
between root icons with menus posted.
SGI_FOCUS_PATCH
Fixes a specific window focus problem.
UNMAP_ON_RESTART UNMAP_ON_RESTART
All windows are unmapped on restart. All windows are unmapped on restart.
_BMS
Formerly used to denote code that interfaced to the HP Broadcast
message server. This code has been switched over to ICCC
messaging. The ifdef's should be removed, the code should stay.
_CMDINV
The #ifdef is somewhat vestigal--it's not even put in
correctly. This brackets code that is partly used to send the
ready message. It should be removed, the code should stay.
_NO_PROTO
If turned on, then pre-ANSI function prototypes are used.
_NO_WM
Enables testing code in WmPanel.c that allows it to be compiled
with a test program outside of the window manager.

10
cde/programs/dtwm/WmCDecor.c
View file

@ -155,13 +155,11 @@ Boolean FrameWindow (ClientData *pcd)
AdoptClient(pcd); /* reparent the window */ AdoptClient(pcd); /* reparent the window */
#ifndef NO_SHAPE
/* shape the frame */ /* shape the frame */
if (wmGD.hasShape && pcd->wShaped) if (wmGD.hasShape && pcd->wShaped)
{ {
SetFrameShape (pcd); SetFrameShape (pcd);
} }
#endif /* NO_SHAPE */
return(TRUE); return(TRUE);
@ -1038,7 +1036,6 @@ void AdoptClient (ClientData *pcd)
XConfigureWindow (DISPLAY, pcd->client, mask, &windowChanges); XConfigureWindow (DISPLAY, pcd->client, mask, &windowChanges);
#ifndef NO_SHAPE
/* shape our frame to match that of the client's window */ /* shape our frame to match that of the client's window */
if (wmGD.hasShape) if (wmGD.hasShape)
{ {
@ -1052,7 +1049,6 @@ void AdoptClient (ClientData *pcd)
&clipShaped, &xbs, &ybs, &wbs, &hbs); &clipShaped, &xbs, &ybs, &wbs, &hbs);
pcd->wShaped = boundingShaped; pcd->wShaped = boundingShaped;
} }
#endif /* NO_SHAPE */
/* reparent the window to the base window */ /* reparent the window to the base window */
XReparentWindow (DISPLAY, pcd->client, pcd->clientBaseWin, XReparentWindow (DISPLAY, pcd->client, pcd->clientBaseWin,
@ -2343,12 +2339,10 @@ void RegenerateClientFrame (ClientData *pcd)
/* regenerate the graphics */ /* regenerate the graphics */
GenerateFrameDisplayLists (pcd); GenerateFrameDisplayLists (pcd);
#ifndef NO_SHAPE
if (wmGD.hasShape && pcd->wShaped) if (wmGD.hasShape && pcd->wShaped)
{ {
SetFrameShape (pcd); SetFrameShape (pcd);
} }
#endif /* NO_SHAPE */
} /* END OF FUNCTION RegenerateClientFrame */ } /* END OF FUNCTION RegenerateClientFrame */
@ -2808,8 +2802,6 @@ void PopGadgetOut (ClientData *pcd, int gadget)
wmGD.gadgetDepressed = 0; wmGD.gadgetDepressed = 0;
} /* END OF FUNCTION PopGadgetOut */ } /* END OF FUNCTION PopGadgetOut */
#ifndef NO_SHAPE
/*************************************<->************************************* /*************************************<->*************************************
* *
* SetFrameShape (pcd) * SetFrameShape (pcd)
@ -2896,7 +2888,5 @@ void SetFrameShape (ClientData *pcd)
None, ShapeSet); None, ShapeSet);
} }
} /* END OF FUNCTION SetFrameShape */ } /* END OF FUNCTION SetFrameShape */
#endif /* NO_SHAPE */

13
cde/programs/dtwm/WmCEvent.c
View file

@ -641,13 +641,11 @@ Boolean HandleEventsOnClientWindow (ClientData *pCD, XEvent *pEvent)
{ {
Boolean doXtDispatchEvent = True; Boolean doXtDispatchEvent = True;
#ifndef NO_SHAPE
if (pEvent->type == (wmGD.shapeEventBase+ShapeNotify)) if (pEvent->type == (wmGD.shapeEventBase+ShapeNotify))
{ {
HandleCShapeNotify (pCD, (XShapeEvent *)pEvent); HandleCShapeNotify (pCD, (XShapeEvent *)pEvent);
} }
else else
#endif /* NO_SHAPE */
switch (pEvent->type) switch (pEvent->type)
{ {
case ColormapNotify: case ColormapNotify:
@ -822,16 +820,12 @@ void HandleCPropertyNotify (ClientData *pCD, XPropertyEvent *propertyEvent)
* The client window has the colormap focus, install the * The client window has the colormap focus, install the
* colormap. * colormap.
*/ */
#ifndef OLD_COLORMAP /* colormap */
/* /*
* We just changed the colormaps list, * We just changed the colormaps list,
* so we need to re-run the whole thing. * so we need to re-run the whole thing.
*/ */
pCD->clientCmapFlagsInitialized = 0; pCD->clientCmapFlagsInitialized = 0;
ProcessColormapList (ACTIVE_PSD, pCD); ProcessColormapList (ACTIVE_PSD, pCD);
#else /* OSF original */
WmInstallColormap (ACTIVE_PSD, pCD->clientColormap);
#endif
} }
} }
break; break;
@ -1945,9 +1939,6 @@ void HandleCEnterNotify (ClientData *pCD, XEnterWindowEvent *enterEvent)
* * the menu comes unposted, the new window has input focus, but no * * the menu comes unposted, the new window has input focus, but no
* client active decorations are changed. * client active decorations are changed.
*/ */
#ifdef SGI_FOCUS_PATCH
SetKeyboardFocus (pCD, REFRESH_LAST_FOCUS);
#endif
} }
} }
if (wmGD.colormapFocusPolicy == CMAP_FOCUS_POINTER) if (wmGD.colormapFocusPolicy == CMAP_FOCUS_POINTER)
@ -2570,8 +2561,6 @@ void HandleClientMessage (ClientData *pCD, XClientMessageEvent *clientEvent)
} /* END OF FUNCTION HandleClientMessage */ } /* END OF FUNCTION HandleClientMessage */
#ifndef NO_SHAPE
/*************************************<->************************************* /*************************************<->*************************************
* *
* HandleCShapeNotify (pCD, shapeEvent) * HandleCShapeNotify (pCD, shapeEvent)
@ -2602,9 +2591,7 @@ HandleCShapeNotify (ClientData *pCD, XShapeEvent *shapeEvent)
SetFrameShape (pCD); SetFrameShape (pCD);
} }
} /* END OF FUNCTION HandleCShapeNotify */ } /* END OF FUNCTION HandleCShapeNotify */
#endif /* NO_SHAPE */
/*************************************<->************************************* /*************************************<->*************************************
* *
* GetParentWindow (window) * GetParentWindow (window)

2
cde/programs/dtwm/WmCEvent.h
View file

@ -59,9 +59,7 @@ extern void HandleClientMessage (ClientData *pCD,
extern void HandleCMotionNotify (ClientData *pCD, XMotionEvent *motionEvent); extern void HandleCMotionNotify (ClientData *pCD, XMotionEvent *motionEvent);
extern void HandleCPropertyNotify (ClientData *pCD, extern void HandleCPropertyNotify (ClientData *pCD,
XPropertyEvent *propertyEvent); XPropertyEvent *propertyEvent);
#ifndef NO_SHAPE
extern void HandleCShapeNotify (ClientData *pCD, XShapeEvent *shapeEvent); extern void HandleCShapeNotify (ClientData *pCD, XShapeEvent *shapeEvent);
#endif /* NO_SHAPE */
extern Boolean HandleEventsOnClientWindow (ClientData *pCD, XEvent *pEvent); extern Boolean HandleEventsOnClientWindow (ClientData *pCD, XEvent *pEvent);
extern Boolean HandleEventsOnSpecialWindows (XEvent *pEvent); extern Boolean HandleEventsOnSpecialWindows (XEvent *pEvent);

38
cde/programs/dtwm/WmColormap.c
View file

@ -144,8 +144,6 @@ void InitColormapFocus (WmScreenData *pSD)
} /* END OF FUNCTION InitColormapFocus */ } /* END OF FUNCTION InitColormapFocus */
#ifndef OLD_COLORMAP
/*************************************<->************************************* /*************************************<->*************************************
* *
* ForceColormapFocus (pSD, pCD) * ForceColormapFocus (pSD, pCD)
@ -181,11 +179,7 @@ void ForceColormapFocus (WmScreenData *pSD, ClientData *pCD)
(pCD->clientState == MAXIMIZED_STATE))) (pCD->clientState == MAXIMIZED_STATE)))
{ {
pSD->colormapFocus = pCD; pSD->colormapFocus = pCD;
#ifndef OLD_COLORMAP /* colormaps */
ProcessColormapList (pSD, pCD); ProcessColormapList (pSD, pCD);
#else /* OSF original */
WmInstallColormap (pSD, pCD->clientColormap);
#endif
} }
else else
{ {
@ -201,10 +195,8 @@ void ForceColormapFocus (WmScreenData *pSD, ClientData *pCD)
} }
} /* END OF FUNCTION ForceColormapFocus */ } /* END OF FUNCTION ForceColormapFocus */
#endif
/*************************************<->************************************* /*************************************<->*************************************
* *
* SetColormapFocus (pSD, pCD) * SetColormapFocus (pSD, pCD)
@ -233,38 +225,10 @@ void SetColormapFocus (WmScreenData *pSD, ClientData *pCD)
return; return;
} }
#ifndef OLD_COLORMAP
ForceColormapFocus (pSD, pCD); ForceColormapFocus (pSD, pCD);
#else /* OSF original */
if (pCD && ((pCD->clientState == NORMAL_STATE) ||
(pCD->clientState == MAXIMIZED_STATE)))
{
pSD->colormapFocus = pCD;
#ifndef OLD_COLORMAP /* colormaps */
ProcessColormapList (pSD, pCD);
#else /* OSF original */
WmInstallColormap (pSD, pCD->clientColormap);
#endif
}
else
{
/*
* The default colormap is installed for minimized windows that have
* the colormap focus.
* !!! should colormaps be installed for icons with client !!!
* !!! icon windows? should the client colormap be installed ? !!!
*/
pSD->colormapFocus = NULL;
WmInstallColormap (pSD, pSD->workspaceColormap);
}
#endif
} /* END OF FUNCTION SetColormapFocus */ } /* END OF FUNCTION SetColormapFocus */
/*************************************<->************************************* /*************************************<->*************************************
* *
* WmInstallColormap (pSD, colormap) * WmInstallColormap (pSD, colormap)
@ -366,11 +330,9 @@ void ResetColormapData (ClientData *pCD, Window *pWindows, int count)
XtFree ((char *)(pCD->cmapWindows)); XtFree ((char *)(pCD->cmapWindows));
XtFree ((char *)(pCD->clientCmapList)); XtFree ((char *)(pCD->clientCmapList));
pCD->clientCmapCount = 0; pCD->clientCmapCount = 0;
#ifndef OLD_COLORMAP /* colormap */
XtFree ((char *)(pCD->clientCmapFlags)); XtFree ((char *)(pCD->clientCmapFlags));
pCD->clientCmapFlags = 0; /* DEBUG: */ pCD->clientCmapFlags = 0; /* DEBUG: */
pCD->clientCmapFlagsInitialized = 0; pCD->clientCmapFlagsInitialized = 0;
#endif
} }
if (count) if (count)

2
cde/programs/dtwm/WmColormap.h
View file

@ -32,9 +32,7 @@
extern void InitWorkspaceColormap (WmScreenData *pSD); extern void InitWorkspaceColormap (WmScreenData *pSD);
extern void InitColormapFocus (WmScreenData *pSD); extern void InitColormapFocus (WmScreenData *pSD);
#ifndef OLD_COLORMAP
extern void ForceColormapFocus (WmScreenData *pSD, ClientData *pCD); extern void ForceColormapFocus (WmScreenData *pSD, ClientData *pCD);
#endif
extern void SetColormapFocus (WmScreenData *pSD, ClientData *pCD); extern void SetColormapFocus (WmScreenData *pSD, ClientData *pCD);
extern void WmInstallColormap (WmScreenData *pSD, Colormap colormap); extern void WmInstallColormap (WmScreenData *pSD, Colormap colormap);
extern void ResetColormapData (ClientData *pCD, Window *pWindows, int count); extern void ResetColormapData (ClientData *pCD, Window *pWindows, int count);

42
cde/programs/dtwm/WmEvent.c
View file

@ -622,38 +622,6 @@ Boolean WmDispatchMenuEvent (XButtonEvent *event)
doXtDispatchEvent = False; doXtDispatchEvent = False;
} }
} }
#ifdef ROOT_ICON_MENU
if (wmGD.menuActive && wmGD.F_NextKeySpec)
{
if (((wmGD.F_NextKeySpec->state == event->state) ||
(wmGD.F_NextKeySpec->state == NOLOCKMOD(event->state))) &&
(wmGD.F_NextKeySpec->keycode == event->button))
{
/*
* This is a key spec to traverse to the next window
* via the keyboard.
*/
UnpostMenu (wmGD.menuActive);
doXtDispatchEvent = False;
}
}
if (wmGD.menuActive && wmGD.F_PrevKeySpec)
{
if (((wmGD.F_PrevKeySpec->state == event->state) ||
(wmGD.F_PrevKeySpec->state == NOLOCKMOD(event->state))) &&
(wmGD.F_PrevKeySpec->keycode == event->button))
{
/*
* This is a key spec to traverse to the previous window
* via the keyboard.
*/
UnpostMenu (wmGD.menuActive);
doXtDispatchEvent = False;
}
}
#endif /* ROOT_ICON_MENU */
} }
else if (wmGD.checkHotspot && else if (wmGD.checkHotspot &&
@ -1218,16 +1186,6 @@ Boolean HandleKeyPress (XKeyEvent *keyEvent,
{ {
wmGD.passKeysKeySpec = keySpecs; wmGD.passKeysKeySpec = keySpecs;
} }
#ifdef ROOT_ICON_MENU
else if (keySpecs->wmFunction == F_Next_Key)
{
wmGD.F_NextKeySpec = keySpecs;
}
else if (keySpecs->wmFunction == F_Prev_Key)
{
wmGD.F_PrevKeySpec = keySpecs;
}
#endif /* ROOT_ICON_MENU */
if (!(keySpecs->wmFunction (keySpecs->wmFuncArgs, if (!(keySpecs->wmFunction (keySpecs->wmFuncArgs,
functionClient, keyEvent))) functionClient, keyEvent)))
{ {

2
cde/programs/dtwm/WmFeedback.c
View file

@ -494,9 +494,7 @@ void HideFeedbackWindow (WmScreenData *pSD)
if (pSD->feedbackWin) if (pSD->feedbackWin)
{ {
XUnmapWindow (DISPLAY, pSD->feedbackWin); XUnmapWindow (DISPLAY, pSD->feedbackWin);
#ifndef OLD_COLORMAP
ForceColormapFocus (ACTIVE_PSD, ACTIVE_PSD->colormapFocus); ForceColormapFocus (ACTIVE_PSD, ACTIVE_PSD->colormapFocus);
#endif
} }
pSD->fbStyle = FB_OFF; pSD->fbStyle = FB_OFF;
} }

51
cde/programs/dtwm/WmFunction.c
View file

@ -955,7 +955,6 @@ Boolean F_Exec (String args, ClientData *pCD, XEvent *event)
#endif #endif
{ {
#ifndef NO_SETPGRP
#if defined(SVR4) || defined(__linux__) #if defined(SVR4) || defined(__linux__)
setsid(); setsid();
#else #else
@ -968,7 +967,6 @@ Boolean F_Exec (String args, ClientData *pCD, XEvent *event)
setpgrp(tpid, tpid); setpgrp(tpid, tpid);
#endif /* SYSV */ #endif /* SYSV */
#endif /* SVR4 */ #endif /* SVR4 */
#endif /* NO_SETPGRP */
/* /*
* Clean up window manager resources. * Clean up window manager resources.
@ -1830,30 +1828,10 @@ F_Help_Mode (String args, ClientData *pCD, XEvent *event)
Boolean F_Next_Key (String args, ClientData *pCD, XEvent *event) Boolean F_Next_Key (String args, ClientData *pCD, XEvent *event)
{ {
#ifdef ROOT_ICON_MENU
Boolean focused = False;
#endif /* ROOT_ICON_MENU */
if (wmGD.keyboardFocusPolicy == KEYBOARD_FOCUS_EXPLICIT) if (wmGD.keyboardFocusPolicy == KEYBOARD_FOCUS_EXPLICIT)
{ {
#ifdef ROOT_ICON_MENU
focused =
#endif /* ROOT_ICON_MENU */
FocusNextWindow ((unsigned long)args, FocusNextWindow ((unsigned long)args,
GetFunctionTimestamp ((XButtonEvent *)event)); GetFunctionTimestamp ((XButtonEvent *)event));
#ifdef ROOT_ICON_MENU
if (focused && wmGD.iconClick &&
event && event->type == KeyPress &&
wmGD.nextKeyboardFocus &&
wmGD.nextKeyboardFocus->clientState == MINIMIZED_STATE &&
!P_ICON_BOX(wmGD.nextKeyboardFocus))
{
/*
* Post system menu from the icon
*/
F_Post_SMenu (args, wmGD.nextKeyboardFocus, event);
return (False);
}
#endif /* ROOT_ICON_MENU */
} }
return (True); return (True);
@ -1892,16 +1870,12 @@ Boolean F_Prev_Cmap (String args, ClientData *pCD, XEvent *event)
pCD->clientColormap = pCD->clientCmapList[pCD->clientCmapIndex]; pCD->clientColormap = pCD->clientCmapList[pCD->clientCmapIndex];
if (ACTIVE_PSD->colormapFocus == pCD) if (ACTIVE_PSD->colormapFocus == pCD)
{ {
#ifndef OLD_COLORMAP /* colormap */
/* /*
* We just re-ordered the colormaps list, * We just re-ordered the colormaps list,
* so we need to re-run the whole thing. * so we need to re-run the whole thing.
*/ */
pCD->clientCmapFlagsInitialized = 0; pCD->clientCmapFlagsInitialized = 0;
ProcessColormapList (ACTIVE_PSD, pCD); ProcessColormapList (ACTIVE_PSD, pCD);
#else /* OSF original */
WmInstallColormap (ACTIVE_PSD, pCD->clientColormap);
#endif
} }
} }
@ -1934,31 +1908,10 @@ Boolean F_Prev_Cmap (String args, ClientData *pCD, XEvent *event)
Boolean F_Prev_Key (String args, ClientData *pCD, XEvent *event) Boolean F_Prev_Key (String args, ClientData *pCD, XEvent *event)
{ {
#ifdef ROOT_ICON_MENU
Boolean focused = False;
#endif /* ROOT_ICON_MENU */
if (wmGD.keyboardFocusPolicy == KEYBOARD_FOCUS_EXPLICIT) if (wmGD.keyboardFocusPolicy == KEYBOARD_FOCUS_EXPLICIT)
{ {
#ifdef ROOT_ICON_MENU
focused =
#endif /* ROOT_ICON_MENU */
FocusPrevWindow ((unsigned long)args, FocusPrevWindow ((unsigned long)args,
GetFunctionTimestamp ((XButtonEvent *)event)); GetFunctionTimestamp ((XButtonEvent *)event));
#ifdef ROOT_ICON_MENU
if (focused && wmGD.iconClick &&
event && event->type == KeyPress &&
wmGD.nextKeyboardFocus &&
wmGD.nextKeyboardFocus->clientState == MINIMIZED_STATE &&
!P_ICON_BOX(wmGD.nextKeyboardFocus))
{
/*
* Post system menu from the icon
*/
F_Post_SMenu (args, wmGD.nextKeyboardFocus, event);
return (False);
}
#endif /* ROOT_ICON_MENU */
} }
return (True); return (True);
@ -2468,16 +2421,12 @@ Boolean F_Next_Cmap (String args, ClientData *pCD, XEvent *event)
pCD->clientColormap = pCD->clientCmapList[pCD->clientCmapIndex]; pCD->clientColormap = pCD->clientCmapList[pCD->clientCmapIndex];
if (ACTIVE_PSD->colormapFocus == pCD) if (ACTIVE_PSD->colormapFocus == pCD)
{ {
#ifndef OLD_COLORMAP /* colormap */
/* /*
* We just re-ordered the colormaps list, * We just re-ordered the colormaps list,
* so we need to re-run the whole thing. * so we need to re-run the whole thing.
*/ */
pCD->clientCmapFlagsInitialized = 0; pCD->clientCmapFlagsInitialized = 0;
ProcessColormapList (ACTIVE_PSD, pCD); ProcessColormapList (ACTIVE_PSD, pCD);
#else /* OSF original */
WmInstallColormap (ACTIVE_PSD, pCD->clientColormap);
#endif
} }
} }

12
cde/programs/dtwm/WmGlobal.h
View file

@ -51,9 +51,7 @@
#include <stdio.h> #include <stdio.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
#ifndef NO_SHAPE
#include <X11/extensions/shape.h> #include <X11/extensions/shape.h>
#endif /* NO_SHAPE */
#include <X11/IntrinsicP.h> #include <X11/IntrinsicP.h>
#include <X11/Intrinsic.h> #include <X11/Intrinsic.h>
#include <X11/StringDefs.h> #include <X11/StringDefs.h>
@ -1536,19 +1534,15 @@ typedef struct _ClientData
Colormap *clientCmapList; Colormap *clientCmapList;
int clientCmapCount; /* len of clientCmapList */ int clientCmapCount; /* len of clientCmapList */
int clientCmapIndex; /* current cmap in list */ int clientCmapIndex; /* current cmap in list */
#ifndef OLD_COLORMAP /* colormap */
int *clientCmapFlags; /* installed, uninstalled */ int *clientCmapFlags; /* installed, uninstalled */
Bool clientCmapFlagsInitialized; /* Are clientCmapFlags valid? */ Bool clientCmapFlagsInitialized; /* Are clientCmapFlags valid? */
#endif
/* associated window data: */ /* associated window data: */
ClientListEntry clientEntry; ClientListEntry clientEntry;
ClientListEntry iconEntry; ClientListEntry iconEntry;
XID windowGroup; /* WM_HINTS field */ XID windowGroup; /* WM_HINTS field */
#ifndef NO_OL_COMPAT
Boolean bPseudoTransient; /* transientFor window group */ Boolean bPseudoTransient; /* transientFor window group */
#endif /* NO_OL_COMPAT */
IconBoxData *thisIconBox; /* icon box data for self */ IconBoxData *thisIconBox; /* icon box data for self */
/* if this is an icon box */ /* if this is an icon box */
Context grabContext; /* used to support icon box */ Context grabContext; /* used to support icon box */
@ -1687,9 +1681,7 @@ typedef struct _ClientData
Window attachWindow; /* _DT_WM_HINTS */ Window attachWindow; /* _DT_WM_HINTS */
SlideDirection slideDirection; /* slide-up direction */ SlideDirection slideDirection; /* slide-up direction */
SlideOutRec *pSOR; /* slide-out record */ SlideOutRec *pSOR; /* slide-out record */
#ifndef NO_SHAPE
short wShaped; /* this window has a bounding shape */ short wShaped; /* this window has a bounding shape */
#endif /* NO_SHAPE */
int usePPosition; /* indicate whether to use PPosition */ int usePPosition; /* indicate whether to use PPosition */
@ -1957,7 +1949,6 @@ typedef struct _WmGlobalData
Atom xa_DT_WM_LOCK_DISPLAY; Atom xa_DT_WM_LOCK_DISPLAY;
Atom xa_DT_WM_READY; Atom xa_DT_WM_READY;
#ifndef NO_OL_COMPAT
Atom xa_OL_WIN_ATTR; Atom xa_OL_WIN_ATTR;
Atom xa_OL_DECOR_RESIZE; Atom xa_OL_DECOR_RESIZE;
Atom xa_OL_DECOR_HEADER; Atom xa_OL_DECOR_HEADER;
@ -1974,7 +1965,6 @@ typedef struct _WmGlobalData
Atom xa_OL_PIN_OUT; Atom xa_OL_PIN_OUT;
Atom xa_OL_MENU_LIMITED; Atom xa_OL_MENU_LIMITED;
Atom xa_OL_MENU_FULL; Atom xa_OL_MENU_FULL;
#endif /* NO_OL_COMPAT */
/* mwm specific appearance and behavior resources and data: */ /* mwm specific appearance and behavior resources and data: */
@ -2038,10 +2028,8 @@ typedef struct _WmGlobalData
Window attributesWindow; Window attributesWindow;
XWindowAttributes windowAttributes; XWindowAttributes windowAttributes;
#ifndef NO_SHAPE
Boolean hasShape; /* server supports Shape extension */ Boolean hasShape; /* server supports Shape extension */
int shapeEventBase, shapeErrorBase; int shapeEventBase, shapeErrorBase;
#endif /* NO_SHAPE */
/* Need to replay enter notify events on windows with the /* Need to replay enter notify events on windows with the
pointer that used to be modalized. This is for pointer focus. */ pointer that used to be modalized. This is for pointer focus. */
int replayEnterEvent; int replayEnterEvent;

71
cde/programs/dtwm/WmHelp.c
View file

@ -463,22 +463,6 @@ void WmDtWmStringHelpCB (Widget theWidget,
char * theHelpString = (char *)client_data; char * theHelpString = (char *)client_data;
pSD = WmScreenDataFromWidget(theWidget); pSD = WmScreenDataFromWidget(theWidget);
#ifdef OLD
if (XtDisplay(theWidget) == DISPLAY)
{
WmDtDisplayTopic(pSD->screenTopLevelW1,
NULL, theHelpString,
DtHELP_TYPE_STRING, theWidget, True,
NULL, 0, NULL, False, NULL);
}
else
{
WmDtDisplayTopic(theWidget, NULL, theHelpString,
DtHELP_TYPE_STRING, theWidget, True,
NULL, 0, NULL, False, NULL);
}
#endif /* OLD */
WmDtDisplayTopic(pSD->screenTopLevelW1, WmDtDisplayTopic(pSD->screenTopLevelW1,
NULL, theHelpString, NULL, theHelpString,
DtHELP_TYPE_DYNAMIC_STRING, theWidget, True, DtHELP_TYPE_DYNAMIC_STRING, theWidget, True,
@ -760,12 +744,6 @@ static void WmDtVersionPopupCB (
if (w) if (w)
{ {
#ifdef OLD
n = 0;
XtSetArg (setArgs[n], XmNx, 0); n++;
XtSetArg (setArgs[n], XmNy, 0); n++;
#endif /* OLD */
/* /*
* Center the Version Dialog on the screen * Center the Version Dialog on the screen
*/ */
@ -973,7 +951,6 @@ void WmDtHelpOnVersion (
Widget parent) Widget parent)
{ {
#ifndef NO_DT
Arg setArgs[10]; Arg setArgs[10];
Arg setArgs2[5]; Arg setArgs2[5];
@ -1050,9 +1027,6 @@ void WmDtHelpOnVersion (
XtSetValues(versionWidget, setArgs, n); XtSetValues(versionWidget, setArgs, n);
} }
XtManageChild(versionWidget); XtManageChild(versionWidget);
#endif /* NO_DT */
} /* END OF FUNCTION WmDtHelpOnVersion */ } /* END OF FUNCTION WmDtHelpOnVersion */
@ -1314,7 +1288,6 @@ WmDtDisplayTopic (
DisplayTopicInfo *displayTopicInfo) DisplayTopicInfo *displayTopicInfo)
{ {
#ifndef NO_DT
Arg setArgs[10]; Arg setArgs[10];
Arg smallArgs[2]; Arg smallArgs[2];
ArgList argsNew; ArgList argsNew;
@ -1526,7 +1499,6 @@ WmDtDisplayTopic (
} }
} /* if n is still 0, we did not find a useful help type */ } /* if n is still 0, we did not find a useful help type */
#endif /* NO_DT */
} /* END OF FUNCTION WmDtDisplayTopic */ } /* END OF FUNCTION WmDtDisplayTopic */
@ -1646,7 +1618,6 @@ Boolean
RestoreHelpDialogs( RestoreHelpDialogs(
WmScreenData *pSD) WmScreenData *pSD)
{ {
#ifndef NO_DT
XrmDatabase db; XrmDatabase db;
XrmName xrm_name[5]; XrmName xrm_name[5];
XrmRepresentation rep_type; XrmRepresentation rep_type;
@ -2034,8 +2005,6 @@ RestoreHelpDialogs(
XrmDestroyDatabase(db); XrmDestroyDatabase(db);
} }
#endif /* NO_DT */
return True; return True;
} /* END OF FUNCTION RestoreHelpDialogs */ } /* END OF FUNCTION RestoreHelpDialogs */
@ -2067,7 +2036,6 @@ void
SaveHelpResources( SaveHelpResources(
WmScreenData *pSD) WmScreenData *pSD)
{ {
#ifndef NO_DT
PtrWsDtHelpData pHelp; PtrWsDtHelpData pHelp;
CacheListStruct *pTemp; CacheListStruct *pTemp;
Arg getArgs[20]; Arg getArgs[20];
@ -2389,7 +2357,6 @@ SaveHelpResources(
_DtAddToResource (DISPLAY, data); _DtAddToResource (DISPLAY, data);
XtFree(data); XtFree(data);
} }
#endif /* NO_DT */
} /* END OF FUNCTION SaveHelpResources */ } /* END OF FUNCTION SaveHelpResources */
@ -2592,25 +2559,6 @@ wmDtHelpSetPosition(
GetSystemMenuPosition (pHelp->pCDforClient, GetSystemMenuPosition (pHelp->pCDforClient,
&x, &y, height, &x, &y, height,
(Context)0); (Context)0);
#ifdef NO
if(y < pHelp->pCDforClient->frameInfo.y)
{
if (!XFindContext (DISPLAY, XtWindow(pHelp->shell),
wmGD.windowContextType,
(caddr_t *)&pCDforHelp))
{
if (wmGD.positionIsFrame)
{
/* x = x - pCDforHelp->clientOffset.x;*/
y = y - pCDforHelp->clientOffset.x;
}
}
else
{
y = y - (2 * pSD->frameBorderWidth);
}
}
#endif
} }
else else
{ {
@ -2642,24 +2590,6 @@ wmDtHelpSetPosition(
XtSetArg (al[ac], XmNwindowGroup, &wGroup); ac++; XtSetArg (al[ac], XmNwindowGroup, &wGroup); ac++;
XtGetValues (pHelp->shell, al, ac); XtGetValues (pHelp->shell, al, ac);
#ifdef FUTURE
if (pHelp->contextForClient != F_CONTEXT_ICON)
{
XtSetArg (args[n], XmNwindowGroup,
pHelp->pCDforClient->client);
n++;
}
else if (pSD->useIconBox && P_ICON_BOX(pHelp->pCDforClient))
{
XtSetArg (args[n], XmNwindowGroup,
P_ICON_BOX(pHelp->pCDforClient)->pCD_iconBox->client);
n++;
}
else
{
XtSetArg (args[n], XmNwindowGroup, 0); n++;
}
#else /* FUTURE */
if (wGroup != pHelp->pCDforClient->client) if (wGroup != pHelp->pCDforClient->client)
{ {
/* /*
@ -2671,7 +2601,6 @@ wmDtHelpSetPosition(
} }
XtSetArg (args[n], XmNwindowGroup, pHelp->pCDforClient->client); n++; XtSetArg (args[n], XmNwindowGroup, pHelp->pCDforClient->client); n++;
#endif /* FUTURE */
} }
else else
{ {

10
cde/programs/dtwm/WmImage.c
View file

@ -122,14 +122,6 @@ Pixmap MakeClientIconPixmap (
return ((Pixmap)NULL); return ((Pixmap)NULL);
} }
#ifdef DISALLOW_DEEP_ICONS
if (depth != 1)
{
Warning (((char *)GETMESSAGE(38, 10, "Color icon pixmap not supported")));
return ((Pixmap)NULL);
}
#endif
/* /*
* Color the bitmap, center it in a pixmap .... * Color the bitmap, center it in a pixmap ....
*/ */
@ -582,7 +574,6 @@ Pixmap MakeIconPixmap (ClientData *pCD, Pixmap bitmap, Pixmap mask, unsigned int
XChangeGC (DISPLAY, imageGC, gc_mask, &gcv); XChangeGC (DISPLAY, imageGC, gc_mask, &gcv);
/* copy the bitmap to the pixmap */ /* copy the bitmap to the pixmap */
#ifndef DISALLOW_DEEP_ICONS
if ((depth > 1) && if ((depth > 1) &&
(depth == DefaultDepth(DISPLAY, pSD->screen))) (depth == DefaultDepth(DISPLAY, pSD->screen)))
{ {
@ -595,7 +586,6 @@ Pixmap MakeIconPixmap (ClientData *pCD, Pixmap bitmap, Pixmap mask, unsigned int
#endif /* NO_CLIP_CENTER */ #endif /* NO_CLIP_CENTER */
} }
else else
#endif /* DISALLOW_DEEP_ICONS */
#ifndef NO_CLIP_CENTER #ifndef NO_CLIP_CENTER
XCopyPlane (DISPLAY, bitmap, iconPixmap, imageGC, src_x, src_y, width, XCopyPlane (DISPLAY, bitmap, iconPixmap, imageGC, src_x, src_y, width,
height, dest_x, dest_y, 1L); height, dest_x, dest_y, 1L);

19
cde/programs/dtwm/WmInitWs.c
View file

@ -44,9 +44,7 @@
#include "WmICCC.h" #include "WmICCC.h"
#define DTWM_NEED_FNTPL #define DTWM_NEED_FNTPL
#include "WmIBitmap.h" #include "WmIBitmap.h"
#ifndef NO_OL_COMPAT
#include "WmOL.h" #include "WmOL.h"
#endif /* NO_OL_COMPAT */
#include <X11/Xos.h> #include <X11/Xos.h>
#include <X11/cursorfont.h> #include <X11/cursorfont.h>
#include <Xm/Xm.h> #include <Xm/Xm.h>
@ -695,14 +693,10 @@ void InitWmGlobal (int argc, char *argv [], char *environ [])
wmGD.xa_DT_WM_EXIT_SESSION = atoms[XA_DT_WM_EXIT_SESSION]; wmGD.xa_DT_WM_EXIT_SESSION = atoms[XA_DT_WM_EXIT_SESSION];
wmGD.xa_DT_WM_LOCK_DISPLAY = atoms[XA_DT_WM_LOCK_DISPLAY]; wmGD.xa_DT_WM_LOCK_DISPLAY = atoms[XA_DT_WM_LOCK_DISPLAY];
wmGD.xa_DT_WM_READY = atoms[XA_DT_WM_READY]; wmGD.xa_DT_WM_READY = atoms[XA_DT_WM_READY];
#ifndef NO_OL_COMPAT
InitOLCompat(); InitOLCompat();
#endif /* NO_OL_COMPAT */
#ifndef NO_SHAPE
wmGD.hasShape = XShapeQueryExtension (DISPLAY, wmGD.hasShape = XShapeQueryExtension (DISPLAY,
&wmGD.shapeEventBase, &wmGD.shapeEventBase,
&wmGD.shapeErrorBase); &wmGD.shapeErrorBase);
#endif /* NO_SHAPE */
wmGD.replayEnterEvent = False; wmGD.replayEnterEvent = False;
wmGD.menuActive = NULL; wmGD.menuActive = NULL;
@ -761,19 +755,6 @@ void InitWmGlobal (int argc, char *argv [], char *environ [])
_DtGetSmWindow(DISPLAY, _DtGetSmWindow(DISPLAY,
RootWindow(DISPLAY, 0), RootWindow(DISPLAY, 0),
&wmGD.dtSmWindow) ; &wmGD.dtSmWindow) ;
#ifdef PANACOMM
/*
* If this is the first screen we've managed,
* tell the session manager we're ready
*/
if (!processedGlobalResources)
{
SendClientMsg( wmGD.dtSmWindow,
(long) wmGD.xa_DT_SM_WM_PROTOCOL,
(long) wmGD.xa_DT_WM_READY,
CurrentTime, NULL, 0);
}
#endif /* PANACOMM */
/* create topmost shell (application shell) */ /* create topmost shell (application shell) */
argnum = 0; argnum = 0;

4
cde/programs/dtwm/WmManage.c
View file

@ -159,7 +159,6 @@ void AdoptInitialClients (WmScreenData *pSD)
if (XQueryTree (DISPLAY, pSD->rootWindow, &root, &parent, &clients, if (XQueryTree (DISPLAY, pSD->rootWindow, &root, &parent, &clients,
&nclients)) &nclients))
{ {
#ifndef DONT_FILTER_ICON_WINDOWS
/* /*
* Filter out icon windows so they don't get managed as a client * Filter out icon windows so they don't get managed as a client
* window. Icon windows will be process in SetupClientIconWindow(). * window. Icon windows will be process in SetupClientIconWindow().
@ -181,7 +180,6 @@ void AdoptInitialClients (WmScreenData *pSD)
} }
} }
} }
#endif
for (i = 0; i < nclients; i++) for (i = 0; i < nclients; i++)
{ {
@ -1153,9 +1151,7 @@ void WithdrawWindow (ClientData *pCD)
} }
XtFree ((char *) (pCD->cmapWindows)); XtFree ((char *) (pCD->cmapWindows));
XtFree ((char *) (pCD->clientCmapList)); XtFree ((char *) (pCD->clientCmapList));
#ifndef OLD_COLORMAP /* colormap */
XtFree ((char *) (pCD->clientCmapFlags)); XtFree ((char *) (pCD->clientCmapFlags));
#endif
} }
/* /*

26
cde/programs/dtwm/WmMenu.c
View file

@ -1439,30 +1439,8 @@ void PostMenu (MenuSpec *menuSpec, ClientData *pCD, int x, int y, unsigned int b
passedInEvent->xbutton.time); passedInEvent->xbutton.time);
} }
#ifndef ALTERNATE_POSTMENU
XtManageChild (menuSpec->menuWidget); XtManageChild (menuSpec->menuWidget);
#else
if (flags & POST_STICKY)
{
_XmSetPopupMenuClick(menuSpec->menuWidget, True);
}
else
{
_XmSetPopupMenuClick(menuSpec->menuWidget, False);
}
/*
* Post the menu by calling the convenience routine that verifies
* the button event, updates the Xt timestamp, and finally manages
* the pane.
*/
_XmPostPopupMenu( menuSpec->menuWidget, passedInEvent);
#endif
/* /*
* set the traversal state. * set the traversal state.
*/ */
@ -1516,9 +1494,7 @@ void UnpostMenu (MenuSpec *menuSpec)
*/ */
{ {
XtUnmanageChild (menuSpec->menuWidget); XtUnmanageChild (menuSpec->menuWidget);
#ifndef OLD_COLORMAP
ForceColormapFocus (ACTIVE_PSD, ACTIVE_PSD->colormapFocus); ForceColormapFocus (ACTIVE_PSD, ACTIVE_PSD->colormapFocus);
#endif
} }
} /* END OF FUNCTION UnpostMenu */ } /* END OF FUNCTION UnpostMenu */
@ -1612,9 +1588,7 @@ static void UnmapCallback (Widget w, XtPointer client_data,
PopGadgetOut(wmGD.gadgetClient, FRAME_SYSTEM); PopGadgetOut(wmGD.gadgetClient, FRAME_SYSTEM);
} }
#ifndef OLD_COLORMAP
ForceColormapFocus (ACTIVE_PSD, ACTIVE_PSD->colormapFocus); ForceColormapFocus (ACTIVE_PSD, ACTIVE_PSD->colormapFocus);
#endif
PullExposureEvents(); PullExposureEvents();
} /* END OF FUNCTION UnmapCallback */ } /* END OF FUNCTION UnmapCallback */

2
cde/programs/dtwm/WmOL.c
View file

@ -20,7 +20,6 @@
* to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
* Floor, Boston, MA 02110-1301 USA * Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef NO_OL_COMPAT
/* /*
* (c) Copyright 1989 Sun Microsystems, Inc. * (c) Copyright 1989 Sun Microsystems, Inc.
* (c) Copyright 1993 HEWLETT-PACKARD COMPANY * (c) Copyright 1993 HEWLETT-PACKARD COMPANY
@ -469,4 +468,3 @@ ProcessOLDecoration(
} /* END OF FUNCTION ProcessOLDecoration */ } /* END OF FUNCTION ProcessOLDecoration */
#endif /* NO_OL_COMPAT */

2
cde/programs/dtwm/WmOL.h
View file

@ -28,7 +28,6 @@
#ifndef _WM_OL_H #ifndef _WM_OL_H
#define _WM_OL_H #define _WM_OL_H
#ifndef NO_OL_COMPAT
/* /*
* Property Names * Property Names
@ -127,6 +126,5 @@ extern void ProcessOLDecoration(ClientData *pCD);
#define GetOLDecorDel(pcd,ptr) (GetOLDecorFlags(pcd,wmGD.xa_OL_DECOR_DEL,ptr)) #define GetOLDecorDel(pcd,ptr) (GetOLDecorFlags(pcd,wmGD.xa_OL_DECOR_DEL,ptr))
#endif /* NO_OL_COMPAT */
/* Do not add anything after the following #endif */ /* Do not add anything after the following #endif */
#endif /* _WM_OL_H */ #endif /* _WM_OL_H */

21
cde/programs/dtwm/WmProperty.c
View file

@ -794,9 +794,7 @@ void ProcessWmColormapWindows (ClientData *pCD)
XWindowAttributes wAttributes; XWindowAttributes wAttributes;
ClientData *pcd; ClientData *pcd;
XSetWindowAttributes sAttributes; XSetWindowAttributes sAttributes;
#ifndef OLD_COLORMAP /* colormaps */
int *pCmapFlags; int *pCmapFlags;
#endif
/* /*
@ -832,7 +830,6 @@ void ProcessWmColormapWindows (ClientData *pCD)
XtFree ((char *)pWindows); XtFree ((char *)pWindows);
} }
} }
#ifndef OLD_COLORMAP /* colormap */
/* Is the above OSF code a bug -- allocates one extra byte, rather */ /* Is the above OSF code a bug -- allocates one extra byte, rather */
/* than one extra element, for the top window if needed? */ /* than one extra element, for the top window if needed? */
else if ( ! (pCmapFlags = (int *)XtCalloc(nitems+1,sizeof(int)))) { else if ( ! (pCmapFlags = (int *)XtCalloc(nitems+1,sizeof(int)))) {
@ -840,7 +837,6 @@ void ProcessWmColormapWindows (ClientData *pCD)
Warning (((char *)GETMESSAGE(54, 4, "Insufficient memory for window manager flags"))); Warning (((char *)GETMESSAGE(54, 4, "Insufficient memory for window manager flags")));
XtFree ((char *)pWindows); XtFree ((char *)pColormaps); XtFree ((char *)pWindows); XtFree ((char *)pColormaps);
} }
#endif
else else
{ {
/* /*
@ -921,9 +917,7 @@ void ProcessWmColormapWindows (ClientData *pCD)
pCD->cmapWindows = pWindows; pCD->cmapWindows = pWindows;
pCD->clientCmapList = pColormaps; pCD->clientCmapList = pColormaps;
pCD->clientCmapIndex = 0; pCD->clientCmapIndex = 0;
#ifndef OLD_COLORMAP /* colormap */
pCD->clientCmapFlags = pCmapFlags; pCD->clientCmapFlags = pCmapFlags;
#endif
} }
else else
{ {
@ -935,9 +929,7 @@ void ProcessWmColormapWindows (ClientData *pCD)
pCD->clientCmapCount = 0; pCD->clientCmapCount = 0;
XtFree ((char *)pWindows); XtFree ((char *)pWindows);
XtFree ((char *)pColormaps); XtFree ((char *)pColormaps);
#ifndef OLD_COLORMAP /* colormap */
XtFree((char *)pCmapFlags); XtFree((char *)pCmapFlags);
#endif
} }
} }
} }
@ -1656,14 +1648,6 @@ GetDtWmRequest (
*/ */
if (property == NULL) if (property == NULL)
{ {
#ifdef PARANOID
/*
* Lock down the server to prevent changes to this
* property while we "edit" it.
*/
XGrabServer(DISPLAY);
#endif /* PARANOID */
/* /*
* Read the property and delete it. * Read the property and delete it.
*/ */
@ -1673,11 +1657,6 @@ GetDtWmRequest (
&actualType, &actualFormat, &nitems, &actualType, &actualFormat, &nitems,
&leftover, (unsigned char **)&property); &leftover, (unsigned char **)&property);
#ifdef PARANOID
/* Give the server back */
XUngrabServer(DISPLAY);
#endif /* PARANOID */
/* /*
* Validate the property that we've read * Validate the property that we've read
*/ */

20
cde/programs/dtwm/WmProtocol.c
View file

@ -46,9 +46,7 @@
#include "WmKeyFocus.h" #include "WmKeyFocus.h"
#include "WmMenu.h" #include "WmMenu.h"
#include "WmWinInfo.h" #include "WmWinInfo.h"
#ifndef NO_WMQUERY
#include "WmEvent.h" #include "WmEvent.h"
#endif /* NO_WMQUERY */
#include "WmPanelP.h" #include "WmPanelP.h"
/* /*
@ -56,7 +54,6 @@
*/ */
#include "WmProtocol.h" #include "WmProtocol.h"
#ifndef NO_WMQUERY
static Boolean wmq_convert (Widget w, Atom *pSelection, Atom *pTarget, static Boolean wmq_convert (Widget w, Atom *pSelection, Atom *pTarget,
Atom *pType_return, XtPointer *pValue_return, unsigned long *pLength_return, Atom *pType_return, XtPointer *pValue_return, unsigned long *pLength_return,
int *pFormat_return); int *pFormat_return);
@ -68,13 +65,11 @@ static void wmq_add_xid (XID win);
static void wmq_done (Widget w, Atom *pSelection, Atom *pTarget); static void wmq_done (Widget w, Atom *pSelection, Atom *pTarget);
static void wmq_lose (Widget w, Atom *pSelection); static void wmq_lose (Widget w, Atom *pSelection);
static void wmq_bump_xids(void); static void wmq_bump_xids(void);
#endif /* NO_WMQUERY */
/* /*
* Global Variables: * Global Variables:
*/ */
#ifndef NO_WMQUERY
Atom *xa_WM_QUERY = NULL; Atom *xa_WM_QUERY = NULL;
Atom xa_WM_POINTER_WINDOW; Atom xa_WM_POINTER_WINDOW;
Atom xa_WM_CLIENT_WINDOW; Atom xa_WM_CLIENT_WINDOW;
@ -82,7 +77,6 @@ Atom xa_WM_ALL_CLIENTS;
XID *pXids = NULL; XID *pXids = NULL;
int numXids = -1; int numXids = -1;
int curXids = 0; int curXids = 0;
#endif /* NO_WMQUERY */
@ -110,10 +104,8 @@ void SetupWmICCC (void)
XA_WM_SAVE_YOURSELF, XA_WM_DELETE_WINDOW, XA_WM_SAVE_YOURSELF, XA_WM_DELETE_WINDOW,
XA_WM_COLORMAP_WINDOWS, XA_WM_TAKE_FOCUS, XA_MWM_HINTS, XA_WM_COLORMAP_WINDOWS, XA_WM_TAKE_FOCUS, XA_MWM_HINTS,
XA_MWM_MENU, XA_MWM_MESSAGES, XA_MOTIF_WM_OFFSET, XA_MWM_MENU, XA_MWM_MESSAGES, XA_MOTIF_WM_OFFSET,
#if !defined(NO_WMQUERY)
XA_MOTIF_WM_CLIENT_WINDOW, XA_MOTIF_WM_POINTER_WINDOW, XA_MOTIF_WM_CLIENT_WINDOW, XA_MOTIF_WM_POINTER_WINDOW,
XA_MOTIF_WM_ALL_CLIENTS, XA_MOTIF_WM_ALL_CLIENTS,
#endif
XA_COMPOUND_TEXT, NUM_ATOMS }; XA_COMPOUND_TEXT, NUM_ATOMS };
static char *atom_names[] = { static char *atom_names[] = {
@ -121,14 +113,12 @@ void SetupWmICCC (void)
_XA_WM_SAVE_YOURSELF, _XA_WM_DELETE_WINDOW, _XA_WM_SAVE_YOURSELF, _XA_WM_DELETE_WINDOW,
_XA_WM_COLORMAP_WINDOWS, _XA_WM_TAKE_FOCUS, _XA_MWM_HINTS, _XA_WM_COLORMAP_WINDOWS, _XA_WM_TAKE_FOCUS, _XA_MWM_HINTS,
_XA_MWM_MENU, _XA_MWM_MESSAGES, _XA_MOTIF_WM_OFFSET, _XA_MWM_MENU, _XA_MWM_MESSAGES, _XA_MOTIF_WM_OFFSET,
#if !defined(NO_WMQUERY)
# ifdef _XA_MOTIF_WM_CLIENT_WINDOW # ifdef _XA_MOTIF_WM_CLIENT_WINDOW
_XA_MOTIF_WM_CLIENT_WINDOW, _XA_MOTIF_WM_POINTER_WINDOW, _XA_MOTIF_WM_CLIENT_WINDOW, _XA_MOTIF_WM_POINTER_WINDOW,
_XA_MOTIF_WM_ALL_CLIENTS, _XA_MOTIF_WM_ALL_CLIENTS,
# else # else
"_MOTIF_WM_CLIENT_WINDOW", "_MOTIF_WM_POINTER_WINDOW", "_MOTIF_WM_CLIENT_WINDOW", "_MOTIF_WM_POINTER_WINDOW",
"_MOTIF_WM_ALL_CLIENTS", "_MOTIF_WM_ALL_CLIENTS",
# endif
# endif # endif
"COMPOUND_TEXT" "COMPOUND_TEXT"
}; };
@ -157,7 +147,6 @@ void SetupWmICCC (void)
wmGD.xa_COMPOUND_TEXT = atoms[XA_COMPOUND_TEXT]; wmGD.xa_COMPOUND_TEXT = atoms[XA_COMPOUND_TEXT];
#ifndef NO_WMQUERY
if (!(xa_WM_QUERY = (Atom *) XtMalloc (wmGD.numScreens * (sizeof (Atom))))) if (!(xa_WM_QUERY = (Atom *) XtMalloc (wmGD.numScreens * (sizeof (Atom)))))
{ {
Warning (((char *)GETMESSAGE(56, 2, "Insufficient memory to XInternAtom _MOTIF_WM_QUERY_nn"))); Warning (((char *)GETMESSAGE(56, 2, "Insufficient memory to XInternAtom _MOTIF_WM_QUERY_nn")));
@ -181,8 +170,6 @@ void SetupWmICCC (void)
xa_WM_CLIENT_WINDOW = atoms[XA_MOTIF_WM_CLIENT_WINDOW]; xa_WM_CLIENT_WINDOW = atoms[XA_MOTIF_WM_CLIENT_WINDOW];
xa_WM_POINTER_WINDOW = atoms[XA_MOTIF_WM_POINTER_WINDOW]; xa_WM_POINTER_WINDOW = atoms[XA_MOTIF_WM_POINTER_WINDOW];
xa_WM_ALL_CLIENTS = atoms[XA_MOTIF_WM_ALL_CLIENTS]; xa_WM_ALL_CLIENTS = atoms[XA_MOTIF_WM_ALL_CLIENTS];
#endif /* NO_WMQUERY */
/* /*
* Setup the icon size property on the root window. * Setup the icon size property on the root window.
@ -205,7 +192,6 @@ void SetupWmICCC (void)
} }
} }
#ifndef NO_WMQUERY
/* /*
* Assert ownership of the WM_QUERY selection * Assert ownership of the WM_QUERY selection
*/ */
@ -224,9 +210,6 @@ void SetupWmICCC (void)
} }
} }
} }
#endif /* NO_WMQUERY */
} /* END OF FUNCTION SetupWmICCC */ } /* END OF FUNCTION SetupWmICCC */
@ -692,8 +675,6 @@ void TimeoutProc (caddr_t client_data, XtIntervalId *id)
} /* END OF FUNCTION TimeoutProc */ } /* END OF FUNCTION TimeoutProc */
#ifndef NO_WMQUERY
/*************************************<->************************************* /*************************************<->*************************************
* *
* Boolean wmq_convert (w, pSelection, pTarget, pType_return, * Boolean wmq_convert (w, pSelection, pTarget, pType_return,
@ -1070,4 +1051,3 @@ wmq_bump_xids ( void )
} }
} }
#endif /* NO_WMQUERY */

25
cde/programs/dtwm/WmResource.c
View file

@ -139,7 +139,6 @@ char defaultSystemMenuName[] = "_MwmWindowMenu_";
char defaultSystemMenuName[] = "DefaultWindowMenu"; char defaultSystemMenuName[] = "DefaultWindowMenu";
#endif /* NO_MESSAGE_CATALOG */ #endif /* NO_MESSAGE_CATALOG */
char builtinSystemMenuName[] = "_MwmWindowMenu_"; char builtinSystemMenuName[] = "_MwmWindowMenu_";
#ifndef MCCABE
#define BUILTINSYSTEMMENU "_MwmWindowMenu_\n\ #define BUILTINSYSTEMMENU "_MwmWindowMenu_\n\
{\n\ {\n\
Restore _R Alt<Key>F5 f.restore\n\ Restore _R Alt<Key>F5 f.restore\n\
@ -434,14 +433,10 @@ void InitBuiltinSystemMenu(void)
} /* END OF FUNCTION InitBuiltinSystemMenu */ } /* END OF FUNCTION InitBuiltinSystemMenu */
#endif /* NO_MESSAGE_CATALOG */ #endif /* NO_MESSAGE_CATALOG */
#else /* MCCABE */
char builtinSystemMenu[];
#endif /* MCCABE */
#define HARD_CODED_PRIMARY 3 #define HARD_CODED_PRIMARY 3
char defaultRootMenuName[] = "DefaultRootMenu"; char defaultRootMenuName[] = "DefaultRootMenu";
char builtinRootMenuName[] = "_MwmRootMenu_"; char builtinRootMenuName[] = "_MwmRootMenu_";
#ifndef MCCABE
#define BUILTINROOTMENU "DefaultRootMenu\n\ #define BUILTINROOTMENU "DefaultRootMenu\n\
{\n\ {\n\
\"Root Menu\" f.title\n\ \"Root Menu\" f.title\n\
@ -454,16 +449,12 @@ char builtinRootMenuName[] = "_MwmRootMenu_";
\"Restart...\" f.restart\n\ \"Restart...\" f.restart\n\
}"; }";
char builtinRootMenu[] = BUILTINROOTMENU char builtinRootMenu[] = BUILTINROOTMENU
#else /* MCCABE */
char builtinRootMenu[];
#endif /* MCCABE */
/* builtin key bindings specification */ /* builtin key bindings specification */
char defaultKeyBindingsName[] = "DefaultKeyBindings"; char defaultKeyBindingsName[] = "DefaultKeyBindings";
char builtinKeyBindingsName[] = "_MwmKeyBindings_"; char builtinKeyBindingsName[] = "_MwmKeyBindings_";
#ifndef MCCABE
#define BUILTINKEYBINDINGS "_MwmKeyBindings_\n\ #define BUILTINKEYBINDINGS "_MwmKeyBindings_\n\
{\n\ {\n\
Shift<Key>Escape window|icon f.post_wmenu\n\ Shift<Key>Escape window|icon f.post_wmenu\n\
@ -480,10 +471,6 @@ char builtinKeyBindingsName[] = "_MwmKeyBindings_";
}"; }";
char builtinKeyBindings[] = BUILTINKEYBINDINGS char builtinKeyBindings[] = BUILTINKEYBINDINGS
#else
char builtinKeyBindings[];
#endif
/* /*
* NOTE: Default Toggle Behavior key bindings. There are TWO key bindings as * NOTE: Default Toggle Behavior key bindings. There are TWO key bindings as
* of 1.1.4 and 1.2. Make sure you make any modify builtinKeyBindings (above) * of 1.1.4 and 1.2. Make sure you make any modify builtinKeyBindings (above)
@ -491,7 +478,6 @@ char builtinKeyBindings[];
*/ */
char behaviorKeyBindingName[] = "_MwmBehaviorKey_"; char behaviorKeyBindingName[] = "_MwmBehaviorKey_";
#ifndef MCCABE
#define BEHAVIORKEYBINDINGS "_MwmBehaviorKey_\n\ #define BEHAVIORKEYBINDINGS "_MwmBehaviorKey_\n\
{\n\ {\n\
Alt Shift Ctrl<Key>exclam root|icon|window f.set_behavior\n\ Alt Shift Ctrl<Key>exclam root|icon|window f.set_behavior\n\
@ -499,17 +485,11 @@ char behaviorKeyBindingName[] = "_MwmBehaviorKey_";
}"; }";
char behaviorKeyBindings[] = BEHAVIORKEYBINDINGS char behaviorKeyBindings[] = BEHAVIORKEYBINDINGS
#else
char behaviorKeyBindings[];
#endif
/* default button bindings specification */ /* default button bindings specification */
/* note - the %s will be replaced by the real DefaultRootMenu */ /* note - the %s will be replaced by the real DefaultRootMenu */
char defaultButtonBindingsName[] = "DefaultButtonBindings"; char defaultButtonBindingsName[] = "DefaultButtonBindings";
char builtinButtonBindingsName[] = "_MwmButtonBindings_"; char builtinButtonBindingsName[] = "_MwmButtonBindings_";
#ifndef MCCABE
# define BUILTINBUTTONBINDINGS "_MwmButtonBindings_\n\ # define BUILTINBUTTONBINDINGS "_MwmButtonBindings_\n\
{\n\ {\n\
<Btn1Down> icon|frame f.raise\n\ <Btn1Down> icon|frame f.raise\n\
@ -518,11 +498,6 @@ char builtinButtonBindingsName[] = "_MwmButtonBindings_";
}"; }";
char builtinButtonBindings[] = BUILTINBUTTONBINDINGS char builtinButtonBindings[] = BUILTINBUTTONBINDINGS
#else
char builtinButtonBindings[];
#endif
static ClientData *_pCD; static ClientData *_pCD;
static String _defaultBackground; static String _defaultBackground;
static String _defaultActiveBackground; static String _defaultActiveBackground;

12
cde/programs/dtwm/WmWinConf.c
View file

@ -1082,16 +1082,11 @@ void CompleteFrameConfig (ClientData *pcd, XEvent *pev)
* unexpectedly. * unexpectedly.
*/ */
#ifndef CONFIG_RELATIVE_TO_CLIENT
tmpX = resizeX; tmpX = resizeX;
tmpY = resizeY; tmpY = resizeY;
/* Use dummy x,y so we don't add frame offset to client location */ /* Use dummy x,y so we don't add frame offset to client location */
FrameToClient (pcd, &tmpX, &tmpY, &resizeWidth, &resizeHeight); FrameToClient (pcd, &tmpX, &tmpY, &resizeWidth, &resizeHeight);
#else
FrameToClient (pcd, &resizeX, &resizeY, &resizeWidth, &resizeHeight);
#endif
tmpWidth = resizeWidth; tmpWidth = resizeWidth;
tmpHeight = resizeHeight; tmpHeight = resizeHeight;
@ -1286,13 +1281,8 @@ void CompleteFrameConfig (ClientData *pcd, XEvent *pev)
else { /* assume normal window frame */ else { /* assume normal window frame */
/* reconfigure the window(s) */ /* reconfigure the window(s) */
ProcessNewConfiguration (pcd, ProcessNewConfiguration (pcd,
#ifndef CONFIG_RELATIVE_TO_CLIENT
moveX, moveX,
moveY, moveY,
#else
moveX + offsetX,
moveY + offsetY,
#endif
(unsigned int) (unsigned int)
(moveWidth - 2*offsetX), (moveWidth - 2*offsetX),
(unsigned int) (unsigned int)
@ -2024,7 +2014,6 @@ void ProcessNewConfiguration (ClientData *pCD, int x, int y, unsigned int width,
} }
} }
#ifndef CONFIG_RELATIVE_TO_CLIENT
/* /*
* If positionIsFrame or user initiated configuration request, * If positionIsFrame or user initiated configuration request,
* then adjust client position to by frame_width and frame_height. * then adjust client position to by frame_width and frame_height.
@ -2034,7 +2023,6 @@ void ProcessNewConfiguration (ClientData *pCD, int x, int y, unsigned int width,
xoff = pCD->clientOffset.x; xoff = pCD->clientOffset.x;
yoff = pCD->clientOffset.y; yoff = pCD->clientOffset.y;
} }
#endif
/* /*
* Changes in position update maximum geometry on maximized windows * Changes in position update maximum geometry on maximized windows

34
cde/programs/dtwm/WmWinInfo.c
View file

@ -195,9 +195,7 @@ GetClientInfo (WmScreenData *pSD, Window clientWindow, long manageFlags)
pCD->piconBottomShadows = NULL; pCD->piconBottomShadows = NULL;
pCD->internalBevel = (wmGD.frameStyle == WmSLAB) ? 0 : pCD->internalBevel = (wmGD.frameStyle == WmSLAB) ? 0 :
FRAME_INTERNAL_SHADOW_WIDTH; FRAME_INTERNAL_SHADOW_WIDTH;
#ifndef NO_OL_COMPAT
pCD->bPseudoTransient = False; pCD->bPseudoTransient = False;
#endif /* NO_OL_COMPAT */
pCD->maxWidth = pCD->maxWidthLimit = BIGSIZE; pCD->maxWidth = pCD->maxWidthLimit = BIGSIZE;
pCD->maxHeight = pCD->maxHeightLimit = BIGSIZE; pCD->maxHeight = pCD->maxHeightLimit = BIGSIZE;
@ -564,10 +562,7 @@ GetWmClientInfo (WmWorkspaceData *pWS,
*/ */
pCD->numInhabited = 0; pCD->numInhabited = 0;
pCD->windowGroup = 0L; pCD->windowGroup = 0L;
#ifndef NO_OL_COMPAT
pCD->bPseudoTransient = False; pCD->bPseudoTransient = False;
#endif /* NO_OL_COMPAT */
/* /*
* Set up _MWM_HINTS data. * Set up _MWM_HINTS data.
@ -799,14 +794,8 @@ ProcessWmClass (ClientData *pCD)
XClassHint classHint; XClassHint classHint;
#ifdef PORT_OLDXLIB
classHint.res_class = "";
classHint.res_name = "";
XGetClassHint (DISPLAY, pCD->client, &classHint);
#else
if ((HasProperty (pCD, XA_WM_CLASS)) && if ((HasProperty (pCD, XA_WM_CLASS)) &&
(XGetClassHint (DISPLAY, pCD->client, &classHint))) (XGetClassHint (DISPLAY, pCD->client, &classHint)))
#endif
{ {
/* the WM_CLASS property exists for the client window */ /* the WM_CLASS property exists for the client window */
pCD->clientClass = classHint.res_class; pCD->clientClass = classHint.res_class;
@ -993,7 +982,6 @@ ProcessWmHints (ClientData *pCD, Boolean firstTime)
if (firstTime) if (firstTime)
{ {
#ifndef NO_OL_COMPAT
ClientData *leader; ClientData *leader;
Atom *pIDs; Atom *pIDs;
unsigned int numIDs = 0; unsigned int numIDs = 0;
@ -1041,7 +1029,6 @@ ProcessWmHints (ClientData *pCD, Boolean firstTime)
{ {
pCD->windowGroup = 0L; pCD->windowGroup = 0L;
} }
#endif /* NO_OL_COMPAT */
/* /*
* The window manger does not do anything with the input hint. Input * The window manger does not do anything with the input hint. Input
* always goes to the selected window. * always goes to the selected window.
@ -1253,21 +1240,6 @@ ProcessWmHints (ClientData *pCD, Boolean firstTime)
} }
} }
} }
#ifdef NO_OL_COMPAT
/*
* Save the window group.
*/
if (flags & WindowGroupHint)
{
pCD->windowGroup = pXWMHints->window_group;
}
else
{
pCD->windowGroup = 0L;
}
#endif /* NO_OL_COMPAT */
} }
else /* not the first time the hints are processed */ else /* not the first time the hints are processed */
{ {
@ -2132,11 +2104,7 @@ WmICCCMToXmString (XTextProperty *wmNameProp)
xms_return = xmsTable[0]; xms_return = xmsTable[0];
for (i = 1; i < nStrings; i++) for (i = 1; i < nStrings; i++)
{ {
#ifdef CONCAT_TEXTLIST
xms_return = XmStringConcatAndFree(xms_return, xmsTable[i]);
#else
XmStringFree(xmsTable[i]); XmStringFree(xmsTable[i]);
#endif /* CONCAT_TEXTLIST */
} }
XtFree((char *)xmsTable); XtFree((char *)xmsTable);
@ -3916,12 +3884,10 @@ ProcessMwmHints (ClientData *pCD)
XFree ((char*)pHints); XFree ((char*)pHints);
} }
#ifndef NO_OL_COMPAT
else else
{ {
ProcessOLDecoration (pCD); ProcessOLDecoration (pCD);
} }
#endif /* NO_OL_COMPAT */
/* /*
* If primary window can't move between workspaces, then * If primary window can't move between workspaces, then