repo: rxvt-unicode-sixel action: commit revision: path_from: revision_from: d1c8d4131691aa21d966945e6bad392aa87db965: path_to: revision_to:
commit d1c8d4131691aa21d966945e6bad392aa87db965 Author: Emanuele GiaquintaDate: Thu Nov 15 11:36:15 2007 +0000 Cosmetics. diff --git a/src/background.C b/src/background.C
--- a/src/background.C
+++ b/src/background.C
@@ -630,7 +630,7 @@ bgPixmap_t::set_file (const char *file)
return false;
}
-# endif /* BG_IMAGE_FROM_FILE */
+# endif /* BG_IMAGE_FROM_FILE */
# ifdef ENABLE_TRANSPARENCY
bool
@@ -1255,7 +1255,7 @@ bgPixmap_t::apply()
}
}
-#endif /* HAVE_BG_PIXMAP */
+#endif /* HAVE_BG_PIXMAP */
#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT
/* taken from aterm-0.4.2 */
diff --git a/src/background.h b/src/background.h
--- a/src/background.h
+++ b/src/background.h
@@ -123,4 +123,4 @@ struct bgPixmap_t {
-#endif /* _BACKGROUND_H_ */
+#endif /* _BACKGROUND_H_ */
diff --git a/src/command.C b/src/command.C
--- a/src/command.C
+++ b/src/command.C
@@ -1852,7 +1852,7 @@ rxvt_term::button_press (XButtonEvent &ev)
#else
MEvent.button = ev.button;
mouse_report (ev);
-#endif /* MOUSE_REPORT_DOUBLECLICK */
+#endif /* MOUSE_REPORT_DOUBLECLICK */
}
else
@@ -1956,7 +1956,7 @@ rxvt_term::button_press (XButtonEvent &ev)
}
}
else
-#endif /* NO_SCROLLBAR_REPORT */
+#endif /* NO_SCROLLBAR_REPORT */
{
char upordown = 0;
@@ -2103,7 +2103,7 @@ rxvt_term::button_release (XButtonEvent &ev)
#else /* MOUSE_REPORT_DOUBLECLICK */
MEvent.button = AnyButton;
mouse_report (ev);
-#endif /* MOUSE_REPORT_DOUBLECLICK */
+#endif /* MOUSE_REPORT_DOUBLECLICK */
return;
}
@@ -2450,7 +2450,7 @@ rxvt_term::process_print_pipe ()
pclose_printer (fd);
}
-#endif /* PRINTPIPE */
+#endif /* PRINTPIPE */
/*}}} */
/* *INDENT-OFF* */
diff --git a/src/command.h b/src/command.h
--- a/src/command.h +++ b/src/command.h @@ -80,4 +80,4 @@ # define ESCZ_ANSWER VT100_ANS /* obsolete ANSI ESC[c */ #endif -#endif /* _COMMAND_H_ */ +#endif /* _COMMAND_H_ */ diff --git a/src/init.C b/src/init.C
--- a/src/init.C
+++ b/src/init.C
@@ -252,7 +252,7 @@ const char *const def_colorName[] =
#ifndef NO_CURSORCOLOR
COLOR_CURSOR_BACKGROUND,
COLOR_CURSOR_FOREGROUND,
-#endif /* ! NO_CURSORCOLOR */
+#endif /* ! NO_CURSORCOLOR */
NULL, /* Color_pointer_fg */
NULL, /* Color_pointer_bg */
NULL, /* Color_border */
@@ -261,7 +261,7 @@ const char *const def_colorName[] =
NULL, /* Color_IT */
NULL, /* Color_UL */
NULL, /* Color_RV */
-#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
+#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
#if ENABLE_FRILLS
NULL, // Color_underline
#endif
@@ -271,7 +271,7 @@ const char *const def_colorName[] =
#ifdef KEEP_SCROLLCOLOR
COLOR_SCROLLBAR,
COLOR_SCROLLTROUGH,
-#endif /* KEEP_SCROLLCOLOR */
+#endif /* KEEP_SCROLLCOLOR */
#if ENABLE_TRANSPARENCY
NULL,
#endif
@@ -540,7 +540,7 @@ rxvt_term::init_resources (int argc, const char *const *argv)
#ifndef NO_CURSORCOLOR
color_aliases (Color_cursor);
color_aliases (Color_cursor2);
-#endif /* NO_CURSORCOLOR */
+#endif /* NO_CURSORCOLOR */
color_aliases (Color_pointer_fg);
color_aliases (Color_pointer_bg);
color_aliases (Color_border);
@@ -548,7 +548,7 @@ rxvt_term::init_resources (int argc, const char *const *argv)
color_aliases (Color_BD);
color_aliases (Color_UL);
color_aliases (Color_RV);
-#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
+#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
if (!rs[Rs_color + Color_border])
rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
@@ -578,7 +578,7 @@ rxvt_term::init_env ()
rs[Rs_display_name] = (const char *)val;
if (val == NULL)
-#endif /* DISPLAY_IS_IP */
+#endif /* DISPLAY_IS_IP */
val = XDisplayString (dpy);
if (rs[Rs_display_name] == NULL)
@@ -628,7 +628,7 @@ rxvt_term::init_env ()
unsetenv ("LINES");
unsetenv ("COLUMNS");
unsetenv ("TERMCAP"); /* terminfo should be okay */
-#endif /* HAVE_UNSETENV */
+#endif /* HAVE_UNSETENV */
}
/*----------------------------------------------------------------------*/
@@ -837,7 +837,7 @@ rxvt_term::Get_Colours ()
))
alias_color (Color_topShadow, Color_White);
}
-#endif /* KEEP_SCROLLCOLOR */
+#endif /* KEEP_SCROLLCOLOR */
#ifdef OFF_FOCUS_FADING
for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
@@ -1304,8 +1304,8 @@ rxvt_get_ttymode (ttymode_t *tio, int erase)
fprintf (stderr, "\n");
# undef FOO
-# endif /* HAVE_TERMIOS_H */
-#endif /* DEBUG_TTYMODE */
+# endif /* HAVE_TERMIOS_H */
+#endif /* DEBUG_TTYMODE */
}
/*----------------------------------------------------------------------*/
@@ -1430,7 +1430,7 @@ rxvt_term::run_child (const char *const *argv)
if (fd >= 0)
if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
close (fd);
-#endif /* SRIOCSREDIR */
+#endif /* SRIOCSREDIR */
}
/* reset signals and spin off the command interpreter */
@@ -1447,7 +1447,7 @@ rxvt_term::run_child (const char *const *argv)
signal (SIGTSTP, SIG_IGN);
signal (SIGTTIN, SIG_IGN);
signal (SIGTTOU, SIG_IGN);
-#endif /* SIGTSTP */
+#endif /* SIGTSTP */
// unblock signals (signals are blocked by iom.C
sigset_t ss;
diff --git a/src/init.h b/src/init.h
--- a/src/init.h +++ b/src/init.h @@ -99,4 +99,4 @@ #define CONSOLE "/dev/console" /* console device */ -#endif /* _INIT_H_ */ +#endif /* _INIT_H_ */ diff --git a/src/main.C b/src/main.C
--- a/src/main.C
+++ b/src/main.C
@@ -1005,7 +1005,7 @@ done:
update_fade_color (idx);
recolour_cursor ();
scr_recolour ();
-#endif /* XTERM_COLOR_CHANGE */
+#endif /* XTERM_COLOR_CHANGE */
}
void
@@ -1708,7 +1708,7 @@ rxvt_term::IMSetPosition ()
XFree (preedit_attr);
}
-#endif /* USE_XIM */
+#endif /* USE_XIM */
void
rxvt_term::get_window_origin (int &x, int &y)
diff --git a/src/rxvt.h b/src/rxvt.h
--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -1398,5 +1398,5 @@ struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
void extract_resources ();
};
-#endif /* _RXVT_H_ */
+#endif /* _RXVT_H_ */
diff --git a/src/scrollbar-next.C b/src/scrollbar-next.C
--- a/src/scrollbar-next.C +++ b/src/scrollbar-next.C @@ -295,5 +295,5 @@ rxvt_term::scrollbar_show_next (int update, int last_top, int last_bot, int scro return 1; } -#endif /* NEXT_SCROLLBAR */ +#endif /* NEXT_SCROLLBAR */ /*----------------------- end-of-file (C source) -----------------------*/ diff --git a/src/scrollbar-rxvt.C b/src/scrollbar-rxvt.C
--- a/src/scrollbar-rxvt.C +++ b/src/scrollbar-rxvt.C @@ -214,6 +214,6 @@ rxvt_term::scrollbar_show_rxvt (int update, int last_top, int last_bot, int scro return 1; } -#endif /* RXVT_SCROLLBAR */ +#endif /* RXVT_SCROLLBAR */ /*----------------------- end-of-file (C source) -----------------------*/ diff --git a/src/scrollbar-xterm.C b/src/scrollbar-xterm.C
--- a/src/scrollbar-xterm.C
+++ b/src/scrollbar-xterm.C
@@ -84,5 +84,5 @@ rxvt_term::scrollbar_show_xterm (int update, int last_top, int last_bot, int scr
xsb ? 0 : sbwidth, scrollBar.end);
return 1;
}
-#endif /* XTERM_SCROLLBAR */
+#endif /* XTERM_SCROLLBAR */
/*----------------------- end-of-file (C source) -----------------------*/
diff --git a/src/xdefaults.C b/src/xdefaults.C
--- a/src/xdefaults.C
+++ b/src/xdefaults.C
@@ -169,14 +169,14 @@ optList[] = {
RSTRG (Rs_color + Color_IT, "colorIT", "color"),
RSTRG (Rs_color + Color_UL, "colorUL", "color"),
RSTRG (Rs_color + Color_RV, "colorRV", "color"),
-#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
+#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
#if ENABLE_FRILLS
RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
#endif
#ifdef KEEP_SCROLLCOLOR
RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
RSTRG (Rs_color + Color_trough, "troughColor", "color"),
-#endif /* KEEP_SCROLLCOLOR */
+#endif /* KEEP_SCROLLCOLOR */
#ifdef OPTION_HC
STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"),
#endif
@@ -184,7 +184,7 @@ optList[] = {
STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"),
/* command-line option = resource name */
RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
-#endif /* NO_CURSORCOLOR */
+#endif /* NO_CURSORCOLOR */
STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
@@ -205,7 +205,7 @@ optList[] = {
STRG (Rs_preeditType, "preeditType", "pt", "style", "input style: style = OverTheSpot|OffTheSpot|Root"),
STRG (Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
STRG (Rs_imFont, "imFont", "imfont", "fontname", "fontset for styles OverTheSpot and OffTheSpot"),
-#endif /* USE_XIM */
+#endif /* USE_XIM */
STRG (Rs_name, NULL, "name", "string", "client instance, icon, and title strings"),
STRG (Rs_title, "title", "title", "string", "title name for window"),
STRG (Rs_title, NULL, "T", NULL, NULL), /* short form */
@@ -246,7 +246,7 @@ optList[] = {
STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"),
#ifdef CUTCHAR_RESOURCE
RSTRG (Rs_cutchars, "cutchars", "string"),
-#endif /* CUTCHAR_RESOURCE */
+#endif /* CUTCHAR_RESOURCE */
RSTRG (Rs_answerbackstring, "answerbackString", "string"),
#ifndef NO_SECONDARY_SCREEN
BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
@@ -760,8 +760,8 @@ rxvt_term::parse_keysym (const char *str, const char *arg)
return 1;
}
-# endif /* KEYSYM_RESOURCE */
-#endif /* NO_RESOURCES */
+# endif /* KEYSYM_RESOURCE */
+#endif /* NO_RESOURCES */
static char *
get_res (XrmDatabase database, const char *program, const char *option)
@@ -865,7 +865,7 @@ rxvt_term::extract_resources ()
# endif
# endif
-#endif /* NO_RESOURCES */
+#endif /* NO_RESOURCES */
}
/*----------------------- end-of-file (C source) -----------------------*/
-----END OF PAGE-----