patch by parasti; changes to his patch: no per function dprint for now

[xonotic/darkplaces.git] / console.h

diff --git a/console.h b/console.h
index 1849f670dc6f002b85956a9a15e2f6696d10524c..74e44839466899722a7263ac79dc51bb9497c3d0 100644 (file)
--- a/console.h
+++ b/console.h
@@ -28,13 +28,14 @@ extern int con_totallines;
 extern int con_backscroll;
 extern qboolean con_initialized;
 
-extern qboolean rcon_redirect;
-extern int rcon_redirect_bufferpos;
-extern char rcon_redirect_buffer[1400];
+void Con_Rcon_Redirect_Init(lhnetsocket_t *sock, lhnetaddress_t *dest);
+void Con_Rcon_Redirect_End();
+void Con_Rcon_Redirect_Abort();
 
 void Con_CheckResize (void);
 void Con_Init (void);
 void Con_Init_Commands (void);
+void Con_Shutdown (void);
 void Con_DrawConsole (int lines);
 void Con_Print(const char *txt);
 void Con_Printf(const char *fmt, ...) DP_FUNC_PRINTF(1);
@@ -64,8 +65,51 @@ void Con_DisplayList(const char **list);
 void Log_Init (void);
 void Log_Close (void);
 void Log_Start (void);
+void Log_DestBuffer_Flush (void); // call this once per frame to send out replies to rcon streaming clients
 
 void Log_Printf(const char *logfilename, const char *fmt, ...) DP_FUNC_PRINTF(2);
 
+#define CON_MASK_HIDENOTIFY 128
+#define CON_MASK_CHAT 1
+#define CON_MASK_INPUT 2
+
+typedef struct con_lineinfo_s
+{
+       char *start;
+       size_t len;
+       int mask;
+
+       // used only by console.c
+       double addtime;
+       int height; // recalculated line height when needed (-1 to unset)
+}
+con_lineinfo_t;
+
+typedef struct conbuffer_s
+{
+       int textsize;
+       char *text;
+       int maxlines;
+       con_lineinfo_t *lines;
+       int lines_first;
+       int lines_count; // cyclic buffer
+}
+conbuffer_t;
+
+#define CONBUFFER_LINES(buf, i) (buf)->lines[((buf)->lines_first + (i)) % (buf)->maxlines]
+#define CONBUFFER_LINES_COUNT(buf) ((buf)->lines_count)
+#define CONBUFFER_LINES_LAST(buf) CONBUFFER_LINES(buf, CONBUFFER_LINES_COUNT(buf) - 1)
+
+void ConBuffer_Init(conbuffer_t *buf, int textsize, int maxlines, mempool_t *mempool);
+void ConBuffer_Clear (conbuffer_t *buf);
+void ConBuffer_Shutdown(conbuffer_t *buf);
+void ConBuffer_FixTimes(conbuffer_t *buf);
+void ConBuffer_DeleteLine(conbuffer_t *buf);
+void ConBuffer_DeleteLastLine(conbuffer_t *buf);
+void ConBuffer_AddLine(conbuffer_t *buf, const char *line, int len, int mask);
+int ConBuffer_FindPrevLine(conbuffer_t *buf, int mask_must, int mask_mustnot, int start);
+int ConBuffer_FindNextLine(conbuffer_t *buf, int mask_must, int mask_mustnot, int start);
+const char *ConBuffer_GetLine(conbuffer_t *buf, int i);
+
 #endif