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.h96
1 files changed, 65 insertions, 31 deletions
diff --git a/app/xterm/xterm.h b/app/xterm/xterm.h
index eb1cb4ec3..01e17b77d 100644
--- a/app/xterm/xterm.h
+++ b/app/xterm/xterm.h
@@ -1,4 +1,4 @@
-/* $XTermId: xterm.h,v 1.461 2007/03/20 23:56:57 tom Exp $ */
+/* $XTermId: xterm.h,v 1.482 2007/07/22 20:14:48 tom Exp $ */
/* $XFree86: xc/programs/xterm/xterm.h,v 3.117 2006/06/19 00:36:52 dickey Exp $ */
@@ -66,14 +66,6 @@ authorization.
#include <sys/param.h>
#endif
-#ifndef HAVE_X11_DECKEYSYM_H
-#define HAVE_X11_DECKEYSYM_H 1
-#endif
-
-#ifndef HAVE_X11_SUNKEYSYM_H
-#define HAVE_X11_SUNKEYSYM_H 1
-#endif
-
#ifndef DFT_TERMTYPE
#define DFT_TERMTYPE "xterm"
#endif
@@ -221,6 +213,18 @@ authorization.
#endif /* HAVE_CONFIG_H */
+#ifndef HAVE_X11_DECKEYSYM_H
+#define HAVE_X11_DECKEYSYM_H 1
+#endif
+
+#ifndef HAVE_X11_SUNKEYSYM_H
+#define HAVE_X11_SUNKEYSYM_H 1
+#endif
+
+#ifndef HAVE_X11_XF86KEYSYM_H
+#define HAVE_X11_XF86KEYSYM_H 0
+#endif
+
/***====================================================================***/
/* if compiling with gcc -ansi -pedantic, we must fix POSIX definitions */
@@ -324,7 +328,7 @@ extern int errno;
#define environ gblenvp /* circumvent a bug */
#endif
-#if !defined(VMS) && !(defined(linux) && defined(__USE_GNU)) && !defined(__hpux) && !defined(_ALL_SOURCE) && !defined(__osf__)
+#if !defined(VMS) && !(defined(linux) && defined(__USE_GNU)) && !defined(__hpux) && !defined(_ALL_SOURCE) && !defined(__osf__)
extern char **environ;
#endif
@@ -334,6 +338,7 @@ extern char **environ;
#define XtNallowC1Printable "allowC1Printable"
#define XtNallowSendEvents "allowSendEvents"
+#define XtNallowTitleOps "allowTitleOps"
#define XtNallowWindowOps "allowWindowOps"
#define XtNaltIsNotMeta "altIsNotMeta"
#define XtNaltSendsEscape "altSendsEscape"
@@ -394,6 +399,7 @@ extern char **environ;
#define XtNforceBoxChars "forceBoxChars"
#define XtNfreeBoldBox "freeBoldBox"
#define XtNhighlightColor "highlightColor"
+#define XtNhighlightReverse "highlightReverse"
#define XtNhighlightSelection "highlightSelection"
#define XtNhighlightTextColor "highlightTextColor"
#define XtNhpLowerleftBugCompat "hpLowerleftBugCompat"
@@ -414,6 +420,8 @@ extern char **environ;
#define XtNmenuBar "menuBar"
#define XtNmenuHeight "menuHeight"
#define XtNmetaSendsEscape "metaSendsEscape"
+#define XtNmkSamplePass "mkSamplePass"
+#define XtNmkSampleSize "mkSampleSize"
#define XtNmkWidth "mkWidth"
#define XtNmodifyCursorKeys "modifyCursorKeys"
#define XtNmodifyFunctionKeys "modifyFunctionKeys"
@@ -479,6 +487,7 @@ extern char **environ;
#define XtCAllowC1Printable "AllowC1Printable"
#define XtCAllowSendEvents "AllowSendEvents"
+#define XtCAllowTitleOps "AllowTitleOps"
#define XtCAllowWindowOps "AllowWindowOps"
#define XtCAltIsNotMeta "AltIsNotMeta"
#define XtCAltSendsEscape "AltSendsEscape"
@@ -533,6 +542,7 @@ extern char **environ;
#define XtCFontStyle "FontStyle"
#define XtCForceBoxChars "ForceBoxChars"
#define XtCFreeBoldBox "FreeBoldBox"
+#define XtCHighlightReverse "HighlightReverse"
#define XtCHighlightSelection "HighlightSelection"
#define XtCHpLowerleftBugCompat "HpLowerleftBugCompat"
#define XtCI18nSelections "I18nSelections"
@@ -550,6 +560,8 @@ extern char **environ;
#define XtCMenuBar "MenuBar"
#define XtCMenuHeight "MenuHeight"
#define XtCMetaSendsEscape "MetaSendsEscape"
+#define XtCMkSamplePass "MkSamplePass"
+#define XtCMkSampleSize "MkSampleSize"
#define XtCMkWidth "MkWidth"
#define XtCModifyCursorKeys "ModifyCursorKeys"
#define XtCModifyFunctionKeys "ModifyFunctionKeys"
@@ -723,6 +735,10 @@ extern void setCgsFont(XtermWidget /*xw*/, VTwin * /*cgsWin*/, CgsEnum /*cgsId*/
extern void setCgsFore(XtermWidget /*xw*/, VTwin * /*cgsWin*/, CgsEnum /*cgsId*/, Pixel /*fg*/);
extern void swapCgs(XtermWidget /*xw*/, VTwin * /*cgsWin*/, CgsEnum /*dstCgsId*/, CgsEnum /*srcCgsId*/);
+#ifdef NO_LEAKS
+extern void noleaks_cachedCgs (XtermWidget /* xw */);
+#endif
+
/* charproc.c */
extern int VTInit (void);
extern int v_write (int /* f */, Char * /* d */, unsigned /* len */);
@@ -817,7 +833,12 @@ extern int main (int /* argc */, char ** /* argv */ ENVP_ARG);
extern int GetBytesAvailable (int /* fd */);
extern int kill_process_group (int /* pid */, int /* sig */);
extern int nonblocking_wait (void);
+
+#if OPT_PTY_HANDSHAKE
extern void first_map_occurred (void);
+#else
+#define first_map_occurred() /* nothing */
+#endif
#ifdef SIGNAL_T
extern SIGNAL_T Exit (int /* n */);
@@ -838,16 +859,17 @@ extern void show_8bit_control (Bool /* value */);
/* misc.c */
extern Bool AllocateTermColor(XtermWidget, ScrnColors *, int, const char *);
-extern Cursor make_colored_cursor (unsigned /* cursorindex */, unsigned long /* fg */, unsigned long /* bg */);
+extern Cursor make_colored_cursor (unsigned /* cursorindex */, unsigned long /* fg */, unsigned long /* bg */);
extern OptionHelp * sortedOpts(OptionHelp *, XrmOptionDescRec *, Cardinal);
-extern Window WMFrameWindow(XtermWidget /* termw */);
+extern Window WMFrameWindow(XtermWidget /* termw */);
extern XrmOptionDescRec * sortedOptDescs(XrmOptionDescRec *, Cardinal);
-extern char *SysErrorMsg (int /* n */);
-extern char *udk_lookup (int /* keycode */, int * /* len */);
+extern char *udk_lookup (int /* keycode */, int * /* len */);
extern char *xtermEnvEncoding (void);
extern char *xtermEnvLocale (void);
extern char *xtermFindShell(char * /* leaf */, Bool /* warning */);
extern char *xtermVersion(void);
+extern const char *SysErrorMsg (int /* n */);
+extern const char *SysReasonMsg (int /* n */);
extern int XStrCmp (char * /* s1 */, char * /* s2 */);
extern int creat_as (uid_t /* uid */, gid_t /* gid */, Bool /* append */, char * /* pathname */, int /* mode */);
extern int open_userfile (uid_t /* uid */, gid_t /* gid */, char * /* path */, Bool /* append */);
@@ -887,6 +909,7 @@ extern void switch_modes (Bool /* tovt */);
extern void timestamp_filename(char * /* dst */, const char * /* src */);
extern void xevents (void);
extern void xt_error (String /* message */);
+extern void xtermCopyEnv (char ** /* oldenv */);
extern void xtermSetenv (char * /* var */, char * /* value */);
#if OPT_DABBREV
@@ -964,35 +987,44 @@ extern ScrnBuf Allocate (int /* nrow */, int /* ncol */, Char ** /* addr */);
extern int ScreenResize (XtermWidget /* xw */, int /* width */, int /* height */, unsigned * /* flags */);
extern size_t ScrnPointers (TScreen * /* screen */, size_t /* len */);
extern void ClearBufRows (XtermWidget /* xw */, int /* first */, int /* last */);
-extern void ScreenWrite (XtermWidget /* xw */, PAIRED_CHARS(Char * /* str */, Char * /* str2 */), unsigned /* flags */, unsigned /* cur_fg_bg */, unsigned /* length */);
+extern void ClearCells (XtermWidget /* xw */, int /* flags */, unsigned /* len */, int /* row */, int /* col */);
+extern void ScrnClearCells (XtermWidget /* xw */, int /* row */, int /* col */, unsigned /* len */);
extern void ScrnDeleteChar (XtermWidget /* xw */, unsigned /* n */);
extern void ScrnDeleteLine (XtermWidget /* xw */, ScrnBuf /* sb */, int /* n */, int /* last */, unsigned /* size */, unsigned /* where */);
+extern void ScrnDisownSelection (XtermWidget /* xw */);
extern void ScrnFillRectangle (XtermWidget /* xw */, XTermRect *, int , unsigned);
extern void ScrnInsertChar (XtermWidget /* xw */, unsigned /* n */);
extern void ScrnInsertLine (XtermWidget /* xw */, ScrnBuf /* sb */, int /* last */, int /* where */, unsigned /* n */, unsigned /* size */);
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 ScrnDisownSelection (XtermWidget /* xw */);
+extern void ScrnWriteText (XtermWidget /* xw */, PAIRED_CHARS(Char * /* str */, Char * /* str2 */), unsigned /* flags */, unsigned /* cur_fg_bg */, unsigned /* length */);
extern void xtermParseRect (XtermWidget /* xw */, int, int *, XTermRect *);
+#if OPT_TRACE && OPT_TRACE_FLAGS
+extern int ScrnTstFlag(TScreen * /* screen */, int /* row */, int /* flag */);
+extern void ScrnClrFlag(TScreen * /* screen */, int /* row */, int /* flag */);
+extern void ScrnSetFlag(TScreen * /* screen */, int /* row */, int /* flag */);
+#else
#define ScrnClrFlag(screen, row, flag) \
- SCRN_BUF_FLAGS(screen, ROW2INX(screen, row)) = \
- (Char *)((long)SCRN_BUF_FLAGS(screen, ROW2INX(screen, row)) & ~ (flag))
+ SCRN_BUF_FLAGS(screen, row) = \
+ (Char *)((long)SCRN_BUF_FLAGS(screen, row) & ~ (flag))
#define ScrnSetFlag(screen, row, flag) \
- SCRN_BUF_FLAGS(screen, ROW2INX(screen, row)) = \
- (Char *)(((long)SCRN_BUF_FLAGS(screen, ROW2INX(screen, row)) | (flag)))
+ SCRN_BUF_FLAGS(screen, row) = \
+ (Char *)(((long)SCRN_BUF_FLAGS(screen, row) | (flag)))
#define ScrnTstFlag(screen, row, flag) \
- (ROW2INX(screen, row + screen->savelines) >= 0 && ((long)SCRN_BUF_FLAGS(screen, ROW2INX(screen, row)) & (flag)) != 0)
+ (okScrnRow(screen, row) && \
+ ((long)SCRN_BUF_FLAGS(screen, row) & (flag)) != 0)
+#endif /* OPT_TRACE && OPT_TRACE_FLAGS */
-#define ScrnClrBlinked(screen, row) ScrnClrFlag(screen, row, BLINK)
-#define ScrnSetBlinked(screen, row) ScrnSetFlag(screen, row, BLINK)
-#define ScrnTstBlinked(screen, row) ScrnTstFlag(screen, row, BLINK)
+#define ScrnClrBlinked(screen, row) ScrnClrFlag(screen, ROW2INX(screen, row), BLINK)
+#define ScrnSetBlinked(screen, row) ScrnSetFlag(screen, ROW2INX(screen, row), BLINK)
+#define ScrnTstBlinked(screen, row) ScrnTstFlag(screen, ROW2INX(screen, row), BLINK)
-#define ScrnClrWrapped(screen, row) ScrnClrFlag(screen, row, LINEWRAPPED)
-#define ScrnSetWrapped(screen, row) ScrnSetFlag(screen, row, LINEWRAPPED)
-#define ScrnTstWrapped(screen, row) ScrnTstFlag(screen, row, LINEWRAPPED)
+#define ScrnClrWrapped(screen, row) ScrnClrFlag(screen, ROW2INX(screen, row), LINEWRAPPED)
+#define ScrnSetWrapped(screen, row) ScrnSetFlag(screen, ROW2INX(screen, row), LINEWRAPPED)
+#define ScrnTstWrapped(screen, row) ScrnTstFlag(screen, ROW2INX(screen, row), LINEWRAPPED)
#define ScrnHaveSelection(screen) \
((screen)->startH.row != (screen)->endH.row \
@@ -1049,7 +1081,8 @@ extern void TabZonk (Tabs /* tabs */);
/* util.c */
extern GC updatedXtermGC (XtermWidget /* xw */, unsigned /* flags */, unsigned /* fg_bg */, Bool /* hilite */);
-extern int AddToRefresh (TScreen * /* screen */);
+extern int AddToRefresh (XtermWidget /* xw */);
+extern int ClearInLine (XtermWidget /* xw */, int /* row */, int /* col */, unsigned /* len */);
extern int HandleExposure (XtermWidget /* xw */, XEvent * /* event */);
extern int char2lower (int /* ch */);
extern int drawXtermText (XtermWidget /* xw */, unsigned /* flags */, GC /* gc */, int /* x */, int /* y */, int /* chrset */, PAIRED_CHARS(Char * /* text */, Char * /* text2 */), Cardinal /* len */, int /* on_wide */);
@@ -1064,8 +1097,9 @@ extern void InsertChar (XtermWidget /* xw */, unsigned /* n */);
extern void InsertLine (XtermWidget /* xw */, int /* n */);
extern void RevScroll (XtermWidget /* xw */, int /* amount */);
extern void ReverseVideo (XtermWidget /* termw */);
+extern void WriteText (XtermWidget /* xw */, PAIRED_CHARS(Char * /* str */, Char * /* str2 */), Cardinal /* len */);
extern void decode_keyboard_type (XtermWidget /* xw */, struct XTERM_RESOURCE * /* rp */);
-extern void decode_wcwidth (int /* mode */);
+extern void decode_wcwidth (int /* mode */, int /* samplesize */, int /* samplepass */);
extern void do_erase_display (XtermWidget /* xw */, int /* param */, int /* mode */);
extern void do_erase_line (XtermWidget /* xw */, int /* param */, int /* mode */);
extern void getXtermSizeHints (XtermWidget /* xw */);
@@ -1186,10 +1220,10 @@ extern void putXtermCell (TScreen * /* screen */, int /* row */, int /* col */
#endif
#if OPT_WIDE_CHARS
+extern int DamagedCells(TScreen * /* screen */, unsigned /* n */, int * /* klp */, int * /* krp */, int /* row */, int /* col */);
+extern int DamagedCurCells(TScreen * /* screen */, unsigned /* n */, int * /* klp */, int * /* krp */);
extern unsigned AsciiEquivs(unsigned /* ch */);
extern unsigned getXtermCellComb (TScreen * /* screen */, int /* row */, int /* col */, int /* off */);
-extern unsigned getXtermCellComb1 (TScreen * /* screen */, int /* row */, int /* col */);
-extern unsigned getXtermCellComb2 (TScreen * /* screen */, int /* row */, int /* col */);
extern void addXtermCombining (TScreen * /* screen */, int /* row */, int /* col */, unsigned /* ch */);
#endif