summaryrefslogtreecommitdiff
path: root/app/xterm/data.c
diff options
context:
space:
mode:
Diffstat (limited to 'app/xterm/data.c')
-rw-r--r--app/xterm/data.c37
1 files changed, 13 insertions, 24 deletions
diff --git a/app/xterm/data.c b/app/xterm/data.c
index 8938442fd..795e75374 100644
--- a/app/xterm/data.c
+++ b/app/xterm/data.c
@@ -1,9 +1,7 @@
-/* $XTermId: data.c,v 1.79 2006/02/13 01:14:58 tom Exp $ */
-
-/* $XFree86: xc/programs/xterm/data.c,v 3.34 2006/02/13 01:14:58 dickey Exp $ */
+/* $XTermId: data.c,v 1.90 2009/08/09 17:22:56 tom Exp $ */
/*
- * Copyright 2002-2005,2006 by Thomas E. Dickey
+ * Copyright 2002-2006,2007 by Thomas E. Dickey
*
* All Rights Reserved
*
@@ -60,7 +58,7 @@ Widget toplevel; /* top-most widget in xterm */
#if OPT_TEK4014
Char *Tpushb;
Char *Tpushback;
-TekLink *TekRefresh;
+TekLink *tekRefreshList;
TekWidget tekWidget;
Widget tekshellwidget;
int T_lastx = -1;
@@ -73,13 +71,11 @@ char *ProgramName;
Arg ourTopLevelShellArgs[] =
{
- {XtNallowShellResize, (XtArgVal) TRUE},
- {XtNinput, (XtArgVal) TRUE},
+ {XtNallowShellResize, (XtArgVal) True},
+ {XtNinput, (XtArgVal) True},
};
Cardinal number_ourTopLevelShellArgs = 2;
-Bool waiting_for_initial_map;
-
Atom wm_delete_window; /* for ICCCM delete window */
XTERM_RESOURCE resource;
@@ -97,19 +93,7 @@ XtermWidget term; /* master data structure for client */
char *xterm_name; /* argv[0] */
int hold_screen;
-SIG_ATOMIC_T need_cleanup = FALSE;
-
-#if OPT_ZICONBEEP
-int zIconBeep; /* non-zero means beep; see charproc.c for details -IAN! */
-Boolean zIconBeep_flagged; /* True if the icon name has been changed */
-#endif /* OPT_ZICONBEEP */
-
-#if OPT_SAME_NAME
-Boolean sameName; /* Don't change the title or icon name if it
- is the same. This prevents flicker on the
- screen at the cost of an extra request to
- the server */
-#endif
+SIG_ATOMIC_T need_cleanup = False;
int am_slave = -1; /* set to file-descriptor if we're a slave process */
int max_plus1;
@@ -119,5 +103,10 @@ PtySelect pty_mask;
char *ptydev;
char *ttydev;
-Boolean waitingForTrackInfo = False;
-EventMode eventMode = NORMAL;
+#if HANDLE_STRUCT_NOTIFY
+int mapstate = -1;
+#endif /* HANDLE_STRUCT_NOTIFY */
+
+#if OPT_SESSION_MGT
+int ice_fd = -1;
+#endif