Enlightenment CVS committal
Author : mej
Project : eterm
Module : Eterm
Dir : eterm/Eterm/src
Modified Files:
command.c e.c eterm_debug.h screen.h startup.c term.c
windows.c
Log Message:
Tue Aug 16 10:48:12 2005 Michael Jennings (mej)
Applied a fix from [EMAIL PROTECTED] for a typo in keysym
handling.
Fixed percent signs in menu files thanks to Yasufumi Haga
<[EMAIL PROTECTED]>.
Fixed E IPC version check to work with old and new schemes.
----------------------------------------------------------------------
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/command.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -3 -r1.107 -r1.108
--- command.c 25 Apr 2005 19:37:20 -0000 1.107
+++ command.c 16 Aug 2005 14:50:43 -0000 1.108
@@ -34,7 +34,7 @@
* he guarantee anything whatsoever.
*----------------------------------------------------------------------*/
-static const char cvs_ident[] = "$Id: command.c,v 1.107 2005/04/25 19:37:20
mej Exp $";
+static const char cvs_ident[] = "$Id: command.c,v 1.108 2005/08/16 14:50:43
mej Exp $";
/* includes: */
#include "config.h"
@@ -1767,6 +1767,7 @@
if (fontname) {
setlocale(LC_ALL, "");
fontset = XCreateFontSet(Xdisplay, fontname, &ml, &mc, &ds);
+ D_FONT(("Created fontset from %s, %d missing charsets, default string
\"%s\".\n", fontname, mc, NONULL(ds)));
FREE(fontname);
if (mc) {
XFreeStringList(ml);
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/e.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- e.c 27 Jun 2005 00:07:13 -0000 1.28
+++ e.c 16 Aug 2005 14:50:46 -0000 1.29
@@ -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.28 2005/06/27 00:07:13 mej Exp
$";
+static const char cvs_ident[] = "$Id: e.c,v 1.29 2005/08/16 14:50:46 mej Exp
$";
#include "config.h"
#include "feature.h"
@@ -90,9 +90,15 @@
char *ver, *tmp;
tmp = strchr((char *) str, ' ');
+ if (!tmp) {
+ tmp = strchr((char *) str, '-');
+ }
if (tmp) {
ver = tmp + 1;
tmp = strchr((char *) ver, ' ');
+ if (! tmp) {
+ tmp = strchr((char *) ver, '-');
+ }
if (tmp) {
*tmp = 0;
}
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/eterm_debug.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- eterm_debug.h 28 Jun 2004 16:36:57 -0000 1.13
+++ eterm_debug.h 16 Aug 2005 14:50:46 -0000 1.14
@@ -78,6 +78,9 @@
# define DEBUG_VT 6
# define D_VT(x) DPRINTF6(x)
+# define DEBUG_ALL_SCREEN 7
+# define D_ALL_SCREEN(x) DPRINTF7(x)
+
# define DEBUG_X 9
#endif /* _ETERM_DEBUG_H */
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/screen.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- screen.h 18 Apr 2005 22:03:41 -0000 1.33
+++ screen.h 16 Aug 2005 14:50:46 -0000 1.34
@@ -59,7 +59,7 @@
if (y1 < low_y)
low_y = y1; if (y2 > high_y) high_y = y2;}} while (0)
#define ERASE_ROWS(row, num) do {XFillRectangle(Xdisplay, draw_buffer,
TermWin.gc, Col2Pixel(0), Row2Pixel(row), TERM_WINDOW_GET_WIDTH(),
Height2Pixel(num)); \
if (buffer_pixmap) {XClearArea(Xdisplay,
TermWin.vt, Col2Pixel(0), Row2Pixel(row), TERM_WINDOW_GET_WIDTH(),
Height2Pixel(num), 0);}} while (0)
-#if 0
+#if FIXME_BLOCK
# define DRAW_STRING(Func, x, y, str, len) Func(Xdisplay, draw_buffer,
TermWin.fontset, TermWin.gc, x, y, str, len)
#else
# define DRAW_STRING(Func, x, y, str, len) Func(Xdisplay, draw_buffer,
TermWin.gc, x, y, str, len)
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/startup.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -3 -r1.51 -r1.52
--- startup.c 27 Jun 2005 00:07:13 -0000 1.51
+++ startup.c 16 Aug 2005 14:50:46 -0000 1.52
@@ -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.51 2005/06/27 00:07:13 mej
Exp $";
+static const char cvs_ident[] = "$Id: startup.c,v 1.52 2005/08/16 14:50:46 mej
Exp $";
#include "config.h"
#include "feature.h"
@@ -324,12 +324,14 @@
#ifdef NO_UTF8_LOCALE
/* Check locale for UTF-8 and deactivate if needed. */
val = getenv("LANG");
+ D_CMD(("Checking locale \"%s\" for UTF-8.\n", NONULL(val)));
if (val && *val) {
char *tmp;
tmp = strcasestr(val, ".utf");
if (tmp) {
*tmp = 0;
+ D_CMD((" -> Deactivating unsupported UTF-8 locale; now using
\"%s\"\n", val));
}
}
#endif
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/term.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -3 -r1.107 -r1.108
--- term.c 19 Apr 2005 01:57:23 -0000 1.107
+++ term.c 16 Aug 2005 14:50:46 -0000 1.108
@@ -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.107 2005/04/19 01:57:23 mej
Exp $";
+static const char cvs_ident[] = "$Id: term.c,v 1.108 2005/08/16 14:50:46 mej
Exp $";
#include "config.h"
#include "feature.h"
@@ -677,7 +677,7 @@
}
/* Process extended keysyms. This is where the conversion to escape
sequences happens. */
- if (keysym >= 0xfe00 && keysym <= 0xffff) {
+ if (keysym >= 0xff00 && keysym <= 0xffff) {
#ifdef KEYSYM_ATTRIBUTE
/* The "keysym" attribute in the config file gets handled here. */
if (!(shft | ctrl) && KeySym_map[keysym - 0xff00] != NULL) {
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/windows.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -3 -r1.71 -r1.72
--- windows.c 19 Apr 2005 01:57:24 -0000 1.71
+++ windows.c 16 Aug 2005 14:50:46 -0000 1.72
@@ -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.71 2005/04/19 01:57:24 mej
Exp $";
+static const char cvs_ident[] = "$Id: windows.c,v 1.72 2005/08/16 14:50:46 mej
Exp $";
#include "config.h"
#include "feature.h"
@@ -527,6 +527,7 @@
gcvalue.background = PixColors[bgColor];
gcvalue.graphics_exposures = 0;
TermWin.gc = LIBAST_X_CREATE_GC(GCForeground | GCBackground | GCFont |
GCGraphicsExposures, &gcvalue);
+ D_X11(("Created GC 0x%08x for TermWin.gc\n", TermWin.gc));
}
if (BITFIELD_IS_SET(eterm_options, ETERM_OPTIONS_NO_CURSOR)) {
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
