frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xnest: move screen saver window list into XnestScreenRec 

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-06-29 14:59:51 +02:00
parent a2c656c968
commit 29fc049907
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xnest/Color.c
View File

@ -263,7 +263,7 @@ xnestSetScreenSaverColormapWindow(ScreenPtr pScreen)
free(xnestOldInstalledColormapWindows); free(xnestOldInstalledColormapWindows);
XSetWMColormapWindows(xnestDisplay, xnscr->rootWindow, XSetWMColormapWindows(xnestDisplay, xnscr->rootWindow,
&xnestScreenSaverWindows[pScreen->myNum], 1); &xnscr->screenSaverWindow, 1);
xnestOldInstalledColormapWindows = NULL; xnestOldInstalledColormapWindows = NULL;
xnestNumOldInstalledColormapWindows = 0; xnestNumOldInstalledColormapWindows = 0;

12
hw/xnest/Screen.c
View File

@ -43,7 +43,6 @@ is" without express or implied warranty.
#include "mipointrst.h" #include "mipointrst.h"
#include "multiscreen.h" #include "multiscreen.h"
Window xnestScreenSaverWindows[MAXSCREENS];
DevPrivateKeyRec xnestScreenCursorFuncKeyRec; DevPrivateKeyRec xnestScreenCursorFuncKeyRec;
DevScreenPrivateKeyRec xnestScreenCursorPrivKeyRec; DevScreenPrivateKeyRec xnestScreenCursorPrivKeyRec;
@ -76,25 +75,26 @@ xnestSaveScreen(ScreenPtr pScreen, int what)
if (xnestSoftwareScreenSaver) if (xnestSoftwareScreenSaver)
return False; return False;
else { else {
Window saverWin = xnestScreenPriv(pScreen)->screenSaverWindow;
switch (what) { switch (what) {
case SCREEN_SAVER_ON: case SCREEN_SAVER_ON:
XMapRaised(xnestDisplay, xnestScreenSaverWindows[pScreen->myNum]); XMapRaised(xnestDisplay, saverWin);
xnestSetScreenSaverColormapWindow(pScreen); xnestSetScreenSaverColormapWindow(pScreen);
break; break;
case SCREEN_SAVER_OFF: case SCREEN_SAVER_OFF:
XUnmapWindow(xnestDisplay, xnestScreenSaverWindows[pScreen->myNum]); XUnmapWindow(xnestDisplay, saverWin);
xnestSetInstalledColormapWindows(pScreen); xnestSetInstalledColormapWindows(pScreen);
break; break;
case SCREEN_SAVER_FORCER: case SCREEN_SAVER_FORCER:
lastEventTime = GetTimeInMillis(); lastEventTime = GetTimeInMillis();
XUnmapWindow(xnestDisplay, xnestScreenSaverWindows[pScreen->myNum]); XUnmapWindow(xnestDisplay, saverWin);
xnestSetInstalledColormapWindows(pScreen); xnestSetInstalledColormapWindows(pScreen);
break; break;
case SCREEN_SAVER_CYCLE: case SCREEN_SAVER_CYCLE:
XUnmapWindow(xnestDisplay, xnestScreenSaverWindows[pScreen->myNum]); XUnmapWindow(xnestDisplay, saverWin);
xnestSetInstalledColormapWindows(pScreen); xnestSetInstalledColormapWindows(pScreen);
break; break;
} }
@ -389,7 +389,7 @@ xnestOpenScreen(ScreenPtr pScreen, int argc, char *argv[])
attributes.background_pixmap = xnestScreenSaverPixmap; attributes.background_pixmap = xnestScreenSaverPixmap;
attributes.colormap = attributes.colormap =
DefaultColormap(xnestDisplay, DefaultScreen(xnestDisplay)); DefaultColormap(xnestDisplay, DefaultScreen(xnestDisplay));
xnestScreenSaverWindows[pScreen->myNum] = xnscr->screenSaverWindow =
XCreateWindow(xnestDisplay, XCreateWindow(xnestDisplay,
xnscr->rootWindow, xnscr->rootWindow,
0, 0, xnestWidth, xnestHeight, 0, 0, 0, xnestWidth, xnestHeight, 0,

2
hw/xnest/Screen.h
View File

@ -18,8 +18,6 @@ is" without express or implied warranty.
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xdefs.h> #include <X11/Xdefs.h>
extern Window xnestScreenSaverWindows[MAXSCREENS];
ScreenPtr xnestScreen(Window window); ScreenPtr xnestScreen(Window window);
Bool xnestOpenScreen(ScreenPtr pScreen, int argc, char *argv[]); Bool xnestOpenScreen(ScreenPtr pScreen, int argc, char *argv[]);
Bool xnestCloseScreen(ScreenPtr pScreen); Bool xnestCloseScreen(ScreenPtr pScreen);

1
hw/xnest/multiscreen.h
View File

@ -13,6 +13,7 @@
typedef struct xnest_screen { typedef struct xnest_screen {
Window rootWindow; Window rootWindow;
Window screenSaverWindow;
ScreenPtr pScreen; ScreenPtr pScreen;
} XnestScreenRec, *XnestScreenPtr; } XnestScreenRec, *XnestScreenPtr;