"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "main.c" between
xterm-363.tgz and xterm-364.tgz

About: xterm is a terminal emulator for X with ISO/ANSI color and vt220 enhancements.

main.c  (xterm-363.tgz):main.c  (xterm-364.tgz)
/* $XTermId: main.c,v 1.866 2020/10/12 18:37:02 tom Exp $ */ /* $XTermId: main.c,v 1.870 2021/02/02 00:20:59 tom Exp $ */
/* /*
* Copyright 2002-2019,2020 by Thomas E. Dickey * Copyright 2002-2020,2021 by Thomas E. Dickey
* *
* All Rights Reserved * All Rights Reserved
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the * copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including * "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish, * without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to * distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to * permit persons to whom the Software is furnished to do so, subject to
* the following conditions: * the following conditions:
skipping to change at line 106 skipping to change at line 106
#include <X11/cursorfont.h> #include <X11/cursorfont.h>
#if OPT_TOOLBAR #if OPT_TOOLBAR
#if defined(HAVE_LIB_XAW) #if defined(HAVE_LIB_XAW)
#include <X11/Xaw/Form.h> #include <X11/Xaw/Form.h>
#elif defined(HAVE_LIB_XAW3D) #elif defined(HAVE_LIB_XAW3D)
#include <X11/Xaw3d/Form.h> #include <X11/Xaw3d/Form.h>
#elif defined(HAVE_LIB_XAW3DXFT) #elif defined(HAVE_LIB_XAW3DXFT)
#include <X11/Xaw3dxft/Form.h> #include <X11/Xaw3dxft/Form.h>
#include <X11/Xaw3dxft/Xaw3dXft.h>
#elif defined(HAVE_LIB_NEXTAW) #elif defined(HAVE_LIB_NEXTAW)
#include <X11/neXtaw/Form.h> #include <X11/neXtaw/Form.h>
#elif defined(HAVE_LIB_XAWPLUS) #elif defined(HAVE_LIB_XAWPLUS)
#include <X11/XawPlus/Form.h> #include <X11/XawPlus/Form.h>
#endif #endif
#endif /* OPT_TOOLBAR */ #endif /* OPT_TOOLBAR */
#include <pwd.h> #include <pwd.h>
#include <ctype.h> #include <ctype.h>
skipping to change at line 1029 skipping to change at line 1030
DATA("-cr", "*cursorColor", XrmoptionSepArg, NULL), DATA("-cr", "*cursorColor", XrmoptionSepArg, NULL),
DATA("-cu", "*curses", XrmoptionNoArg, "on"), DATA("-cu", "*curses", XrmoptionNoArg, "on"),
DATA("+cu", "*curses", XrmoptionNoArg, "off"), DATA("+cu", "*curses", XrmoptionNoArg, "off"),
DATA("-dc", "*dynamicColors",XrmoptionNoArg, "off"), DATA("-dc", "*dynamicColors",XrmoptionNoArg, "off"),
DATA("+dc", "*dynamicColors",XrmoptionNoArg, "on"), DATA("+dc", "*dynamicColors",XrmoptionNoArg, "on"),
DATA("-fb", "*boldFont", XrmoptionSepArg, NULL), DATA("-fb", "*boldFont", XrmoptionSepArg, NULL),
DATA("-fbb", "*freeBoldBox", XrmoptionNoArg, "off"), DATA("-fbb", "*freeBoldBox", XrmoptionNoArg, "off"),
DATA("+fbb", "*freeBoldBox", XrmoptionNoArg, "on"), DATA("+fbb", "*freeBoldBox", XrmoptionNoArg, "on"),
DATA("-fbx", "*forceBoxChars", XrmoptionNoArg, "off"), DATA("-fbx", "*forceBoxChars", XrmoptionNoArg, "off"),
DATA("+fbx", "*forceBoxChars", XrmoptionNoArg, "on"), DATA("+fbx", "*forceBoxChars", XrmoptionNoArg, "on"),
DATA("-fc", "*initialFont", XrmoptionSepArg, NULL),
#ifndef NO_ACTIVE_ICON #ifndef NO_ACTIVE_ICON
DATA("-fi", "*iconFont", XrmoptionSepArg, NULL), DATA("-fi", "*iconFont", XrmoptionSepArg, NULL),
#endif /* NO_ACTIVE_ICON */ #endif /* NO_ACTIVE_ICON */
#if OPT_RENDERFONT #if OPT_RENDERFONT
DATA("-fa", "*faceName", XrmoptionSepArg, NULL), DATA("-fa", "*faceName", XrmoptionSepArg, NULL),
DATA("-fd", "*faceNameDoublesize", XrmoptionSepArg, NULL), DATA("-fd", "*faceNameDoublesize", XrmoptionSepArg, NULL),
DATA("-fs", "*faceSize", XrmoptionSepArg, NULL), DATA("-fs", "*faceSize", XrmoptionSepArg, NULL),
#endif #endif
#if OPT_WIDE_ATTRS && OPT_ISO_COLORS #if OPT_WIDE_ATTRS && OPT_ISO_COLORS
DATA("-itc", "*colorITMode", XrmoptionNoArg, "off"), DATA("-itc", "*colorITMode", XrmoptionNoArg, "off"),
skipping to change at line 1224 skipping to change at line 1226
{ "-help", "print out this message" }, { "-help", "print out this message" },
{ "-display displayname", "X server to contact" }, { "-display displayname", "X server to contact" },
{ "-geometry geom", "size (in characters) and position" }, { "-geometry geom", "size (in characters) and position" },
{ "-/+rv", "turn on/off reverse video" }, { "-/+rv", "turn on/off reverse video" },
{ "-bg color", "background color" }, { "-bg color", "background color" },
{ "-fg color", "foreground color" }, { "-fg color", "foreground color" },
{ "-bd color", "border color" }, { "-bd color", "border color" },
{ "-bw number", "border width in pixels" }, { "-bw number", "border width in pixels" },
{ "-fn fontname", "normal text font" }, { "-fn fontname", "normal text font" },
{ "-fb fontname", "bold text font" }, { "-fb fontname", "bold text font" },
{ "-fc fontmenu", "start with named fontmenu choice" },
{ "-/+fbb", "turn on/off normal/bold font comparison inhibit"}, { "-/+fbb", "turn on/off normal/bold font comparison inhibit"},
{ "-/+fbx", "turn off/on linedrawing characters"}, { "-/+fbx", "turn off/on linedrawing characters"},
#if OPT_RENDERFONT #if OPT_RENDERFONT
{ "-fa pattern", "FreeType font-selection pattern" }, { "-fa pattern", "FreeType font-selection pattern" },
{ "-fd pattern", "FreeType Doublesize font-selection pattern" }, { "-fd pattern", "FreeType Doublesize font-selection pattern" },
{ "-fs size", "FreeType font-size" }, { "-fs size", "FreeType font-size" },
#endif #endif
#if OPT_WIDE_CHARS #if OPT_WIDE_CHARS
{ "-fw fontname", "doublewidth text font" }, { "-fw fontname", "doublewidth text font" },
{ "-fwb fontname", "doublewidth bold text font" }, { "-fwb fontname", "doublewidth bold text font" },
skipping to change at line 2210 skipping to change at line 2213
#undef DATA #undef DATA
#endif #endif
Widget form_top, menu_top; Widget form_top, menu_top;
Dimension menu_high; Dimension menu_high;
TScreen *screen; TScreen *screen;
int mode; int mode;
char *my_class = x_strdup(DEFCLASS); char *my_class = x_strdup(DEFCLASS);
unsigned line_speed = VAL_LINE_SPEED; unsigned line_speed = VAL_LINE_SPEED;
Window winToEmbedInto = None; Window winToEmbedInto = None;
#if defined(HAVE_LIB_XAW3DXFT)
Xaw3dXftData *xaw3dxft_data;
#endif
ProgramName = argv[0]; ProgramName = argv[0];
#ifdef HAVE_POSIX_SAVED_IDS #ifdef HAVE_POSIX_SAVED_IDS
save_euid = geteuid(); save_euid = geteuid();
save_egid = getegid(); save_egid = getegid();
#endif #endif
save_ruid = getuid(); save_ruid = getuid();
save_rgid = getgid(); save_rgid = getgid();
skipping to change at line 2329 skipping to change at line 2335
if (n < argc && !command_to_exec) { if (n < argc && !command_to_exec) {
Syntax(argv[n]); Syntax(argv[n]);
} }
} }
/* This dumped core on HP-UX 9.05 with X11R5 */ /* This dumped core on HP-UX 9.05 with X11R5 */
#if OPT_I18N_SUPPORT #if OPT_I18N_SUPPORT
XtSetLanguageProc(NULL, NULL, NULL); XtSetLanguageProc(NULL, NULL, NULL);
#endif #endif
/* enable Xft support in Xaw3DXft */
#if defined(HAVE_LIB_XAW3DXFT)
GET_XAW3DXFT_DATA(xaw3dxft_data);
xaw3dxft_data->encoding = -1;
#endif
#ifdef TERMIO_STRUCT /* { */ #ifdef TERMIO_STRUCT /* { */
/* Initialization is done here rather than above in order /* Initialization is done here rather than above in order
* to prevent any assumptions about the order of the contents * to prevent any assumptions about the order of the contents
* of the various terminal structures (which may change from * of the various terminal structures (which may change from
* implementation to implementation). * implementation to implementation).
*/ */
memset(&d_tio, 0, sizeof(d_tio)); memset(&d_tio, 0, sizeof(d_tio));
d_tio.c_iflag = ICRNL | IXON; d_tio.c_iflag = ICRNL | IXON;
d_tio.c_oflag = TAB3 | D_TIO_FLAGS; d_tio.c_oflag = TAB3 | D_TIO_FLAGS;
{ {
 End of changes. 7 change blocks. 
2 lines changed or deleted 14 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)