old
/
eterm
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Sun Sep 17 17:29:26 PDT 2000 Michael Jennings <mej@eterm.org>

Browse Source 
Got rid of the useless backing_store option.


SVN revision: 3520
eterm-0.10
Michael Jennings 23 years ago
parent 7666c71c9b
commit f964562863
11 changed files with 53 additions and 74 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      ChangeLog
  2. 3
      src/buttons.c
  3. 4
      src/command.c
  4. 1
      src/feature.h
  5. 5
      src/menus.c
  6. 61
      src/options.c
  7. 17
      src/options.h
  8. 4
      src/screen.c
  9. 8
      src/scrollbar.c
  10. 4
      src/term.c
  11. 15
      src/windows.c

5
ChangeLog
Unescape View File

@ -3904,3 +3904,8 @@ Sun Sep 17 13:05:13 PDT 2000 Michael Jennings <mej@eterm.org>
<gnea@rochester.rr.com>.
-------------------------------------------------------------------------------
Sun Sep 17 17:29:26 PDT 2000 Michael Jennings <mej@eterm.org>
Got rid of the useless backing_store option.
-------------------------------------------------------------------------------

3
src/buttons.c
Unescape View File

@ -80,7 +80,6 @@ bbar_create(void)
xattr.border_pixel = BlackPixel(Xdisplay, Xscreen);
xattr.save_under = FALSE;
xattr.backing_store = NotUseful;
xattr.override_redirect = TRUE;
xattr.colormap = cmap;
@ -96,7 +95,7 @@ bbar_create(void)
gcvalue.font = bbar->font->fid;
bbar->win = XCreateWindow(Xdisplay, Xroot, bbar->x, bbar->y, bbar->w, bbar->h, 0, Xdepth, InputOutput, CopyFromParent,
CWOverrideRedirect | CWSaveUnder | CWBackingStore | CWBorderPixel | CWColormap, &xattr);
CWOverrideRedirect | CWSaveUnder | CWBorderPixel | CWColormap, &xattr);
XDefineCursor(Xdisplay, bbar->win, cursor);
XSelectInput(Xdisplay, bbar->win, mask);
XStoreName(Xdisplay, bbar->win, "Eterm Button Bar");

4
src/command.c
Unescape View File

@ -2199,7 +2199,7 @@ run_command(char *argv[])
shell = "/bin/sh";
argv0 = my_basename(shell);
if (Options & Opt_loginShell) {
if (Options & Opt_login_shell) {
char *p = MALLOC(strlen(argv0) + 2);
p[0] = '-';
@ -2214,7 +2214,7 @@ run_command(char *argv[])
}
#ifdef UTMP_SUPPORT
privileges(RESTORE);
if (Options & Opt_utmpLogging) {
if (Options & Opt_write_utmp) {
add_utmp_entry(ttydev, display_name, ptyfd);
}
privileges(IGNORE);

1
src/feature.h
Unescape View File

@ -260,7 +260,6 @@
#define FONT0_IDX 2
#ifndef PIXMAP_SUPPORT
# undef BACKING_STORE
# undef PIXMAP_OFFSET
# undef IMLIB_TRANS
# undef BACKGROUND_CYCLING_SUPPORT

5
src/menus.c
Unescape View File

@ -444,7 +444,6 @@ menu_create(char *title)
if (!mask) {
xattr.border_pixel = BlackPixel(Xdisplay, Xscreen);
xattr.save_under = TRUE;
xattr.backing_store = WhenMapped;
xattr.override_redirect = TRUE;
xattr.colormap = cmap;
@ -456,13 +455,13 @@ menu_create(char *title)
menu->title = STRDUP(title ? title : "");
menu->win = XCreateWindow(Xdisplay, Xroot, 0, 0, 1, 1, 0, Xdepth, InputOutput, CopyFromParent,
CWOverrideRedirect | CWSaveUnder | CWBackingStore | CWBorderPixel | CWColormap, &xattr);
CWOverrideRedirect | CWSaveUnder | CWBorderPixel | CWColormap, &xattr);
XDefineCursor(Xdisplay, menu->win, cursor);
XSelectInput(Xdisplay, menu->win, mask);
XStoreName(Xdisplay, menu->win, menu->title);
menu->swin = XCreateWindow(Xdisplay, menu->win, 0, 0, 1, 1, 0, Xdepth, InputOutput, CopyFromParent,
CWOverrideRedirect | CWSaveUnder | CWBackingStore | CWBorderPixel | CWColormap, &xattr);
CWOverrideRedirect | CWSaveUnder | CWBorderPixel | CWColormap, &xattr);
menu->gc = LIBMEJ_X_CREATE_GC(0, NULL);
menuitem_clear_current(menu);

61
src/options.c
Unescape View File

@ -138,7 +138,6 @@ char *rs_finished_text = NULL;
char *rs_term_name = NULL;
#ifdef PIXMAP_SUPPORT
char *rs_pixmapScale = NULL;
char *rs_backing_store = NULL;
char *rs_icon = NULL;
char *rs_cmod_image = NULL;
char *rs_cmod_red = NULL;
@ -198,7 +197,7 @@ static const struct {
OPT_BLONG("version", "display version and configuration information", NULL, 0),
/* =======[ Color options ]======= */
OPT_BOOL('r', "reverse-video", "reverse video", &Options, Opt_reverseVideo),
OPT_BOOL('r', "reverse-video", "reverse video", &Options, Opt_reverse_video),
OPT_STR('b', "background-color", "background color", &rs_color[bgColor]),
OPT_STR('f', "foreground-color", "foreground color", &rs_color[fgColor]),
OPT_LONG("color0", "color 0", &rs_color[minColor]),
@ -296,10 +295,10 @@ static const struct {
#endif
/* =======[ Toggles ]======= */
OPT_BOOL('l', "login-shell", "login shell, prepend - to shell name", &Options, Opt_loginShell),
OPT_BOOL('l', "login-shell", "login shell, prepend - to shell name", &Options, Opt_login_shell),
OPT_BOOL('s', "scrollbar", "display scrollbar", &Options, Opt_scrollbar),
OPT_BOOL('u', "utmp-logging", "make a utmp entry", &Options, Opt_utmpLogging),
OPT_BOOL('v', "visual-bell", "visual bell", &Options, Opt_visualBell),
OPT_BOOL('u', "utmp-logging", "make a utmp entry", &Options, Opt_write_utmp),
OPT_BOOL('v', "visual-bell", "visual bell", &Options, Opt_visual_bell),
OPT_BOOL('H', "home-on-output", "jump to bottom on output", &Options, Opt_home_on_output),
OPT_BLONG("home-on-input", "jump to bottom on input", &Options, Opt_home_on_input),
OPT_BOOL('q', "no-input", "configure for output only", &Options, Opt_no_input),
@ -309,15 +308,14 @@ static const struct {
OPT_BOOL('x', "borderless", "force Eterm to have no borders", &Options, Opt_borderless),
#ifndef NO_MAPALERT
# ifdef MAPALERT_OPTION
OPT_BOOL('m', "map-alert", "uniconify on beep", &Options, Opt_mapAlert),
OPT_BOOL('m', "map-alert", "uniconify on beep", &Options, Opt_map_alert),
# endif
#endif
#ifdef META8_OPTION
OPT_BOOL('8', "meta-8", "Meta key toggles 8-bit", &Options, Opt_meta8),
#endif
OPT_BLONG("backing-store", "use backing store", &Options, Opt_backing_store),
OPT_BLONG("double-buffer", "use double-buffering to reduce exposes (uses more memory)", &Options, Opt_double_buffer),
OPT_BLONG("no-cursor", "disable the text cursor", &Options, Opt_noCursor),
OPT_BLONG("no-cursor", "disable the text cursor", &Options, Opt_no_cursor),
OPT_BLONG("pause", "pause after the child process exits", &Options, Opt_pause),
OPT_BLONG("xterm-select", "duplicate xterm's broken selection behavior", &Options, Opt_xterm_select),
OPT_BLONG("select-line", "triple-click selects whole line", &Options, Opt_select_whole_line),
@ -508,11 +506,6 @@ version(void)
#else
printf(" -BACKGROUND_CYCLING_SUPPORT");
#endif
#ifdef BACKING_STORE
printf(" +BACKING_STORE");
#else
printf(" -BACKING_STORE");
#endif
#ifdef USE_EFFECTS
printf(" +USE_EFFECTS");
#else
@ -1849,7 +1842,7 @@ parse_color(char *buff, void *state)
char *tmp = get_pword(2, buff);
if (!BEG_STRCASECMP(tmp, "reverse")) {
Options |= Opt_reverseVideo;
Options |= Opt_reverse_video;
} else if (BEG_STRCASECMP(tmp, "normal")) {
print_error("Parse error in file %s, line %lu: Invalid value \"%s\" for attribute video\n",
file_peek_path(), file_peek_line(), tmp);
@ -2059,9 +2052,9 @@ parse_toggles(char *buff, void *state)
if (!BEG_STRCASECMP(buff, "map_alert ")) {
#if !defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
if (bool_val) {
Options |= Opt_mapAlert;
Options |= Opt_map_alert;
} else {
Options &= ~(Opt_mapAlert);
Options &= ~(Opt_map_alert);
}
#else
print_warning("Support for the map_alert attribute was not compiled in, ignoring\n");
@ -2069,15 +2062,15 @@ parse_toggles(char *buff, void *state)
} else if (!BEG_STRCASECMP(buff, "visual_bell ")) {
if (bool_val) {
Options |= Opt_visualBell;
Options |= Opt_visual_bell;
} else {
Options &= ~(Opt_visualBell);
Options &= ~(Opt_visual_bell);
}
} else if (!BEG_STRCASECMP(buff, "login_shell ")) {
if (bool_val) {
Options |= Opt_loginShell;
Options |= Opt_login_shell;
} else {
Options &= ~(Opt_loginShell);
Options &= ~(Opt_login_shell);
}
} else if (!BEG_STRCASECMP(buff, "scrollbar ")) {
if (bool_val) {
@ -2089,9 +2082,9 @@ parse_toggles(char *buff, void *state)
} else if (!BEG_STRCASECMP(buff, "utmp_logging ")) {
#ifdef UTMP_SUPPORT
if (bool_val) {
Options |= Opt_utmpLogging;
Options |= Opt_write_utmp;
} else {
Options &= ~(Opt_utmpLogging);
Options &= ~(Opt_write_utmp);
}
#else
print_warning("Support for the utmp_logging attribute was not compiled in, ignoring\n");
@ -2161,13 +2154,6 @@ parse_toggles(char *buff, void *state)
} else {
Options &= ~(Opt_borderless);
}
} else if (!BEG_STRCASECMP(buff, "backing_store ")) {
if (bool_val) {
Options |= Opt_backing_store;
} else {
Options &= ~(Opt_backing_store);
}
} else if (!BEG_STRCASECMP(buff, "double_buffer ")) {
if (bool_val) {
Options |= Opt_double_buffer;
@ -2177,9 +2163,9 @@ parse_toggles(char *buff, void *state)
} else if (!BEG_STRCASECMP(buff, "no_cursor ")) {
if (bool_val) {
Options |= Opt_noCursor;
Options |= Opt_no_cursor;
} else {
Options &= ~(Opt_noCursor);
Options &= ~(Opt_no_cursor);
}
} else if (!BEG_STRCASECMP(buff, "pause ")) {
@ -3985,7 +3971,7 @@ post_parse(void)
}
#endif
if (Options & Opt_reverseVideo) {
if (Options & Opt_reverse_video) {
char *tmp;
/* swap foreground/background colors */
@ -4646,11 +4632,11 @@ save_config(char *path, unsigned char save_theme)
#endif
fprintf(fp, " begin toggles\n");
fprintf(fp, " map_alert %d\n", (Options & Opt_mapAlert ? 1 : 0));
fprintf(fp, " visual_bell %d\n", (Options & Opt_visualBell ? 1 : 0));
fprintf(fp, " login_shell %d\n", (Options & Opt_loginShell ? 1 : 0));
fprintf(fp, " map_alert %d\n", (Options & Opt_map_alert ? 1 : 0));
fprintf(fp, " visual_bell %d\n", (Options & Opt_visual_bell ? 1 : 0));
fprintf(fp, " login_shell %d\n", (Options & Opt_login_shell ? 1 : 0));
fprintf(fp, " scrollbar %d\n", (Options & Opt_scrollbar ? 1 : 0));
fprintf(fp, " utmp_logging %d\n", (Options & Opt_utmpLogging ? 1 : 0));
fprintf(fp, " utmp_logging %d\n", (Options & Opt_write_utmp ? 1 : 0));
fprintf(fp, " meta8 %d\n", (Options & Opt_meta8 ? 1 : 0));
fprintf(fp, " iconic %d\n", (Options & Opt_iconic ? 1 : 0));
fprintf(fp, " home_on_output %d\n", (Options & Opt_home_on_output ? 1 : 0));
@ -4660,9 +4646,8 @@ save_config(char *path, unsigned char save_theme)
fprintf(fp, " scrollbar_right %d\n", (Options & Opt_scrollbar_right ? 1 : 0));
fprintf(fp, " scrollbar_popup %d\n", (Options & Opt_scrollbar_popup ? 1 : 0));
fprintf(fp, " borderless %d\n", (Options & Opt_borderless ? 1 : 0));
fprintf(fp, " backing_store %d\n", (Options & Opt_backing_store ? 1 : 0));
fprintf(fp, " double_buffer %d\n", (Options & Opt_double_buffer ? 1 : 0));
fprintf(fp, " no_cursor %d\n", (Options & Opt_noCursor ? 1 : 0));
fprintf(fp, " no_cursor %d\n", (Options & Opt_no_cursor ? 1 : 0));
fprintf(fp, " pause %d\n", (Options & Opt_pause ? 1 : 0));
fprintf(fp, " xterm_select %d\n", (Options & Opt_xterm_select ? 1 : 0));
fprintf(fp, " select_line %d\n", (Options & Opt_select_whole_line ? 1 : 0));

17
src/options.h
Unescape View File

@ -58,19 +58,19 @@
#define optList_numoptions() (sizeof(optList)/sizeof(optList[0]))
# define Opt_console (1LU << 0)
# define Opt_loginShell (1LU << 1)
# define Opt_login_shell (1LU << 1)
# define Opt_iconic (1LU << 2)
# define Opt_visualBell (1LU << 3)
# define Opt_mapAlert (1LU << 4)
# define Opt_reverseVideo (1LU << 5)
# define Opt_utmpLogging (1LU << 6)
# define Opt_visual_bell (1LU << 3)
# define Opt_map_alert (1LU << 4)
# define Opt_reverse_video (1LU << 5)
# define Opt_write_utmp (1LU << 6)
# define Opt_scrollbar (1LU << 7)
# define Opt_meta8 (1LU << 8)
# define Opt_home_on_output (1LU << 9)
# define Opt_scrollbar_right (1LU << 10)
# define Opt_borderless (1LU << 11)
# define Opt_backing_store (1LU << 12)
# define Opt_noCursor (1LU << 13)
# define Opt_no_input (1LU << 12)
# define Opt_no_cursor (1LU << 13)
# define Opt_pause (1LU << 14)
# define Opt_home_on_input (1LU << 15)
# define Opt_report_as_keysyms (1LU << 16)
@ -81,7 +81,6 @@
# define Opt_install (1LU << 21)
# define Opt_scrollbar_floating (1LU << 22)
# define Opt_double_buffer (1LU << 23)
# define Opt_no_input (1LU << 24)
# define IMOPT_TRANS (1U << 0)
# define IMOPT_ITRANS (1U << 1)
@ -219,7 +218,7 @@ extern char *rs_anim_pixmap_list;
extern char **rs_anim_pixmaps;
extern time_t rs_anim_delay;
extern char *rs_path;
extern char *rs_noCursor;
extern char *rs_no_cursor;
#ifdef USE_XIM
extern char *rs_input_method;
extern char *rs_preedit_type;

4
src/screen.c
Unescape View File

@ -1528,11 +1528,11 @@ scr_bell(void)
{
#ifndef NO_MAPALERT
#ifdef MAPALERT_OPTION
if (Options & Opt_mapAlert)
if (Options & Opt_map_alert)
#endif
XMapWindow(Xdisplay, TermWin.parent);
#endif
if (Options & Opt_visualBell) {
if (Options & Opt_visual_bell) {
scr_rvideo_mode(!rvideo);
scr_rvideo_mode(!rvideo);
} else

8
src/scrollbar.c
Unescape View File

@ -682,26 +682,26 @@ scrollbar_init(int width, int height)
/* Create the scrollbar trough window. It will be the parent to the other windows. */
scrollbar.win = XCreateWindow(Xdisplay, TermWin.parent, ((Options & Opt_scrollbar_right) ? (width - scrollbar_trough_width()) : (0)), bbar_calc_docked_height(BBAR_DOCKED_TOP),
scrollbar_trough_width(), height, 0, Xdepth, InputOutput, CopyFromParent,
CWOverrideRedirect | CWBackingStore | CWBackPixel | CWBorderPixel | CWColormap, &Attributes);
CWOverrideRedirect | CWBackPixel | CWBorderPixel | CWColormap, &Attributes);
XDefineCursor(Xdisplay, scrollbar.win, cursor);
XSelectInput(Xdisplay, scrollbar.win, mask);
D_SCROLLBAR(("Created scrollbar window 0x%08x\n", scrollbar.win));
/* Now the up arrow window. */
scrollbar.up_win = XCreateWindow(Xdisplay, scrollbar.win, scrollbar_get_shadow(), scrollbar_up_loc(), scrollbar_arrow_width(), scrollbar_arrow_height(),
0, Xdepth, InputOutput, CopyFromParent, CWOverrideRedirect | CWSaveUnder | CWBackingStore | CWColormap, &Attributes);
0, Xdepth, InputOutput, CopyFromParent, CWOverrideRedirect | CWColormap, &Attributes);
XSelectInput(Xdisplay, scrollbar.up_win, mask);
D_SCROLLBAR(("Created scrollbar up arrow window 0x%08x\n", scrollbar.up_win));
/* The down arrow window */
scrollbar.dn_win = XCreateWindow(Xdisplay, scrollbar.win, scrollbar_get_shadow(), scrollbar_dn_loc(), scrollbar_arrow_width(), scrollbar_arrow_height(),
0, Xdepth, InputOutput, CopyFromParent, CWOverrideRedirect | CWSaveUnder | CWBackingStore | CWColormap, &Attributes);
0, Xdepth, InputOutput, CopyFromParent, CWOverrideRedirect | CWColormap, &Attributes);
XSelectInput(Xdisplay, scrollbar.dn_win, mask);
D_SCROLLBAR(("Created scrollbar down arrow window 0x%08x\n", scrollbar.dn_win));
/* The anchor window */
scrollbar.sa_win = XCreateWindow(Xdisplay, scrollbar.win, scrollbar_get_shadow(), scrollbar.anchor_top, scrollbar_anchor_width(), scrollbar_anchor_height(),
0, Xdepth, InputOutput, CopyFromParent, CWOverrideRedirect | CWSaveUnder | CWBackingStore | CWColormap, &Attributes);
0, Xdepth, InputOutput, CopyFromParent, CWOverrideRedirect | CWSaveUnder | CWColormap, &Attributes);
XSelectInput(Xdisplay, scrollbar.sa_win, mask);
XMapWindow(Xdisplay, scrollbar.sa_win);
D_SCROLLBAR(("Created scrollbar anchor window 0x%08x\n", scrollbar.sa_win));

4
src/term.c
Unescape View File

@ -2153,12 +2153,12 @@ xterm_seq(int op, const char *str)
break;
case 20:
nstr = (char *) strsep(&tnstr, ";");
OPT_SET_OR_TOGGLE(nstr, Options, Opt_visualBell);
OPT_SET_OR_TOGGLE(nstr, Options, Opt_visual_bell);
break;
#ifdef MAPALERT_OPTION
case 21:
nstr = (char *) strsep(&tnstr, ";");
OPT_SET_OR_TOGGLE(nstr, Options, Opt_mapAlert);
OPT_SET_OR_TOGGLE(nstr, Options, Opt_map_alert);
break;
#endif
case 22:

15
src/windows.c
Unescape View File

@ -329,7 +329,6 @@ Create_Windows(int argc, char *argv[])
} else {
mwmhints.flags = 0;
}
Attributes.backing_store = WhenMapped;
Attributes.colormap = cmap;
szHint.base_width = (2 * TermWin.internalBorder + ((Options & Opt_scrollbar) ? (scrollbar_get_width() + (2 * scrollbar_get_shadow())) : 0));
@ -420,15 +419,9 @@ Create_Windows(int argc, char *argv[])
/* the vt window */
TermWin.x = (((Options & Opt_scrollbar) && !(Options & Opt_scrollbar_right)) ? (scrollbar_get_width() + (2 * scrollbar_get_shadow())) : 0);
TermWin.y = bbar_calc_docked_height(BBAR_DOCKED_TOP);
if ((!(Options & Opt_borderless)) && (Options & Opt_backing_store)) {
D_X11(("Creating term window with save_under = TRUE\n"));
TermWin.vt = XCreateWindow(Xdisplay, TermWin.parent, TermWin.x, TermWin.y, szHint.width, szHint.height, 0, Xdepth, InputOutput, CopyFromParent,
CWBackPixel | CWBorderPixel | CWOverrideRedirect | CWBackingStore | CWColormap, &Attributes);
} else {
D_X11(("Creating term window with no backing store\n"));
TermWin.vt = XCreateWindow(Xdisplay, TermWin.parent, TermWin.x, TermWin.y, szHint.width, szHint.height, 0, Xdepth, InputOutput, CopyFromParent,
CWBackPixel | CWBorderPixel | CWOverrideRedirect | CWColormap, &Attributes);
}
TermWin.vt = XCreateWindow(Xdisplay, TermWin.parent, TermWin.x, TermWin.y, szHint.width, szHint.height, 0, Xdepth, InputOutput, CopyFromParent,
CWBackPixel | CWBorderPixel | CWOverrideRedirect | CWColormap, &Attributes);
D_X11(("Created terminal window 0x%08x at %dx%d\n", TermWin.vt, TermWin.x, TermWin.y));
if (!(background_is_pixmap()) && !(Options & Opt_borderless)) {
XSetWindowBackground(Xdisplay, TermWin.vt, PixColors[bgColor]);
XClearWindow(Xdisplay, TermWin.vt);
@ -466,7 +459,7 @@ Create_Windows(int argc, char *argv[])
TermWin.gc = LIBMEJ_X_CREATE_GC(GCForeground | GCBackground | GCFont | GCGraphicsExposures, &gcvalue);
}
if (Options & Opt_noCursor) {
if (Options & Opt_no_cursor) {
scr_cursor_visible(0);
}
}

Write Preview
Loading…
Cancel
Save