improve abstraction of the console buffers; console drawing still needs to be changed...

[xonotic/darkplaces.git] / console.h

diff --git a/console.h b/console.h
index d8b56ed3f639de26abe7dd824e9799a7b4950a0c..54b753104e6c7cf16304553dbca923e742c76f08 100644 (file)
--- a/console.h
+++ b/console.h
@@ -27,25 +27,27 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 extern int con_totallines;
 extern int con_backscroll;
 extern qboolean con_initialized;
-extern qbyte *con_chars;
+
+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_InitLogging (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, ...);
+void Con_Printf(const char *fmt, ...) DP_FUNC_PRINTF(1);
 void Con_DPrint(const char *msg);
-void Con_DPrintf(const char *fmt, ...);
-void Con_SafePrint(const char *msg);
-void Con_SafePrintf(const char *fmt, ...);
-void Con_LogPrint(const char *logfilename, const char *msg);
-void Con_LogPrintf(const char *logfilename, const char *fmt, ...);
+void Con_DPrintf(const char *fmt, ...) DP_FUNC_PRINTF(1);
 void Con_Clear_f (void);
 void Con_DrawNotify (void);
 void Con_ClearNotify (void);
 void Con_ToggleConsole_f (void);
 
+qboolean GetMapList (const char *s, char *completedname, int completednamebufferlength);
+
 // wrapper function to attempt to either complete the command line
 // or to list possible matches grouped by type
 // (i.e. will display possible variables, aliases, commands
@@ -56,5 +58,63 @@ void Con_CompleteCommandLine(void);
 // formatted in columns on the console
 void Con_DisplayList(const char **list);
 
+
+//
+// log
+//
+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_IDX(buf, i) (((buf)->lines_first + (i)) % (buf)->maxlines)
+#define CONBUFFER_LINES_UNIDX(buf, i) (((i) - (buf)->lines_first + (buf)->maxlines) % (buf)->maxlines)
+#define CONBUFFER_LINES_LAST(buf) CONBUFFER_LINES_IDX(buf, (buf)->lines_count - 1)
+#define CONBUFFER_LINES(buf, i) (buf)->lines[CONBUFFER_LINES_IDX(buf, i)]
+#define CONBUFFER_LINES_PRED(buf, i) (((i) + (buf)->maxlines - 1) % (buf)->maxlines)
+#define CONBUFFER_LINES_SUCC(buf, i) (((i) + 1) % (buf)->maxlines)
+#define CONBUFFER_LINES_FIRST(buf) ((buf)->lines_first)
+#define CONBUFFER_LINES_COUNT(buf) ((buf)->lines_count)
+
+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