summaryrefslogtreecommitdiffstats
path: root/xrdp/xrdp_interface.c
diff options
context:
space:
mode:
Diffstat (limited to 'xrdp/xrdp_interface.c')
-rw-r--r--xrdp/xrdp_interface.c253
1 files changed, 34 insertions, 219 deletions
diff --git a/xrdp/xrdp_interface.c b/xrdp/xrdp_interface.c
index b8bf4664..4b674e5e 100644
--- a/xrdp/xrdp_interface.c
+++ b/xrdp/xrdp_interface.c
@@ -22,204 +22,12 @@
#include "xrdp.h"
-#ifdef XRDP_LIB
-
-struct xrdp_mod g_mod;
-struct xrdp_process* g_rdp_process;
-struct stream* g_s;
-int (* g_callback)(int, int, int);
-
-/*****************************************************************************/
-int mod_event(struct xrdp_mod* v, int msg, int param1, int param2)
-{
- if (g_callback != 0)
- {
- return g_callback(msg, param1, param2);
- }
- else
- {
- return 0;
- }
-}
-
-/*****************************************************************************/
-int server_init(void)
-{
- g_init_system();
- g_memset(&g_mod, 0, sizeof(struct xrdp_mod));
- g_rdp_process = 0;
- make_stream(g_s);
- init_stream(g_s, 8192);
- g_mod.handle = (long)(&g_mod);
- g_mod.mod_event = mod_event;
- return 0;
-}
-
-/*****************************************************************************/
-int server_exit(void)
-{
- xrdp_process_delete(g_rdp_process);
- free_stream(g_s);
- g_exit_system();
- return 0;
-}
-
-/*****************************************************************************/
-int server_connect(int sck, int* width, int* height, int* bpp)
-{
- g_rdp_process = xrdp_process_create(0);
- g_rdp_process->sck = sck;
- if (xrdp_rdp_incoming(g_rdp_process->rdp_layer) != 0)
- {
- return 1;
- }
- if (width != 0)
- {
- *width = g_rdp_process->rdp_layer->client_info.width;
- }
- if (height != 0)
- {
- *height = g_rdp_process->rdp_layer->client_info.height;
- }
- if (bpp != 0)
- {
- *bpp = g_rdp_process->rdp_layer->client_info.bpp;
- }
- return 0;
-}
-
-/*****************************************************************************/
-int server_loop(int sck)
-{
- if (g_rdp_process == 0)
- {
- return 1;
- }
- if (g_rdp_process->term)
- {
- return 1;
- }
- if (g_rdp_process->wm != 0)
- {
- if (g_rdp_process->wm->mod == 0)
- {
- g_rdp_process->wm->mod = &g_mod;
- }
- if (g_mod.wm == 0)
- {
- g_mod.wm = (long)(g_rdp_process->wm);
- }
- }
- init_stream(g_s, 8192);
- if (xrdp_process_loop(g_rdp_process, g_s) != 0)
- {
- return 1;
- }
- return 0;
-}
-
-/*****************************************************************************/
-int server_set_callback(int (* callback)(int, int, int))
-{
- g_callback = callback;
- return 0;
-}
-
-/*****************************************************************************/
-int server_begin_update(void)
-{
- struct xrdp_wm* wm;
- struct xrdp_painter* p;
-
- wm = (struct xrdp_wm*)g_mod.wm;
- p = xrdp_painter_create(wm);
- xrdp_painter_begin_update(p);
- g_mod.painter = (long)p;
- return 0;
-}
-
-/*****************************************************************************/
-int server_end_update(void)
-{
- struct xrdp_painter* p;
-
- p = (struct xrdp_painter*)g_mod.painter;
- xrdp_painter_end_update(p);
- xrdp_painter_delete(p);
- g_mod.painter = 0;
- return 0;
-}
-
-/*****************************************************************************/
-int server_fill_rect(int x, int y, int cx, int cy, int color)
-{
- struct xrdp_wm* wm;
- struct xrdp_painter* p;
-
- wm = (struct xrdp_wm*)g_mod.wm;
- p = (struct xrdp_painter*)g_mod.painter;
- p->fg_color = color;
- xrdp_painter_fill_rect(p, wm->screen, x, y, cx, cy);
- return 0;
-}
-
-/*****************************************************************************/
-int server_screen_blt(int x, int y, int cx, int cy, int srcx, int srcy)
-{
- struct xrdp_wm* wm;
-
- wm = (struct xrdp_wm*)g_mod.wm;
- xrdp_orders_init(wm->orders);
- xrdp_orders_screen_blt(wm->orders, x, y, cx, cy, srcx, srcy, 0xcc, 0);
- xrdp_orders_send(wm->orders);
- return 0;
-}
-
-/*****************************************************************************/
-int server_paint_rect(int x, int y, int cx, int cy, char* data)
-{
- struct xrdp_wm* wm;
- struct xrdp_bitmap* b;
-
- wm = (struct xrdp_wm*)g_mod.wm;
- b = xrdp_bitmap_create_with_data(cx, cy, wm->screen->bpp, data, wm);
- xrdp_painter_draw_bitmap((struct xrdp_painter*)g_mod.painter,
- wm->screen, b, x, y, cx, cy);
- xrdp_bitmap_delete(b);
- return 0;
-}
-
-/*****************************************************************************/
-int server_set_pointer(int x, int y, char* data, char* mask)
-{
- struct xrdp_wm* wm;
-
- wm = (struct xrdp_wm*)g_mod.wm;
- xrdp_wm_pointer(wm, data, mask, x, y);
- return 0;
-}
-
-/*****************************************************************************/
-int server_palette(int* palette)
-{
- struct xrdp_wm* wm;
-
- wm = (struct xrdp_wm*)g_mod.wm;
- if (g_memcmp(wm->palette, palette, 255 * sizeof(int)) != 0)
- {
- g_memcpy(wm->palette, palette, 256 * sizeof(int));
- xrdp_wm_send_palette(wm);
- }
- return 0;
-}
-
-#else
-
/*****************************************************************************/
/* this is the log windows nofity function */
-int xrdp_wm_log_wnd_notify(struct xrdp_bitmap* wnd,
- struct xrdp_bitmap* sender,
- int msg, long param1, long param2)
+int
+xrdp_wm_log_wnd_notify(struct xrdp_bitmap* wnd,
+ struct xrdp_bitmap* sender,
+ int msg, long param1, long param2)
{
struct xrdp_painter* painter;
struct xrdp_wm* wm;
@@ -262,7 +70,7 @@ int xrdp_wm_log_wnd_notify(struct xrdp_bitmap* wnd,
painter->font->color = wnd->wm->black;
for (index = 0; index < wnd->wm->log->count; index++)
{
- text = (char*)xrdp_list_get_item(wnd->wm->log, index);
+ text = (char*)list_get_item(wnd->wm->log, index);
xrdp_painter_draw_text(painter, wnd, 10, 30 + index * 15, text);
}
}
@@ -271,20 +79,22 @@ int xrdp_wm_log_wnd_notify(struct xrdp_bitmap* wnd,
}
/*****************************************************************************/
-int server_begin_update(struct xrdp_mod* mod)
+int
+server_begin_update(struct xrdp_mod* mod)
{
struct xrdp_wm* wm;
struct xrdp_painter* p;
wm = (struct xrdp_wm*)mod->wm;
- p = xrdp_painter_create(wm);
+ p = xrdp_painter_create(wm, wm->session);
xrdp_painter_begin_update(p);
mod->painter = (long)p;
return 0;
}
/*****************************************************************************/
-int server_end_update(struct xrdp_mod* mod)
+int
+server_end_update(struct xrdp_mod* mod)
{
struct xrdp_painter* p;
@@ -296,8 +106,9 @@ int server_end_update(struct xrdp_mod* mod)
}
/*****************************************************************************/
-int server_fill_rect(struct xrdp_mod* mod, int x, int y, int cx, int cy,
- int color)
+int
+server_fill_rect(struct xrdp_mod* mod, int x, int y, int cx, int cy,
+ int color)
{
struct xrdp_wm* wm;
struct xrdp_painter* p;
@@ -310,21 +121,23 @@ 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_screen_blt(struct xrdp_mod* mod, int x, int y, int cx, int cy,
+ int srcx, int srcy)
{
struct xrdp_wm* wm;
wm = (struct xrdp_wm*)mod->wm;
- xrdp_orders_init(wm->orders);
- xrdp_orders_screen_blt(wm->orders, x, y, cx, cy, srcx, srcy, 0xcc, 0);
- xrdp_orders_send(wm->orders);
+ libxrdp_orders_init(wm->session);
+ libxrdp_orders_screen_blt(wm->session, x, y, cx, cy, srcx, srcy, 0xcc, 0);
+ libxrdp_orders_send(wm->session);
return 0;
}
/*****************************************************************************/
-int server_paint_rect(struct xrdp_mod* mod, int x, int y, int cx, int cy,
- char* data)
+int
+server_paint_rect(struct xrdp_mod* mod, int x, int y, int cx, int cy,
+ char* data)
{
struct xrdp_wm* wm;
struct xrdp_bitmap* b;
@@ -338,8 +151,9 @@ int server_paint_rect(struct xrdp_mod* mod, int x, int y, int cx, int cy,
}
/*****************************************************************************/
-int server_set_pointer(struct xrdp_mod* mod, int x, int y,
- char* data, char* mask)
+int
+server_set_pointer(struct xrdp_mod* mod, int x, int y,
+ char* data, char* mask)
{
struct xrdp_wm* wm;
@@ -349,7 +163,8 @@ int server_set_pointer(struct xrdp_mod* mod, int x, int y,
}
/*****************************************************************************/
-int server_palette(struct xrdp_mod* mod, int* palette)
+int
+server_palette(struct xrdp_mod* mod, int* palette)
{
struct xrdp_wm* wm;
@@ -363,19 +178,20 @@ int server_palette(struct xrdp_mod* mod, int* palette)
}
/*****************************************************************************/
-int server_msg(struct xrdp_mod* mod, char* msg)
+int
+server_msg(struct xrdp_mod* mod, char* msg)
{
struct xrdp_wm* wm;
struct xrdp_bitmap* but;
wm = (struct xrdp_wm*)mod->wm;
- xrdp_list_add_item(wm->log, (long)g_strdup(msg));
+ list_add_item(wm->log, (long)g_strdup(msg));
if (wm->log_wnd == 0)
{
/* log window */
wm->log_wnd = xrdp_bitmap_create(400, 400, wm->screen->bpp,
WND_TYPE_WND, wm);
- xrdp_list_add_item(wm->screen->child_list, (long)wm->log_wnd);
+ list_add_item(wm->screen->child_list, (long)wm->log_wnd);
wm->log_wnd->parent = wm->screen;
wm->log_wnd->owner = wm->screen;
wm->log_wnd->bg_color = wm->grey;
@@ -384,7 +200,7 @@ int server_msg(struct xrdp_mod* mod, char* msg)
set_string(&wm->log_wnd->caption1, "Connection Log");
/* ok button */
but = xrdp_bitmap_create(60, 25, wm->screen->bpp, WND_TYPE_BUTTON, wm);
- xrdp_list_insert_item(wm->log_wnd->child_list, 0, (long)but);
+ list_insert_item(wm->log_wnd->child_list, 0, (long)but);
but->parent = wm->log_wnd;
but->owner = wm->log_wnd;
but->left = (400 - 60) - 10;
@@ -401,9 +217,8 @@ int server_msg(struct xrdp_mod* mod, char* msg)
}
/*****************************************************************************/
-int server_is_term(struct xrdp_mod* mod)
+int
+server_is_term(struct xrdp_mod* mod)
{
return g_is_term();
}
-
-#endif /* XRDP_LIB */
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-10 18:43:31 +0000