Skip to content

dix: unexport DontPropagateMask and wDontPropagateMask() macro #1387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

dix: unexport DontPropagateMask and wDontPropagateMask() macro #1387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions dix/window_priv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
#include "include/dix.h"
#include "include/window.h"

extern Mask DontPropagateMasks[];

#define wDontPropagateMask(w) wUseDefault(w, dontPropagateMask, DontPropagateMasks[(w)->dontPropagate])

/*
* @brief create a window
*
Expand Down
3 changes: 0 additions & 3 deletions include/windowstr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,6 @@ typedef struct _Window {
* fields (or filling the appropriate default value)
*/

extern _X_EXPORT Mask DontPropagateMasks[];

#define wTrackParent(w,field) ((w)->optional ? \
(w)->optional->field \
: FindWindowWithOptional(w)->optional->field)
Expand All @@ -183,7 +181,6 @@ extern _X_EXPORT Mask DontPropagateMasks[];
#define wVisual(w) wTrackParent(w, visual)
#define wCursor(w) ((w)->cursorIsNone ? None : wTrackParent(w, cursor))
#define wColormap(w) ((w)->drawable.class == InputOnly ? None : wTrackParent(w, colormap))
#define wDontPropagateMask(w) wUseDefault(w, dontPropagateMask, DontPropagateMasks[(w)->dontPropagate])
#define wOtherEventMasks(w) wUseDefault(w, otherEventMasks, 0)
#define wOtherClients(w) wUseDefault(w, otherClients, NULL)
#define wOtherInputMasks(w) wUseDefault(w, inputMasks, NULL)
Expand Down
Loading