"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "main.c" between
xterm-367.tgz and xterm-368.tgz

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

main.c  (xterm-367.tgz):main.c  (xterm-368.tgz)
/* $XTermId: main.c,v 1.877 2021/03/21 22:09:06 tom Exp $ */ /* $XTermId: main.c,v 1.881 2021/06/03 21:23:20 tom Exp $ */
/* /*
* Copyright 2002-2020,2021 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,
skipping to change at line 2224 skipping to change at line 2224
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) #if defined(HAVE_LIB_XAW3DXFT)
Xaw3dXftData *xaw3dxft_data; Xaw3dXftData *xaw3dxft_data;
#endif #endif
ProgramName = argv[0]; ProgramName = x_strdup(x_basename(argv[0]));
ProgramPath = xtermFindShell(argv[0], True);
if (ProgramPath != NULL)
argv[0] = ProgramPath;
#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();
#if defined(DISABLE_SETUID) || defined(DISABLE_SETGID) #if defined(DISABLE_SETUID) || defined(DISABLE_SETGID)
skipping to change at line 2272 skipping to change at line 2275
get_pty(NULL, NULL); get_pty(NULL, NULL);
disableSetUid(); disableSetUid();
disableSetGid(); disableSetGid();
TRACE_IDS; TRACE_IDS;
#define get_pty(pty, from) really_get_pty(pty, from) #define get_pty(pty, from) really_get_pty(pty, from)
#endif #endif
/* Do these first, since we may not be able to open the display */ /* Do these first, since we may not be able to open the display */
TRACE_OPTS(xtermOptions, optionDescList, XtNumber(optionDescList)); TRACE_OPTS(xtermOptions, optionDescList, XtNumber(optionDescList));
TRACE_ARGV("Before XtOpenApplication", argv); TRACE_ARGV("Before XtOpenApplication", argv);
restart_params = 0;
if (argc > 1) { if (argc > 1) {
XrmOptionDescRec *option_ptr; XrmOptionDescRec *option_ptr;
char *option_value; char *option_value;
int n; int n;
Bool quit = False; Bool quit = False;
for (n = 1; n < argc; n++) { for (n = 1; n < argc; n++) {
if ((option_ptr = parseArg(&n, argv, &option_value)) == 0) { if ((option_ptr = parseArg(&n, argv, &option_value)) == 0) {
if (argv[n] == 0) { if (argv[n] == 0) {
break; break;
} else if (isOption(argv[n])) { } else if (isOption(argv[n])) {
Syntax(argv[n]); Syntax(argv[n]);
} else if (explicit_shname != 0) { } else if (explicit_shname != 0) {
xtermWarning("Explicit shell already was %s\n", explicit_shna me); xtermWarning("Explicit shell already was %s\n", explicit_shna me);
Syntax(argv[n]); Syntax(argv[n]);
} }
explicit_shname = xtermFindShell(argv[n], True); explicit_shname = xtermFindShell(argv[n], True);
if (explicit_shname == 0) if (explicit_shname == 0)
exit(0); exit(0);
TRACE(("...explicit shell %s\n", explicit_shname)); TRACE(("...explicit shell %s\n", explicit_shname));
restart_params = (argc - n);
} else if (!strcmp(option_ptr->option, "-e")) { } else if (!strcmp(option_ptr->option, "-e")) {
command_to_exec = (argv + n + 1); command_to_exec = (argv + n + 1);
if (!command_to_exec[0]) if (!command_to_exec[0])
Syntax(argv[n]); Syntax(argv[n]);
restart_params = (argc - n);
break; break;
} else if (!strcmp(option_ptr->option, "-version")) { } else if (!strcmp(option_ptr->option, "-version")) {
Version(); Version();
quit = True; quit = True;
} else if (!strcmp(option_ptr->option, "-help")) { } else if (!strcmp(option_ptr->option, "-help")) {
Help(); Help();
quit = True; quit = True;
} else if (!strcmp(option_ptr->option, "-baudrate")) { } else if (!strcmp(option_ptr->option, "-baudrate")) {
NeedParam(option_ptr, option_value); NeedParam(option_ptr, option_value);
if ((line_speed = lookup_baudrate(option_value)) == 0) { if ((line_speed = lookup_baudrate(option_value)) == 0) {
skipping to change at line 2476 skipping to change at line 2482
TRACE_IDS; TRACE_IDS;
#endif #endif
toplevel = xtermOpenApplication(&app_con, toplevel = xtermOpenApplication(&app_con,
my_class, my_class,
optionDescList, optionDescList,
XtNumber(optionDescList), XtNumber(optionDescList),
&argc, argv, &argc, argv,
fallback_resources, fallback_resources,
sessionShellWidgetClass, sessionShellWidgetClass,
NULL, 0); NULL, 0);
TRACE(("created toplevel widget %p, window %#lx\n",
(void *) toplevel, XtWindow(toplevel)));
XtGetApplicationResources(toplevel, (XtPointer) &resource, XtGetApplicationResources(toplevel, (XtPointer) &resource,
application_resources, application_resources,
XtNumber(application_resources), NULL, 0); XtNumber(application_resources), NULL, 0);
TRACE_XRES(); TRACE_XRES();
#ifdef HAVE_LIB_XCURSOR #ifdef HAVE_LIB_XCURSOR
if (!strcmp(resource.cursorTheme, "none")) { if (!strcmp(resource.cursorTheme, "none")) {
TRACE(("startup with no cursorTheme\n")); TRACE(("startup with no cursorTheme\n"));
init_colored_cursor(XtDisplay(toplevel)); init_colored_cursor(XtDisplay(toplevel));
} else { } else {
skipping to change at line 2655 skipping to change at line 2663
XtNmenuBar, menu_top, XtNmenuBar, menu_top,
XtNresizable, True, XtNresizable, True,
XtNfromVert, menu_top, XtNfromVert, menu_top,
XtNleft, XawChainLeft, XtNleft, XawChainLeft,
XtNright, XawChainRight, XtNright, XawChainRight,
XtNtop, XawChainTop, XtNtop, XawChainTop,
XtNbottom, XawChainBottom, XtNbottom, XawChainBottom,
XtNmenuHeight, menu_high, XtNmenuHeight, menu_high,
#endif #endif
(XtPointer) 0); (XtPointer) 0);
TRACE(("created vt100 widget %p, window %#lx\n",
(void *) term, XtWindow(term)));
decode_keyboard_type(term, &resource); decode_keyboard_type(term, &resource);
screen = TScreenOf(term); screen = TScreenOf(term);
screen->inhibit = 0; screen->inhibit = 0;
#ifdef ALLOWLOGGING #ifdef ALLOWLOGGING
if (term->misc.logInhibit) if (term->misc.logInhibit)
screen->inhibit |= I_LOG; screen->inhibit |= I_LOG;
#endif #endif
if (term->misc.signalInhibit) if (term->misc.signalInhibit)
 End of changes. 7 change blocks. 
2 lines changed or deleted 12 lines changed or added

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