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

Mon Apr 25 15:34:49 2005 Michael Jennings (mej) 

Added --enable-escreen-fx flag to ./configure to enable/disable the
Escreen startup effects (bosconian, matrix, etc.).

Fixed some warnings.
----------------------------------------------------------------------


SVN revision: 14359
This commit is contained in:
Michael Jennings 2005-04-25 19:37:23 +00:00
parent 5e636b7067
commit 302d5b7363
7 changed files with 42 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -5339,3 +5339,10 @@ Wed Apr 20 19:07:38 2005 Michael Frysinger (vapier)
Patch from Tres <tres@mindspring.com> to fix window manager hints on Patch from Tres <tres@mindspring.com> to fix window manager hints on
64bit systems. http://bugs.gentoo.org/show_bug.cgi?id=76324 64bit systems. http://bugs.gentoo.org/show_bug.cgi?id=76324
---------------------------------------------------------------------- ----------------------------------------------------------------------
Mon Apr 25 15:34:49 2005 Michael Jennings (mej)
Added --enable-escreen-fx flag to ./configure to enable/disable the
Escreen startup effects (bosconian, matrix, etc.).
Fixed some warnings.
----------------------------------------------------------------------

16
configure.in
View File

@ -425,7 +425,19 @@ AC_ARG_ENABLE(etwin,
) )
if test ! -z "$FOUND_SCREEN" || test ! -z "$FOUND_LIBTWIN"; then if test ! -z "$FOUND_SCREEN" || test ! -z "$FOUND_LIBTWIN"; then
AC_DEFINE(ESCREEN, , [Define for Escreen support.]) AC_DEFINE(ESCREEN, , [Define for Escreen support.])
AC_MSG_CHECKING(for Escreen startup effects)
AC_ARG_ENABLE(escreen-fx, [ --enable-escreen-fx enable Escreen startup effects], [
if test "$enableval" = "yes"; then
AC_MSG_RESULT(yes)
AC_DEFINE(ESCREEN_FX, , [Define to enable Escreen startup effects.])
else
AC_MSG_RESULT(no)
fi
], [
AC_MSG_RESULT(no)
]
)
fi fi
AC_MSG_CHECKING(if profiling macros should be included) AC_MSG_CHECKING(if profiling macros should be included)
@ -927,7 +939,7 @@ fi
dnl# Enable/disable name reporting escape sequences dnl# Enable/disable name reporting escape sequences
AC_MSG_CHECKING(if we should enable name reporting escape sequences) AC_MSG_CHECKING(if we should enable name reporting escape sequences)
AC_ARG_ENABLE(name-eporting-escapes, [ --enable-name-reporting-escapes Specify this to enable title/icon name reporting], [ AC_ARG_ENABLE(name-reporting-escapes, [ --enable-name-reporting-escapes Specify this to enable title/icon name reporting], [
if test "$enableval" = "yes"; then if test "$enableval" = "yes"; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_DEFINE(ENABLE_NAME_REPORTING_ESCAPES, 1, [Defined to enable title/icon name reporting escape sequences.]) AC_DEFINE(ENABLE_NAME_REPORTING_ESCAPES, 1, [Defined to enable title/icon name reporting escape sequences.])

8
src/command.c
View File

@ -2607,7 +2607,7 @@ exe_prg(void *xd, char **argv)
/****** Azundris' playthings :-) ******/ /****** Azundris' playthings :-) ******/
#ifdef HAVE_HUMOR #ifdef ESCREEN_FX
#define DIRECT_MASK (~(RS_Cursor|RS_Select|RS_fontMask)) #define DIRECT_MASK (~(RS_Cursor|RS_Select|RS_fontMask))
#define COLOUR_MASK (RS_fgMask|RS_bgMask) #define COLOUR_MASK (RS_fgMask|RS_bgMask)
#define DIRECT_SET_SCREEN(x,y,fg,bg) (screen.text[ys+y])[x]=fg; (screen.rend[ys+y])[x]=bg&DIRECT_MASK; #define DIRECT_SET_SCREEN(x,y,fg,bg) (screen.text[ys+y])[x]=fg; (screen.rend[ys+y])[x]=bg&DIRECT_MASK;
@ -2828,7 +2828,7 @@ escreen_reg_funcs(void)
ns_register_inp(efuns, input_dialog); ns_register_inp(efuns, input_dialog);
ns_register_tab(efuns, menu_tab); ns_register_tab(efuns, menu_tab);
#ifdef HAVE_HUMOR #ifdef ESCREEN_FX
ns_register_fun(efuns, waitstate); ns_register_fun(efuns, waitstate);
#endif #endif
@ -3024,9 +3024,9 @@ init_command(char **argv)
Xfd = XConnectionNumber(Xdisplay); Xfd = XConnectionNumber(Xdisplay);
D_CMD(("Xfd = %d\n", Xfd)); D_CMD(("Xfd = %d\n", Xfd));
cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
AT_LEAST((int) num_fds, Xfd + 1); AT_LEAST(num_fds, ((unsigned int) (Xfd + 1)));
if (pipe_fd >= 0) { if (pipe_fd >= 0) {
AT_LEAST((int) num_fds, pipe_fd + 1); AT_LEAST(num_fds, ((unsigned int) (pipe_fd + 1)));
} }
if ((cmd_fd = command_func(argv)) < 0) { if ((cmd_fd = command_func(argv)) < 0) {
print_error("Unable to run sub-command.\n"); print_error("Unable to run sub-command.\n");

2
src/font.c
View File

@ -732,7 +732,7 @@ set_shadow_color_by_pixel(unsigned char which, Pixel p)
\- This part is not included in the contents of the line variable. \- This part is not included in the contents of the line variable.
*/ */
unsigned char unsigned char
parse_font_fx(const char *line) parse_font_fx(char *line)
{ {
char *color, *corner; char *color, *corner;
unsigned char which, n; unsigned char which, n;

2
src/font.h
View File

@ -97,7 +97,7 @@ extern void change_font(int, const char *);
extern const char *get_font_name(void *); extern const char *get_font_name(void *);
extern void set_shadow_color_by_name(unsigned char, const char *); extern void set_shadow_color_by_name(unsigned char, const char *);
extern void set_shadow_color_by_pixel(unsigned char, Pixel); extern void set_shadow_color_by_pixel(unsigned char, Pixel);
extern unsigned char parse_font_fx(const char *line); extern unsigned char parse_font_fx(char *line);
_XFUNCPROTOEND _XFUNCPROTOEND

28
src/options.c
View File

@ -2567,20 +2567,20 @@ init_defaults(void)
conf_init_subsystem(); conf_init_subsystem();
/* Register Eterm's context parsers. */ /* Register Eterm's context parsers. */
conf_register_context("color", parse_color); conf_register_context("color", SPIF_CAST_C(ctx_handler_t) parse_color);
conf_register_context("attributes", parse_attributes); conf_register_context("attributes", SPIF_CAST_C(ctx_handler_t) parse_attributes);
conf_register_context("toggles", parse_toggles); conf_register_context("toggles", SPIF_CAST_C(ctx_handler_t) parse_toggles);
conf_register_context("keyboard", parse_keyboard); conf_register_context("keyboard", SPIF_CAST_C(ctx_handler_t) parse_keyboard);
conf_register_context("misc", parse_misc); conf_register_context("misc", SPIF_CAST_C(ctx_handler_t) parse_misc);
conf_register_context("imageclasses", parse_imageclasses); conf_register_context("imageclasses", SPIF_CAST_C(ctx_handler_t) parse_imageclasses);
conf_register_context("image", parse_image); conf_register_context("image", SPIF_CAST_C(ctx_handler_t) parse_image);
conf_register_context("actions", parse_actions); conf_register_context("actions", SPIF_CAST_C(ctx_handler_t) parse_actions);
conf_register_context("menu", parse_menu); conf_register_context("menu", SPIF_CAST_C(ctx_handler_t) parse_menu);
conf_register_context("menuitem", parse_menuitem); conf_register_context("menuitem", SPIF_CAST_C(ctx_handler_t) parse_menuitem);
conf_register_context("button_bar", parse_bbar); conf_register_context("button_bar", SPIF_CAST_C(ctx_handler_t) parse_bbar);
conf_register_context("xim", parse_xim); conf_register_context("xim", SPIF_CAST_C(ctx_handler_t) parse_xim);
conf_register_context("multichar", parse_multichar); conf_register_context("multichar", SPIF_CAST_C(ctx_handler_t) parse_multichar);
conf_register_context("escreen", parse_escreen); conf_register_context("escreen", SPIF_CAST_C(ctx_handler_t) parse_escreen);
} }
/* Sync up options with our internal data after parsing options and configs */ /* Sync up options with our internal data after parsing options and configs */

2
src/screen.c
View File

@ -491,7 +491,7 @@ scr_color(unsigned int color, unsigned int Intensity)
break; break;
} }
} else { } else {
if ((rstyle & Intensity) && (color >= minColor) && (color <= maxColor)) { if ((rstyle & Intensity) && ((int) color >= minColor) && (color <= maxColor)) {
switch (Intensity) { switch (Intensity) {
case RS_Bold: case RS_Bold:
if (BITFIELD_IS_SET(vt_options, VT_OPTIONS_BOLD_BRIGHTENS_FOREGROUND)) { if (BITFIELD_IS_SET(vt_options, VT_OPTIONS_BOLD_BRIGHTENS_FOREGROUND)) {