debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dtwm: Remove WSM define, that is always on for CDE

Browse Source
This commit is contained in:
Peter Howkins
2018-06-20 00:46:58 +01:00
parent 5dc05eaeb4
commit 9a551dd8a6
57 changed files with 237 additions and 2797 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cde/programs/dtwm/WmKeyFocus.c
View File

@@ -358,14 +358,12 @@ void SetKeyboardFocus (ClientData *pCD, long focusFlags)
void ResetExplicitSelectHandling (ClientData *pCD)
{
#ifdef WSM
Boolean bUnseen;
bUnseen = (pCD->clientState & UNSEEN_STATE) ? True : False;
if (bUnseen)
pCD->clientState &= ~UNSEEN_STATE;
#endif /* WSM */
if ((pCD->clientState == NORMAL_STATE) ||
(pCD->clientState == MAXIMIZED_STATE))
{
@@ -383,11 +381,9 @@ void ResetExplicitSelectHandling (ClientData *pCD)
/* !!! grab reset if client icon window? !!! */
}
#ifdef WSM
if (bUnseen)
pCD->clientState |= UNSEEN_STATE;
#endif /* WSM */
} /* END OF FUNCTION ResetExplicitSelectHandling */
@@ -500,9 +496,7 @@ void SetFocusIndication (ClientData *pCD)
void ClearFocusIndication (ClientData *pCD, Boolean refresh)
{
ClientData *saveCD;
#ifdef WSM
Boolean bUnseen;
#endif /* WSM */
/*
* Set the "focus" to NULL to insure correct display of the frame
@@ -512,11 +506,9 @@ void ClearFocusIndication (ClientData *pCD, Boolean refresh)
saveCD = wmGD.keyboardFocus;
wmGD.keyboardFocus = NULL;
#ifdef WSM
bUnseen = (pCD->clientState & UNSEEN_STATE) ? True : False;
if (bUnseen)
pCD->clientState &= ~UNSEEN_STATE;
#endif /* WSM */
if ((pCD->clientState == NORMAL_STATE) ||
(pCD->clientState == MAXIMIZED_STATE))
@@ -536,10 +528,8 @@ void ClearFocusIndication (ClientData *pCD, Boolean refresh)
ShowInactiveIcon (pCD, refresh);
}
#ifdef WSM
if (bUnseen)
pCD->clientState |= UNSEEN_STATE;
#endif /* WSM */
/* restore old keyboard focus */
wmGD.keyboardFocus = saveCD;
@@ -1313,9 +1303,7 @@ Boolean CheckForKeyFocus (ClientListEntry *pNextEntry, unsigned long type, Boole
*/
if (((pNextEntry->type == NORMAL_STATE) &&
#ifdef WSM
(!(pCD->clientState & UNSEEN_STATE)) &&
#endif /* WSM */
(pCD->clientState != MINIMIZED_STATE)) ||
((pNextEntry->type == MINIMIZED_STATE) &&
(pCD->clientState == MINIMIZED_STATE)))
@@ -1475,9 +1463,7 @@ void AutoResetKeyFocus (ClientData *pcdNoFocus, Time focusTime)
{
if ((pNextEntry->type != MINIMIZED_STATE) &&
(pCD->clientState != MINIMIZED_STATE) &&
#ifdef WSM
(!(pCD->clientState & UNSEEN_STATE)) &&
#endif /* WSM */
(pCD != pcdNoFocus))
{
if (pCD->transientChildren)