X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=screen.h;h=01d264ca72a7540eb8ce826b844009ea075e8d04;hp=f1fdd7fa29d2cb95b2ec22a216dc5a8b69c70b30;hb=2b065b3efdf9a5aced95aa93aed4db1caf8191bb;hpb=c2995f2c4c030b1c3adb163fd84b4ea5b3d2b104

diff --git a/screen.h b/screen.h
index f1fdd7fa..01d264ca 100644
--- a/screen.h
+++ b/screen.h
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -19,29 +19,80 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // screen.h
 
-void SCR_Init (void);
+#ifndef SCREEN_H
+#define SCREEN_H
 
-void SCR_UpdateScreen (void);
+#include <stddef.h>
+#include "qtypes.h"
+struct portable_samplepair_s;
 
+void CL_Screen_Init (void);
+void CL_UpdateScreen (void);
+void SCR_CenterPrint(const char *str);
 
-void SCR_SizeUp (void);
-void SCR_SizeDown (void);
-void SCR_CenterPrint (char *str);
+void SCR_BeginLoadingPlaque (qbool startup);
+void SCR_EndLoadingPlaque (void);
 
-//void SCR_BeginLoadingPlaque (void);
-//void SCR_EndLoadingPlaque (void);
+// invoke refresh of loading plaque (nothing else seen)
+void SCR_UpdateLoadingScreen(qbool clear, qbool startup);
+void SCR_UpdateLoadingScreenIfShown(void);
 
-extern float scr_con_current;
-extern float scr_conlines; // lines of console to display
+// pushes an item on the loading screen
+void SCR_PushLoadingScreen (const char *msg, float len_in_parent);
+void SCR_PopLoadingScreen (qbool redraw);
+void SCR_ClearLoadingScreen (qbool redraw);
+
+void SCR_CaptureVideo_SoundFrame(const struct portable_samplepair_s *paintbuffer, size_t length);
+
+extern float scr_con_current; // current height of displayed console
 
 extern int sb_lines;
 
-extern int clearnotify; // set to 0 whenever notify text is drawn
-extern qboolean	scr_disabled_for_loading;
-extern qboolean	scr_skipupdate;
+extern struct cvar_s scr_viewsize;
+extern struct cvar_s scr_fov;
+extern struct cvar_s cl_showfps;
+extern struct cvar_s cl_showtime;
+extern struct cvar_s cl_showdate;
+
+extern struct cvar_s crosshair;
+extern struct cvar_s crosshair_size;
+
+extern struct cvar_s scr_conalpha;
+extern struct cvar_s scr_conalphafactor;
+extern struct cvar_s scr_conalpha2factor;
+extern struct cvar_s scr_conalpha3factor;
+extern struct cvar_s scr_conscroll_x;
+extern struct cvar_s scr_conscroll_y;
+extern struct cvar_s scr_conscroll2_x;
+extern struct cvar_s scr_conscroll2_y;
+extern struct cvar_s scr_conscroll3_x;
+extern struct cvar_s scr_conscroll3_y;
+extern struct cvar_s scr_conbrightness;
+extern struct cvar_s r_letterbox;
+
+extern struct cvar_s scr_refresh;
+extern struct cvar_s scr_stipple;
+
+extern struct cvar_s r_stereo_separation;
+extern struct cvar_s r_stereo_angle;
+qbool R_Stereo_Active(void);
+extern int r_stereo_side;
+
+typedef struct scr_touchscreenarea_s
+{
+	const char *pic;
+	const char *text;
+	float rect[4];
+	float textheight;
+	float active;
+	float activealpha;
+	float inactivealpha;
+}
+scr_touchscreenarea_t;
+
+// FIXME: should resize dynamically?
+extern int scr_numtouchscreenareas;
+extern scr_touchscreenarea_t scr_touchscreenareas[128];
+
+#endif
 
-extern cvar_t scr_viewsize;
-extern cvar_t scr_viewsize;
-extern cvar_t crosshair;
-extern cvar_t crosshair_size;
-extern cvar_t showfps;