mirror of https://github.com/FreeRDP/FreeRDP
xfreerdp: remove dependency on libfreerdp-rail
This commit is contained in:
parent
6857a4f2b7
commit
b32341785e
|
@ -12,7 +12,6 @@ typedef struct mf_context mfContext;
|
|||
#include <freerdp/gdi/dc.h>
|
||||
#include <freerdp/gdi/gfx.h>
|
||||
#include <freerdp/gdi/region.h>
|
||||
#include <freerdp/rail/rail.h>
|
||||
#include <freerdp/cache/cache.h>
|
||||
#include <freerdp/channels/channels.h>
|
||||
|
||||
|
|
|
@ -32,7 +32,6 @@
|
|||
#include <freerdp/gdi/gdi.h>
|
||||
#include <freerdp/gdi/dc.h>
|
||||
#include <freerdp/gdi/region.h>
|
||||
#include <freerdp/rail/rail.h>
|
||||
#include <freerdp/cache/cache.h>
|
||||
#include <freerdp/channels/channels.h>
|
||||
|
||||
|
|
|
@ -22,7 +22,6 @@
|
|||
|
||||
#include <freerdp/api.h>
|
||||
#include <freerdp/freerdp.h>
|
||||
#include <freerdp/rail/rail.h>
|
||||
|
||||
struct _MONITOR_INFO
|
||||
{
|
||||
|
|
|
@ -27,8 +27,6 @@
|
|||
#include <winpr/wlog.h>
|
||||
#include <winpr/print.h>
|
||||
|
||||
#include <freerdp/rail/rail.h>
|
||||
|
||||
#include "xf_window.h"
|
||||
#include "xf_rail.h"
|
||||
|
||||
|
@ -863,9 +861,6 @@ int xf_rail_init(xfContext* xfc, RailClientContext* rail)
|
|||
|
||||
xfc->rail = rail;
|
||||
|
||||
context->rail = rail_new(context->settings);
|
||||
rail_register_update_callbacks(context->rail, context->update);
|
||||
|
||||
xf_rail_register_update_callbacks(context->update);
|
||||
|
||||
rail->custom = (void*) xfc;
|
||||
|
@ -886,20 +881,12 @@ int xf_rail_init(xfContext* xfc, RailClientContext* rail)
|
|||
|
||||
int xf_rail_uninit(xfContext* xfc, RailClientContext* rail)
|
||||
{
|
||||
rdpContext* context = (rdpContext*) xfc;
|
||||
|
||||
if (xfc->rail)
|
||||
{
|
||||
xfc->rail->custom = NULL;
|
||||
xfc->rail = NULL;
|
||||
}
|
||||
|
||||
if (context->rail)
|
||||
{
|
||||
rail_free(context->rail);
|
||||
context->rail = NULL;
|
||||
}
|
||||
|
||||
if (xfc->railWindows)
|
||||
{
|
||||
HashTable_Free(xfc->railWindows);
|
||||
|
|
|
@ -777,6 +777,7 @@ void xf_ShowWindow(xfContext* xfc, xfAppWindow* appWindow, BYTE state)
|
|||
XFlush(xfc->display);
|
||||
}
|
||||
|
||||
#if 0
|
||||
void xf_SetWindowIcon(xfContext* xfc, xfAppWindow* appWindow, rdpIcon* icon)
|
||||
{
|
||||
int x, y;
|
||||
|
@ -812,6 +813,7 @@ void xf_SetWindowIcon(xfContext* xfc, xfAppWindow* appWindow, rdpIcon* icon)
|
|||
|
||||
free(propdata);
|
||||
}
|
||||
#endif
|
||||
|
||||
void xf_SetWindowRects(xfContext* xfc, xfAppWindow* appWindow, RECTANGLE_16* rects, int nrects)
|
||||
{
|
||||
|
|
|
@ -76,7 +76,6 @@ struct xf_window
|
|||
int shmid;
|
||||
Window handle;
|
||||
Window* xfwin;
|
||||
rdpWindow* window;
|
||||
BOOL fullscreen;
|
||||
BOOL decorations;
|
||||
BOOL is_mapped;
|
||||
|
@ -153,7 +152,7 @@ int xf_AppWindowInit(xfContext* xfc, xfAppWindow* appWindow);
|
|||
void xf_SetWindowText(xfContext* xfc, xfAppWindow* appWindow, char* name);
|
||||
void xf_MoveWindow(xfContext* xfc, xfAppWindow* appWindow, int x, int y, int width, int height);
|
||||
void xf_ShowWindow(xfContext* xfc, xfAppWindow* appWindow, BYTE state);
|
||||
void xf_SetWindowIcon(xfContext* xfc, xfAppWindow* appWindow, rdpIcon* icon);
|
||||
//void xf_SetWindowIcon(xfContext* xfc, xfAppWindow* appWindow, rdpIcon* icon);
|
||||
void xf_SetWindowRects(xfContext* xfc, xfAppWindow* appWindow, RECTANGLE_16* rects, int nrects);
|
||||
void xf_SetWindowVisibilityRects(xfContext* xfc, xfAppWindow* appWindow, RECTANGLE_16* rects, int nrects);
|
||||
void xf_SetWindowStyle(xfContext* xfc, xfAppWindow* appWindow, UINT32 style, UINT32 ex_style);
|
||||
|
|
Loading…
Reference in New Issue