mirror of
https://github.com/OpenTTD/OpenTTD.git
synced 2025-03-05 22:04:57 +00:00
(svn r280) -Fix: ^M removement in console.c
This commit is contained in:
parent
7693c58e28
commit
f7cfd47261
68
console.c
68
console.c
@ -7,10 +7,10 @@
|
||||
#include "variables.h"
|
||||
#include "hal.h"
|
||||
#include <stdarg.h>
|
||||
#include "console.h"
|
||||
|
||||
#ifdef WIN32
|
||||
#include <windows.h>
|
||||
#include "console.h"
|
||||
|
||||
#ifdef WIN32
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
// ** main console ** //
|
||||
@ -50,31 +50,31 @@ static const WindowDesc _iconsole_window_desc = {
|
||||
|
||||
/* *************** */
|
||||
/* end of header */
|
||||
/* *************** */
|
||||
|
||||
static void IConsoleAppendClipboard()
|
||||
{
|
||||
#ifdef WIN32
|
||||
if (IsClipboardFormatAvailable(CF_TEXT)) {
|
||||
byte * data;
|
||||
HGLOBAL cbuf;
|
||||
int i;
|
||||
|
||||
OpenClipboard(NULL);
|
||||
cbuf = GetClipboardData(CF_TEXT);
|
||||
data = (byte *) GlobalLock(cbuf);
|
||||
|
||||
i=0;
|
||||
while (IS_INT_INSIDE(data[i], 32, 256)) {
|
||||
_iconsole_cmdline[_iconsole_cmdpos]=data[i];
|
||||
i++;
|
||||
_iconsole_cmdpos++;
|
||||
}
|
||||
|
||||
GlobalUnlock(cbuf);
|
||||
CloseClipboard();
|
||||
}
|
||||
#endif
|
||||
/* *************** */
|
||||
|
||||
static void IConsoleAppendClipboard()
|
||||
{
|
||||
#ifdef WIN32
|
||||
if (IsClipboardFormatAvailable(CF_TEXT)) {
|
||||
byte * data;
|
||||
HGLOBAL cbuf;
|
||||
int i;
|
||||
|
||||
OpenClipboard(NULL);
|
||||
cbuf = GetClipboardData(CF_TEXT);
|
||||
data = (byte *) GlobalLock(cbuf);
|
||||
|
||||
i=0;
|
||||
while (IS_INT_INSIDE(data[i], 32, 256)) {
|
||||
_iconsole_cmdline[_iconsole_cmdpos]=data[i];
|
||||
i++;
|
||||
_iconsole_cmdpos++;
|
||||
}
|
||||
|
||||
GlobalUnlock(cbuf);
|
||||
CloseClipboard();
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
static void IConsoleClearCommand()
|
||||
@ -132,11 +132,11 @@ static void IConsoleWndProc(Window *w, WindowEvent *e)
|
||||
break;
|
||||
|
||||
case WE_KEYPRESS:
|
||||
e->keypress.cont=false;
|
||||
if (e->keypress.keycode == (WKC_CTRL | 'V'))
|
||||
{
|
||||
IConsoleAppendClipboard();
|
||||
SetWindowDirty(w);
|
||||
e->keypress.cont=false;
|
||||
if (e->keypress.keycode == (WKC_CTRL | 'V'))
|
||||
{
|
||||
IConsoleAppendClipboard();
|
||||
SetWindowDirty(w);
|
||||
} else
|
||||
if (e->keypress.keycode == (WKC_UP))
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user