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

WIP: rootless mode 

2do: input not working yet
     properties (eg. window name aren't set)
     connection closes when window closed
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-08-30 16:40:04 +02:00
parent 00da0f625f
commit 6c9ef7905a
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/xnest/Args.c
View File

@ -46,6 +46,7 @@ char *xnestWindowName = NULL;
int xnestNumScreens = 0; int xnestNumScreens = 0;
Bool xnestDoDirectColormaps = FALSE; Bool xnestDoDirectColormaps = FALSE;
xcb_window_t xnestParentWindow = 0; xcb_window_t xnestParentWindow = 0;
Bool xnestRootless = FALSE;
int int
ddxProcessArgument(int argc, char *argv[], int i) ddxProcessArgument(int argc, char *argv[], int i)
@ -63,6 +64,11 @@ ddxProcessArgument(int argc, char *argv[], int i)
noDPMSExtension = TRUE; noDPMSExtension = TRUE;
#endif #endif
if (!strcmp(argv[i], "-rootless")) {
xnestRootless = TRUE;
return 1;
}
if (!strcmp(argv[i], "-display")) { if (!strcmp(argv[i], "-display")) {
if (++i < argc) { if (++i < argc) {
xnestDisplayName = argv[i]; xnestDisplayName = argv[i];
@ -182,6 +188,7 @@ ddxProcessArgument(int argc, char *argv[], int i)
void void
ddxUseMsg(void) ddxUseMsg(void)
{ {
ErrorF("-rootless enable rootless mode\n");
ErrorF("-display string display name of the real server\n"); ErrorF("-display string display name of the real server\n");
ErrorF("-full utilize full regeneration\n"); ErrorF("-full utilize full regeneration\n");
ErrorF("-class string default visual class\n"); ErrorF("-class string default visual class\n");

1
hw/xnest/Args.h
View File

@ -35,5 +35,6 @@ extern char *xnestWindowName;
extern int xnestNumScreens; extern int xnestNumScreens;
extern Bool xnestDoDirectColormaps; extern Bool xnestDoDirectColormaps;
extern xcb_window_t xnestParentWindow; extern xcb_window_t xnestParentWindow;
extern Bool xnestRootless;
#endif /* XNESTARGS_H */ #endif /* XNESTARGS_H */

3
hw/xnest/Window.c
View File

@ -49,6 +49,9 @@ DevPrivateKeyRec xnestWindowPrivateKeyRec;
*/ */
static inline xcb_window_t xnest_upstream_window_parent(WindowPtr pWin) static inline xcb_window_t xnest_upstream_window_parent(WindowPtr pWin)
{ {
if (xnestRootless && pWin->parent && !pWin->parent->parent)
return xnestUpstreamInfo.screenInfo->root;
return (pWin->parent ? return (pWin->parent ?
xnestWindow(pWin->parent) : xnestWindow(pWin->parent) :
xnest_screen_priv(pWin->drawable.pScreen)->upstream_frame_window); xnest_screen_priv(pWin->drawable.pScreen)->upstream_frame_window);