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

include: restructuring and cleanup of header files

Browse Source
This commit is contained in:
Marc-André Moreau 2011-08-15 14:33:04 -04:00
parent 28e87ceb1c
commit 9961038649
81 changed files with 108 additions and 299 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/DirectFB/CMakeLists.txt
View File

@ -17,10 +17,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
include_directories(../../libfreerdp-gdi)
include_directories(../../libfreerdp-kbd)
include_directories(../../libfreerdp-core)
include_directories(../../libfreerdp-cache)
include_directories(${DIRECTFB_INCLUDE_DIRS})
add_executable(dfreerdp

4
client/DirectFB/df_event.c
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#include "keyboard.h"
#include <freerdp/kbd.h>
#include <freerdp/kbd/kbd.h>
#include <freerdp/kbd/vkcodes.h>
#include "df_event.h"

4
client/DirectFB/dfreerdp.h
View File

@ -20,13 +20,13 @@
#ifndef __DFREERDP_H
#define __DFREERDP_H
#include "gdi.h"
#include <stdio.h>
#include <unistd.h>
#include <string.h>
#include <directfb.h>
#include <freerdp/freerdp.h>
#include <freerdp/chanman.h>
#include <freerdp/chanman/chanman.h>
#include <freerdp/gdi/gdi.h>
#define SET_DFI(_instance, _dfi) (_instance)->param1 = _dfi
#define GET_DFI(_instance) ((dfInfo*) ((_instance)->param1))

4
client/X11/CMakeLists.txt
View File

@ -17,10 +17,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
include_directories(../../libfreerdp-gdi)
include_directories(../../libfreerdp-kbd)
include_directories(../../libfreerdp-core)
include_directories(../../libfreerdp-cache)
include_directories(${X11_INCLUDE_DIRS})
add_executable(xfreerdp

4
client/X11/xf_event.c
View File

@ -17,8 +17,8 @@
* limitations under the License.
*/
#include "keyboard.h"
#include <freerdp/kbd.h>
#include <freerdp/kbd/kbd.h>
#include <freerdp/kbd/vkcodes.h>
#include "xf_event.h"

4
client/X11/xf_keyboard.c
View File

@ -24,8 +24,8 @@
#include <X11/Xutil.h>
#include <X11/keysym.h>
#include "keyboard.h"
#include <freerdp/kbd.h>
#include <freerdp/kbd/kbd.h>
#include <freerdp/kbd/vkcodes.h>
#include "xf_keyboard.h"

4
client/X11/xfreerdp.h
View File

@ -20,11 +20,11 @@
#ifndef __XFREERDP_H
#define __XFREERDP_H
#include "gdi.h"
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <freerdp/freerdp.h>
#include <freerdp/chanman.h>
#include <freerdp/chanman/chanman.h>
#include <freerdp/gdi/gdi.h>
typedef struct xf_info xfInfo;

4
client/test/CMakeLists.txt
View File

@ -17,10 +17,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
include_directories(../../libfreerdp-gdi)
include_directories(../../libfreerdp-core)
include_directories(../../libfreerdp-cache)
add_executable(freerdp-test
freerdp.c)

4
client/test/freerdp.c
View File

@ -17,19 +17,19 @@
* limitations under the License.
*/
#include "gdi.h"
#include <errno.h>
#include <pthread.h>
#include <stdio.h>
#include <unistd.h>
#include <string.h>
#include <sys/select.h>
#include <freerdp/gdi/gdi.h>
#include <freerdp/utils/args.h>
#include <freerdp/utils/memory.h>
#include <freerdp/utils/semaphore.h>
#include <freerdp/utils/event.h>
#include <freerdp/constants.h>
#include <freerdp/chanman.h>
#include <freerdp/chanman/chanman.h>
#include <freerdp/plugins/cliprdr.h>
#define SET_TFI(_instance, _tfi) (_instance)->param1 = _tfi

2
cunit/test_chanman.c
View File

@ -22,7 +22,7 @@
#include <stdlib.h>
#include <freerdp/freerdp.h>
#include <freerdp/constants.h>
#include <freerdp/chanman.h>
#include <freerdp/chanman/chanman.h>
#include <freerdp/utils/event.h>
#include "test_chanman.h"

2
cunit/test_cliprdr.c
View File

@ -22,7 +22,7 @@
#include <stdlib.h>
#include <freerdp/freerdp.h>
#include <freerdp/constants.h>
#include <freerdp/chanman.h>
#include <freerdp/chanman/chanman.h>
#include <freerdp/utils/event.h>
#include <freerdp/utils/hexdump.h>
#include <freerdp/utils/memory.h>

4
cunit/test_color.c
View File

@ -20,8 +20,8 @@
#include <stdio.h>
#include <stdlib.h>
#include <freerdp/freerdp.h>
#include "gdi.h"
#include "color.h"
#include <freerdp/gdi/gdi.h>
#include <freerdp/gdi/color.h>
#include "test_color.h"
int init_color_suite(void)

2
cunit/test_drdynvc.c
View File

@ -22,7 +22,7 @@
#include <stdlib.h>
#include <freerdp/freerdp.h>
#include <freerdp/constants.h>
#include <freerdp/chanman.h>
#include <freerdp/chanman/chanman.h>
#include <freerdp/utils/event.h>
#include <freerdp/utils/hexdump.h>
#include <freerdp/utils/memory.h>

3
cunit/test_libgdi.c
View File

@ -22,7 +22,8 @@
#include <stdlib.h>
#include <freerdp/freerdp.h>
#include "gdi.h"
#include <freerdp/gdi/gdi.h>
#include "gdi_dc.h"
#include "gdi_pen.h"
#include "gdi_line.h"

2
cunit/test_librfx.c
View File

@ -28,7 +28,7 @@
#include <freerdp/types.h>
#include <freerdp/utils/memory.h>
#include <freerdp/utils/hexdump.h>
#include <freerdp/rfx.h>
#include <freerdp/rfx/rfx.h>
#include "rfx_types.h"
#include "rfx_bitstream.h"
#include "rfx_rlgr.h"

0
libfreerdp-cache/bitmap_v2.h → include/freerdp/cache/bitmap_v2.h vendored
View File

0
libfreerdp-cache/brush.h → include/freerdp/cache/brush.h vendored
View File

8
libfreerdp-cache/cache.h → include/freerdp/cache/cache.h vendored
View File

@ -20,10 +20,10 @@
#ifndef __CACHE_H
#define __CACHE_H
#include "brush.h"
#include "bitmap_v2.h"
#include "offscreen.h"
#include "color_table.h"
#include <freerdp/cache/brush.h>
#include <freerdp/cache/bitmap_v2.h>
#include <freerdp/cache/offscreen.h>
#include <freerdp/cache/color_table.h>
#include <freerdp/types.h>
#include <freerdp/utils/stream.h>

0
libfreerdp-cache/color_table.h → include/freerdp/cache/color_table.h vendored
View File

0
libfreerdp-cache/offscreen.h → include/freerdp/cache/offscreen.h vendored
View File

0
include/freerdp/chanman.h → include/freerdp/chanman/chanman.h
View File

0
libfreerdp-gdi/color.h → include/freerdp/gdi/color.h
View File

2
libfreerdp-gdi/gdi.h → include/freerdp/gdi/gdi.h
View File

@ -20,7 +20,7 @@
#ifndef __GDI_H
#define __GDI_H
#include "cache.h"
#include <freerdp/cache/cache.h>
#include "color.h"
#include <freerdp/freerdp.h>
#include <freerdp/utils/debug.h>

0
include/freerdp/kbd.h → include/freerdp/kbd/kbd.h
View File

9
libfreerdp-kbd/layout_ids.h → include/freerdp/kbd/layouts.h
View File

@ -22,7 +22,7 @@
#ifndef __LAYOUT_IDS_H
#define __LAYOUT_IDS_H
#include <freerdp/kbd.h>
#include <freerdp/kbd/kbd.h>
/* Keyboard layout IDs */
@ -177,10 +177,7 @@
#define KBD_CHINESE_TRADITIONAL_MICROSOFT_PINYIN_IME_3 0xE00E0804
#define KBD_CHINESE_TRADITIONAL_ALPHANUMERIC 0xE00F0404
rdpKeyboardLayout *
get_keyboard_layouts(int types);
char *
get_layout_name(unsigned int keyboardLayoutID);
rdpKeyboardLayout* get_keyboard_layouts(int types);
char* get_layout_name(unsigned int keyboardLayoutID);
#endif

0
libfreerdp-kbd/locales.h → include/freerdp/kbd/locales.h
View File

9
libfreerdp-kbd/keyboard.h → include/freerdp/kbd/vkcodes.h
View File

@ -19,12 +19,11 @@
/* Microsoft Windows Virtual Key Codes: http://msdn.microsoft.com/en-us/library/ms645540.aspx */
#ifndef __KEYBOARD_H
#define __KEYBOARD_H
#ifndef __VKCODES_H
#define __VKCODES_H
#include <stddef.h>
#include "layout_ids.h"
#include <freerdp/kbd/layouts.h>
/* Mouse buttons */
@ -584,4 +583,4 @@ static const virtualKey virtualKeyboard[256 + 2] =
{ 0x1C, 1, "" , "KPEN" },
};
#endif /* __KEYBOARD_H */
#endif /* __VKCODES_H */

158
include/freerdp/rail.h
View File

@ -309,173 +309,19 @@ enum FRDP_EVENT_TYPE_RAIL
/* RAIL Common structures */
// Events from 'rail' vchannel plugin to UI
enum RAIL_VCHANNEL_EVENT
{
RAIL_VCHANNEL_EVENT_SESSION_ESTABLISHED = 1,
RAIL_VCHANNEL_EVENT_EXEC_RESULT_RETURNED,
RAIL_VCHANNEL_EVENT_SERVER_SYSPARAM_RECEIVED,
RAIL_VCHANNEL_EVENT_MOVESIZE_STARTED,
RAIL_VCHANNEL_EVENT_MOVESIZE_FINISHED,
RAIL_VCHANNEL_EVENT_MINMAX_INFO_UPDATED,
RAIL_VCHANNEL_EVENT_LANGBAR_STATUS_UPDATED,
RAIL_VCHANNEL_EVENT_APP_RESPONSE_RECEIVED
};
typedef struct _RAIL_VCHANNEL_EVENT
{
uint32 event_id;
union
{
struct
{
uint16 flags;
uint16 exec_result;
uint32 raw_result;
const char* exe_or_file;
} exec_result_info;
struct
{
uint32 param_type;
boolean screen_saver_enabled;
boolean screen_saver_lock_enabled;
} server_param_info;
struct
{
uint32 window_id;
uint16 move_size_type;
uint16 pos_x;
uint16 pos_y;
} movesize_info;
struct
{
uint32 window_id;
uint16 max_width;
uint16 max_height;
uint16 max_pos_x;
uint16 max_pos_y;
uint16 min_track_width;
uint16 min_track_height;
uint16 max_track_width;
uint16 max_track_height;
} minmax_info;
struct
{
uint32 status;
} langbar_info;
struct
{
uint32 window_id;
const char* application_id;
} app_response_info;
}param;
void* param;
}
RAIL_VCHANNEL_EVENT;
// Events from UI to 'rail' vchannel plugin
enum RAIL_UI_EVENT
{
RAIL_UI_EVENT_UPDATE_CLIENT_SYSPARAM = 1,
RAIL_UI_EVENT_EXECUTE_REMOTE_APP,
RAIL_UI_EVENT_ACTIVATE,
RAIL_UI_EVENT_SYS_COMMAND,
RAIL_UI_EVENT_NOTIFY,
RAIL_UI_EVENT_WINDOW_MOVE,
RAIL_UI_EVENT_SYSTEM_MENU,
RAIL_UI_EVENT_LANGBAR_INFO,
RAIL_UI_EVENT_GET_APP_ID
};
typedef struct _RAIL_UI_EVENT
{
uint32 event_id;
union
{
struct
{
uint32 param;
union
{
boolean full_window_drag_enabled;
boolean menu_access_key_always_underlined;
boolean keyboard_for_user_prefered;
boolean left_right_mouse_buttons_swapped;
RECTANGLE_16 work_area;
RECTANGLE_16 display_resolution;
RECTANGLE_16 taskbar_size;
struct
{
uint32 flags;
const char* color_scheme;
} high_contrast_system_info;
} value;
} sysparam_info;
struct
{
boolean exec_or_file_is_file_path;
const char* exe_or_file;
const char* working_directory;
const char* arguments;
} execute_info;
struct
{
uint32 window_id;
boolean enabled;
} activate_info;
struct
{
uint32 window_id;
uint32 syscommand;
} syscommand_info;
struct
{
uint32 window_id;
uint32 notify_icon_id;
uint32 message;
} notify_info;
struct
{
uint32 window_id;
RECTANGLE_16 new_position;
} window_move_info;
struct
{
uint32 window_id;
uint16 left;
uint16 top;
} system_menu_info;
struct
{
uint32 status;
} langbar_info;
struct
{
uint32 window_id;
} get_app_id_info;
} param;
void* param;
}
RAIL_UI_EVENT;
#endif /* __RAIL_H */

0
include/freerdp/rfx.h → include/freerdp/rfx/rfx.h
View File

7
libfreerdp-cache/CMakeLists.txt
View File

@ -19,15 +19,10 @@
set(FREERDP_CACHE_SRCS
brush.c
brush.h
bitmap_v2.c
bitmap_v2.h
offscreen.c
offscreen.h
color_table.c
color_table.h
cache.c
cache.h)
cache.c)
add_library(freerdp-cache SHARED ${FREERDP_CACHE_SRCS})

2
libfreerdp-cache/bitmap_v2.c
View File

@ -20,7 +20,7 @@
#include <freerdp/utils/stream.h>
#include <freerdp/utils/memory.h>
#include "bitmap_v2.h"
#include <freerdp/cache/bitmap_v2.h>
void* bitmap_v2_get(rdpBitmapV2* bitmap_v2, uint8 id, uint16 index)
{

2
libfreerdp-cache/brush.c
View File

@ -20,7 +20,7 @@
#include <freerdp/utils/stream.h>
#include <freerdp/utils/memory.h>
#include "brush.h"
#include <freerdp/cache/brush.h>
void* brush_get(rdpBrush* brush, uint8 index, uint8* bpp)
{

2
libfreerdp-cache/cache.c
View File

@ -20,7 +20,7 @@
#include <freerdp/utils/stream.h>
#include <freerdp/utils/memory.h>
#include "cache.h"
#include <freerdp/cache/cache.h>
rdpCache* cache_new(rdpSettings* settings)
{

2
libfreerdp-cache/color_table.c
View File

@ -20,7 +20,7 @@
#include <freerdp/utils/stream.h>
#include <freerdp/utils/memory.h>
#include "color_table.h"
#include <freerdp/cache/color_table.h>
void* color_table_get(rdpColorTable* color_table, uint8 index)
{

2
libfreerdp-cache/offscreen.c
View File

@ -20,7 +20,7 @@
#include <freerdp/utils/stream.h>
#include <freerdp/utils/memory.h>
#include "offscreen.h"
#include <freerdp/cache/offscreen.h>
void* offscreen_get(rdpOffscreen* offscreen, uint16 index)
{

2
libfreerdp-chanman/libchanman.c
View File

@ -38,7 +38,7 @@
#include <string.h>
#include <freerdp/freerdp.h>
#include <freerdp/constants.h>
#include <freerdp/chanman.h>
#include <freerdp/chanman/chanman.h>
#include <freerdp/svc.h>
#include <freerdp/utils/memory.h>
#include <freerdp/utils/list.h>

6
libfreerdp-gdi/CMakeLists.txt
View File

@ -17,11 +17,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
include_directories(../libfreerdp-cache)
set(FREERDP_GDI_SRCS
color.c
color.h
gdi_8bpp.c
gdi_8bpp.h
gdi_16bpp.c
@ -48,8 +45,7 @@ set(FREERDP_GDI_SRCS
gdi_region.h
gdi_shape.c
gdi_shape.h
gdi.c
gdi.h)
gdi.c)
add_library(freerdp-gdi SHARED ${FREERDP_GDI_SRCS})

3
libfreerdp-gdi/color.c
View File

@ -21,8 +21,7 @@
#include <string.h>
#include <stdlib.h>
#include <freerdp/freerdp.h>
#include "color.h"
#include <freerdp/gdi/color.h>
uint32 gdi_color_convert_rgb(uint32 srcColor, int srcBpp, int dstBpp, HCLRCONV clrconv)
{

7
libfreerdp-gdi/gdi.c
View File

@ -22,9 +22,8 @@
#include <stdlib.h>
#include <freerdp/freerdp.h>
#include <freerdp/constants.h>
#include <freerdp/rfx.h>
#include "color.h"
#include <freerdp/gdi/color.h>
#include <freerdp/rfx/rfx.h>
#include "gdi_dc.h"
#include "gdi_pen.h"
@ -37,7 +36,7 @@
#include "gdi_drawing.h"
#include "gdi_clipping.h"
#include "gdi.h"
#include <freerdp/gdi/gdi.h>
/* Ternary Raster Operation Table */
const uint32 rop3_code_table[] =

4
libfreerdp-gdi/gdi_16bpp.c
View File

@ -21,9 +21,9 @@
#include <string.h>
#include <stdlib.h>
#include <freerdp/freerdp.h>
#include <freerdp/gdi/gdi.h>
#include <freerdp/gdi/color.h>
#include "gdi.h"
#include "color.h"
#include "gdi_pen.h"
#include "gdi_bitmap.h"
#include "gdi_region.h"

2
libfreerdp-gdi/gdi_16bpp.h
View File

@ -18,7 +18,7 @@
*/
#include <freerdp/freerdp.h>
#include "gdi.h"
#include <freerdp/gdi/gdi.h>
typedef void (*pSetPixel16_ROP2)(uint16 *pixel, uint16 *pen);

4
libfreerdp-gdi/gdi_32bpp.c
View File

@ -21,9 +21,9 @@
#include <string.h>
#include <stdlib.h>
#include <freerdp/freerdp.h>
#include <freerdp/gdi/gdi.h>
#include <freerdp/gdi/color.h>
#include "gdi.h"
#include "color.h"
#include "gdi_pen.h"
#include "gdi_bitmap.h"
#include "gdi_region.h"

2
libfreerdp-gdi/gdi_32bpp.h
View File

@ -18,7 +18,7 @@
*/
#include <freerdp/freerdp.h>
#include "gdi.h"
#include <freerdp/gdi/gdi.h>
typedef void (*pSetPixel32_ROP2)(uint32 *pixel, uint32 *pen);

4
libfreerdp-gdi/gdi_8bpp.c
View File

@ -21,9 +21,9 @@
#include <string.h>
#include <stdlib.h>
#include <freerdp/freerdp.h>
#include <freerdp/gdi/gdi.h>
#include <freerdp/gdi/color.h>
#include "gdi.h"
#include "color.h"
#include "gdi_pen.h"
#include "gdi_bitmap.h"
#include "gdi_region.h"

2
libfreerdp-gdi/gdi_8bpp.h
View File

@ -18,7 +18,7 @@
*/
#include <freerdp/freerdp.h>
#include "gdi.h"
#include <freerdp/gdi/gdi.h>
typedef void (*pSetPixel8_ROP2)(uint8 *pixel, uint8 *pen);

5
libfreerdp-gdi/gdi_bitmap.c
View File

@ -20,11 +20,10 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <freerdp/freerdp.h>
#include "gdi.h"
#include <freerdp/gdi/gdi.h>
#include <freerdp/gdi/color.h>
#include "color.h"
#include "gdi_32bpp.h"
#include "gdi_16bpp.h"
#include "gdi_8bpp.h"

2
libfreerdp-gdi/gdi_bitmap.h
View File

@ -20,7 +20,7 @@
#ifndef __GDI_BITMAP_H
#define __GDI_BITMAP_H
#include "gdi.h"
#include <freerdp/gdi/gdi.h>
GDI_COLOR gdi_GetPixel(HGDI_DC hdc, int nXPos, int nYPos);
GDI_COLOR gdi_SetPixel(HGDI_DC hdc, int X, int Y, GDI_COLOR crColor);

2
libfreerdp-gdi/gdi_brush.c
View File

@ -24,7 +24,7 @@
#include <stdlib.h>
#include <freerdp/freerdp.h>
#include "gdi.h"
#include <freerdp/gdi/gdi.h>
#include "gdi_32bpp.h"
#include "gdi_16bpp.h"

2
libfreerdp-gdi/gdi_brush.h
View File

@ -20,7 +20,7 @@
#ifndef __GDI_BRUSH_H
#define __GDI_BRUSH_H
#include "gdi.h"
#include <freerdp/gdi/gdi.h>
HGDI_BRUSH gdi_CreateSolidBrush(GDI_COLOR crColor);
HGDI_BRUSH gdi_CreatePatternBrush(HGDI_BITMAP hbmp);

2
libfreerdp-gdi/gdi_clipping.c
View File

@ -21,8 +21,8 @@
#include <string.h>
#include <stdlib.h>
#include <freerdp/freerdp.h>
#include <freerdp/gdi/gdi.h>
#include "gdi.h"
#include "gdi_region.h"
#include "gdi_clipping.h"

2
libfreerdp-gdi/gdi_clipping.h
View File

@ -20,7 +20,7 @@
#ifndef __GDI_CLIPPING_H
#define __GDI_CLIPPING_H
#include "gdi.h"
#include <freerdp/gdi/gdi.h>
int gdi_SetClipRgn(HGDI_DC hdc, int nXLeft, int nYLeft, int nWidth, int nHeight);
HGDI_RGN gdi_GetClipRgn(HGDI_DC hdc);

2
libfreerdp-gdi/gdi_dc.c
View File

@ -23,8 +23,8 @@
#include <string.h>
#include <stdlib.h>
#include <freerdp/freerdp.h>
#include <freerdp/gdi/gdi.h>
#include "gdi.h"
#include "gdi_region.h"
#include "gdi_dc.h"

2
libfreerdp-gdi/gdi_dc.h
View File

@ -20,7 +20,7 @@
#ifndef __GDI_DC_H
#define __GDI_DC_H
#include "gdi.h"
#include <freerdp/gdi/gdi.h>
HGDI_DC gdi_GetDC();
HGDI_DC gdi_CreateCompatibleDC(HGDI_DC hdc);

2
libfreerdp-gdi/gdi_drawing.c
View File

@ -24,7 +24,7 @@
#include <stdlib.h>
#include <freerdp/freerdp.h>
#include "gdi.h"
#include <freerdp/gdi/gdi.h>
#include "gdi_dc.h"

2
libfreerdp-gdi/gdi_drawing.h
View File

@ -20,7 +20,7 @@
#ifndef __GDI_DRAWING_H
#define __GDI_DRAWING_H
#include "gdi.h"
#include <freerdp/gdi/gdi.h>
int gdi_GetROP2(HGDI_DC hdc);
int gdi_SetROP2(HGDI_DC hdc, int fnDrawMode);

2
libfreerdp-gdi/gdi_line.c
View File

@ -22,7 +22,7 @@
#include <stdlib.h>
#include <freerdp/freerdp.h>
#include "gdi.h"
#include <freerdp/gdi/gdi.h>
#include "gdi_32bpp.h"
#include "gdi_16bpp.h"

2
libfreerdp-gdi/gdi_line.h
View File

@ -20,7 +20,7 @@
#ifndef __GDI_LINE_H
#define __GDI_LINE_H
#include "gdi.h"
#include <freerdp/gdi/gdi.h>
int gdi_LineTo(HGDI_DC hdc, int nXEnd, int nYEnd);
int gdi_PolylineTo(HGDI_DC hdc, GDI_POINT *lppt, int cCount);

2
libfreerdp-gdi/gdi_palette.c
View File

@ -24,7 +24,7 @@
#include <stdlib.h>
#include <freerdp/freerdp.h>
#include "gdi.h"
#include <freerdp/gdi/gdi.h>
#include "gdi_palette.h"

2
libfreerdp-gdi/gdi_palette.h
View File

@ -20,7 +20,7 @@
#ifndef __GDI_PALETTE_H
#define __GDI_PALETTE_H
#include "gdi.h"
#include <freerdp/gdi/gdi.h>
HGDI_PALETTE gdi_CreatePalette(HGDI_PALETTE palette);
HGDI_PALETTE gdi_GetSystemPalette();

2
libfreerdp-gdi/gdi_pen.c
View File

@ -24,7 +24,7 @@
#include <stdlib.h>
#include <freerdp/freerdp.h>
#include "gdi.h"
#include <freerdp/gdi/gdi.h>
#include "gdi_pen.h"

2
libfreerdp-gdi/gdi_pen.h
View File

@ -20,7 +20,7 @@
#ifndef __GDI_PEN_H
#define __GDI_PEN_H
#include "gdi.h"
#include <freerdp/gdi/gdi.h>
HGDI_PEN gdi_CreatePen(int fnPenStyle, int nWidth, int crColor);
uint8 gdi_GetPenColor_8bpp(HGDI_PEN pen);

2
libfreerdp-gdi/gdi_region.c
View File

@ -22,7 +22,7 @@
#include <stdlib.h>
#include <freerdp/freerdp.h>
#include "gdi.h"
#include <freerdp/gdi/gdi.h>
#include "gdi_region.h"

2
libfreerdp-gdi/gdi_region.h
View File

@ -20,7 +20,7 @@
#ifndef __GDI_REGION_H
#define __GDI_REGION_H
#include "gdi.h"
#include <freerdp/gdi/gdi.h>
HGDI_RGN gdi_CreateRectRgn(int nLeftRect, int nTopRect, int nRightRect, int nBottomRect);
HGDI_RECT gdi_CreateRect(int xLeft, int yTop, int xRight, int yBottom);

2
libfreerdp-gdi/gdi_shape.c
View File

@ -21,8 +21,8 @@
#include <string.h>
#include <stdlib.h>
#include <freerdp/freerdp.h>
#include <freerdp/gdi/gdi.h>
#include "gdi.h"
#include "gdi_8bpp.h"
#include "gdi_16bpp.h"
#include "gdi_32bpp.h"

2
libfreerdp-gdi/gdi_shape.h
View File

@ -20,7 +20,7 @@
#ifndef __GDI_SHAPE_H
#define __GDI_SHAPE_H
#include "gdi.h"
#include <freerdp/gdi/gdi.h>
int gdi_Ellipse(HGDI_DC hdc, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect);
int gdi_FillRect(HGDI_DC hdc, HGDI_RECT rect, HGDI_BRUSH hbr);

5
libfreerdp-kbd/CMakeLists.txt
View File

@ -18,11 +18,8 @@
# limitations under the License.
set(FREERDP_KBD_SRCS
keyboard.h
locales.c
locales.h
layout_ids.c
layout_ids.h
layouts.c
layouts_xkb.c
layouts_xkb.h
x_layout_id_table.c

8
libfreerdp-kbd/layout_ids.c → libfreerdp-kbd/layouts.c
View File

@ -22,7 +22,7 @@
#include <string.h>
#include "libkbd.h"
#include "layout_ids.h"
#include <freerdp/kbd/layouts.h>
typedef struct
{
@ -229,8 +229,7 @@ keyboardIME keyboardIMEs[] =
};
rdpKeyboardLayout *
get_keyboard_layouts(int types)
rdpKeyboardLayout* get_keyboard_layouts(int types)
{
rdpKeyboardLayout * layouts;
int num;
@ -276,8 +275,7 @@ get_keyboard_layouts(int types)
return layouts;
}
char *
get_layout_name(unsigned int keyboardLayoutID)
char* get_layout_name(unsigned int keyboardLayoutID)
{
int i;
for(i = 0; i < sizeof(keyboardLayouts) / sizeof(keyboardLayout); i++)

24
libfreerdp-kbd/layouts_xkb.c
View File

@ -22,26 +22,28 @@
#include <string.h>
#include "libkbd.h"
#include "keyboard.h"
#include <freerdp/kbd/vkcodes.h>
#include "x_layout_id_table.h"
#include "layouts_xkb.h"
#ifndef KEYMAP_PATH
#define KEYMAP_PATH "/usr/local/freerdp/keymaps"
#endif
#ifdef WITH_XKBFILE
#include <X11/XKBlib.h>
#include <X11/extensions/XKBfile.h>
#include <X11/extensions/XKBrules.h>
int
init_xkb(void *dpy)
int init_xkb(void *dpy)
{
return XkbQueryExtension(dpy, NULL, NULL, NULL, NULL, NULL);
}
/* return substring starting after nth comma, ending at following comma */
static char *
comma_substring(char *s, int n)
static char* comma_substring(char *s, int n)
{
char *p;
if (!s)
@ -56,8 +58,7 @@ comma_substring(char *s, int n)
return s;
}
unsigned int
detect_keyboard_layout_from_xkb(void *dpy)
unsigned int detect_keyboard_layout_from_xkb(void *dpy)
{
char *layout, *variant;
unsigned int keyboard_layout = 0, group = 0;
@ -93,8 +94,7 @@ detect_keyboard_layout_from_xkb(void *dpy)
return keyboard_layout;
}
int
init_keycodes_from_xkb(void *dpy, RdpKeycodes x_keycode_to_rdp_keycode)
int init_keycodes_from_xkb(void *dpy, RdpKeycodes x_keycode_to_rdp_keycode)
{
int ret = 0;
XkbDescPtr xkb;
@ -163,8 +163,7 @@ static const KeycodeToVkcode defaultKeycodeToVkcode =
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
};
static int
load_xkb_keyboard(KeycodeToVkcode map, char* kbd)
static int load_xkb_keyboard(KeycodeToVkcode map, char* kbd)
{
char* pch;
char *beg, *end;
@ -357,8 +356,7 @@ load_xkb_keyboard(KeycodeToVkcode map, char* kbd)
return 1;
}
void
load_keyboard_map(KeycodeToVkcode keycodeToVkcode, char *xkbfile)
void load_keyboard_map(KeycodeToVkcode keycodeToVkcode, char *xkbfile)
{
char* kbd;
char* xkbfileEnd;

9
libfreerdp-kbd/libkbd.c
View File

@ -20,16 +20,15 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <freerdp/kbd.h>
#include <freerdp/types.h>
#include <freerdp/kbd/kbd.h>
#include "libkbd.h"
#include "locales.h"
#include "layout_ids.h"
#include <freerdp/kbd/locales.h>
#include <freerdp/kbd/vkcodes.h>
#include <freerdp/kbd/layouts.h>
#include "layouts_xkb.h"
#include "keyboard.h"
/*
* The actual mapping from X keycodes to RDP keycodes, initialized from xkb keycodes or similar.

2
libfreerdp-kbd/locales.c
View File

@ -22,7 +22,7 @@
#include <string.h>
#include "libkbd.h"
#include "locales.h"
#include <freerdp/kbd/locales.h>
typedef struct
{

2
libfreerdp-kbd/x_layout_id_table.c
View File

@ -22,7 +22,7 @@
#include <string.h>
#include "libkbd.h"
#include "layout_ids.h"
#include <freerdp/kbd/layouts.h>
#include "x_layout_id_table.h"

6
libfreerdp-kbd/x_layout_id_table.h
View File

@ -22,12 +22,10 @@
#ifndef __LAYOUTS_X_H
#define __LAYOUTS_X_H
unsigned int
find_keyboard_layout_in_xorg_rules(char* layout, char* variant);
unsigned int find_keyboard_layout_in_xorg_rules(char* layout, char* variant);
#if defined(sun)
unsigned int
detect_keyboard_type_and_layout_sunos(char* xkbfile, int length);
unsigned int detect_keyboard_type_and_layout_sunos(char* xkbfile, int length);
#endif
#endif

2
libfreerdp-rfx/librfx.c
View File

@ -21,7 +21,7 @@
#include <stdlib.h>
#include <string.h>
#include <inttypes.h>
#include <freerdp/rfx.h>
#include <freerdp/rfx/rfx.h>
#include <freerdp/utils/memory.h>
#include "rfx_constants.h"

2
libfreerdp-rfx/rfx_bitstream.h
View File

@ -20,7 +20,7 @@
#ifndef __RFX_BITSTREAM_H
#define __RFX_BITSTREAM_H
#include <freerdp/rfx.h>
#include <freerdp/rfx/rfx.h>
struct _RFX_BITSTREAM
{

2
libfreerdp-rfx/rfx_decode.h
View File

@ -20,7 +20,7 @@
#ifndef __RFX_DECODE_H
#define __RFX_DECODE_H
#include <freerdp/rfx.h>
#include <freerdp/rfx/rfx.h>
void rfx_decode_ycbcr_to_rgb(sint16* y_r_buf, sint16* cb_g_buf, sint16* cr_b_buf);

2
libfreerdp-rfx/rfx_differential.h
View File

@ -20,7 +20,7 @@
#ifndef __RFX_DIFFERENTIAL_H
#define __RFX_DIFFERENTIAL_H
#include <freerdp/rfx.h>
#include <freerdp/rfx/rfx.h>
void rfx_differential_decode(sint16* buffer, int buffer_size);
void rfx_differential_encode(sint16* buffer, int buffer_size);

2
libfreerdp-rfx/rfx_dwt.h
View File

@ -20,7 +20,7 @@
#ifndef __RFX_DWT_H
#define __RFX_DWT_H
#include <freerdp/rfx.h>
#include <freerdp/rfx/rfx.h>
void rfx_dwt_2d_decode(sint16* buffer, sint16* dwt_buffer);
void rfx_dwt_2d_encode(sint16* buffer, sint16* dwt_buffer);

2
libfreerdp-rfx/rfx_encode.h
View File

@ -20,7 +20,7 @@
#ifndef __RFX_ENCODE_H
#define __RFX_ENCODE_H
#include <freerdp/rfx.h>
#include <freerdp/rfx/rfx.h>
void rfx_encode_rgb_to_ycbcr(sint16* y_r_buf, sint16* cb_g_buf, sint16* cr_b_buf);

2
libfreerdp-rfx/rfx_pool.h
View File

@ -20,7 +20,7 @@
#ifndef __RFX_POOL_H
#define __RFX_POOL_H
#include <freerdp/rfx.h>
#include <freerdp/rfx/rfx.h>
struct _RFX_POOL
{

2
libfreerdp-rfx/rfx_quantization.h
View File

@ -20,7 +20,7 @@
#ifndef __RFX_QUANTIZATION_H
#define __RFX_QUANTIZATION_H
#include <freerdp/rfx.h>
#include <freerdp/rfx/rfx.h>
void rfx_quantization_decode(sint16* buffer, const uint32* quantization_values);
void rfx_quantization_encode(sint16* buffer, const uint32* quantization_values);

2
libfreerdp-rfx/rfx_rlgr.h
View File

@ -20,7 +20,7 @@
#ifndef __RFX_RLGR_H
#define __RFX_RLGR_H
#include <freerdp/rfx.h>
#include <freerdp/rfx/rfx.h>
int rfx_rlgr_decode(RLGR_MODE mode, const uint8* data, int data_size, sint16* buffer, int buffer_size);
int rfx_rlgr_encode(RLGR_MODE mode, const sint16* data, int data_size, uint8* buffer, int buffer_size);