diff options
author | jsorg71 <jsorg71> | 2007-04-13 05:48:52 +0000 |
---|---|---|
committer | jsorg71 <jsorg71> | 2007-04-13 05:48:52 +0000 |
commit | e7308caeb3f21250499e69a6c58a1ad114fd8418 (patch) | |
tree | ffdd90fd48a18043a19cc895bc7661a5b6bde2ce /xrdp/xrdp_process.c | |
parent | 7423dfe6ebb9a7f3ab82a6f7e60c9285be3b1a58 (diff) | |
download | xrdp-proprietary-e7308caeb3f21250499e69a6c58a1ad114fd8418.tar.gz xrdp-proprietary-e7308caeb3f21250499e69a6c58a1ad114fd8418.zip |
added xrdp_mm work for module management
Diffstat (limited to 'xrdp/xrdp_process.c')
-rw-r--r-- | xrdp/xrdp_process.c | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/xrdp/xrdp_process.c b/xrdp/xrdp_process.c index 2ff99377..eba8c9d6 100644 --- a/xrdp/xrdp_process.c +++ b/xrdp/xrdp_process.c @@ -57,11 +57,12 @@ xrdp_process_loop(struct xrdp_process* self) { rv = libxrdp_process_data(self->session); } - if (self->wm == 0 && self->session->up_and_running && rv == 0) + if ((self->wm == 0) && (self->session->up_and_running) && (rv == 0)) { DEBUG(("calling xrdp_wm_init and creating wm")); self->wm = xrdp_wm_create(self, self->session->client_info); - xrdp_wm_init(self->wm); + /* at this point the wm(window manager) is create and wm::login_mode is + zero so xrdp_wm_init should be called by xrdp_wm_idle */ } return rv; } @@ -96,7 +97,7 @@ xrdp_process_main_loop(struct xrdp_process* self) sel_r = g_tcp_select(self->sck, self->app_sck); if (sel_r == 0) /* no data on any stream */ { - g_sleep(10); + xrdp_wm_idle(self->wm); } else if (sel_r < 0) { @@ -111,15 +112,7 @@ xrdp_process_main_loop(struct xrdp_process* self) } if (sel_r & 2) /* mod socket fired */ { - if (self->wm->mod == 0) - { - break; - } - if (self->wm->mod->mod_signal == 0) - { - break; - } - if (self->wm->mod->mod_signal(self->wm->mod) != 0) + if (xrdp_wm_app_sck_signal(self->wm, self->app_sck) != 0) { break; } @@ -130,11 +123,14 @@ xrdp_process_main_loop(struct xrdp_process* self) } if (self->wm != 0) { - if (self->wm->mod != 0) + if (self->wm->mm != 0) { - if (self->wm->mod->mod_end != 0) + if (self->wm->mm->mod != 0) { - self->wm->mod->mod_end(self->wm->mod); + if (self->wm->mm->mod->mod_end != 0) + { + self->wm->mm->mod->mod_end(self->wm->mm->mod); + } } } } |