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 009b05bdc55e20a1cc9cc1b44d68fbf1231abb12..54b753104e6c7cf16304553dbca923e742c76f08 100644 (file)
--- a/console.h
+++ b/console.h
@@ -35,6 +35,7 @@ void Con_Rcon_Redirect_Abort();
 void Con_CheckResize (void);
 void Con_Init (void);
 void Con_Init_Commands (void);
 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);
 void Con_DrawConsole (int lines);
 void Con_Print(const char *txt);
 void Con_Printf(const char *fmt, ...) DP_FUNC_PRINTF(1);


@@ -68,5 +69,52 @@ void Log_DestBuffer_Flush (void); // call this once per frame to send out replie
 
 void Log_Printf(const char *logfilename, const char *fmt, ...) DP_FUNC_PRINTF(2);
 
 
 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
 
 #endif