mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:FreeRDP/FreeRDP

Browse Source
This commit is contained in:
Marc-André Moreau 2011-11-08 23:26:53 -05:00
commit a67096243b
7 changed files with 99 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitignore vendored
View File

@ -1,5 +1,4 @@
# CMake
*.cmake
CMakeFiles/
CMakeCache.txt
config.h
@ -7,6 +6,12 @@ install_manifest.txt
CTestTestfile.cmake
freerdp.pc
*.cmake
/**/*.cmake
/**/**/*.cmake
/**/**/**/*.cmake
/**/**/**/**/*.cmake
# Make
Makefile

48
cmake/FindXdamage.cmake Normal file
View File

@ -0,0 +1,48 @@
# - Find XDAMAGE
# Find the XDAMAGE libraries
#
# This module defines the following variables:
# XDAMAGE_FOUND - True if XDAMAGE_INCLUDE_DIR & XDAMAGE_LIBRARY are found
# XDAMAGE_LIBRARIES - Set when XDAMAGE_LIBRARY is found
# XDAMAGE_INCLUDE_DIRS - Set when XDAMAGE_INCLUDE_DIR is found
#
# XDAMAGE_INCLUDE_DIR - where to find Xdamage.h, etc.
# XDAMAGE_LIBRARY - the XDAMAGE library
#
#=============================================================================
# Copyright 2011 O.S. Systems Software Ltda.
# Copyright 2011 Otavio Salvador <otavio@ossystems.com.br>
# Copyright 2011 Marc-Andre Moreau <marcandre.moreau@gmail.com>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#=============================================================================
find_path(XDAMAGE_INCLUDE_DIR NAMES Xdamage.h
PATH_SUFFIXES X11/extensions
DOC "The Xdamage include directory"
)
find_library(XDAMAGE_LIBRARY NAMES Xdamage
DOC "The Xdamage library"
)
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(XDAMAGE DEFAULT_MSG XDAMAGE_LIBRARY XDAMAGE_INCLUDE_DIR)
if(XDAMAGE_FOUND)
set( XDAMAGE_LIBRARIES ${XDAMAGE_LIBRARY} )
set( XDAMAGE_INCLUDE_DIRS ${XDAMAGE_INCLUDE_DIR} )
endif()
mark_as_advanced(XDAMAGE_INCLUDE_DIR XDAMAGE_LIBRARY)

3
libfreerdp-codec/nsc.c
View File

@ -264,7 +264,8 @@ void nsc_rle_decode(STREAM* in, STREAM* out, uint32 origsz)
void nsc_rle_decompress_data(NSC_CONTEXT* context)
{
STREAM* rles;
uint16 i, origsize;
uint16 i;
uint32 origsize;
rles = stream_new(0);
rles->p = rles->data = context->nsc_stream->pdata->p;
rles->size = context->nsc_stream->pdata->size;

4
libfreerdp-core/capabilities.c
View File

@ -232,6 +232,8 @@ void rdp_write_bitmap_capability_set(STREAM* s, rdpSettings* settings)
desktopResizeFlag = settings->desktop_resize;
printf("desktop width:%d height:%d\n", settings->width, settings->height);
stream_write_uint16(s, preferredBitsPerPixel); /* preferredBitsPerPixel (2 bytes) */
stream_write_uint16(s, 1); /* receive1BitPerPixel (2 bytes) */
stream_write_uint16(s, 1); /* receive4BitsPerPixel (2 bytes) */
@ -1779,7 +1781,7 @@ boolean rdp_recv_demand_active(rdpRdp* rdp, STREAM* s)
/* capabilitySets */
if (!rdp_read_capability_sets(s, rdp->settings, numberCapabilities))
{
printf("rdp_read_capability_sets failes\n");
printf("rdp_read_capability_sets failed\n");
return False;
}

7
server/X11/CMakeLists.txt
View File

@ -31,6 +31,13 @@ if(XEXT_FOUND)
target_link_libraries(xfreerdp-server ${XEXT_LIBRARIES})
endif()
find_suggested_package(Xdamage)
if(XDAMAGE_FOUND)
add_definitions(-DWITH_XDAMAGE)
include_directories(${XDAMAGE_INCLUDE_DIRS})
target_link_libraries(xfreerdp-server ${XDAMAGE_LIBRARIES})
endif()
target_link_libraries(xfreerdp-server freerdp-core)
target_link_libraries(xfreerdp-server freerdp-codec)
target_link_libraries(xfreerdp-server freerdp-utils)

63
server/X11/xf_peer.c
View File

@ -25,6 +25,10 @@
#include <X11/Xutil.h>
#include <sys/select.h>
#ifdef WITH_XDAMAGE
#include <X11/extensions/Xdamage.h>
#endif
#include <freerdp/utils/sleep.h>
#include <freerdp/utils/memory.h>
#include <freerdp/utils/thread.h>
@ -43,6 +47,8 @@ xfInfo* xf_info_init()
xfInfo* xfi;
int pf_count;
int vi_count;
int damage_event;
int damage_error;
XVisualInfo* vi;
XVisualInfo* vis;
XVisualInfo template;
@ -114,6 +120,9 @@ xfInfo* xf_info_init()
xfi->clrconv->invert = 1;
xfi->clrconv->alpha = 1;
XSelectInput(xfi->display, DefaultRootWindow(xfi->display), SubstructureNotifyMask);
XDamageQueryExtension(xfi->display, &damage_event, &damage_error);
return xfi;
}
@ -122,8 +131,8 @@ void xf_peer_context_new(freerdp_peer* client, xfPeerContext* context)
context->info = xf_info_init();
context->rfx_context = rfx_context_new();
context->rfx_context->mode = RLGR3;
context->rfx_context->width = client->settings->width;
context->rfx_context->height = client->settings->height;
context->rfx_context->width = context->info->width;
context->rfx_context->height = context->info->height;
rfx_context_set_pixel_format(context->rfx_context, RFX_PIXEL_FORMAT_RGB);
context->s = stream_new(65536);
@ -156,17 +165,13 @@ STREAM* xf_peer_stream_init(xfPeerContext* context)
void xf_peer_live_rfx(freerdp_peer* client)
{
int x, y;
STREAM* s;
int width;
int height;
int wrects;
int hrects;
int nrects;
uint8* data;
xfInfo* xfi;
XImage* image;
RFX_RECT* rects;
RFX_RECT rect;
uint32 seconds;
uint32 useconds;
rdpUpdate* update;
@ -180,26 +185,8 @@ void xf_peer_live_rfx(freerdp_peer* client)
xfi = (xfInfo*) xfp->info;
cmd = &update->surface_bits_command;
wrects = 16;
hrects = 12;
nrects = wrects * hrects;
rects = xmalloc(sizeof(RFX_RECT) * nrects);
for (y = 0; y < hrects; y++)
{
for (x = 0; x < wrects; x++)
{
rects[(y * wrects) + x].x = x * 64;
rects[(y * wrects) + x].y = y * 64;
rects[(y * wrects) + x].width = 64;
rects[(y * wrects) + x].height = 64;
}
}
width = wrects * 64;
height = hrects * 64;
width = xfi->width;
height = xfi->height;
data = (uint8*) xmalloc(width * height * 3);
while (1)
@ -214,7 +201,12 @@ void xf_peer_live_rfx(freerdp_peer* client)
image = xf_snapshot(xfi, 0, 0, width, height);
freerdp_image_convert((uint8*) image->data, data, width, height, 32, 24, xfi->clrconv);
rfx_compose_message(xfp->rfx_context, s, rects, nrects, data, width, height, 64 * wrects * 3);
rect.x = 0;
rect.y = 0;
rect.width = width;
rect.height = height;
rfx_compose_message(xfp->rfx_context, s, &rect, 1, data, width, height, width * 3);
cmd->destLeft = 0;
cmd->destTop = 0;
@ -234,7 +226,7 @@ static boolean xf_peer_sleep_tsdiff(uint32 *old_sec, uint32 *old_usec, uint32 ne
{
sint32 sec, usec;
if (*old_sec==0 && *old_usec==0)
if (*old_sec == 0 && *old_usec == 0)
{
*old_sec = new_sec;
*old_usec = new_usec;
@ -244,7 +236,7 @@ static boolean xf_peer_sleep_tsdiff(uint32 *old_sec, uint32 *old_usec, uint32 ne
sec = new_sec - *old_sec;
usec = new_usec - *old_usec;
if (sec<0 || (sec==0 && usec<0))
if (sec < 0 || (sec == 0 && usec < 0))
{
printf("Invalid time stamp detected.\n");
return False;
@ -307,6 +299,12 @@ void xf_peer_dump_rfx(freerdp_peer* client)
boolean xf_peer_post_connect(freerdp_peer* client)
{
xfInfo* xfi;
xfPeerContext* xfp;
xfp = (xfPeerContext*) client->context;
xfi = (xfInfo*) xfp->info;
/**
* This callback is called when the entire connection sequence is done, i.e. we've received the
* Font List PDU from the client and sent out the Font Map PDU.
@ -329,6 +327,11 @@ boolean xf_peer_post_connect(freerdp_peer* client)
/* A real server should tag the peer as activated here and start sending updates in mainloop. */
client->settings->width = xfi->width;
client->settings->height = xfi->height;
client->update->DesktopResize(client->update);
xfp->activated = False;
/* Return False here would stop the execution of the peer mainloop. */
return True;
}

1
server/X11/xfreerdp.c
View File

@ -17,7 +17,6 @@
* limitations under the License.
*/
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>