"Fossies" - the Fresh Open Source Software Archive  

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

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

charproc.c  (xterm-367.tgz):charproc.c  (xterm-368.tgz)
/* $XTermId: charproc.c,v 1.1830 2021/03/21 22:45:24 tom Exp $ */ /* $XTermId: charproc.c,v 1.1832 2021/06/07 19:51:06 tom Exp $ */
/* /*
* Copyright 1999-2020,2021 by Thomas E. Dickey * Copyright 1999-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 804 skipping to change at line 804
Sres(XtNlocale, XtCLocale, misc.locale_str, "medium"), Sres(XtNlocale, XtCLocale, misc.locale_str, "medium"),
Sres(XtNlocaleFilter, XtCLocaleFilter, misc.localefilter, DEFLOCALEFILTER), Sres(XtNlocaleFilter, XtCLocaleFilter, misc.localefilter, DEFLOCALEFILTER),
#endif #endif
#if OPT_INPUT_METHOD #if OPT_INPUT_METHOD
Sres(XtNximFont, XtCXimFont, misc.f_x, DEFXIMFONT), Sres(XtNximFont, XtCXimFont, misc.f_x, DEFXIMFONT),
#endif #endif
#if OPT_SCROLL_LOCK #if OPT_SCROLL_LOCK
Bres(XtNallowScrollLock, XtCAllowScrollLock, screen.allowScrollLock0, False) , Bres(XtNallowScrollLock, XtCAllowScrollLock, screen.allowScrollLock0, False) ,
Bres(XtNautoScrollLock, XtCAutoScrollLock, screen.autoScrollLock, False),
#endif #endif
/* these are used only for testing ncurses, not in the manual page */ /* these are used only for testing ncurses, not in the manual page */
#if OPT_XMC_GLITCH #if OPT_XMC_GLITCH
Bres(XtNxmcInline, XtCXmcInline, screen.xmc_inline, False), Bres(XtNxmcInline, XtCXmcInline, screen.xmc_inline, False),
Bres(XtNxmcMoveSGR, XtCXmcMoveSGR, screen.move_sgr_ok, True), Bres(XtNxmcMoveSGR, XtCXmcMoveSGR, screen.move_sgr_ok, True),
Ires(XtNxmcAttributes, XtCXmcAttributes, screen.xmc_attributes, 1), Ires(XtNxmcAttributes, XtCXmcAttributes, screen.xmc_attributes, 1),
Ires(XtNxmcGlitch, XtCXmcGlitch, screen.xmc_glitch, 0), Ires(XtNxmcGlitch, XtCXmcGlitch, screen.xmc_glitch, 0),
#endif #endif
skipping to change at line 9072 skipping to change at line 9073
,DATA(SetChecksum) ,DATA(SetChecksum)
,DATA_END ,DATA_END
}; };
#undef DATA #undef DATA
#if OPT_RENDERFONT #if OPT_RENDERFONT
#define DATA(name) { #name, er##name } #define DATA(name) { #name, er##name }
static const FlagList tblRenderFont[] = static const FlagList tblRenderFont[] =
{ {
DATA(Default) DATA(Default)
,DATA(DefaultOff)
,DATA_END ,DATA_END
}; };
#undef DATA #undef DATA
#endif #endif
#define DATA(name) { #name, ss##name } #define DATA(name) { #name, ss##name }
static const FlagList tblShift2S[] = static const FlagList tblShift2S[] =
{ {
DATA(Always) DATA(Always)
,DATA(Never) ,DATA(Never)
skipping to change at line 9444 skipping to change at line 9446
init_Bres(screen.allowSendEvent0); init_Bres(screen.allowSendEvent0);
init_Bres(screen.allowColorOp0); init_Bres(screen.allowColorOp0);
init_Bres(screen.allowFontOp0); init_Bres(screen.allowFontOp0);
init_Bres(screen.allowMouseOp0); init_Bres(screen.allowMouseOp0);
init_Bres(screen.allowTcapOp0); init_Bres(screen.allowTcapOp0);
init_Bres(screen.allowTitleOp0); init_Bres(screen.allowTitleOp0);
init_Bres(screen.allowWindowOp0); init_Bres(screen.allowWindowOp0);
#if OPT_SCROLL_LOCK #if OPT_SCROLL_LOCK
init_Bres(screen.allowScrollLock0); init_Bres(screen.allowScrollLock0);
init_Bres(screen.autoScrollLock);
#endif #endif
init_Sres(screen.disallowedColorOps); init_Sres(screen.disallowedColorOps);
set_flags_from_list(screen->disallow_color_ops, set_flags_from_list(screen->disallow_color_ops,
screen->disallowedColorOps, screen->disallowedColorOps,
tblColorOps); tblColorOps);
init_Sres(screen.disallowedFontOps); init_Sres(screen.disallowedFontOps);
skipping to change at line 9840 skipping to change at line 9843
if (wnew->work.render_font == erDefault) { if (wnew->work.render_font == erDefault) {
if (IsEmpty(CurrentXftFont(wnew))) { if (IsEmpty(CurrentXftFont(wnew))) {
free((void *) CurrentXftFont(wnew)); free((void *) CurrentXftFont(wnew));
CurrentXftFont(wnew) = x_strdup(DEFFACENAME_AUTO); CurrentXftFont(wnew) = x_strdup(DEFFACENAME_AUTO);
TRACE(("will allow runtime switch to render_font using \"%s\"\n", TRACE(("will allow runtime switch to render_font using \"%s\"\n",
CurrentXftFont(wnew))); CurrentXftFont(wnew)));
} else { } else {
wnew->work.render_font = erTrue; wnew->work.render_font = erTrue;
TRACE(("initially using TrueType font\n")); TRACE(("initially using TrueType font\n"));
} }
} else if (wnew->work.render_font == erDefaultOff) {
wnew->work.render_font = erFalse;
} }
/* minor tweak to make debug traces consistent: */ /* minor tweak to make debug traces consistent: */
if (wnew->work.render_font) { if (wnew->work.render_font) {
if (IsEmpty(CurrentXftFont(wnew))) { if (IsEmpty(CurrentXftFont(wnew))) {
wnew->work.render_font = False; wnew->work.render_font = False;
TRACE(("reset render_font since there is no face_name\n")); TRACE(("reset render_font since there is no face_name\n"));
} }
} }
#endif #endif
 End of changes. 5 change blocks. 
1 lines changed or deleted 6 lines changed or added

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