Enlightenment CVS committal
Author : mej
Project : eterm
Module : Eterm
Dir : eterm/Eterm/src
Modified Files:
Tag: ETERM-0_10
actions.c actions.h buttons.c buttons.h command.c draw.c
draw.h e.c e.h encoding.c encoding.h eterm_debug.h
eterm_utmp.h events.c events.h feature.h font.c font.h main.c
menus.c menus.h misc.c misc.h mmx_cmod.S options.c options.h
pixmap.c pixmap.h profile.h screen.c screen.h script.c
script.h scrollbar.c scrollbar.h startup.c startup.h system.c
system.h term.c term.h timer.c timer.h utmp.c windows.c
windows.h
Log Message:
Mon Mar 3 01:12:34 2003 Michael Jennings (mej)
Merge.
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/actions.c,v
retrieving revision 1.20.2.3
retrieving revision 1.20.2.4
diff -u -3 -r1.20.2.3 -r1.20.2.4
--- actions.c 19 Nov 2002 04:41:53 -0000 1.20.2.3
+++ actions.c 3 Mar 2003 06:20:37 -0000 1.20.2.4
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2002, Michael Jennings
+ * Copyright (C) 1997-2003, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: actions.c,v 1.20.2.3 2002/11/19 04:41:53 mej
Exp $";
+static const char cvs_ident[] = "$Id: actions.c,v 1.20.2.4 2003/03/03 06:20:37 mej
Exp $";
#include "config.h"
#include "feature.h"
@@ -146,7 +146,8 @@
/* When we do have to check the modifiers, we do so in this order to eliminate the
most popular choices first. If any test fails, we return FALSE. */
- D_ACTIONS(("Checking modifier set 0x%08x (" MOD_FMT ") vs. X modifier set 0x%08x
(" MOD_FMT ")\n", mod, SHOW_MODS(mod), x_mod, SHOW_X_MODS(x_mod)));
+ D_ACTIONS(("Checking modifier set 0x%08x (" MOD_FMT ") vs. X modifier set 0x%08x
(" MOD_FMT ")\n",
+ mod, SHOW_MODS(mod), x_mod, SHOW_X_MODS(x_mod)));
if (mod != MOD_ANY) {
/* LOGICAL_XOR() returns true if either the first parameter or the second
parameter
is true, but not both...just like XOR. If the mask we're looking for is
set in
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/actions.h,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -3 -r1.9 -r1.9.2.1
--- actions.h 3 Feb 2002 20:53:05 -0000 1.9
+++ actions.h 3 Mar 2003 06:20:37 -0000 1.9.2.1
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2002, Michael Jennings
+ * Copyright (C) 1997-2003, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/buttons.c,v
retrieving revision 1.25.2.4
retrieving revision 1.25.2.5
diff -u -3 -r1.25.2.4 -r1.25.2.5
--- buttons.c 8 Jan 2003 19:14:13 -0000 1.25.2.4
+++ buttons.c 3 Mar 2003 06:20:38 -0000 1.25.2.5
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2002, Michael Jennings
+ * Copyright (C) 1997-2003, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: buttons.c,v 1.25.2.4 2003/01/08 19:14:13 mej
Exp $";
+static const char cvs_ident[] = "$Id: buttons.c,v 1.25.2.5 2003/03/03 06:20:38 mej
Exp $";
#include "config.h"
#include "feature.h"
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/buttons.h,v
retrieving revision 1.9.2.3
retrieving revision 1.9.2.4
diff -u -3 -r1.9.2.3 -r1.9.2.4
--- buttons.h 19 Nov 2002 04:41:54 -0000 1.9.2.3
+++ buttons.h 3 Mar 2003 06:20:39 -0000 1.9.2.4
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2002, Michael Jennings
+ * Copyright (C) 1997-2003, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/command.c,v
retrieving revision 1.69.2.5
retrieving revision 1.69.2.6
diff -u -3 -r1.69.2.5 -r1.69.2.6
--- command.c 27 Nov 2002 20:22:21 -0000 1.69.2.5
+++ command.c 3 Mar 2003 06:20:40 -0000 1.69.2.6
@@ -34,7 +34,7 @@
* he guarantee anything whatsoever.
*----------------------------------------------------------------------*/
-static const char cvs_ident[] = "$Id: command.c,v 1.69.2.5 2002/11/27 20:22:21 mej
Exp $";
+static const char cvs_ident[] = "$Id: command.c,v 1.69.2.6 2003/03/03 06:20:40 mej
Exp $";
/* includes: */
#include "config.h"
@@ -3109,7 +3109,7 @@
imlib_context_set_image(images[image_bg].current->iml->im);
imlib_free_image_and_decache();
images[image_bg].current->iml->im = NULL;
- xterm_seq(XTerm_Pixmap, rs_anim_pixmaps[image_idx++]);
+ xterm_seq(ESCSEQ_XTERM_PIXMAP, rs_anim_pixmaps[image_idx++]);
last_update = now;
old_handler = signal(SIGALRM, check_pixmap_change);
alarm(rs_anim_delay);
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/draw.c,v
retrieving revision 1.10.2.2
retrieving revision 1.10.2.3
diff -u -3 -r1.10.2.2 -r1.10.2.3
--- draw.c 19 Nov 2002 04:41:54 -0000 1.10.2.2
+++ draw.c 3 Mar 2003 06:20:41 -0000 1.10.2.3
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2002, Michael Jennings
+ * Copyright (C) 1997-2003, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: draw.c,v 1.10.2.2 2002/11/19 04:41:54 mej Exp
$";
+static const char cvs_ident[] = "$Id: draw.c,v 1.10.2.3 2003/03/03 06:20:41 mej Exp
$";
#include "config.h"
#include "feature.h"
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/draw.h,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -3 -r1.7 -r1.7.2.1
--- draw.h 3 Feb 2002 20:53:06 -0000 1.7
+++ draw.h 3 Mar 2003 06:20:42 -0000 1.7.2.1
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2002, Michael Jennings
+ * Copyright (C) 1997-2003, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/e.c,v
retrieving revision 1.20.2.2
retrieving revision 1.20.2.3
diff -u -3 -r1.20.2.2 -r1.20.2.3
--- e.c 19 Nov 2002 04:41:54 -0000 1.20.2.2
+++ e.c 3 Mar 2003 06:20:43 -0000 1.20.2.3
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2002, Michael Jennings
+ * Copyright (C) 1997-2003, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: e.c,v 1.20.2.2 2002/11/19 04:41:54 mej Exp $";
+static const char cvs_ident[] = "$Id: e.c,v 1.20.2.3 2003/03/03 06:20:43 mej Exp $";
#include "config.h"
#include "feature.h"
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/e.h,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -3 -r1.11 -r1.11.2.1
--- e.h 3 Feb 2002 20:53:06 -0000 1.11
+++ e.h 3 Mar 2003 06:20:43 -0000 1.11.2.1
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2002, Michael Jennings
+ * Copyright (C) 1997-2003, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/encoding.c,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -3 -r1.5.2.1 -r1.5.2.2
--- encoding.c 9 May 2002 15:31:20 -0000 1.5.2.1
+++ encoding.c 3 Mar 2003 06:20:44 -0000 1.5.2.2
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2002, Michael Jennings
+ * Copyright (C) 1997-2003, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: encoding.c,v 1.5.2.1 2002/05/09 15:31:20 mej
Exp $";
+static const char cvs_ident[] = "$Id: encoding.c,v 1.5.2.2 2003/03/03 06:20:44 mej
Exp $";
#include "config.h"
#include "feature.h"
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/encoding.h,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -3 -r1.3 -r1.3.2.1
--- encoding.h 3 Feb 2002 20:53:06 -0000 1.3
+++ encoding.h 3 Mar 2003 06:20:45 -0000 1.3.2.1
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2002, Michael Jennings
+ * Copyright (C) 1997-2003, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/eterm_debug.h,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -3 -r1.5.2.1 -r1.5.2.2
--- eterm_debug.h 19 Nov 2002 04:41:54 -0000 1.5.2.1
+++ eterm_debug.h 3 Mar 2003 06:20:45 -0000 1.5.2.2
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2002, Michael Jennings
+ * Copyright (C) 1997-2003, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/eterm_utmp.h,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -3 -r1.9 -r1.9.2.1
--- eterm_utmp.h 26 Apr 2002 18:30:47 -0000 1.9
+++ eterm_utmp.h 3 Mar 2003 06:20:45 -0000 1.9.2.1
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2002, Michael Jennings
+ * Copyright (C) 1997-2003, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/events.c,v
retrieving revision 1.51.2.2
retrieving revision 1.51.2.3
diff -u -3 -r1.51.2.2 -r1.51.2.3
--- events.c 19 Nov 2002 04:41:54 -0000 1.51.2.2
+++ events.c 3 Mar 2003 06:20:45 -0000 1.51.2.3
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2002, Michael Jennings
+ * Copyright (C) 1997-2003, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: events.c,v 1.51.2.2 2002/11/19 04:41:54 mej Exp
$";
+static const char cvs_ident[] = "$Id: events.c,v 1.51.2.3 2003/03/03 06:20:45 mej Exp
$";
#include "config.h"
#include "feature.h"
@@ -805,10 +805,15 @@
REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &primary_data), 0);
+#ifdef HAVE_TWIN
+ /* It's really silly that Twin uses mouse drag codes that are
+ * different from the ones that xterm uses.
+ */
if ((PrivateModes & PrivMode_mouse_report) && !(button_state.bypass_keystate)) {
- mouse_drag_report(&(ev->xbutton));
+ twin_mouse_drag_report(&(ev->xbutton));
return 1;
}
+#endif
if (ev->xany.window == TermWin.vt) {
if (ev->xbutton.state & (Button1Mask | Button3Mask)) {
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/events.h,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -3 -r1.13 -r1.13.2.1
--- events.h 3 Feb 2002 20:53:06 -0000 1.13
+++ events.h 3 Mar 2003 06:20:48 -0000 1.13.2.1
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2002, Michael Jennings
+ * Copyright (C) 1997-2003, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/feature.h,v
retrieving revision 1.32.2.1
retrieving revision 1.32.2.2
diff -u -3 -r1.32.2.1 -r1.32.2.2
--- feature.h 19 Nov 2002 04:41:54 -0000 1.32.2.1
+++ feature.h 3 Mar 2003 06:20:48 -0000 1.32.2.2
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2002, Michael Jennings
+ * Copyright (C) 1997-2003, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/font.c,v
retrieving revision 1.31.2.3
retrieving revision 1.31.2.4
diff -u -3 -r1.31.2.3 -r1.31.2.4
--- font.c 26 Nov 2002 22:58:20 -0000 1.31.2.3
+++ font.c 3 Mar 2003 06:20:49 -0000 1.31.2.4
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2002, Michael Jennings
+ * Copyright (C) 1997-2003, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@@ -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.31.2.3 2002/11/26 22:58:20 mej Exp
$";
+static const char cvs_ident[] = "$Id: font.c,v 1.31.2.4 2003/03/03 06:20:49 mej Exp
$";
#include "config.h"
#include "feature.h"
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/font.h,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -3 -r1.14 -r1.14.2.1
--- font.h 25 Apr 2002 02:28:57 -0000 1.14
+++ font.h 3 Mar 2003 06:20:50 -0000 1.14.2.1
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2002, Michael Jennings
+ * Copyright (C) 1997-2003, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/main.c,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -3 -r1.9.2.1 -r1.9.2.2
--- main.c 9 May 2002 15:31:20 -0000 1.9.2.1
+++ main.c 3 Mar 2003 06:20:50 -0000 1.9.2.2
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2002, Michael Jennings
+ * Copyright (C) 1997-2003, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: main.c,v 1.9.2.1 2002/05/09 15:31:20 mej Exp $";
+static const char cvs_ident[] = "$Id: main.c,v 1.9.2.2 2003/03/03 06:20:50 mej Exp $";
extern int eterm_bootstrap(int argc, char *argv[]);
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/menus.c,v
retrieving revision 1.47.2.3
retrieving revision 1.47.2.4
diff -u -3 -r1.47.2.3 -r1.47.2.4
--- menus.c 19 Nov 2002 04:41:54 -0000 1.47.2.3
+++ menus.c 3 Mar 2003 06:20:51 -0000 1.47.2.4
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2002, Michael Jennings
+ * Copyright (C) 1997-2003, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: menus.c,v 1.47.2.3 2002/11/19 04:41:54 mej Exp
$";
+static const char cvs_ident[] = "$Id: menus.c,v 1.47.2.4 2003/03/03 06:20:51 mej Exp
$";
#include "config.h"
#include "feature.h"
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/menus.h,v
retrieving revision 1.17.2.2
retrieving revision 1.17.2.3
diff -u -3 -r1.17.2.2 -r1.17.2.3
--- menus.h 19 Nov 2002 04:41:55 -0000 1.17.2.2
+++ menus.h 3 Mar 2003 06:20:53 -0000 1.17.2.3
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2002, Michael Jennings
+ * Copyright (C) 1997-2003, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/misc.c,v
retrieving revision 1.20.2.2
retrieving revision 1.20.2.3
diff -u -3 -r1.20.2.2 -r1.20.2.3
--- misc.c 19 Nov 2002 04:41:55 -0000 1.20.2.2
+++ misc.c 3 Mar 2003 06:20:53 -0000 1.20.2.3
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2002, Michael Jennings
+ * Copyright (C) 1997-2003, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: misc.c,v 1.20.2.2 2002/11/19 04:41:55 mej Exp
$";
+static const char cvs_ident[] = "$Id: misc.c,v 1.20.2.3 2003/03/03 06:20:53 mej Exp
$";
#include "config.h"
#include "feature.h"
@@ -224,7 +224,7 @@
}
char *
-safe_print_string(char *str, unsigned long len)
+safe_print_string(const char *str, unsigned long len)
{
static char *ret_buff = NULL;
static unsigned long rb_size = 0;
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/misc.h,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -3 -r1.12 -r1.12.2.1
--- misc.h 3 Feb 2002 20:53:06 -0000 1.12
+++ misc.h 3 Mar 2003 06:20:53 -0000 1.12.2.1
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2002, Michael Jennings
+ * Copyright (C) 1997-2003, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@@ -40,7 +40,7 @@
extern unsigned long str_leading_match(register const char *, register const char *);
extern char *str_trim(char *str);
extern int parse_escaped_string(char *str);
-extern char *safe_print_string(char *buff, unsigned long len);
+extern char *safe_print_string(const char *buff, unsigned long len);
extern unsigned long add_carriage_returns(unsigned char *buff, unsigned long cnt);
extern unsigned char mkdirhier(const char *);
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/mmx_cmod.S,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -3 -r1.4 -r1.4.2.1
--- mmx_cmod.S 3 Feb 2002 20:53:06 -0000 1.4
+++ mmx_cmod.S 3 Mar 2003 06:20:53 -0000 1.4.2.1
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2002, Michael Jennings
+ * Copyright (C) 1997-2003, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/options.c,v
retrieving revision 1.102.2.7
retrieving revision 1.102.2.8
diff -u -3 -r1.102.2.7 -r1.102.2.8
--- options.c 27 Nov 2002 20:22:21 -0000 1.102.2.7
+++ options.c 3 Mar 2003 06:20:54 -0000 1.102.2.8
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2002, Michael Jennings
+ * Copyright (C) 1997-2003, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@@ -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.102.2.7 2002/11/27 20:22:21 mej
Exp $";
+static const char cvs_ident[] = "$Id: options.c,v 1.102.2.8 2003/03/03 06:20:54 mej
Exp $";
#include "config.h"
#include "feature.h"
@@ -351,7 +351,7 @@
usage(void)
{
printf("Eterm Enlightened Terminal Emulator for the X Window System\n");
- printf("Copyright (c) 1997-2002, " AUTHORS "\n\n");
+ printf("Copyright (c) 1997-2003, " AUTHORS "\n\n");
printf("Option types:\n");
printf(" (bool) -- Boolean option ('1', 'on', 'yes', or 'true' to activate, '0',
'off', 'no', or 'false' to deactivate)\n");
@@ -377,7 +377,7 @@
{
printf("Eterm " VERSION "\n");
- printf("Copyright (c) 1997-2002, " AUTHORS "\n\n");
+ printf("Copyright (c) 1997-2003, " AUTHORS "\n\n");
printf("Build info:\n");
printf(" Built on " BUILD_DATE "\n");
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/options.h,v
retrieving revision 1.36.2.4
retrieving revision 1.36.2.5
diff -u -3 -r1.36.2.4 -r1.36.2.5
--- options.h 19 Nov 2002 04:41:55 -0000 1.36.2.4
+++ options.h 3 Mar 2003 06:20:56 -0000 1.36.2.5
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2002, Michael Jennings
+ * Copyright (C) 1997-2003, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/pixmap.c,v
retrieving revision 1.78.2.5
retrieving revision 1.78.2.6
diff -u -3 -r1.78.2.5 -r1.78.2.6
--- pixmap.c 8 Jan 2003 19:14:13 -0000 1.78.2.5
+++ pixmap.c 3 Mar 2003 06:20:56 -0000 1.78.2.6
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2002, Michael Jennings
+ * Copyright (C) 1997-2003, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: pixmap.c,v 1.78.2.5 2003/01/08 19:14:13 mej Exp
$";
+static const char cvs_ident[] = "$Id: pixmap.c,v 1.78.2.6 2003/03/03 06:20:56 mej Exp
$";
#include "config.h"
#include "feature.h"
@@ -256,7 +256,7 @@
D_PIXMAP(("scale_pixmap(\"%s\")\n", geom));
if (!strcmp(geom, "?")) {
sprintf(str, "[%dx%d+%d+%d]", pmap->w, pmap->h, pmap->x, pmap->y);
- xterm_seq(XTerm_title, str);
+ xterm_seq(ESCSEQ_XTERM_TITLE, str);
return 0;
}
if ((opstr = strchr(geom, ':')) != NULL) {
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/pixmap.h,v
retrieving revision 1.40.2.1
retrieving revision 1.40.2.2
diff -u -3 -r1.40.2.1 -r1.40.2.2
--- pixmap.h 19 Nov 2002 04:41:55 -0000 1.40.2.1
+++ pixmap.h 3 Mar 2003 06:20:57 -0000 1.40.2.2
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2002, Michael Jennings
+ * Copyright (C) 1997-2003, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/profile.h,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -3 -r1.7 -r1.7.2.1
--- profile.h 3 Feb 2002 20:53:06 -0000 1.7
+++ profile.h 3 Mar 2003 06:20:58 -0000 1.7.2.1
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2002, Michael Jennings
+ * Copyright (C) 1997-2003, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/screen.c,v
retrieving revision 1.59.2.3
retrieving revision 1.59.2.4
diff -u -3 -r1.59.2.3 -r1.59.2.4
--- screen.c 19 Nov 2002 04:41:56 -0000 1.59.2.3
+++ screen.c 3 Mar 2003 06:20:58 -0000 1.59.2.4
@@ -3,7 +3,7 @@
*
*/
-static const char cvs_ident[] = "$Id: screen.c,v 1.59.2.3 2002/11/19 04:41:56 mej Exp
$";
+static const char cvs_ident[] = "$Id: screen.c,v 1.59.2.4 2003/03/03 06:20:58 mej Exp
$";
#include "config.h"
#include "feature.h"
@@ -3277,7 +3277,7 @@
}
void /* drag report as used by the "twin" program */
-mouse_drag_report(XButtonEvent * ev)
+twin_mouse_drag_report(XButtonEvent * ev)
{
int button_number, key_state, x = Pixel2Col(ev->x), y = Pixel2Row(ev->y);
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/screen.h,v
retrieving revision 1.20.2.2
retrieving revision 1.20.2.3
diff -u -3 -r1.20.2.2 -r1.20.2.3
--- screen.h 19 Nov 2002 04:41:56 -0000 1.20.2.2
+++ screen.h 3 Mar 2003 06:20:59 -0000 1.20.2.3
@@ -302,7 +302,7 @@
extern void selection_rotate(int, int);
extern void selection_send(XSelectionRequestEvent *);
extern void mouse_report(XButtonEvent *);
-extern void mouse_drag_report(XButtonEvent *);
+extern void twin_mouse_drag_report(XButtonEvent *);
extern void mouse_tracking(int, int, int, int, int);
extern void debug_colors(void);
#ifdef MULTI_CHARSET
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/script.c,v
retrieving revision 1.15.2.4
retrieving revision 1.15.2.5
diff -u -3 -r1.15.2.4 -r1.15.2.5
--- script.c 8 Jan 2003 19:14:14 -0000 1.15.2.4
+++ script.c 3 Mar 2003 06:20:59 -0000 1.15.2.5
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2002, Michael Jennings
+ * Copyright (C) 1997-2003, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: script.c,v 1.15.2.4 2003/01/08 19:14:14 mej Exp
$";
+static const char cvs_ident[] = "$Id: script.c,v 1.15.2.5 2003/03/03 06:20:59 mej Exp
$";
#include "config.h"
#include "feature.h"
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/script.h,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -3 -r1.10.2.1 -r1.10.2.2
--- script.h 19 Nov 2002 04:41:56 -0000 1.10.2.1
+++ script.h 3 Mar 2003 06:21:00 -0000 1.10.2.2
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2002, Michael Jennings
+ * Copyright (C) 1997-2003, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/scrollbar.c,v
retrieving revision 1.38.2.2
retrieving revision 1.38.2.3
diff -u -3 -r1.38.2.2 -r1.38.2.3
--- scrollbar.c 19 Nov 2002 04:41:56 -0000 1.38.2.2
+++ scrollbar.c 3 Mar 2003 06:21:00 -0000 1.38.2.3
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2002, Michael Jennings
+ * Copyright (C) 1997-2003, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: scrollbar.c,v 1.38.2.2 2002/11/19 04:41:56 mej
Exp $";
+static const char cvs_ident[] = "$Id: scrollbar.c,v 1.38.2.3 2003/03/03 06:21:00 mej
Exp $";
#include "config.h"
#include "feature.h"
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/scrollbar.h,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -u -3 -r1.24 -r1.24.2.1
--- scrollbar.h 3 Feb 2002 20:53:06 -0000 1.24
+++ scrollbar.h 3 Mar 2003 06:21:00 -0000 1.24.2.1
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2002, Michael Jennings
+ * Copyright (C) 1997-2003, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/startup.c,v
retrieving revision 1.29.2.4
retrieving revision 1.29.2.5
diff -u -3 -r1.29.2.4 -r1.29.2.5
--- startup.c 19 Nov 2002 04:41:56 -0000 1.29.2.4
+++ startup.c 3 Mar 2003 06:21:00 -0000 1.29.2.5
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2002, Michael Jennings
+ * Copyright (C) 1997-2003, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: startup.c,v 1.29.2.4 2002/11/19 04:41:56 mej
Exp $";
+static const char cvs_ident[] = "$Id: startup.c,v 1.29.2.5 2003/03/03 06:21:00 mej
Exp $";
#include "config.h"
#include "feature.h"
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/startup.h,v
retrieving revision 1.14.2.2
retrieving revision 1.14.2.3
diff -u -3 -r1.14.2.2 -r1.14.2.3
--- startup.h 19 Nov 2002 04:41:56 -0000 1.14.2.2
+++ startup.h 3 Mar 2003 06:21:00 -0000 1.14.2.3
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2002, Michael Jennings
+ * Copyright (C) 1997-2003, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/system.c,v
retrieving revision 1.14.2.2
retrieving revision 1.14.2.3
diff -u -3 -r1.14.2.2 -r1.14.2.3
--- system.c 19 Nov 2002 04:41:56 -0000 1.14.2.2
+++ system.c 3 Mar 2003 06:21:00 -0000 1.14.2.3
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2002, Michael Jennings
+ * Copyright (C) 1997-2003, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: system.c,v 1.14.2.2 2002/11/19 04:41:56 mej Exp
$";
+static const char cvs_ident[] = "$Id: system.c,v 1.14.2.3 2003/03/03 06:21:00 mej Exp
$";
#include "../config.h"
#include "feature.h"
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/system.h,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -3 -r1.7 -r1.7.2.1
--- system.h 3 Feb 2002 20:53:07 -0000 1.7
+++ system.h 3 Mar 2003 06:21:00 -0000 1.7.2.1
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2002, Michael Jennings
+ * Copyright (C) 1997-2003, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/term.c,v
retrieving revision 1.78.2.5
retrieving revision 1.78.2.6
diff -u -3 -r1.78.2.5 -r1.78.2.6
--- term.c 27 Jan 2003 22:42:49 -0000 1.78.2.5
+++ term.c 3 Mar 2003 06:21:00 -0000 1.78.2.6
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2002, Michael Jennings
+ * Copyright (C) 1997-2003, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: term.c,v 1.78.2.5 2003/01/27 22:42:49 mej Exp
$";
+static const char cvs_ident[] = "$Id: term.c,v 1.78.2.6 2003/03/03 06:21:00 mej Exp
$";
#include "config.h"
#include "feature.h"
@@ -327,7 +327,7 @@
LK_RET();
break;
case SunXK_Front:
- xterm_seq(XTerm_Takeover, "");
+ xterm_seq(ESCSEQ_XTERM_TAKEOVER, "");
LK_RET();
break;
default:
@@ -412,10 +412,10 @@
#ifdef GREEK_SUPPORT
greek_mode = !greek_mode;
if (greek_mode) {
- xterm_seq(XTerm_title, (greek_getmode() == GREEK_ELOT928 ? "[Greek:
iso]" : "[Greek: ibm]"));
+ xterm_seq(ESCSEQ_XTERM_TITLE, (greek_getmode() == GREEK_ELOT928 ?
"[Greek: iso]" : "[Greek: ibm]"));
greek_reset();
} else
- xterm_seq(XTerm_title, APL_NAME "-" VERSION);
+ xterm_seq(ESCSEQ_XTERM_TITLE, APL_NAME "-" VERSION);
LK_RET();
#endif
break;
@@ -1143,7 +1143,7 @@
break;
#endif
case 8:
- xterm_seq(XTerm_title, APL_NAME "-" VERSION);
+ xterm_seq(ESCSEQ_XTERM_TITLE, APL_NAME "-" VERSION);
break;
case 9:
#ifdef PIXMAP_OFFSET
@@ -1165,7 +1165,7 @@
tint = (tint & 0xffff00) |
(images[image_bg].current->iml->bmod->brightness & 0xff);
}
snprintf(tbuff, sizeof(tbuff), APL_NAME "-" VERSION ":
Transparent - %d%% shading - 0x%06lx tint mask", shading, tint);
- xterm_seq(XTerm_title, tbuff);
+ xterm_seq(ESCSEQ_XTERM_TITLE, tbuff);
} else
#endif
#ifdef PIXMAP_SUPPORT
@@ -1181,10 +1181,10 @@
len = strlen(fname) + sizeof(APL_NAME) + sizeof(VERSION) + 5;
tbuff = MALLOC(len);
snprintf(tbuff, len, APL_NAME "-" VERSION ": %s", fname);
- xterm_seq(XTerm_title, tbuff);
+ xterm_seq(ESCSEQ_XTERM_TITLE, tbuff);
FREE(tbuff);
} else {
- xterm_seq(XTerm_title, APL_NAME "-" VERSION ": No Pixmap");
+ xterm_seq(ESCSEQ_XTERM_TITLE, APL_NAME "-" VERSION ": No
Pixmap");
}
}
#endif /* PIXMAP_SUPPORT */
@@ -1298,10 +1298,10 @@
}
switch (arg) {
case 'l':
- xterm_seq(XTerm_title, (char *) string);
+ xterm_seq(ESCSEQ_XTERM_TITLE, (char *) string);
break;
case 'L':
- xterm_seq(XTerm_iconName, (char *) string);
+ xterm_seq(ESCSEQ_XTERM_ICONNAME, (char *) string);
break;
case 'I':
set_icon_pixmap((char *) string, NULL);
@@ -1377,7 +1377,8 @@
BOUND(y, 1, scr->height / TermWin.fheight);
BOUND(x, 1, scr->width / TermWin.fwidth);
XResizeWindow(Xdisplay, TermWin.parent,
- Width2Pixel(x) + 2 * TermWin.internalBorder +
(scrollbar_is_visible()? scrollbar_trough_width() : 0), Height2Pixel(y) + 2 *
TermWin.internalBorder);
+ Width2Pixel(x) + 2 * TermWin.internalBorder +
(scrollbar_is_visible()? scrollbar_trough_width() : 0),
+ Height2Pixel(y) + 2 * TermWin.internalBorder);
break;
case 11:
break;
@@ -1821,10 +1822,15 @@
#endif
switch (op) {
- case XTerm_title:
+ case ESCSEQ_XTERM_NAME: /* 0 */
+ set_title(str); /* drop */
+ case ESCSEQ_XTERM_ICONNAME: /* 1 */
+ set_icon_name(str);
+ break;
+ case ESCSEQ_XTERM_TITLE: /* 2 */
set_title(str);
break;
- case XTerm_prop:
+ case ESCSEQ_XTERM_PROP: /* 3 */
if ((nstr = (char *) strsep(&tnstr, ";")) == NULL) {
break;
}
@@ -1833,23 +1839,17 @@
}
set_text_property(TermWin.parent, nstr, valptr);
break;
- case XTerm_name:
- set_title(str); /* drop */
- case XTerm_iconName:
- set_icon_name(str);
- break;
- case XTerm_Takeover:
+ case ESCSEQ_XTERM_TAKEOVER: /* 5 */
XSetInputFocus(Xdisplay, TermWin.parent, RevertToParent, CurrentTime);
XRaiseWindow(Xdisplay, TermWin.parent);
break;
- case XTerm_EtermSeq:
-
+ case ESCSEQ_XTERM_ETERMSEQ: /* 6 */
/* Eterm proprietary escape sequences. See technical reference for
details. */
- D_CMD(("Got XTerm_EtermSeq sequence\n"));
+ D_CMD(("Got ESCSEQ_XTERM_ETERMSEQ sequence\n"));
nstr = (char *) strsep(&tnstr, ";");
eterm_seq_op = (unsigned char) strtol(nstr, (char **) NULL, 10);
- D_CMD((" XTerm_EtermSeq operation is %d\n", eterm_seq_op));
+ D_CMD((" ESCSEQ_XTERM_ETERMSEQ operation is %d\n", eterm_seq_op));
/* Yes, there is order to the numbers for this stuff. And here it is:
0-9 Image Class/Mode Configuration
10-19 Scrollbar/Buttonbar/Menu Configuration
@@ -2365,20 +2365,62 @@
}
break;
- case XTerm_ccolor:
- /* Change cursor color */
-#ifndef NO_CURSORCOLOR
- nstr = (char *) strsep(&tnstr, ";");
- if (nstr) {
- if (XParseColor(Xdisplay, cmap, nstr, &xcol) && XAllocColor(Xdisplay,
cmap, &xcol)) {
- PixColors[cursorColor] = xcol.pixel;
- scr_refresh(DEFAULT_REFRESH);
- }
+#ifdef XTERM_COLOR_CHANGE
+ case ESCSEQ_XTERM_FGCOLOR: /* 10 */
+ if ((nstr = (char *) strsep(&tnstr, ";")) != NULL) {
+ set_window_color(fgColor, nstr);
+ }
+ /* drop */
+ case ESCSEQ_XTERM_BGCOLOR: /* 11 */
+ if ((nstr = (char *) strsep(&tnstr, ";")) != NULL) {
+ set_window_color(bgColor, nstr);
+ }
+ /* drop */
+ case ESCSEQ_XTERM_CURSOR_COLOR: /* 12 */
+ if ((nstr = (char *) strsep(&tnstr, ";")) != NULL) {
+# ifndef NO_CURSORCOLOR
+ set_window_color(cursorColor, nstr);
+# endif
+ }
+ /* drop */
+ case ESCSEQ_XTERM_PTR_FGCOLOR: /* 13 */
+ if ((nstr = (char *) strsep(&tnstr, ";")) != NULL) {
+ set_pointer_colors(nstr, NULL);
+ }
+ /* drop */
+ case ESCSEQ_XTERM_PTR_BGCOLOR: /* 14 */
+ if ((nstr = (char *) strsep(&tnstr, ";")) != NULL) {
+ /* UNSUPPORTED */
+ }
+ /* drop */
+ case ESCSEQ_XTERM_TEK_FGCOLOR: /* 15 */
+ if ((nstr = (char *) strsep(&tnstr, ";")) != NULL) {
+ /* UNSUPPORTED */
+ }
+ /* drop */
+ case ESCSEQ_XTERM_TEK_BGCOLOR: /* 16 */
+ if ((nstr = (char *) strsep(&tnstr, ";")) != NULL) {
+ /* UNSUPPORTED */
+ }
+ /* drop */
+ case ESCSEQ_XTERM_HILIGHT_COLOR: /* 17 */
+ if ((nstr = (char *) strsep(&tnstr, ";")) != NULL) {
+ /* UNSUPPORTED */
+ }
+ /* drop */
+ case ESCSEQ_XTERM_BOLD_COLOR: /* 18 */
+ if ((nstr = (char *) strsep(&tnstr, ";")) != NULL) {
+ set_window_color(colorBD, nstr);
+ }
+ /* drop */
+ case ESCSEQ_XTERM_ULINE_COLOR: /* 19 */
+ if ((nstr = (char *) strsep(&tnstr, ";")) != NULL) {
+ set_window_color(colorUL, nstr);
}
#endif
break;
- case XTerm_Pixmap:
+ case ESCSEQ_XTERM_PIXMAP: /* 20 */
#ifdef PIXMAP_SUPPORT
FOREACH_IMAGE(if (!image_mode_is(idx, MODE_IMAGE) && image_mode_is(idx,
ALLOW_IMAGE)) {
image_set_mode(idx, MODE_IMAGE);}
@@ -2409,25 +2451,25 @@
#endif /* PIXMAP_SUPPORT */
break;
- case XTerm_restoreFG:
+ case ESCSEQ_XTERM_DUMPSCREEN: /* 30 */
+#if 0
+ nstr = (char *) strsep(&tnstr, ";");
+ if (nstr && *nstr) {
+ scr_dump_to_file(nstr);
+ }
+ break;
+#endif
+ case ESCSEQ_XTERM_RESTOREFG: /* 39 */
#ifdef XTERM_COLOR_CHANGE
set_window_color(fgColor, str);
#endif
break;
- case XTerm_restoreBG:
+ case ESCSEQ_XTERM_RESTOREBG: /* 40 */
#ifdef XTERM_COLOR_CHANGE
set_window_color(bgColor, str);
#endif
break;
- case XTerm_DumpScreen:
-#if 0
- nstr = (char *) strsep(&tnstr, ";");
- if (nstr && *nstr) {
- scr_dump_to_file(nstr);
- }
- break;
-#endif
- case XTerm_logfile:
+ case ESCSEQ_XTERM_LOGFILE: /* 46 */
nstr = (char *) strsep(&tnstr, ";");
if (nstr && *nstr && BOOL_OPT_ISTRUE(nstr)) {
/* Logging on */
@@ -2435,7 +2477,7 @@
/* Logging off */
}
break;
- case XTerm_font:
+ case ESCSEQ_XTERM_FONT: /* 50 */
change_font(0, str);
break;
default:
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/term.h,v
retrieving revision 1.21.2.2
retrieving revision 1.21.2.3
diff -u -3 -r1.21.2.2 -r1.21.2.3
--- term.h 27 Jan 2003 22:42:49 -0000 1.21.2.2
+++ term.h 3 Mar 2003 06:21:01 -0000 1.21.2.3
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2002, Michael Jennings
+ * Copyright (C) 1997-2003, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@@ -59,24 +59,33 @@
} } while (0)
/* XTerm escape sequences: ESC ] Ps;Pt BEL */
-# define XTerm_name 0
-# define XTerm_iconName 1
-# define XTerm_title 2
-# define XTerm_prop 3
-# define XTerm_ccolor 12
-# define XTerm_logfile 46
-# define XTerm_font 50
+# define ESCSEQ_XTERM_NAME 0
+# define ESCSEQ_XTERM_ICONNAME 1
+# define ESCSEQ_XTERM_TITLE 2
+# define ESCSEQ_XTERM_PROP 3
+# define ESCSEQ_XTERM_FGCOLOR 10
+# define ESCSEQ_XTERM_BGCOLOR 11
+# define ESCSEQ_XTERM_CURSOR_COLOR 12
+# define ESCSEQ_XTERM_PTR_FGCOLOR 13
+# define ESCSEQ_XTERM_PTR_BGCOLOR 14
+# define ESCSEQ_XTERM_TEK_FGCOLOR 15
+# define ESCSEQ_XTERM_TEK_BGCOLOR 16
+# define ESCSEQ_XTERM_HILIGHT_COLOR 17
+# define ESCSEQ_XTERM_BOLD_COLOR 18
+# define ESCSEQ_XTERM_ULINE_COLOR 19
+# define ESCSEQ_XTERM_LOGFILE 46
+# define ESCSEQ_XTERM_FONT 50
/* rxvt/Eterm extensions of XTerm escape sequences: ESC ] Ps;Pt BEL */
-# define XTerm_Takeover 5 /* Steal keyboard focus and raise window */
-# define XTerm_EtermSeq 6 /* Eterm proprietary escape sequences */
-# define XTerm_Pixmap 20 /* new bg pixmap */
-# define XTerm_DumpScreen 30 /* Dump contents of scrollback to a file */
-# define XTerm_restoreFG 39 /* change default fg color */
-# define XTerm_restoreBG 49 /* change default bg color */
+# define ESCSEQ_XTERM_TAKEOVER 5 /* Steal keyboard focus and raise window */
+# define ESCSEQ_XTERM_ETERMSEQ 6 /* Eterm proprietary escape sequences */
+# define ESCSEQ_XTERM_PIXMAP 20 /* new bg pixmap */
+# define ESCSEQ_XTERM_DUMPSCREEN 30 /* Dump contents of scrollback to a file */
+# define ESCSEQ_XTERM_RESTOREFG 39 /* change default fg color */
+# define ESCSEQ_XTERM_RESTOREBG 49 /* change default bg color */
-# define restoreFG 39 /* restore default fg color */
-# define restoreBG 49 /* restore default bg color */
+# define restoreFG 39 /* restore default fg color */
+# define restoreBG 49 /* restore default bg color */
enum color_list {
fgColor,
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/timer.c,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -u -3 -r1.9.2.2 -r1.9.2.3
--- timer.c 19 Nov 2002 04:41:56 -0000 1.9.2.2
+++ timer.c 3 Mar 2003 06:21:01 -0000 1.9.2.3
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2002, Michael Jennings
+ * Copyright (C) 1997-2003, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: timer.c,v 1.9.2.2 2002/11/19 04:41:56 mej Exp
$";
+static const char cvs_ident[] = "$Id: timer.c,v 1.9.2.3 2003/03/03 06:21:01 mej Exp
$";
#include "config.h"
#include "feature.h"
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/timer.h,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -3 -r1.6 -r1.6.2.1
--- timer.h 3 Feb 2002 20:53:07 -0000 1.6
+++ timer.h 3 Mar 2003 06:21:01 -0000 1.6.2.1
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2002, Michael Jennings
+ * Copyright (C) 1997-2003, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/utmp.c,v
retrieving revision 1.13.2.2
retrieving revision 1.13.2.3
diff -u -3 -r1.13.2.2 -r1.13.2.3
--- utmp.c 19 Nov 2002 04:41:56 -0000 1.13.2.2
+++ utmp.c 3 Mar 2003 06:21:01 -0000 1.13.2.3
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2002, Michael Jennings
+ * Copyright (C) 1997-2003, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: utmp.c,v 1.13.2.2 2002/11/19 04:41:56 mej Exp
$";
+static const char cvs_ident[] = "$Id: utmp.c,v 1.13.2.3 2003/03/03 06:21:01 mej Exp
$";
#include "config.h"
#include "feature.h"
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/windows.c,v
retrieving revision 1.51.2.3
retrieving revision 1.51.2.4
diff -u -3 -r1.51.2.3 -r1.51.2.4
--- windows.c 19 Nov 2002 04:41:56 -0000 1.51.2.3
+++ windows.c 3 Mar 2003 06:21:01 -0000 1.51.2.4
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2002, Michael Jennings
+ * Copyright (C) 1997-2003, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: windows.c,v 1.51.2.3 2002/11/19 04:41:56 mej
Exp $";
+static const char cvs_ident[] = "$Id: windows.c,v 1.51.2.4 2003/03/03 06:21:01 mej
Exp $";
#include "config.h"
#include "feature.h"
@@ -331,6 +331,26 @@
stored_palette(SAVE);
}
+void
+set_pointer_colors(const char *fg_name, const char *bg_name)
+{
+ XColor fg, bg;
+
+ if (fg_name != NULL) {
+ fg.pixel = get_color_by_name(fg_name, COLOR_NAME(pointerColor));
+ } else {
+ fg.pixel = PixColors[pointerColor];
+ }
+ XQueryColor(Xdisplay, cmap, &fg);
+ if (bg_name != NULL) {
+ bg.pixel = get_color_by_name(bg_name, COLOR_NAME(bgColor));
+ } else {
+ bg.pixel = PixColors[bgColor];
+ }
+ XQueryColor(Xdisplay, cmap, &bg);
+ XRecolorCursor(Xdisplay, TermWin_cursor, &fg, &bg);
+}
+
/* Create_Windows() - Open and map the window */
void
Create_Windows(int argc, char *argv[])
@@ -409,8 +429,8 @@
#endif
CWBackPixel | CWBorderPixel | CWColormap |
CWOverrideRedirect, &Attributes);
- xterm_seq(XTerm_title, rs_title);
- xterm_seq(XTerm_iconName, rs_iconName);
+ xterm_seq(ESCSEQ_XTERM_TITLE, rs_title);
+ xterm_seq(ESCSEQ_XTERM_ICONNAME, rs_iconName);
classHint.res_name = (char *) rs_name;
classHint.res_class = APL_NAME;
wmHint.window_group = TermWin.parent;
@@ -431,16 +451,7 @@
}
/* vt cursor: Black-on-White is standard, but this is more popular */
TermWin_cursor = XCreateFontCursor(Xdisplay, XC_xterm);
- {
-
- XColor fg, bg;
-
- fg.pixel = PixColors[pointerColor];
- XQueryColor(Xdisplay, cmap, &fg);
- bg.pixel = PixColors[bgColor];
- XQueryColor(Xdisplay, cmap, &bg);
- XRecolorCursor(Xdisplay, TermWin_cursor, &fg, &bg);
- }
+ set_pointer_colors(NULL, NULL);
/* cursor (menu/scrollbar): Black-on-White */
cursor = XCreateFontCursor(Xdisplay, XC_left_ptr);
@@ -704,10 +715,10 @@
print_warning("Unable to resolve \"%s\" as a color name.\n", color);
return;
}
- redraw_image(image_bg);
set_colorfgbg();
scr_touch();
scr_refresh(DEFAULT_REFRESH);
+ redraw_image(image_bg);
}
#endif /* XTERM_COLOR_CHANGE */
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/windows.h,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -u -3 -r1.14.2.1 -r1.14.2.2
--- windows.h 19 Nov 2002 04:41:56 -0000 1.14.2.1
+++ windows.h 3 Mar 2003 06:21:02 -0000 1.14.2.2
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2002, Michael Jennings
+ * Copyright (C) 1997-2003, Michael Jennings
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@@ -46,6 +46,7 @@
extern Pixel get_color_by_name(const char *, const char *);
extern Pixel get_color_by_pixel(Pixel, Pixel);
extern void process_colors(void);
+extern void set_pointer_colors(const char *, const char *);
extern void Create_Windows(int, char * []);
extern void resize_parent(unsigned int, unsigned int);
extern void set_width(unsigned short);
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
