Enlightenment CVS committal
Author : mej
Project : eterm
Module : Eterm
Dir : eterm/Eterm/src
Modified Files:
command.c font.c font.h options.c screen.c
Log Message:
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.
----------------------------------------------------------------------
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/command.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -3 -r1.106 -r1.107
--- command.c 19 Apr 2005 01:57:16 -0000 1.106
+++ command.c 25 Apr 2005 19:37:20 -0000 1.107
@@ -34,7 +34,7 @@
* he guarantee anything whatsoever.
*----------------------------------------------------------------------*/
-static const char cvs_ident[] = "$Id: command.c,v 1.106 2005/04/19 01:57:16
mej Exp $";
+static const char cvs_ident[] = "$Id: command.c,v 1.107 2005/04/25 19:37:20
mej Exp $";
/* includes: */
#include "config.h"
@@ -2607,7 +2607,7 @@
/****** Azundris' playthings :-) ******/
-#ifdef HAVE_HUMOR
+#ifdef ESCREEN_FX
#define DIRECT_MASK (~(RS_Cursor|RS_Select|RS_fontMask))
#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;
@@ -2828,7 +2828,7 @@
ns_register_inp(efuns, input_dialog);
ns_register_tab(efuns, menu_tab);
-#ifdef HAVE_HUMOR
+#ifdef ESCREEN_FX
ns_register_fun(efuns, waitstate);
#endif
@@ -3024,9 +3024,9 @@
Xfd = XConnectionNumber(Xdisplay);
D_CMD(("Xfd = %d\n", Xfd));
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) {
- AT_LEAST((int) num_fds, pipe_fd + 1);
+ AT_LEAST(num_fds, ((unsigned int) (pipe_fd + 1)));
}
if ((cmd_fd = command_func(argv)) < 0) {
print_error("Unable to run sub-command.\n");
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/font.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- font.c 19 Apr 2005 01:57:17 -0000 1.45
+++ font.c 25 Apr 2005 19:37:22 -0000 1.46
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: font.c,v 1.45 2005/04/19 01:57:17 mej
Exp $";
+static const char cvs_ident[] = "$Id: font.c,v 1.46 2005/04/25 19:37:22 mej
Exp $";
#include "config.h"
#include "feature.h"
@@ -732,7 +732,7 @@
\- This part is not included in the contents of the line variable.
*/
unsigned char
-parse_font_fx(const char *line)
+parse_font_fx(char *line)
{
char *color, *corner;
unsigned char which, n;
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/font.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- font.h 11 Jan 2004 22:10:29 -0000 1.16
+++ font.h 25 Apr 2005 19:37:22 -0000 1.17
@@ -97,7 +97,7 @@
extern const char *get_font_name(void *);
extern void set_shadow_color_by_name(unsigned char, const char *);
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
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/options.c,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -3 -r1.138 -r1.139
--- options.c 19 Apr 2005 01:57:19 -0000 1.138
+++ options.c 25 Apr 2005 19:37:22 -0000 1.139
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: options.c,v 1.138 2005/04/19 01:57:19
mej Exp $";
+static const char cvs_ident[] = "$Id: options.c,v 1.139 2005/04/25 19:37:22
mej Exp $";
#include "config.h"
#include "feature.h"
@@ -2567,20 +2567,20 @@
conf_init_subsystem();
/* Register Eterm's context parsers. */
- conf_register_context("color", parse_color);
- conf_register_context("attributes", parse_attributes);
- conf_register_context("toggles", parse_toggles);
- conf_register_context("keyboard", parse_keyboard);
- conf_register_context("misc", parse_misc);
- conf_register_context("imageclasses", parse_imageclasses);
- conf_register_context("image", parse_image);
- conf_register_context("actions", parse_actions);
- conf_register_context("menu", parse_menu);
- conf_register_context("menuitem", parse_menuitem);
- conf_register_context("button_bar", parse_bbar);
- conf_register_context("xim", parse_xim);
- conf_register_context("multichar", parse_multichar);
- conf_register_context("escreen", parse_escreen);
+ conf_register_context("color", SPIF_CAST_C(ctx_handler_t) parse_color);
+ conf_register_context("attributes", SPIF_CAST_C(ctx_handler_t)
parse_attributes);
+ conf_register_context("toggles", SPIF_CAST_C(ctx_handler_t) parse_toggles);
+ conf_register_context("keyboard", SPIF_CAST_C(ctx_handler_t)
parse_keyboard);
+ conf_register_context("misc", SPIF_CAST_C(ctx_handler_t) parse_misc);
+ conf_register_context("imageclasses", SPIF_CAST_C(ctx_handler_t)
parse_imageclasses);
+ conf_register_context("image", SPIF_CAST_C(ctx_handler_t) parse_image);
+ conf_register_context("actions", SPIF_CAST_C(ctx_handler_t) parse_actions);
+ conf_register_context("menu", SPIF_CAST_C(ctx_handler_t) parse_menu);
+ conf_register_context("menuitem", SPIF_CAST_C(ctx_handler_t)
parse_menuitem);
+ conf_register_context("button_bar", SPIF_CAST_C(ctx_handler_t) parse_bbar);
+ conf_register_context("xim", SPIF_CAST_C(ctx_handler_t) parse_xim);
+ conf_register_context("multichar", SPIF_CAST_C(ctx_handler_t)
parse_multichar);
+ conf_register_context("escreen", SPIF_CAST_C(ctx_handler_t) parse_escreen);
}
/* Sync up options with our internal data after parsing options and configs */
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/screen.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -3 -r1.84 -r1.85
--- screen.c 19 Apr 2005 01:57:21 -0000 1.84
+++ screen.c 25 Apr 2005 19:37:23 -0000 1.85
@@ -3,7 +3,7 @@
*
*/
-static const char cvs_ident[] = "$Id: screen.c,v 1.84 2005/04/19 01:57:21 mej
Exp $";
+static const char cvs_ident[] = "$Id: screen.c,v 1.85 2005/04/25 19:37:23 mej
Exp $";
#include "config.h"
#include "feature.h"
@@ -491,7 +491,7 @@
break;
}
} else {
- if ((rstyle & Intensity) && (color >= minColor) && (color <=
maxColor)) {
+ if ((rstyle & Intensity) && ((int) color >= minColor) && (color <=
maxColor)) {
switch (Intensity) {
case RS_Bold:
if (BITFIELD_IS_SET(vt_options,
VT_OPTIONS_BOLD_BRIGHTENS_FOREGROUND)) {
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
