X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=console.h;h=860c501eebfe3b89a0901842426e89ef72326915;hb=e6486761b694551ddb2c7ae9c87262c9a84f58fe;hp=54b753104e6c7cf16304553dbca923e742c76f08;hpb=c2b8c4445746e076b248030967926d49d4108b2b;p=xonotic%2Fdarkplaces.git

diff --git a/console.h b/console.h
index 54b75310..860c501e 100644
--- a/console.h
+++ b/console.h
@@ -28,50 +28,74 @@ extern int con_totallines;
 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_Init(lhnetsocket_t *sock, lhnetaddress_t *dest, qboolean proquakeprotocol);
+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 a chosen console target
+void Con_MaskPrint(int mask, const char *msg);
+
+// Prints to a chosen console target
+void Con_MaskPrintf(int mask, const char *fmt, ...) DP_FUNC_PRINTF(2);
+
+/// Prints to all appropriate console targets, and adds timestamps
 void Con_Print(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);
 
+int Nicks_CompleteChatLine(char *buffer, size_t size, unsigned int pos);
+
 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);
+//@}
 
+// CON_MASK_PRINT is the default (Con_Print/Con_Printf)
+// CON_MASK_DEVELOPER is used by Con_DPrint/Con_DPrintf
 #define CON_MASK_HIDENOTIFY 128
 #define CON_MASK_CHAT 1
 #define CON_MASK_INPUT 2
+#define CON_MASK_DEVELOPER 4
+#define CON_MASK_PRINT 8
 
 typedef struct con_lineinfo_s
 {
@@ -79,38 +103,45 @@ typedef struct con_lineinfo_s
 	size_t len;
 	int mask;
 
-	// used only by console.c
+	/// used only by console.c
 	double addtime;
-	int height; // recalculated line height when needed (-1 to unset)
+	int height; ///< recalculated line height when needed (-1 to unset)
 }
 con_lineinfo_t;
 
 typedef struct conbuffer_s
 {
+	qboolean active;
 	int textsize;
 	char *text;
 	int maxlines;
 	con_lineinfo_t *lines;
 	int lines_first;
-	int lines_count; // cyclic buffer
+	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(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);