mirrors/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Background login image on the primary monitor only

Browse Source
This commit is contained in:
matt335672 2021-08-05 14:25:00 +01:00
parent d998ce7b5b
commit 82b8c0a78e
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
xrdp/xrdp_login_wnd.c
View File

@ -643,7 +643,9 @@ xrdp_login_wnd_create(struct xrdp_wm *self)
int log_width; int log_width;
int log_height; int log_height;
int regular; int regular;
int primary_x_offset; int primary_width; /* Dimensions of primary screen */
int primary_height;
int primary_x_offset; /* Offset of centre of primary screen */
int primary_y_offset; int primary_y_offset;
int index; int index;
int x; int x;
@ -653,8 +655,10 @@ xrdp_login_wnd_create(struct xrdp_wm *self)
globals = &self->xrdp_config->cfg_globals; globals = &self->xrdp_config->cfg_globals;
primary_x_offset = self->screen->width / 2; primary_width = self->screen->width;
primary_y_offset = self->screen->height / 2; primary_height = self->screen->height;
primary_x_offset = primary_width / 2;
primary_y_offset = primary_height / 2;
log_width = globals->ls_width; log_width = globals->ls_width;
log_height = globals->ls_height; log_height = globals->ls_height;
@ -686,8 +690,10 @@ xrdp_login_wnd_create(struct xrdp_wm *self)
cx = self->client_info->minfo_wm[index].right; cx = self->client_info->minfo_wm[index].right;
cy = self->client_info->minfo_wm[index].bottom; cy = self->client_info->minfo_wm[index].bottom;
primary_x_offset = x + ((cx - x) / 2); primary_width = cx - x;
primary_y_offset = y + ((cy - y) / 2); primary_height = cy - y;
primary_x_offset = x + (primary_width / 2);
primary_y_offset = y + (primary_height / 2);
break; break;
} }
} }
@ -747,17 +753,17 @@ xrdp_login_wnd_create(struct xrdp_wm *self)
globals->ls_background_transform, globals->ls_background_transform,
0, 0); 0, 0);
/* Place the background in the bottom right corner */ /* Place the background in the bottom right corner */
but->left = self->screen->width - but->width; but->left = primary_x_offset + (primary_width / 2) - but->width;
but->top = self->screen->height - but->height; but->top = primary_y_offset + (primary_height / 2) - but->height;
} }
else else
{ {
xrdp_bitmap_load(but, fileName, self->palette, xrdp_bitmap_load(but, fileName, self->palette,
globals->ls_top_window_bg_color, globals->ls_top_window_bg_color,
globals->ls_background_transform, globals->ls_background_transform,
self->screen->width, self->screen->height); primary_width, primary_height);
but->left = 0; but->left = primary_x_offset - (primary_width / 2);
but->top = 0; but->top = primary_y_offset - (primary_height / 2);
} }
but->parent = self->screen; but->parent = self->screen;
but->owner = self->screen; but->owner = self->screen;