added directfb stuff
This commit is contained in:
parent
7306308be6
commit
891036edd1
@ -338,6 +338,13 @@ mi_invalidate(int x, int y, int cx, int cy)
|
||||
mi_add_to(x, y, cx, cy);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
int
|
||||
mi_create_bs(void)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
static void
|
||||
render_callback(DFBRectangle * rect, void * ctx)
|
||||
|
@ -2,6 +2,9 @@
|
||||
# makefile
|
||||
# directfb
|
||||
|
||||
INCDIR=/home/j/stb/stb810-SP2/build/staging/usr/local/include/directfb
|
||||
ROOTFS=/home/j/stb/stb810-SP2/build/rootfs
|
||||
|
||||
CC = mipsel-linux-gnu-gcc
|
||||
OBJS = tcp.o iso.o mcs.o secure.o rdp.o rdp5.o orders.o \
|
||||
bitmap.o cache.o mppc.o pstcache.o channels.o licence.o \
|
||||
@ -9,12 +12,10 @@ ssl_calls.o
|
||||
|
||||
UIOBJS = uimain.o bsops.o dfb.o
|
||||
|
||||
#CFLAGS = -O2 -mips3 -Wall -I../../../staging/usr/local/include/directfb
|
||||
#CFLAGS = -O3 -Wall -I../../../staging/usr/local/include/directfb
|
||||
CFLAGS = -O2 -Wall -I../../../staging/usr/local/include/directfb
|
||||
CFLAGS = -O2 -Wall -I$(INCDIR)
|
||||
# -DWITH_DEBUG
|
||||
|
||||
LDFLAGS = -L../../usr/local/lib -L../../usr/lib -L../../lib
|
||||
LDFLAGS = -L$(ROOTFS)/usr/local/lib -L$(ROOTFS)/usr/lib -L$(ROOTFS)/lib
|
||||
|
||||
all: rd
|
||||
|
||||
|
@ -486,7 +486,7 @@ process_polygon(STREAM s, POLYGON_ORDER * os, uint32 present, BOOL delta)
|
||||
{
|
||||
int index, data, next;
|
||||
uint8 flags = 0;
|
||||
POINT *points;
|
||||
RD_POINT *points;
|
||||
|
||||
if (present & 0x01)
|
||||
rdp_in_coord(s, &os->x, delta);
|
||||
@ -528,8 +528,8 @@ process_polygon(STREAM s, POLYGON_ORDER * os, uint32 present, BOOL delta)
|
||||
return;
|
||||
}
|
||||
|
||||
points = (POINT *) xmalloc((os->npoints + 1) * sizeof(POINT));
|
||||
memset(points, 0, (os->npoints + 1) * sizeof(POINT));
|
||||
points = (RD_POINT *) xmalloc((os->npoints + 1) * sizeof(RD_POINT));
|
||||
memset(points, 0, (os->npoints + 1) * sizeof(RD_POINT));
|
||||
|
||||
points[0].x = os->x;
|
||||
points[0].y = os->y;
|
||||
@ -565,7 +565,7 @@ process_polygon2(STREAM s, POLYGON2_ORDER * os, uint32 present, BOOL delta)
|
||||
{
|
||||
int index, data, next;
|
||||
uint8 flags = 0;
|
||||
POINT *points;
|
||||
RD_POINT *points;
|
||||
|
||||
if (present & 0x0001)
|
||||
rdp_in_coord(s, &os->x, delta);
|
||||
@ -613,8 +613,8 @@ process_polygon2(STREAM s, POLYGON2_ORDER * os, uint32 present, BOOL delta)
|
||||
return;
|
||||
}
|
||||
|
||||
points = (POINT *) xmalloc((os->npoints + 1) * sizeof(POINT));
|
||||
memset(points, 0, (os->npoints + 1) * sizeof(POINT));
|
||||
points = (RD_POINT *) xmalloc((os->npoints + 1) * sizeof(RD_POINT));
|
||||
memset(points, 0, (os->npoints + 1) * sizeof(RD_POINT));
|
||||
|
||||
points[0].x = os->x;
|
||||
points[0].y = os->y;
|
||||
@ -651,7 +651,7 @@ process_polyline(STREAM s, POLYLINE_ORDER * os, uint32 present, BOOL delta)
|
||||
int index, next, data;
|
||||
uint8 flags = 0;
|
||||
PEN pen;
|
||||
POINT *points;
|
||||
RD_POINT *points;
|
||||
|
||||
if (present & 0x01)
|
||||
rdp_in_coord(s, &os->x, delta);
|
||||
@ -690,8 +690,8 @@ process_polyline(STREAM s, POLYLINE_ORDER * os, uint32 present, BOOL delta)
|
||||
return;
|
||||
}
|
||||
|
||||
points = (POINT *) xmalloc((os->lines + 1) * sizeof(POINT));
|
||||
memset(points, 0, (os->lines + 1) * sizeof(POINT));
|
||||
points = (RD_POINT *) xmalloc((os->lines + 1) * sizeof(RD_POINT));
|
||||
memset(points, 0, (os->lines + 1) * sizeof(RD_POINT));
|
||||
|
||||
points[0].x = os->x;
|
||||
points[0].y = os->y;
|
||||
|
@ -170,8 +170,8 @@ BOOL rdpsnd_init(void);
|
||||
/* rdpsnd_oss.c */
|
||||
BOOL wave_out_open(void);
|
||||
void wave_out_close(void);
|
||||
BOOL wave_out_format_supported(WAVEFORMATEX * pwfx);
|
||||
BOOL wave_out_set_format(WAVEFORMATEX * pwfx);
|
||||
BOOL wave_out_format_supported(RD_WAVEFORMATEX * pwfx);
|
||||
BOOL wave_out_set_format(RD_WAVEFORMATEX * pwfx);
|
||||
void wave_out_volume(uint16 left, uint16 right);
|
||||
void wave_out_write(STREAM s, uint16 tick, uint8 index);
|
||||
void wave_out_play(void);
|
||||
@ -266,9 +266,9 @@ void ui_triblt(uint8 opcode, int x, int y, int cx, int cy, RD_HBITMAP src, int s
|
||||
BRUSH * brush, int bgcolour, int fgcolour);
|
||||
void ui_line(uint8 opcode, int startx, int starty, int endx, int endy, PEN * pen);
|
||||
void ui_rect(int x, int y, int cx, int cy, int colour);
|
||||
void ui_polygon(uint8 opcode, uint8 fillmode, POINT * point, int npoints, BRUSH * brush,
|
||||
void ui_polygon(uint8 opcode, uint8 fillmode, RD_POINT * point, int npoints, BRUSH * brush,
|
||||
int bgcolour, int fgcolour);
|
||||
void ui_polyline(uint8 opcode, POINT * points, int npoints, PEN * pen);
|
||||
void ui_polyline(uint8 opcode, RD_POINT * points, int npoints, PEN * pen);
|
||||
void ui_ellipse(uint8 opcode, uint8 fillmode, int x, int y, int cx, int cy, BRUSH * brush,
|
||||
int bgcolour, int fgcolour);
|
||||
void ui_draw_glyph(int mixmode, int x, int y, int cx, int cy, RD_HGLYPH glyph, int srcx, int srcy,
|
||||
|
@ -56,7 +56,7 @@ pstcache_load_bitmap(uint8 cache_id, uint16 cache_idx)
|
||||
uint8 *celldata;
|
||||
int fd;
|
||||
CELLHEADER cellhdr;
|
||||
HBITMAP bitmap;
|
||||
RD_HBITMAP bitmap;
|
||||
|
||||
if (!g_bitmap_cache_persist_enable)
|
||||
return False;
|
||||
|
@ -996,7 +996,7 @@ process_colour_pointer_pdu(STREAM s)
|
||||
{
|
||||
uint16 x, y, width, height, cache_idx, masklen, datalen;
|
||||
uint8 *mask, *data;
|
||||
HCURSOR cursor;
|
||||
RD_HCURSOR cursor;
|
||||
|
||||
in_uint16_le(s, cache_idx);
|
||||
in_uint16_le(s, x);
|
||||
|
@ -18,6 +18,7 @@
|
||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
#include <stdarg.h>
|
||||
#include "rdesktop.h"
|
||||
#include "bsops.h"
|
||||
#include "uimain.h"
|
||||
@ -107,6 +108,7 @@ void
|
||||
mi_reset_clip(void);
|
||||
void
|
||||
mi_line(int x1, int y1, int x2, int y2, int colour);
|
||||
void *
|
||||
mi_create_cursor(unsigned int x, unsigned int y,
|
||||
int width, int height,
|
||||
unsigned char * andmask, unsigned char * xormask);
|
||||
@ -783,7 +785,7 @@ ui_end_update(void)
|
||||
|
||||
/*****************************************************************************/
|
||||
void
|
||||
ui_polygon(uint8 opcode, uint8 fillmode, POINT * point, int npoints,
|
||||
ui_polygon(uint8 opcode, uint8 fillmode, RD_POINT * point, int npoints,
|
||||
BRUSH * brush, int bgcolour, int fgcolour)
|
||||
{
|
||||
/* not used */
|
||||
@ -791,7 +793,7 @@ ui_polygon(uint8 opcode, uint8 fillmode, POINT * point, int npoints,
|
||||
|
||||
/*****************************************************************************/
|
||||
void
|
||||
ui_polyline(uint8 opcode, POINT * points, int npoints, PEN * pen)
|
||||
ui_polyline(uint8 opcode, RD_POINT * points, int npoints, PEN * pen)
|
||||
{
|
||||
int i, x, y, dx, dy;
|
||||
if (npoints > 0)
|
||||
|
Loading…
Reference in New Issue
Block a user