Merge pull request #3564 from matt335672/refactor_server_methods

Remove global mod server methods from xrdp.h

xrdp/xrdp.h

@@ -503,9 +503,11 @@ xrdp_mm_suppress_output(struct xrdp_mm *self, int suppress,
                         int left, int top, int right, int bottom);
 int
 xrdp_mm_up_and_running(struct xrdp_mm *self);
-int xrdp_mm_send_unicode_to_chansrv(struct xrdp_mm *self,
-                                    int key_down,
-                                    char32_t unicode);
+int
+xrdp_mm_send_unicode_to_chansrv(struct xrdp_mm *self,
+                                int key_down,
+                                char32_t unicode);
+
 struct xrdp_mm *
 xrdp_mm_create(struct xrdp_wm *owner);
 void
@@ -533,162 +535,4 @@ xrdp_mm_egfx_send_planar_bitmap(struct xrdp_mm *self,
                                 struct xrdp_bitmap *bitmap,
                                 struct xrdp_rect *rect,
                                 int surface_id, int x, int y);
-int
-server_begin_update(struct xrdp_mod *mod);
-int
-server_end_update(struct xrdp_mod *mod);
-int
-server_bell_trigger(struct xrdp_mod *mod);
-int
-server_chansrv_in_use(struct xrdp_mod *mod);
-void
-server_init_xkb_layout(struct xrdp_mod *mod,
-                       struct xrdp_client_info *client_info);
-int
-server_fill_rect(struct xrdp_mod *mod, int x, int y, int cx, int cy);
-int
-server_screen_blt(struct xrdp_mod *mod, int x, int y, int cx, int cy,
-                  int srcx, int srcy);
-int
-server_paint_rect(struct xrdp_mod *mod, int x, int y, int cx, int cy,
-                  char *data, int width, int height, int srcx, int srcy);
-int
-server_paint_rect_bpp(struct xrdp_mod *mod, int x, int y, int cx, int cy,
-                      char *data, int width, int height, int srcx, int srcy,
-                      int bpp);
-int
-server_composite(struct xrdp_mod *mod, int srcidx, int srcformat, int srcwidth,
-                 int srcrepeat, int *srctransform, int mskflags, int mskidx,
-                 int mskformat, int mskwidth, int mskrepeat, int op,
-                 int srcx, int srcy, int mskx, int msky,
-                 int dstx, int dsty, int width, int height, int dstformat);
-int
-server_paint_rects(struct xrdp_mod *mod, int num_drects, short *drects,
-                   int num_crects, short *crects,
-                   char *data, int width, int height,
-                   int flags, int frame_id);
-int
-server_set_pointer_system(struct xrdp_mod *mod, int pointer_type);
-int
-server_set_pointer(struct xrdp_mod *mod, int x, int y,
-                   char *data, char *mask);
-int
-server_set_pointer_ex(struct xrdp_mod *mod, int x, int y,
-                      char *data, char *mask, int bpp);
-int
-server_set_pointer_large(struct xrdp_mod *mod, int x, int y,
-                         char *data, char *mask, int bpp,
-                         int width, int height);
-int
-server_paint_rects_ex(struct xrdp_mod *mod,
-                      int num_drects, short *drects,
-                      int num_crects, short *crects,
-                      char *data, int left, int top,
-                      int width, int height,
-                      int flags, int frame_id,
-                      void *shmem_ptr, int shmem_bytes);
-int
-server_palette(struct xrdp_mod *mod, int *palette);
-int
-server_msg(struct xrdp_mod *mod, const char *msg, int code);
-int
-server_set_clip(struct xrdp_mod *mod, int x, int y, int cx, int cy);
-int
-server_reset_clip(struct xrdp_mod *mod);
-int
-server_set_fgcolor(struct xrdp_mod *mod, int fgcolor);
-int
-server_set_bgcolor(struct xrdp_mod *mod, int bgcolor);
-int
-server_set_opcode(struct xrdp_mod *mod, int opcode);
-int
-server_set_mixmode(struct xrdp_mod *mod, int mixmode);
-int
-server_set_brush(struct xrdp_mod *mod, int x_origin, int y_origin,
-                 int style, char *pattern);
-int
-server_set_pen(struct xrdp_mod *mod, int style, int width);
-int
-server_draw_line(struct xrdp_mod *mod, int x1, int y1, int x2, int y2);
-int
-server_add_char(struct xrdp_mod *mod, int font, int character,
-                int offset, int baseline,
-                int width, int height, char *data);
-int
-server_draw_text(struct xrdp_mod *mod, int font,
-                 int flags, int mixmode, int clip_left, int clip_top,
-                 int clip_right, int clip_bottom,
-                 int box_left, int box_top,
-                 int box_right, int box_bottom,
-                 int x, int y, char *data, int data_len);
-int
-client_monitor_resize(struct xrdp_mod *mod, int width, int height,
-                      int num_monitors, const struct monitor_info *monitors);
-int
-server_monitor_resize_done(struct xrdp_mod *mod);
-int
-is_channel_allowed(struct xrdp_wm *wm, int channel_id);
-int
-server_get_channel_count(struct xrdp_mod *mod);
-int
-server_query_channel(struct xrdp_mod *mod, int index, char *channel_name,
-                     int *channel_flags);
-int
-server_get_channel_id(struct xrdp_mod *mod, const char *name);
-int
-server_send_to_channel(struct xrdp_mod *mod, int channel_id,
-                       char *data, int data_len,
-                       int total_data_len, int flags);
-int
-server_create_os_surface(struct xrdp_mod *mod, int id,
-                         int width, int height);
-int
-server_create_os_surface_bpp(struct xrdp_mod *mod, int id,
-                             int width, int height, int bpp);
-int
-server_switch_os_surface(struct xrdp_mod *mod, int id);
-int
-server_delete_os_surface(struct xrdp_mod *mod, int id);
-int
-server_paint_rect_os(struct xrdp_mod *mod, int x, int y, int cx, int cy,
-                     int id, int srcx, int srcy);
-int
-server_set_hints(struct xrdp_mod *mod, int hints, int mask);
-int
-server_window_new_update(struct xrdp_mod *mod, int window_id,
-                         struct rail_window_state_order *window_state,
-                         int flags);
-int
-server_window_delete(struct xrdp_mod *mod, int window_id);
-int
-server_window_icon(struct xrdp_mod *mod, int window_id, int cache_entry,
-                   int cache_id, struct rail_icon_info *icon_info,
-                   int flags);
-int
-server_window_cached_icon(struct xrdp_mod *mod,
-                          int window_id, int cache_entry,
-                          int cache_id, int flags);
-int
-server_notify_new_update(struct xrdp_mod *mod,
-                         int window_id, int notify_id,
-                         struct rail_notify_state_order *notify_state,
-                         int flags);
-int
-server_notify_delete(struct xrdp_mod *mod, int window_id,
-                     int notify_id);
-int
-server_monitored_desktop(struct xrdp_mod *mod,
-                         struct rail_monitored_desktop_order *mdo,
-                         int flags);
-int
-server_add_char_alpha(struct xrdp_mod *mod, int font, int character,
-                      int offset, int baseline,
-                      int width, int height, char *data);
-int
-server_session_info(struct xrdp_mod *mod, const char *data, int data_bytes);
-int
-server_egfx_cmd(struct xrdp_mod *v,
-                char *cmd, int cmd_bytes,
-                char *data, int data_bytes);
-
 #endif