Update to xterm version 269.

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

1 files changed, 30 insertions, 5 deletions

diff --git a/app/xterm/ptyx.h b/app/xterm/ptyx.h
index d59caa106..70b8304af 100644
--- a/app/xterm/ptyx.h
+++ b/app/xterm/ptyx.h
@@ -1,7 +1,7 @@
-/* $XTermId: ptyx.h,v 1.675 2010/10/11 08:25:53 tom Exp $ */
+/* $XTermId: ptyx.h,v 1.684 2011/02/17 00:13:06 tom Exp $ */
 
 /*
- * Copyright 1999-2009,2010 by Thomas E. Dickey
+ * Copyright 1999-2010,2011 by Thomas E. Dickey
  *
  *                         All Rights Reserved
  *
@@ -60,6 +60,7 @@
 #endif
 
 /* ptyx.h */
+/* *INDENT-OFF* */
 /* @(#)ptyx.h	X10/6.6	11/10/86 */
 
 #include <X11/IntrinsicP.h>
@@ -91,6 +92,12 @@
 
 #define TypeRealloc(type,n,p)	(type *)realloc(p, (n) * sizeof(type))
 
+#define TypeXtReallocN(t,p,n)	(t *)(void *)XtRealloc((char *)(p), (Cardinal)(sizeof(t) * (size_t) (n)))
+
+#define TypeXtMallocX(type,n)	(type *)(void *)XtMalloc((Cardinal)(sizeof(type) + (size_t) (n)))
+#define TypeXtMallocN(type,n)	(type *)(void *)XtMalloc((Cardinal)(sizeof(type) * (size_t) (n)))
+#define TypeXtMalloc(type)	TypeXtMallocN(type, 1)
+
 /* use these to allocate partly-structured data */
 #define CastMallocN(type,n)	(type *)malloc(sizeof(type) + (size_t) (n))
 #define CastMalloc(type)	CastMallocN(type,0)
@@ -886,6 +893,13 @@ typedef enum {
 } FontOps;
 
 typedef enum {
+    esFalse = 0
+    , esTrue
+    , esAlways
+    , esNever
+} FullscreenOps;
+
+typedef enum {
     etSetTcap = 1
     , etGetTcap
     , etLAST
@@ -903,6 +917,7 @@ typedef enum {
     , ewSetWinSizeChars = 8
 #if OPT_MAXIMIZE
     , ewMaximizeWin = 9
+    , ewFullscreenWin = 10
 #endif
     , ewGetWinState = 11
     , ewGetWinPosition = 13
@@ -1653,6 +1668,9 @@ typedef struct {
 
 	Boolean		awaitInput;	/* select-timeout mode		*/
 	Boolean		grabbedKbd;	/* keyboard is grabbed		*/
+#if OPT_MAXIMIZE
+	Boolean		fullscreen;	/* window is fullscreen		*/
+#endif
 #ifdef ALLOWLOGGING
 	int		logging;	/* logging mode			*/
 	int		logfd;		/* file descriptor of log	*/
@@ -2034,6 +2052,11 @@ typedef struct _TekScreen {
 
 #define MULTICLICKTIME 250	/* milliseconds */
 
+typedef struct {
+    const char *name;
+    int code;
+} FlagList;
+
 typedef enum {
     fwNever = 0,
     fwResource,
@@ -2458,7 +2481,7 @@ typedef struct _TekWidgetRec {
  * These definitions do not depend on whether xterm supports active-icon.
  */
 #define VWindow(screen)		WhichVWin(screen)->window
-#define VShellWindow		XtWindow(SHELL_OF(term))
+#define VShellWindow(xw)	XtWindow(SHELL_OF(xw))
 #define TWindow(screen)		WhichTWin(screen)->window
 #define TShellWindow		XtWindow(SHELL_OF(tekWidget))
 
@@ -2511,8 +2534,8 @@ typedef struct _TekWidgetRec {
 
 #if OPT_TOOLBAR
 #define ToolbarHeight(w)	((resource.toolBar) \
-				 ? (term->VT100_TB_INFO(menu_height) \
-				  + term->VT100_TB_INFO(menu_border) * 2) \
+				 ? ((w)->VT100_TB_INFO(menu_height) \
+				  + (w)->VT100_TB_INFO(menu_border) * 2) \
 				 : 0)
 #else
 #define ToolbarHeight(w) 0
@@ -2606,4 +2629,6 @@ typedef struct Tek_Link
 #define TRACE2(p) /*nothing*/
 #endif
 
+/* *INDENT-ON* */
+
 #endif /* included_ptyx_h */