(svn r17708) -Feature [FS#2053]: [OSX] Implement clipboard support for OS X.

This commit is contained in:
michi_cc
2009-10-04 21:08:38 +00:00
parent a831143f45
commit 049d62b35c
6 changed files with 91 additions and 74 deletions

View File

@@ -465,28 +465,18 @@ void DetermineBasePaths(const char *exe)
_searchpaths[SP_APPLICATION_BUNDLE_DIR] = NULL;
}
/**
* Insert a chunk of text from the clipboard onto the textbuffer. Get TEXT clipboard
* and append this up to the maximum length (either absolute or screenlength). If maxlength
* is zero, we don't care about the screenlength but only about the physical length of the string
* @param tb Textbuf type to be changed
* @return true on successful change of Textbuf, or false otherwise
*/
bool InsertTextBufferClipboard(Textbuf *tb)
bool GetClipboardContents(char *buffer, size_t buff_len)
{
HGLOBAL cbuf;
char utf8_buf[512];
const char *ptr;
WChar c;
uint16 width, length;
if (IsClipboardFormatAvailable(CF_UNICODETEXT)) {
OpenClipboard(NULL);
cbuf = GetClipboardData(CF_UNICODETEXT);
ptr = (const char*)GlobalLock(cbuf);
const char *ret = convert_from_fs((wchar_t*)ptr, utf8_buf, lengthof(utf8_buf));
const char *ret = convert_from_fs((wchar_t*)ptr, buffer, buff_len);
GlobalUnlock(cbuf);
CloseClipboard();
@@ -497,7 +487,7 @@ bool InsertTextBufferClipboard(Textbuf *tb)
cbuf = GetClipboardData(CF_TEXT);
ptr = (const char*)GlobalLock(cbuf);
strecpy(utf8_buf, FS2OTTD(ptr), lastof(utf8_buf));
ttd_strlcpy(buffer, FS2OTTD(ptr), buff_len);
GlobalUnlock(cbuf);
CloseClipboard();
@@ -506,33 +496,6 @@ bool InsertTextBufferClipboard(Textbuf *tb)
return false;
}
width = length = 0;
for (ptr = utf8_buf; (c = Utf8Consume(&ptr)) != '\0';) {
if (!IsPrintable(c)) break;
byte len = Utf8CharLen(c);
if (tb->size + length + len > tb->maxsize) break;
byte charwidth = GetCharacterWidth(FS_NORMAL, c);
if (tb->maxwidth != 0 && width + tb->width + charwidth > tb->maxwidth) break;
width += charwidth;
length += len;
}
if (length == 0) return false;
memmove(tb->buf + tb->caretpos + length, tb->buf + tb->caretpos, tb->size - tb->caretpos);
memcpy(tb->buf + tb->caretpos, utf8_buf, length);
tb->width += width;
tb->caretxoffs += width;
tb->size += length;
tb->caretpos += length;
assert(tb->size <= tb->maxsize);
tb->buf[tb->size - 1] = '\0'; // terminating zero
return true;
}