Skip to content

Commit 682ca95

Browse files
authored
Merge pull request #2175 from Nexarian/refactor_resizing_into_state_machine
Refactoring resizing into state machine.
2 parents 7711978 + 6f461aa commit 682ca95

File tree

5 files changed

+466
-195
lines changed

5 files changed

+466
-195
lines changed

xrdp/xrdp.h

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,12 @@ xrdp_wm_get_wait_objs(struct xrdp_wm *self, tbus *robjs, int *rc,
147147
tbus *wobjs, int *wc, int *timeout);
148148
int
149149
xrdp_wm_check_wait_objs(struct xrdp_wm *self);
150+
const char *
151+
xrdp_wm_login_state_to_str(enum wm_login_state login_state);
150152
int
151153
xrdp_wm_set_login_state(struct xrdp_wm *self, enum wm_login_state login_state);
154+
int
155+
xrdp_wm_can_resize(struct xrdp_wm *self);
152156
void
153157
xrdp_wm_mod_connect_done(struct xrdp_wm *self, int status);
154158

@@ -397,18 +401,12 @@ xrdp_bitmap_compress(char *in_data, int width, int height,
397401

398402
/* xrdp_mm.c */
399403

400-
struct dynamic_monitor_layout
404+
struct display_control_monitor_layout_data
401405
{
402-
int flags;
403-
int left;
404-
int top;
405-
int width;
406-
int height;
407-
int physical_width;
408-
int physical_height;
409-
int orientation;
410-
int desktop_scale_factor;
411-
int device_scale_factor;
406+
struct display_size_description description;
407+
enum display_resize_state state;
408+
int last_state_update_timestamp;
409+
int start_time;
412410
};
413411

414412
int

0 commit comments

Comments
 (0)