kekePower/rdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Indentation fix

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@1037 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
Peter Åstrand 2006-01-05 11:56:57 +00:00
parent da3ab666b3
commit d1391ebe17
1 changed files with 64 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
xclip.c
View File

@ -264,8 +264,7 @@ xclip_send_data_with_convert(uint8* source, size_t source_size, Atom target)
{
#ifdef USE_UNICODE_CLIPBOARD
if (target == format_string_atom ||
target == format_unicode_atom ||
target == format_utf8_string_atom)
target == format_unicode_atom || target == format_utf8_string_atom)
{
if (rdp_clipboard_request_format != RDP_CF_TEXT)
return False;
@ -321,15 +320,18 @@ xclip_send_data_with_convert(uint8* source, size_t source_size, Atom target)
char *unicode_buffer_remaining = unicode_buffer;
char *data_remaining = (char *) source;
size_t data_size_remaining = source_size;
iconv(cd, &data_remaining, &data_size_remaining, &unicode_buffer_remaining, &unicode_buffer_size_remaining);
iconv(cd, &data_remaining, &data_size_remaining, &unicode_buffer_remaining,
&unicode_buffer_size_remaining);
iconv_close(cd);
/* translate linebreaks */
uint32 translated_data_size = unicode_buffer_size - unicode_buffer_size_remaining;
uint8* translated_data = utf16_lf2crlf((uint8*)unicode_buffer, &translated_data_size);
uint8 *translated_data =
utf16_lf2crlf((uint8 *) unicode_buffer, &translated_data_size);
if (translated_data != NULL)
{
DEBUG_CLIPBOARD(("Sending Unicode string of %d bytes\n", translated_data_size));
DEBUG_CLIPBOARD(("Sending Unicode string of %d bytes\n",
translated_data_size));
cliprdr_send_data(translated_data, translated_data_size);
xfree(translated_data); /* Not the same thing as XFree! */
}
@ -477,7 +479,8 @@ xclip_handle_SelectionNotify(XSelectionEvent * event)
*/
if (best_text_target != 0)
{
XConvertSelection(g_display, clipboard_atom, best_text_target, rdesktop_clipboard_target_atom, g_wnd, event->time);
XConvertSelection(g_display, clipboard_atom, best_text_target,
rdesktop_clipboard_target_atom, g_wnd, event->time);
return;
}
else
@ -550,14 +553,14 @@ xclip_handle_SelectionRequest(XSelectionRequestEvent * event)
Otherwise, we default to RDP_CF_TEXT.
*/
res = XGetWindowProperty(g_display, event->requestor,
rdesktop_clipboard_target_atom, 0, 1, True, XA_INTEGER,
&type, &format, &nitems, &bytes_left, &prop_return);
rdesktop_clipboard_target_atom, 0, 1, True,
XA_INTEGER, &type, &format, &nitems, &bytes_left,
&prop_return);
wanted_format = (uint32 *) prop_return;
format = (res == Success) ? *wanted_format : RDP_CF_TEXT;
XFree(prop_return);
}
else if (event->target == format_string_atom ||
event->target == XA_STRING)
else if (event->target == format_string_atom || event->target == XA_STRING)
{
/* STRING and XA_STRING are defined to be ISO8859-1 */
format = CF_TEXT;
@ -651,7 +654,8 @@ xclip_handle_PropertyNotify(XPropertyEvent * event)
if (g_clip_buflen > 0)
{
if (!xclip_send_data_with_convert(g_clip_buffer, g_clip_buflen, g_incr_target))
if (!xclip_send_data_with_convert
(g_clip_buffer, g_clip_buflen, g_incr_target))
{
helper_cliprdr_send_empty_response();
}
@ -685,8 +689,8 @@ xclip_handle_PropertyNotify(XPropertyEvent * event)
res = XGetWindowProperty(g_display, DefaultRootWindow(g_display),
rdesktop_clipboard_formats_atom, 0,
XMaxRequestSize(g_display), False, XA_STRING, &type,
&format, &nitems, &bytes_left, &data);
XMaxRequestSize(g_display), False, XA_STRING,
&type, &format, &nitems, &bytes_left, &data);
if ((res == Success) && (nitems > 0))
{
@ -735,8 +739,7 @@ ui_clip_handle_data(uint8 * data, uint32 length)
{
BOOL free_data = False;
if (selection_request.target == format_string_atom ||
selection_request.target == XA_STRING)
if (selection_request.target == format_string_atom || selection_request.target == XA_STRING)
{
/* We're expecting a CF_TEXT response */
uint8 *firstnull;
@ -769,7 +772,8 @@ ui_clip_handle_data(uint8 * data, uint32 length)
iconv_close(cd);
return;
}
iconv(cd, &data_remaining, &length_remaining, &utf8_data_remaining, &utf8_length_remaining);
iconv(cd, &data_remaining, &length_remaining, &utf8_data_remaining,
&utf8_length_remaining);
iconv_close(cd);
free_data = True;
data = (uint8 *) utf8_data;