X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=sys_sdl.c;h=6bbbe382aebd46dbc600d81d45571b6858134590;hb=41f1138b4a171ebb11be1418ed5579a8935b5516;hp=39c57df999a2159099295a4015f7d8cfe4f5df47;hpb=65fea57d305ccc8d64fa83759d5b32bb69617b95;p=xonotic%2Fdarkplaces.git diff --git a/sys_sdl.c b/sys_sdl.c index 39c57df9..6bbbe382 100644 --- a/sys_sdl.c +++ b/sys_sdl.c @@ -1,5 +1,6 @@ #ifdef WIN32 +#include #include "conio.h" #else #include @@ -30,7 +31,7 @@ void Sys_Shutdown (void) void Sys_Error (const char *error, ...) { va_list argptr; - char string[1024]; + char string[MAX_INPUTLINE]; // change stdin to non blocking #ifndef WIN32 @@ -49,7 +50,22 @@ void Sys_Error (const char *error, ...) void Sys_PrintToTerminal(const char *text) { - fprintf(stdout, "%s", text); +#ifndef WIN32 + // BUG: for some reason, NDELAY also affects stdout (1) when used on stdin (0). + int origflags = fcntl (1, F_GETFL, 0); + fcntl (1, F_SETFL, origflags & ~FNDELAY); +#endif + while(*text) + { + int written = (int)write(1, text, (int)strlen(text)); + if(written <= 0) + break; // sorry, I cannot do anything about this error - without an output + text += written; + } +#ifndef WIN32 + fcntl (1, F_SETFL, origflags); +#endif + //fprintf(stdout, "%s", text); } double Sys_DoubleTime (void) @@ -83,7 +99,7 @@ char *Sys_ConsoleInput(void) { if (cls.state == ca_dedicated) { - static char text[256]; + static char text[MAX_INPUTLINE]; int len = 0; #ifdef WIN32 int c; @@ -160,7 +176,7 @@ char *Sys_GetClipboardData (void) { if ((cliptext = GlobalLock (hClipboardData)) != 0) { - data = malloc (GlobalSize(hClipboardData)+1); + data = Z_Malloc (GlobalSize(hClipboardData)+1); strcpy (data, cliptext); GlobalUnlock (hClipboardData); }