mirrors/FreeRDP
0
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2024-11-27 20:04:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

xfreerdp: fix usage of new DEBUG_ macroses for RAIL and X11 Client.

Browse Source
This commit is contained in:
roman-b 2011-09-03 19:50:26 +03:00
parent f44798230b
commit 69b4b0318c
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/X11/xf_event.c
View File

@ -486,10 +486,9 @@ boolean xf_event_process(freerdp* instance, XEvent* event)
app = True; app = True;
} }
#if WITH_DEBUG_X11
if (event->type != MotionNotify) if (event->type != MotionNotify)
DEBUG_X11("%s Event: wnd=0x%04X", X11_EVENT_STRINGS[event->type], (uint32) event->xany.window); DEBUG_X11("%s Event: wnd=0x%04X", X11_EVENT_STRINGS[event->type], (uint32) event->xany.window);
#endif
switch (event->type) switch (event->type)
{ {

10
client/X11/xf_rail.c
View File

@ -333,16 +333,15 @@ void xf_process_rail_server_minmaxinfo_event(xfInfo* xfi, rdpChanMan* chanman, R
xfWindow * window = NULL; xfWindow * window = NULL;
window = (xfWindow *) rail_window->extra; window = (xfWindow *) rail_window->extra;
printf("Server Min Max Info PDU: windowId=0x%X " DEBUG_X11("windowId=0x%X maxWidth=%d maxHeight=%d maxPosX=%d maxPosY=%d "
"maxWidth=%d maxHeight=%d maxPosX=%d maxPosY=%d " "minTrackWidth=%d minTrackHeight=%d maxTrackWidth=%d maxTrackHeight=%d",
"minTrackWidth=%d minTrackHeight=%d maxTrackWidth=%d maxTrackHeight=%d\n",
minmax->windowId, minmax->maxWidth, minmax->maxHeight, minmax->windowId, minmax->maxWidth, minmax->maxHeight,
(sint16)minmax->maxPosX, (sint16)minmax->maxPosY, (sint16)minmax->maxPosX, (sint16)minmax->maxPosY,
minmax->minTrackWidth, minmax->minTrackHeight, minmax->minTrackWidth, minmax->minTrackHeight,
minmax->maxTrackWidth, minmax->maxTrackHeight); minmax->maxTrackWidth, minmax->maxTrackHeight);
xf_SetWindowMinMaxInfo(xfi, window, minmax->maxWidth, minmax->maxHeight, minmax->maxPosX, minmax->maxPosY, xf_SetWindowMinMaxInfo(xfi, window, minmax->maxWidth, minmax->maxHeight, minmax->maxPosX, minmax->maxPosY,
minmax->minTrackWidth, minmax->minTrackHeight, minmax->maxTrackWidth, minmax->maxTrackHeight); minmax->minTrackWidth, minmax->minTrackHeight, minmax->maxTrackWidth, minmax->maxTrackHeight);
} }
} }
@ -374,8 +373,7 @@ void xf_process_rail_server_localmovesize_event(xfInfo* xfi, rdpChanMan* chanman
xfWindow * window = NULL; xfWindow * window = NULL;
window = (xfWindow *) rail_window->extra; window = (xfWindow *) rail_window->extra;
printf("Server Local MoveSize PDU: windowId=0x%X " DEBUG_X11("windowId=0x%X isMoveSizeStart=%d moveSizeType=%s PosX=%d PosY=%d",
"isMoveSizeStart=%d moveSizeType=%s PosX=%d PosY=%d\n",
movesize->windowId, movesize->isMoveSizeStart, movesize->windowId, movesize->isMoveSizeStart,
movetype_names[movesize->moveSizeType], (sint16)movesize->posX, (sint16)movesize->posY); movetype_names[movesize->moveSizeType], (sint16)movesize->posX, (sint16)movesize->posY);

2
cmake/ConfigOptions.cmake
View File

@ -9,6 +9,8 @@ option(WITH_DEBUG_CERTIFICATE "Print certificate related debug messages." OFF)
option(WITH_DEBUG_LICENSE "Print license debug messages." OFF) option(WITH_DEBUG_LICENSE "Print license debug messages." OFF)
option(WITH_DEBUG_GDI "Print graphics debug messages." OFF) option(WITH_DEBUG_GDI "Print graphics debug messages." OFF)
option(WITH_DEBUG_RFX "Print RemoteFX debug messages." OFF) option(WITH_DEBUG_RFX "Print RemoteFX debug messages." OFF)
option(WITH_DEBUG_X11 "Print X11 Client debug messages" OFF)
option(WITH_DEBUG_RAIL "Print RemoteApp debug messages" OFF)
option(WITH_MANPAGES "Generate manpages." ON) option(WITH_MANPAGES "Generate manpages." ON)
option(WITH_PROFILER "Compile profiler." OFF) option(WITH_PROFILER "Compile profiler." OFF)
option(WITH_SSE2 "Use SSE2 optimization." OFF) option(WITH_SSE2 "Use SSE2 optimization." OFF)

2
config.h.in
View File

@ -31,5 +31,7 @@
#cmakedefine WITH_DEBUG_RFX #cmakedefine WITH_DEBUG_RFX
#cmakedefine WITH_PROFILER #cmakedefine WITH_PROFILER
#cmakedefine WITH_SSE2 #cmakedefine WITH_SSE2
#cmakedefine WITH_DEBUG_X11
#cmakedefine WITH_DEBUG_RAIL
#endif #endif

2
libfreerdp-rail/window.c
View File

@ -143,7 +143,7 @@ void window_state_update(rdpWindow* window, WINDOW_ORDER_INFO* orderInfo, WINDOW
DEBUG_RAIL("ownerWindowId:0x%08X", window->ownerWindowId); DEBUG_RAIL("ownerWindowId:0x%08X", window->ownerWindowId);
} }
DEBUG_RAIL("window_state_update: windowId=0x%X ownerWindowId=0x%X\n", DEBUG_RAIL("windowId=0x%X ownerWindowId=0x%X",
window->windowId, window->ownerWindowId); window->windowId, window->ownerWindowId);
if (orderInfo->fieldFlags & WINDOW_ORDER_FIELD_STYLE) if (orderInfo->fieldFlags & WINDOW_ORDER_FIELD_STYLE)