diff options
| author | Laxmikant Rashinkar <LK.Rashinkar@gmail.com> | 2014-02-23 18:03:31 -0800 |
|---|---|---|
| committer | Laxmikant Rashinkar <LK.Rashinkar@gmail.com> | 2014-02-23 18:03:31 -0800 |
| commit | 76a090196406fbd8a5a3bda1d90fd6e9699b2799 (patch) | |
| tree | f90ec42c15955b71d2c26b95ba5a0301eb489338 /xrdp/xrdp_login_wnd.c | |
| parent | c5c8324d91277bdbddf7402453b0b8f56e698972 (diff) | |
| download | xrdp-proprietary-76a090196406fbd8a5a3bda1d90fd6e9699b2799.tar.gz xrdp-proprietary-76a090196406fbd8a5a3bda1d90fd6e9699b2799.zip | |
o --enable-load_pulse_modules changed to --enable-loadpulsemodules
o color entries in xrdp.ini file are now specfied using RGB format only
o login screen now works with pixel depth of 8, 15, 16 and 24 bits
Diffstat (limited to 'xrdp/xrdp_login_wnd.c')
| -rw-r--r-- | xrdp/xrdp_login_wnd.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/xrdp/xrdp_login_wnd.c b/xrdp/xrdp_login_wnd.c index bd63b0ec..2e53fca5 100644 --- a/xrdp/xrdp_login_wnd.c +++ b/xrdp/xrdp_login_wnd.c @@ -643,7 +643,7 @@ xrdp_login_wnd_create(struct xrdp_wm *self) * @return 0 on success, -1 on failure *****************************************************************************/ int APP_CC -load_xrdp_config(struct xrdp_config *config) +load_xrdp_config(struct xrdp_config *config, int bpp) { struct xrdp_cfg_globals *globals; @@ -663,7 +663,8 @@ load_xrdp_config(struct xrdp_config *config) /* set default values incase we can't get them from xrdp.ini file */ globals->ini_version = 1; - globals->ls_top_window_bg_color = xrdp_wm_htoi("bf9c00"); + globals->ls_top_window_bg_color = HCOLOR(bpp, xrdp_wm_htoi("009cb5")); + globals->ls_bg_color = HCOLOR(bpp, xrdp_wm_htoi("dedede")); globals->ls_width = 350; globals->ls_height = 350; globals->ls_bg_color = 0xdedede; @@ -814,7 +815,7 @@ load_xrdp_config(struct xrdp_config *config) /* login screen values */ else if (g_strncmp(n, "ls_top_window_bg_color", 64) == 0) - globals->ls_top_window_bg_color = xrdp_wm_htoi(v); + globals->ls_top_window_bg_color = HCOLOR(bpp, xrdp_wm_htoi(v)); else if (g_strncmp(n, "ls_width", 64) == 0) globals->ls_width = g_atoi(v); @@ -823,7 +824,7 @@ load_xrdp_config(struct xrdp_config *config) globals->ls_height = g_atoi(v); else if (g_strncmp(n, "ls_bg_color", 64) == 0) - globals->ls_bg_color = xrdp_wm_htoi(v); + globals->ls_bg_color = HCOLOR(bpp, xrdp_wm_htoi(v)); else if (g_strncmp(n, "ls_logo_filename", 255) == 0) { |