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

Style

Browse source 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@749 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Sander van Dijk 2012-09-30 08:23:00 +00:00
parent 408c366096
commit f2a2cd3fcf
2 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Quake/console.c
View file

@ -1135,6 +1135,10 @@ void Con_DrawNotify (void)
} }
} }
extern qpic_t *pic_ovr, *pic_ins; //johnfitz -- new cursor handling
extern double key_blinktime;
extern int key_insert;
/* /*
================ ================
Con_DrawInput -- johnfitz -- modified to allow insert editing Con_DrawInput -- johnfitz -- modified to allow insert editing
@ -1144,9 +1148,6 @@ The input line scrolls horizontally if typing goes beyond the right edge
*/ */
void Con_DrawInput (void) void Con_DrawInput (void)
{ {
extern qpic_t *pic_ovr, *pic_ins; //johnfitz -- new cursor handling
extern double key_blinktime;
extern int key_insert;
int i, ofs; int i, ofs;
if (key_dest != key_console && !con_forcedup) if (key_dest != key_console && !con_forcedup)

38
Quake/keys.c
View file

@ -229,15 +229,15 @@ Key_Console -- johnfitz -- heavy revision
Interactive line editing and console scrollback Interactive line editing and console scrollback
==================== ====================
*/ */
extern char key_tabpartial[MAXCMDLINE]; extern char *con_text, key_tabpartial[MAXCMDLINE];
extern int con_vislines; extern int con_current, con_linewidth, con_vislines;
void Key_Console (int key) void Key_Console (int key)
{ {
static char current[MAXCMDLINE] = ""; static char current[MAXCMDLINE] = "";
int history_line_last; int history_line_last, i, x;
size_t len; size_t len;
char *workline = key_lines[edit_line]; char *line, *workline = key_lines[edit_line];
switch (key) switch (key)
{ {
@ -302,10 +302,6 @@ void Key_Console (int key)
if (keydown[K_CTRL]) if (keydown[K_CTRL])
{ {
//skip initial empty lines //skip initial empty lines
int i, x;
char *line;
extern int con_current, con_linewidth;
extern char *con_text;
for (i = con_current - con_totallines + 1; i <= con_current; i++) for (i = con_current - con_totallines + 1; i <= con_current; i++)
{ {
@ -425,20 +421,24 @@ void Key_Console (int key)
history_line= edit_line; history_line= edit_line;
return; return;
} }
} break;
case 'v':
case 'V':
#if defined(__MACOSX__) || defined(__MACOS__) #if defined(__MACOSX__) || defined(__MACOS__)
/* Cmd+V paste request for Mac : */ /* Cmd+V paste request for Mac : */
if (keydown[K_COMMAND] && (key == 'V' || key == 'v')) if (keydown[K_COMMAND])
{ {
PasteToConsole(); PasteToConsole();
return; return;
} }
#endif #endif
if (keydown[K_CTRL] && (key=='V' || key=='v')) if (keydown[K_CTRL])
{ {
PasteToConsole(); PasteToConsole();
return; return;
}
break;
} }
if (key < 32 || key > 127) if (key < 32 || key > 127)