summaryrefslogtreecommitdiff
path: root/app/xterm/xterm.h
diff options
context:
space:
mode:
Diffstat (limited to 'app/xterm/xterm.h')
-rw-r--r--app/xterm/xterm.h18
1 files changed, 10 insertions, 8 deletions
diff --git a/app/xterm/xterm.h b/app/xterm/xterm.h
index f68cce0af..952da4c5c 100644
--- a/app/xterm/xterm.h
+++ b/app/xterm/xterm.h
@@ -1,4 +1,4 @@
-/* $XTermId: xterm.h,v 1.746 2014/09/03 23:58:49 tom Exp $ */
+/* $XTermId: xterm.h,v 1.749 2014/11/28 19:30:12 tom Exp $ */
/*
* Copyright 1999-2013,2014 by Thomas E. Dickey
@@ -517,6 +517,7 @@ extern char **environ;
#define XtNprinterNewLine "printerNewLine"
#define XtNprivateColorRegisters "privateColorRegisters"
#define XtNquietGrab "quietGrab"
+#define XtNregisScreenSize "regisScreenSize"
#define XtNrenderFont "renderFont"
#define XtNresizeGravity "resizeGravity"
#define XtNretryInputMethod "retryInputMethod"
@@ -694,6 +695,7 @@ extern char **environ;
#define XtCPrinterNewLine "PrinterNewLine"
#define XtCPrivateColorRegisters "PrivateColorRegisters"
#define XtCQuietGrab "QuietGrab"
+#define XtCRegisScreenSize "RegisScreenSize"
#define XtCRenderFont "RenderFont"
#define XtCResizeGravity "ResizeGravity"
#define XtCRetryInputMethod "RetryInputMethod"
@@ -908,7 +910,7 @@ extern void ToggleCursorBlink(TScreen * /* screen */);
#endif
#if OPT_BLINK_TEXT
-extern Bool LineHasBlinking(TScreen * /* screen */, LineData * /* ld */);
+extern Bool LineHasBlinking(TScreen * /* screen */, CLineData * /* ld */);
#endif
#if OPT_INPUT_METHOD
@@ -976,12 +978,12 @@ extern void VTInitModifiers(XtermWidget /* xw */);
/* linedata.c */
extern LineData *getLineData(TScreen * /* screen */, int /* row */);
-extern void copyLineData(LineData * /* dst */, LineData * /* src */);
+extern void copyLineData(LineData * /* dst */, CLineData * /* src */);
extern void initLineData(XtermWidget /* xw */);
extern CellData *newCellData(XtermWidget /* xw */, Cardinal /* count */);
-extern void saveCellData(TScreen * /* screen */, CellData * /* data */, Cardinal /* cell */, LineData * /* ld */, int /* column */);
-extern void restoreCellData(TScreen * /* screen */, CellData * /* data */, Cardinal /* cell */, LineData * /* ld */, int /* column */);
+extern void saveCellData(TScreen * /* screen */, CellData * /* data */, Cardinal /* cell */, CLineData * /* ld */, int /* column */);
+extern void restoreCellData(TScreen * /* screen */, const CellData * /* data */, Cardinal /* cell */, LineData * /* ld */, int /* column */);
/* main.c */
#define ENVP_ARG /**/
@@ -1236,7 +1238,7 @@ extern void ScrnInsertLine (XtermWidget /* xw */, ScrnBuf /* sb */, int /* last
extern void ScrnRefresh (XtermWidget /* xw */, int /* toprow */, int /* leftcol */, int /* nrows */, int /* ncols */, Bool /* force */);
extern void ScrnUpdate (XtermWidget /* xw */, int /* toprow */, int /* leftcol */, int /* nrows */, int /* ncols */, Bool /* force */);
extern void ScrnWriteText (XtermWidget /* xw */, IChar * /* str */, unsigned /* flags */, unsigned /* cur_fg_bg */, unsigned /* length */);
-extern void ShowWrapMarks (XtermWidget /* xw */, int /* row */, LineData * /* ld */);
+extern void ShowWrapMarks (XtermWidget /* xw */, int /* row */, CLineData * /* ld */);
extern void setupLineData (TScreen * /* screen */, ScrnBuf /* base */, Char * /* data */, unsigned /* nrow */, unsigned /* ncol */);
extern void xtermParseRect (XtermWidget /* xw */, int, int *, XTermRect *);
@@ -1345,7 +1347,7 @@ extern Pixel getXtermForeground(XtermWidget /* xw */, unsigned /* flags */, int
extern int ClearInLine (XtermWidget /* xw */, int /* row */, int /* col */, unsigned /* len */);
extern int HandleExposure (XtermWidget /* xw */, XEvent * /* event */);
extern int dimRound (double /* value */);
-extern int drawXtermText (XtermWidget /* xw */, unsigned /* attr_flags */, unsigned /* draw_flags */, GC /* gc */, int /* x */, int /* y */, int /* chrset */, IChar * /* text */, Cardinal /* len */, int /* on_wide */);
+extern int drawXtermText (XtermWidget /* xw */, unsigned /* attr_flags */, unsigned /* draw_flags */, GC /* gc */, int /* x */, int /* y */, int /* chrset */, const IChar * /* text */, Cardinal /* len */, int /* on_wide */);
extern int extendedBoolean(const char * /* value */, const FlagList * /* table */, Cardinal /* limit */);
extern void ChangeColors (XtermWidget /* xw */, ScrnColors * /* pNew */);
extern void ClearRight (XtermWidget /* xw */, int /* n */);
@@ -1499,7 +1501,7 @@ extern void Resolve_XMC (XtermWidget /* xw */);
#endif
#if OPT_WIDE_CHARS
-unsigned visual_width(IChar * /* str */, Cardinal /* len */);
+unsigned visual_width(const IChar * /* str */, Cardinal /* len */);
#else
#define visual_width(a, b) (b)
#endif