Update to xterm version 269.

Tested and ok ajacoutot@, jasper@, krw@, shadchin@

1 files changed, 25 insertions, 14 deletions

diff --git a/app/xterm/xterm.h b/app/xterm/xterm.h
index fb46c3bc6..8555f1b79 100644
--- a/app/xterm/xterm.h
+++ b/app/xterm/xterm.h
@@ -1,8 +1,8 @@
-/* $XTermId: xterm.h,v 1.637 2010/11/11 11:41:54 tom Exp $ */
+/* $XTermId: xterm.h,v 1.644 2011/02/20 00:49:16 tom Exp $ */
 
 /************************************************************
 
-Copyright 1999-2009,2010 by Thomas E. Dickey
+Copyright 1999-2010,2011 by Thomas E. Dickey
 
                         All Rights Reserved
 
@@ -40,11 +40,16 @@ authorization.
  */
 #ifndef included_xterm_h
 #define included_xterm_h
+/* *INDENT-OFF* */
 
 #ifdef HAVE_CONFIG_H
 #include <xtermcfg.h>
 #endif
 
+#ifndef GCC_PRINTFLIKE
+#define GCC_PRINTFLIKE(f,n)	/* nothing */
+#endif
+
 #ifndef GCC_UNUSED
 #define GCC_UNUSED		/* nothing */
 #endif
@@ -418,6 +423,7 @@ extern char **environ;
 #define XtNforcePackedFont	"forcePackedFont"
 #define XtNformatOtherKeys	"formatOtherKeys"
 #define XtNfreeBoldBox		"freeBoldBox"
+#define XtNfullscreen		"fullscreen"
 #define XtNhighlightColor	"highlightColor"
 #define XtNhighlightColorMode	"highlightColorMode"
 #define XtNhighlightReverse	"highlightReverse"
@@ -545,7 +551,7 @@ extern char **environ;
 #define XtCC132			"C132"
 #define XtCCacheDoublesize	"CacheDoublesize"
 #define XtCCharClass		"CharClass"
-#define XtCCjkWidth 		"CjkWidth"
+#define XtCCjkWidth		"CjkWidth"
 #define XtCColorAttrMode	"ColorAttrMode"
 #define XtCColorMode		"ColorMode"
 #define XtCColumn		"Column"
@@ -587,6 +593,7 @@ extern char **environ;
 #define XtCForcePackedFont	"ForcePackedFont"
 #define XtCFormatOtherKeys	"FormatOtherKeys"
 #define XtCFreeBoldBox		"FreeBoldBox"
+#define XtCFullscreen		"Fullscreen"
 #define XtCHighlightColorMode	"HighlightColorMode"
 #define XtCHighlightReverse	"HighlightReverse"
 #define XtCHighlightSelection	"HighlightSelection"
@@ -610,7 +617,7 @@ extern char **environ;
 #define XtCMetaSendsEscape	"MetaSendsEscape"
 #define XtCMkSamplePass 	"MkSamplePass"
 #define XtCMkSampleSize 	"MkSampleSize"
-#define XtCMkWidth 		"MkWidth"
+#define XtCMkWidth		"MkWidth"
 #define XtCModifyCursorKeys	"ModifyCursorKeys"
 #define XtCModifyFunctionKeys	"ModifyFunctionKeys"
 #define XtCModifyKeypadKeys	"ModifyKeypadKeys"
@@ -813,6 +820,7 @@ extern void RestartBlinking(TScreen * /* screen */);
 extern void ShowCursor (void);
 extern void SwitchBufPtrs (TScreen * /* screen */, int /* toBuf */);
 extern void ToggleAlternate (XtermWidget /* xw */);
+extern void VTInitTranslations (void);
 extern void VTReset (XtermWidget /* xw */, int /* full */, int /* saved */);
 extern void VTRun (XtermWidget /* xw */);
 extern void dotext (XtermWidget /* xw */, int  /* charset */, IChar * /* buf */, Cardinal  /* len */);
@@ -974,7 +982,7 @@ extern void HandleStringEvent          PROTO_XT_ACTIONS_ARGS;
 extern void Panic (const char * /* s */, int  /* a */);
 extern void Redraw (void);
 extern void ReverseOldColors (void);
-extern void SysError (int  /* i */) GCC_NORETURN;
+extern void SysError (int /* i */) GCC_NORETURN;
 extern void VisualBell (void);
 extern void do_dcs (XtermWidget /* xw */, Char * /* buf */, size_t  /* len */);
 extern void do_decrpm (XtermWidget /* xw */, int /* nparam */, int *  /* params */);
@@ -1081,10 +1089,10 @@ extern void writePtyData (int  /* f */, IChar * /* d */, unsigned  /* len */);
 	 : False)
 #else
 #define morePtyData(screen, data) ((data)->last > (data)->next)
-#define nextPtyData(screen, data) (*((data)->next++) & \
-					(screen->output_eight_bits \
-					? 0xff \
-					: 0x7f))
+#define nextPtyData(screen, data) (IChar) (*((data)->next++) & \
+					   (screen->output_eight_bits \
+					    ? 0xff \
+					    : 0x7f))
 #define writePtyData(f,d,len) v_write(f,d,len)
 #endif
 
@@ -1097,6 +1105,7 @@ extern int ScreenResize (XtermWidget /* xw */, int  /* width */, int  /* height
 extern size_t ScrnPointers (TScreen * /* screen */, size_t  /* len */);
 extern void ClearBufRows (XtermWidget /* xw */, int  /* first */, int  /* last */);
 extern void ClearCells (XtermWidget /* xw */, int /* flags */, unsigned /* len */, int /* row */, int /* col */);
+extern void FullScreen(XtermWidget /* xw */, Bool /* enabled */);
 extern void ScrnAllocBuf (XtermWidget /* xw */);
 extern void ScrnClearCells (XtermWidget /* xw */, int /* row */, int /* col */, unsigned /* len */);
 extern void ScrnDeleteChar (XtermWidget /* xw */, unsigned  /* n */);
@@ -1200,6 +1209,7 @@ 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 drawXtermText (XtermWidget /* xw */, unsigned /* flags */, GC /* gc */, int /* x */, int /* y */, int /* chrset */, IChar * /* text */, Cardinal /* len */, int /* on_wide */);
+extern int extendedBoolean(const char * /* value */, FlagList * /* table */, Cardinal /* limit */);
 extern void ChangeColors (XtermWidget  /* xw */, ScrnColors * /* pNew */);
 extern void ClearRight (XtermWidget /* xw */, int /* n */);
 extern void ClearScreen (XtermWidget /* xw */);
@@ -1267,10 +1277,10 @@ extern Pixel xtermGetColorRes(XtermWidget /* xw */, ColorRes * /* res */);
 #define MapToColorMode(fg, screen, flags) \
 	(((screen)->colorBLMode && ((flags) & BLINK)) \
 	 ? COLOR_BL \
-	 : (((screen)->colorULMode && ((flags) & UNDERLINE)) \
-	    ? COLOR_UL \
-	    : (((screen)->colorBDMode && ((flags) & BOLD)) \
-	       ? COLOR_BD \
+	 : (((screen)->colorBDMode && ((flags) & BOLD)) \
+	    ? COLOR_BD \
+	    : (((screen)->colorULMode && ((flags) & UNDERLINE)) \
+	       ? COLOR_UL \
 	       : fg)))
 
 #define checkVeryBoldAttr(flags, fg, code, attr) \
@@ -1359,5 +1369,6 @@ unsigned visual_width(IChar * /* str */, Cardinal  /* len */);
 #ifdef __cplusplus
 	}
 #endif
+/* *INDENT-ON* */
 
-#endif	/* included_xterm_h */
+#endif /* included_xterm_h */