CVS: rdesktop/uiports makefile_svga, 1.2, 1.3 svgawin.c, 1.6, 1.7
Jay Sorg <[email protected]> Tue, 05 Jun 2007 22:59:55 -0700
| Newsgroups | gmane.network.rdesktop.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/rdesktop/rdesktop/uiports
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19906
Modified Files:
makefile_svga svgawin.c
Log Message:
get svga uiport compiling
Index: makefile_svga
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/uiports/makefile_svga,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** makefile_svga 13 Mar 2005 03:45:27 -0000 1.2
--- makefile_svga 6 Jun 2007 05:59:53 -0000 1.3
***************
*** 1,5 ****
CC = gcc
CFLAGS = -Os -DWITH_OPENSSL -DL_ENDIAN -Wall
! RESTOBJ = ../tcp.o ../iso.o ../mcs.o ../secure.o ../rdp.o ../rdp5.o ../orders.o ../cache.o ../mppc.o ../licence.o ../bitmap.o ../channels.o ../pstcache.o
LDFLAGS = -lvga -lcrypto
--- 1,5 ----
CC = gcc
CFLAGS = -Os -DWITH_OPENSSL -DL_ENDIAN -Wall
! RESTOBJ = ../tcp.o ../iso.o ../mcs.o ../secure.o ../rdp.o ../rdp5.o ../orders.o ../cache.o ../mppc.o ../licence.o ../bitmap.o ../channels.o ../pstcache.o ../ssl.o
LDFLAGS = -lvga -lcrypto
Index: svgawin.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/uiports/svgawin.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** svgawin.c 6 Jun 2007 04:38:29 -0000 1.6
--- svgawin.c 6 Jun 2007 05:59:53 -0000 1.7
***************
*** 41,45 ****
int g_height = 600;
int g_width = 800;
! int g_server_bpp = 8;
int g_encryption = 1;
int g_desktop_save = 1;
--- 41,45 ----
int g_height = 600;
int g_width = 800;
! int g_server_depth = 8;
int g_encryption = 1;
int g_desktop_save = 1;
***************
*** 55,58 ****
--- 55,59 ----
int g_keyboard_subtype = 0x0; /* Defaults to US keyboard layout */
int g_keyboard_functionkeys = 0xc; /* Defaults to US keyboard layout */
+ RD_BOOL g_numlock_sync = False;
/* hack globals */
***************
*** 409,413 ****
{
s = data;
! d = get_ptr(x, y, sdata, g_width, g_server_bpp);
for (i = 0; i < cy; i++)
{
--- 410,414 ----
{
s = data;
! d = get_ptr(x, y, sdata, g_width, g_server_depth);
for (i = 0; i < cy; i++)
{
***************
*** 448,452 ****
for (i = 0; i < cx; i++)
((uint16*)temp)[i] = color;
! d = get_ptr(x, y, sdata, g_width, g_server_bpp);
for (i = 0; i < cy; i++)
{
--- 449,453 ----
for (i = 0; i < cx; i++)
((uint16*)temp)[i] = color;
! d = get_ptr(x, y, sdata, g_width, g_server_depth);
for (i = 0; i < cy; i++)
{
***************
*** 488,493 ****
if (srcy < y)
{ // bottom to top
! s = get_ptr(srcx, (srcy + cy) - 1, sdata, g_width, g_server_bpp);
! d = get_ptr(x, (y + cy) - 1, sdata, g_width, g_server_bpp);
for (i = 0; i < cy; i++) // copy down
{
--- 489,494 ----
if (srcy < y)
{ // bottom to top
! s = get_ptr(srcx, (srcy + cy) - 1, sdata, g_width, g_server_depth);
! d = get_ptr(x, (y + cy) - 1, sdata, g_width, g_server_depth);
for (i = 0; i < cy; i++) // copy down
{
***************
*** 499,504 ****
else if (srcy > y || srcx > x) // copy up or left
{ // top to bottom
! s = get_ptr(srcx, srcy, sdata, g_width, g_server_bpp);
! d = get_ptr(x, y, sdata, g_width, g_server_bpp);
for (i = 0; i < cy; i++)
{
--- 500,505 ----
else if (srcy > y || srcx > x) // copy up or left
{ // top to bottom
! s = get_ptr(srcx, srcy, sdata, g_width, g_server_depth);
! d = get_ptr(x, y, sdata, g_width, g_server_depth);
for (i = 0; i < cy; i++)
{
***************
*** 510,515 ****
else // copy straight right
{
! s = get_ptr(srcx, srcy, sdata, g_width, g_server_bpp);
! d = get_ptr(x, y, sdata, g_width, g_server_bpp);
for (i = 0; i < cy; i++)
{
--- 511,516 ----
else // copy straight right
{
! s = get_ptr(srcx, srcy, sdata, g_width, g_server_depth);
! d = get_ptr(x, y, sdata, g_width, g_server_depth);
for (i = 0; i < cy; i++)
{
***************
*** 529,535 ****
temp = (uint8*)xmalloc(cx * cy * g_server_Bpp);
for (i = 0; i < cy; i++)
! vga_getscansegment(get_ptr(0, i, temp, cx, g_server_bpp), srcx, srcy + i, cx * g_server_Bpp);
for (i = 0; i < cy; i++)
! vga_drawscansegment(get_ptr(0, i, temp, cx, g_server_bpp), x, y + i, cx * g_server_Bpp);
xfree(temp);
}
--- 530,536 ----
temp = (uint8*)xmalloc(cx * cy * g_server_Bpp);
for (i = 0; i < cy; i++)
! vga_getscansegment(get_ptr(0, i, temp, cx, g_server_depth), srcx, srcy + i, cx * g_server_Bpp);
for (i = 0; i < cy; i++)
! vga_drawscansegment(get_ptr(0, i, temp, cx, g_server_depth), x, y + i, cx * g_server_Bpp);
xfree(temp);
}
***************
*** 591,595 ****
for (i = 0; i < cy; i++)
{
! copy_mem(p, get_ptr(x, y + i, sdata, g_width, g_server_bpp), cx * g_server_Bpp);
p = p + cx * g_server_Bpp;
}
--- 592,596 ----
for (i = 0; i < cy; i++)
{
! copy_mem(p, get_ptr(x, y + i, sdata, g_width, g_server_depth), cx * g_server_Bpp);
p = p + cx * g_server_Bpp;
}
***************
*** 638,642 ****
for (i = 0; i < 32; i++)
{
! ptr = get_ptr(k, i, mouse_under, 32, g_server_bpp);
len = (j - k) * g_server_Bpp;
if (ox + k >= 0 && oy + i >= 0 && ox + k < g_width && oy + i < g_height)
--- 639,643 ----
for (i = 0; i < 32; i++)
{
! ptr = get_ptr(k, i, mouse_under, 32, g_server_depth);
len = (j - k) * g_server_Bpp;
if (ox + k >= 0 && oy + i >= 0 && ox + k < g_width && oy + i < g_height)
***************
*** 666,670 ****
{
pixel = get_pixel(mousex + j, mousey + i);
! set_pixel2(j, i, pixel, mouse_under, 32, g_server_bpp);
if (mcursor.andmask[i * 32 + j] == 0)
k = 0;
--- 667,671 ----
{
pixel = get_pixel(mousex + j, mousey + i);
! set_pixel2(j, i, pixel, mouse_under, 32, g_server_depth);
if (mcursor.andmask[i * 32 + j] == 0)
k = 0;
***************
*** 677,681 ****
k = ~0;
pixel = rop(0x6, k, pixel);
! set_pixel2(j, i, pixel, mouse_a, 32, g_server_bpp);
}
}
--- 678,682 ----
k = ~0;
pixel = rop(0x6, k, pixel);
! set_pixel2(j, i, pixel, mouse_a, 32, g_server_depth);
}
}
***************
*** 692,696 ****
if (i < g_height && i >= 0)
{
! ptr = get_ptr(k, i - mousey, mouse_a, 32, g_server_bpp);
len = (j - k) * g_server_Bpp;
vga_drawscansegment(ptr, mousex + k, i, len);
--- 693,697 ----
if (i < g_height && i >= 0)
{
! ptr = get_ptr(k, i - mousey, mouse_a, 32, g_server_depth);
len = (j - k) * g_server_Bpp;
vga_drawscansegment(ptr, mousex + k, i, len);
***************
*** 757,761 ****
while (rect != 0)
{
! p = get_ptr(rect->x, rect->y, sdata, g_width, g_server_bpp);
for (i = 0; i < rect->cy; i++)
{
--- 758,762 ----
while (rect != 0)
{
! p = get_ptr(rect->x, rect->y, sdata, g_width, g_server_depth);
for (i = 0; i < rect->cy; i++)
{
***************
*** 1127,1131 ****
/*****************************************************************************/
! void ui_destroy_colourmap(HCOLOURMAP map)
{
if (colmap == map)
--- 1128,1132 ----
/*****************************************************************************/
! void ui_destroy_colourmap(RD_HCOLOURMAP map)
{
if (colmap == map)
***************
*** 1144,1148 ****
/*****************************************************************************/
! HBITMAP ui_create_bitmap(int width, int height, uint8* data)
{
bitmap* b;
--- 1145,1149 ----
/*****************************************************************************/
! RD_HBITMAP ui_create_bitmap(int width, int height, uint8* data)
{
bitmap* b;
***************
*** 1158,1162 ****
//*****************************************************************************
! void draw_glyph (int x, int y, HGLYPH glyph, int fgcolour)
{
bitmap* the_glyph;
--- 1159,1163 ----
//*****************************************************************************
! void draw_glyph (int x, int y, RD_HGLYPH glyph, int fgcolour)
{
bitmap* the_glyph;
***************
*** 1378,1382 ****
/*****************************************************************************/
void ui_triblt(uint8 opcode, int x, int y, int cx, int cy,
! HBITMAP src, int srcx, int srcy,
BRUSH* brush, int bgcolour, int fgcolour)
{
--- 1379,1383 ----
/*****************************************************************************/
void ui_triblt(uint8 opcode, int x, int y, int cx, int cy,
! RD_HBITMAP src, int srcx, int srcy,
BRUSH* brush, int bgcolour, int fgcolour)
{
***************
*** 1386,1390 ****
/*****************************************************************************/
void ui_memblt(uint8 opcode, int x, int y, int cx, int cy,
! HBITMAP src, int srcx, int srcy)
{
bitmap* b;
--- 1387,1391 ----
/*****************************************************************************/
void ui_memblt(uint8 opcode, int x, int y, int cx, int cy,
! RD_HBITMAP src, int srcx, int srcy)
{
bitmap* b;
***************
*** 1399,1403 ****
b = (bitmap*)src;
if (opcode == 0xc)
! accel_draw_box(x, y, cx, cy, get_ptr(srcx, srcy, b->data, b->width, g_server_bpp),
b->width * g_server_Bpp);
else
--- 1400,1404 ----
b = (bitmap*)src;
if (opcode == 0xc)
! accel_draw_box(x, y, cx, cy, get_ptr(srcx, srcy, b->data, b->width, g_server_depth),
b->width * g_server_Bpp);
else
***************
*** 1407,1411 ****
for (j = 0; j < cx; j++)
{
! pixel = get_pixel2(srcx + j, srcy + i, b->data, b->width, g_server_bpp);
set_pixel(x + j, y + i, pixel, opcode);
}
--- 1408,1412 ----
for (j = 0; j < cx; j++)
{
! pixel = get_pixel2(srcx + j, srcy + i, b->data, b->width, g_server_depth);
set_pixel(x + j, y + i, pixel, opcode);
}
***************
*** 1477,1484 ****
for (i = 0; i < cy; i++)
for (j = 0; j < cx; j++)
! set_pixel2(j, i, get_pixel(srcx + j, srcy + i), temp, cx, g_server_bpp);
for (i = 0; i < cy; i++)
for (j = 0; j < cx; j++)
! set_pixel(x + j, y + i, get_pixel2(j, i, temp, cx, g_server_bpp), opcode);
xfree(temp);
}
--- 1478,1485 ----
for (i = 0; i < cy; i++)
for (j = 0; j < cx; j++)
! set_pixel2(j, i, get_pixel(srcx + j, srcy + i), temp, cx, g_server_depth);
for (i = 0; i < cy; i++)
for (j = 0; j < cx; j++)
! set_pixel(x + j, y + i, get_pixel2(j, i, temp, cx, g_server_depth), opcode);
xfree(temp);
}
***************
*** 1647,1651 ****
/*****************************************************************************/
! void ui_polygon(uint8 opcode, uint8 fillmode, POINT * point, int npoints,
BRUSH * brush, int bgcolour, int fgcolour)
{
--- 1648,1652 ----
/*****************************************************************************/
! void ui_polygon(uint8 opcode, uint8 fillmode, RD_POINT * point, int npoints,
BRUSH * brush, int bgcolour, int fgcolour)
{
***************
*** 1653,1657 ****
/*****************************************************************************/
! void ui_polyline(uint8 opcode, POINT * points, int npoints, PEN * pen)
{
}
--- 1654,1658 ----
/*****************************************************************************/
! void ui_polyline(uint8 opcode, RD_POINT * points, int npoints, PEN * pen)
{
}
***************
*** 1917,1927 ****
else if (strcmp(in_argv[i], "-a") == 0)
{
! g_server_bpp = strtol(in_argv[i + 1], NULL, 10);
! if (g_server_bpp != 8 && g_server_bpp != 16)
{
error("invalid server bpp\n");
return 0;
}
! g_server_Bpp = (g_server_bpp + 7) / 8;
}
else if (strcmp(in_argv[i], "-l") == 0)
--- 1918,1928 ----
else if (strcmp(in_argv[i], "-a") == 0)
{
! g_server_depth = strtol(in_argv[i + 1], NULL, 10);
! if (g_server_depth != 8 && g_server_depth != 16)
{
error("invalid server bpp\n");
return 0;
}
! g_server_Bpp = (g_server_depth + 7) / 8;
}
else if (strcmp(in_argv[i], "-l") == 0)
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/