fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-03 06:20:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

moved clipboard pasting code into new PasteToConsole() helper procedure

Browse source 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@744 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Ozkan Sezer 2012-09-27 14:00:12 +00:00
parent 67a3c2104b
commit ddfc90fd36
1 changed files with 47 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
Quake/keys.c
View file

@ -173,6 +173,52 @@ keyname_t keynames[] =
==============================================================================
*/
static void PasteToConsole (void)
{
char *cbd, *p, *workline;
int mvlen, inslen;
if (key_linepos == MAXCMDLINE - 1)
return;
if ((cbd = PL_GetClipboardData()) == NULL)
return;
p = cbd;
while (*p)
{
if (*p == '\n' || *p == '\r' || *p == '\b')
{
*p = 0;
break;
}
p++;
}
inslen = (int) (p - cbd);
if (inslen + key_linepos > MAXCMDLINE - 1)
inslen = MAXCMDLINE - 1 - key_linepos;
if (inslen <= 0) goto done;
workline = key_lines[edit_line];
workline += key_linepos;
mvlen = (int) strlen(workline);
if (mvlen + inslen + key_linepos > MAXCMDLINE - 1)
{
mvlen = MAXCMDLINE - 1 - key_linepos - inslen;
if (mvlen < 0) mvlen = 0;
}
// insert the string
if (mvlen != 0)
memmove (workline + inslen, workline, mvlen);
memcpy (workline, cbd, inslen);
key_linepos += inslen;
workline[mvlen + inslen] = '\0';
done:
Z_Free(cbd);
}
/*
====================
Key_Console -- johnfitz -- heavy revision
@ -380,49 +426,7 @@ void Key_Console (int key)
if ((key=='V' || key=='v') && keydown[K_CTRL])
{
if (key_linepos == MAXCMDLINE - 1)
return;
else
{
char *cbd, *p;
int mvlen, inslen;
if ((cbd = PL_GetClipboardData()) == NULL)
return;
p = cbd;
while (*p)
{
if (*p == '\n' || *p == '\r' ||
*p == '\b')
{
*p = 0;
break;
}
p++;
}
inslen = (int) (p - cbd);
if (inslen + key_linepos > MAXCMDLINE - 1)
inslen = MAXCMDLINE - 1 - key_linepos;
if (inslen <= 0) goto done;
workline += key_linepos;
mvlen = (int) strlen(workline);
if (mvlen + inslen + key_linepos > MAXCMDLINE - 1)
{
mvlen = MAXCMDLINE - 1 - key_linepos - inslen;
if (mvlen < 0) mvlen = 0;
}
// insert the string
if (mvlen > 0)
memmove (workline + inslen, workline, mvlen);
memcpy (workline, cbd, inslen);
key_linepos += inslen;
workline[mvlen + inslen] = '\0';
done:
Z_Free(cbd);
}
PasteToConsole();
return;
}