Skip to content

dix: unexport screenIsSaved and HasSaverWindow() #1381

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

Merged
merged 1 commit into from
Nov 20, 2025
+12 −4
Merged

dix: unexport screenIsSaved and HasSaverWindow() #1381

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
1 change: 1 addition & 0 deletions Xext/xtest.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
#include "dix/exevents_priv.h"
#include "dix/inpututils_priv.h"
#include "dix/request_priv.h"
#include "dix/screensaver_priv.h"
#include "mi/mi_priv.h"
#include "mi/mipointer_priv.h"
#include "miext/extinit_priv.h"
Expand Down
1 change: 1 addition & 0 deletions composite/compwindow.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@

#include "dix/dix_priv.h"
#include "dix/resource_priv.h"
#include "dix/screensaver_priv.h"
#include "include/extinit.h"
#include "os/osdep.h"
#include "Xext/panoramiXsrv.h"
Expand Down
8 changes: 8 additions & 0 deletions dix/screensaver_priv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@
#ifndef _XSERVER_DIX_SCREENSAVER_PRIV_H
#define _XSERVER_DIX_SCREENSAVER_PRIV_H

#include <stdbool.h>
#include <X11/Xdefs.h>
#include <X11/Xmd.h>

#include "include/callback.h"
#include "include/dix.h"
#include "include/screenint.h"
#include "include/scrnintstr.h"

extern CARD32 defaultScreenSaverTime;
extern CARD32 defaultScreenSaverInterval;
Expand All @@ -36,4 +38,10 @@ static inline int dixCallScreensaverAccessCallback(ClientPtr client,
return rec.status;
}

extern int screenIsSaved;

static inline bool HasSaverWindow(ScreenPtr pScreen) {
Copy link
Contributor

@stefan11111 stefan11111 Nov 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there any reason to not keep this a macro?

Copy link
Contributor Author

@metux metux Nov 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

type safety ?

return (pScreen->screensaver.pWindow != NullWindow);
}

#endif /* _XSERVER_DIX_SCREENSAVER_PRIV_H */
4 changes: 0 additions & 4 deletions include/windowstr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,4 @@ typedef struct _ScreenSaverStuff *ScreenSaverStuffPtr;
#define SCREEN_IS_TILED 2
#define SCREEN_IS_BLACK 3

#define HasSaverWindow(pScreen) (pScreen->screensaver.pWindow != NullWindow)

extern _X_EXPORT int screenIsSaved;

#endif /* WINDOWSTRUCT_H */
1 change: 1 addition & 0 deletions mi/mieq.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ in this Software without prior written authorization from The Open Group.
#include "dix/dix_priv.h"
#include "dix/input_priv.h"
#include "dix/inpututils_priv.h"
#include "dix/screensaver_priv.h"
#include "mi/mi_priv.h"
#include "mi/mipointer_priv.h"
#include "os/bug_priv.h"
Expand Down
1 change: 1 addition & 0 deletions mi/mioverlay.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include "dix/cursor_priv.h"
#include "dix/dix_priv.h"
#include "dix/screen_hooks_priv.h"
#include "dix/screensaver_priv.h"
#include "mi/mi_priv.h"

#include "scrnintstr.h"
Expand Down