X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=console.h;h=438e9ca21e2ea40b46eae26621d73a2de23f554c;hp=be1010ded02a692d1f2ec9b2acc2718de8c1a361;hb=63049d016df231bb7b125024ed8a1d11a323a83d;hpb=f800c0a37d45e51883f60e2751eb930251a7a903

diff --git a/console.h b/console.h
index be1010de..438e9ca2 100644
--- a/console.h
+++ b/console.h
@@ -29,57 +29,110 @@ extern int con_backscroll;
 extern qboolean con_initialized;
 
 void Con_Rcon_Redirect_Init(lhnetsocket_t *sock, lhnetaddress_t *dest);
-void Con_Rcon_Redirect_End();
-void Con_Rcon_Redirect_Abort();
+void Con_Rcon_Redirect_End(void);
+void Con_Rcon_Redirect_Abort(void);
 
+/// If the line width has changed, reformat the buffer.
 void Con_CheckResize (void);
 void Con_Init (void);
 void Con_Init_Commands (void);
+void Con_Shutdown (void);
 void Con_DrawConsole (int lines);
+
+/// Prints to all appropriate console targets, and adds timestamps
 void Con_Print(const char *txt);
-void Con_PrintNotToHistory(const char *txt);
+
+/// Prints to all appropriate console targets.
 void Con_Printf(const char *fmt, ...) DP_FUNC_PRINTF(1);
+
+/// A Con_Print that only shows up if the "developer" cvar is set.
 void Con_DPrint(const char *msg);
+
+/// A Con_Printf that only shows up if the "developer" cvar is set
 void Con_DPrintf(const char *fmt, ...) DP_FUNC_PRINTF(1);
 void Con_Clear_f (void);
 void Con_DrawNotify (void);
+
+/// Clear all notify lines.
 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
-// that match what they've typed so far)
+/// 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
+/// that match what they've typed so far)
 void Con_CompleteCommandLine(void);
 
-// Generic libs/util/console.c function to display a list
-// formatted in columns on the console
+/// Generic libs/util/console.c function to display a list
+/// formatted in columns on the console
 void Con_DisplayList(const char **list);
 
 
-//
-// log
-//
+/*! \name 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_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
-#define CON_MASK_LOADEDHISTORY 4
-
-void Con_AddLine(const char *line, int len, int mask);
-int Con_FindPrevLine(int mask_must, int mask_mustnot, int start);
-int Con_FindNextLine(int mask_must, int mask_mustnot, int start);
-const char *Con_GetLine(int i);
-int Con_GetLineID(int i);
-int Con_GetLineByID(int i);
+
+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);
+
+/*! Notifies the console code about the current time
+ * (and shifts back times of other entries when the time
+ * went backwards)
+ */
+void ConBuffer_FixTimes(conbuffer_t *buf);
+
+/// Deletes the first line from the console history.
+void ConBuffer_DeleteLine(conbuffer_t *buf);
+
+/// Deletes the last line from the console history.
+void ConBuffer_DeleteLastLine(conbuffer_t *buf);
+
+/// Appends a given string as a new line to the console.
+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