Vantha/0ad
1
1
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Removes clipboard debug logging on X11, fixes #5535

Browse Source 
This was SVN commit r22551.
This commit is contained in:
historic_bruno 2019-07-25 05:34:04 +00:00
parent 1e9cc3d43e
commit 8d293db6eb
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/lib/sysdep/os/unix/x/x.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2013 Wildfire Games.
/* Copyright (C) 2019 Wildfire Games.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@ -207,7 +207,7 @@ wchar_t *sys_clipboard_get()
&len, &bytes_left,
&data);
if(result != Success)
debug_printf("clipboard_get: result: %d type:%lu len:%lu format:%d bytes_left:%lu\n",
debug_printf("clipboard_get: XGetWindowProperty failed! result: %d type:%lu len:%lu format:%d bytes_left:%lu\n",
result, type, len, format, bytes_left);
if(result == Success && bytes_left > 0)
{
@ -218,9 +218,6 @@ wchar_t *sys_clipboard_get()
if(result == Success)
{
debug_printf("clipboard_get: XGetWindowProperty succeeded, returning data\n");
debug_printf("clipboard_get: data was: \"%s\", type was %lu, XA_STRING atom is %lu\n", (char *)data, type, XA_STRING);
if(type == XA_STRING) //Latin-1: Just copy into low byte of wchar_t
{
wchar_t *ret=(wchar_t *)malloc((bytes_left+1)*sizeof(wchar_t));
@ -352,8 +349,6 @@ Status sys_clipboard_set(const wchar_t *str)
{
ONCE(x11_clipboard_init());
debug_printf("sys_clipboard_set: %s\n", utf8_from_wstring(str).c_str());
if(selection_data)
{
free(selection_data);