mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r2399) - Fix: Update OS/2 project file with filename changes 

- Fix: Make clipboard code a bit nicer (thanks Tron)
This commit is contained in:
orudge 2005-06-02 19:55:37 +00:00
parent 81ac4ac152
commit e8c6b8feca
2 changed files with 35 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openttd.tgt
View File

@ -2112,8 +2112,8 @@ WVList
0
484
MItem
5
ttd.c
9
openttd.c
485
WString
4

65
os2.c
View File

@ -707,45 +707,46 @@ const HalMusicDriver _os2_music_driver = {
*/
bool InsertTextBufferClipboard(Textbuf *tb)
{
HAB hab = 0; // anchor-block handle
PSZ pszClipText, pszClipText2;
uint16 width = 0;
uint16 length = 0;
char clipbuf[300];
pszClipText2 = clipbuf;
HAB hab = 0;
if (WinOpenClipbrd(hab))
{
if (pszClipText = (PSZ) WinQueryClipbrdData(hab, CF_TEXT))
strncpy(clipbuf, pszClipText, 300);
const char* text = (const char*)WinQueryClipbrdData(hab, CF_TEXT);
if (text != NULL)
{
uint length = 0;
uint width = 0;
const char* i;
for (i = text; IsValidAsciiChar(*i); i++)
{
uint w;
if (tb->length + length >= tb->maxlength - 1) break;
w = GetCharacterWidth((byte)*i);
if (tb->maxwidth != 0 && width + tb->width + w > tb->maxwidth) break;
width += w;
length++;
}
memmove(tb->buf + tb->caretpos + length, tb->buf + tb->caretpos, tb->length - tb->caretpos + 1);
memcpy(tb->buf + tb->caretpos, text, length);
tb->width += width;
tb->caretxoffs += width;
tb->length += length;
tb->caretpos += length;
WinCloseClipbrd(hab);
return true;
}
WinCloseClipbrd(hab);
}
if (!pszClipText)
return false;
for (; IsValidAsciiChar(*pszClipText2) && (tb->length + length) < tb->maxlength - 1 &&
(tb->maxwidth == 0 || width + tb->width + GetCharacterWidth((byte)*pszClipText2) <= tb->maxwidth); pszClipText2++)
{
width += GetCharacterWidth((byte)*pszClipText2);
length++;
}
if (length == 0)
return false;
memmove(tb->buf + tb->caretpos + length, tb->buf + tb->caretpos, tb->length - tb->caretpos);
memcpy(tb->buf + tb->caretpos, clipbuf, length);
tb->width += width;
tb->caretxoffs += width;
tb->length += length;
tb->caretpos += length;
tb->buf[tb->length + 1] = '\0'; // terminating zero
return true;
return false;
}
static TID thread1 = 0;