Enlightenment CVS committal
Author : mej
Project : eterm
Module : Eterm
Dir : eterm/Eterm/src
Modified Files:
Tag: ETERM-0_10
pixmap.c screen.c screen.h startup.c term.c
Log Message:
Wed Mar 3 12:48:40 2004 Michael Jennings (mej)
Merges.
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/pixmap.c,v
retrieving revision 1.78.2.10
retrieving revision 1.78.2.11
diff -u -3 -r1.78.2.10 -r1.78.2.11
--- pixmap.c 19 Jan 2004 19:49:22 -0000 1.78.2.10
+++ pixmap.c 3 Mar 2004 17:42:46 -0000 1.78.2.11
@@ -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.10 2004/01/19 19:49:22 mej
Exp $";
+static const char cvs_ident[] = "$Id: pixmap.c,v 1.78.2.11 2004/03/03 17:42:46 mej
Exp $";
#include "config.h"
#include "feature.h"
@@ -1166,6 +1166,12 @@
xscaled = (unsigned short) ((xsize * x_ratio) * ((float) w / 100.0));
yscaled = (unsigned short) ((ysize * x_ratio) * ((float) h / 100.0));
} else {
+ if (!w && BITFIELD_IS_SET(simg->pmap->op, OP_HSCALE)) {
+ w = 100;
+ }
+ if (!h && BITFIELD_IS_SET(simg->pmap->op, OP_VSCALE)) {
+ h = 100;
+ }
if (w > 0) {
xscaled = width * ((float) w / 100.0);
} else {
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/screen.c,v
retrieving revision 1.59.2.7
retrieving revision 1.59.2.8
diff -u -3 -r1.59.2.7 -r1.59.2.8
--- screen.c 7 Oct 2003 00:48:28 -0000 1.59.2.7
+++ screen.c 3 Mar 2004 17:42:46 -0000 1.59.2.8
@@ -3,7 +3,7 @@
*
*/
-static const char cvs_ident[] = "$Id: screen.c,v 1.59.2.7 2003/10/07 00:48:28 mej Exp
$";
+static const char cvs_ident[] = "$Id: screen.c,v 1.59.2.8 2004/03/03 17:42:46 mej Exp
$";
#include "config.h"
#include "feature.h"
@@ -757,7 +757,7 @@
if (screen.row == screen.bscroll) {
scroll_text(screen.tscroll, screen.bscroll, 1, 0);
j = screen.bscroll + TermWin.saveLines;
- blank_screen_mem(screen.text, screen.rend, j, rstyle &
~RS_Uline);
+ blank_screen_mem(screen.text, screen.rend, j, rstyle &
~(RS_Uline|RS_Overscore));
} else if (screen.row < (TERM_WINDOW_GET_REPORTED_ROWS() - 1)) {
screen.row++;
row = screen.row + TermWin.saveLines;
@@ -786,7 +786,7 @@
j = screen.bscroll + TermWin.saveLines;
/* blank_line(screen.text[j], screen.rend[j], TermWin.ncol,
rstyle); Bug fix from John Ellison - need to reset rstyle */
- blank_screen_mem(screen.text, screen.rend, j, rstyle & ~RS_Uline);
+ blank_screen_mem(screen.text, screen.rend, j, rstyle &
~(RS_Uline|RS_Overscore));
} else if (screen.row < (TERM_WINDOW_GET_REPORTED_ROWS() - 1)) {
screen.row++;
row = screen.row + TermWin.saveLines;
@@ -1004,9 +1004,9 @@
default:
return;
}
- blank_line(&(screen.text[row][col]), &(screen.rend[row][col]), num, rstyle &
~RS_Uline);
+ blank_line(&(screen.text[row][col]), &(screen.rend[row][col]), num, rstyle &
~(RS_Uline|RS_Overscore));
} else {
- blank_screen_mem(screen.text, screen.rend, row, rstyle & ~RS_Uline);
+ blank_screen_mem(screen.text, screen.rend, row, rstyle &
~(RS_Uline|RS_Overscore));
}
}
@@ -1059,7 +1059,7 @@
}
if (row >= 0 && row <= TERM_WINDOW_GET_REPORTED_ROWS()) { /* check OOB */
UPPER_BOUND(num, (TERM_WINDOW_GET_REPORTED_ROWS() - row));
- if (rstyle & RS_RVid || rstyle & RS_Uline)
+ if (rstyle & RS_RVid || rstyle & RS_Uline || rstyle & RS_Overscore)
ren = -1;
else {
if (GET_BGCOLOR(rstyle) == bgColor) {
@@ -1076,7 +1076,7 @@
}
}
for (; num--; row++) {
- blank_screen_mem(screen.text, screen.rend, row + row_offset, rstyle &
~(RS_RVid | RS_Uline));
+ blank_screen_mem(screen.text, screen.rend, row + row_offset, rstyle &
~(RS_RVid | RS_Uline | RS_Overscore));
blank_screen_mem(drawn_text, drawn_rend, row, ren);
}
}
@@ -2059,6 +2059,15 @@
UPDATE_BOX(xpixel, ypixel - 1, xpixel + Width2Pixel(wlen) - 1,
ypixel - 1);
}
}
+ if (rend & RS_Overscore) {
+ if (ascent > 1) {
+ XDrawLine(Xdisplay, draw_buffer, TermWin.gc, xpixel, ypixel -
ascent, xpixel + Width2Pixel(wlen) - 1, ypixel - ascent);
+ UPDATE_BOX(xpixel, ypixel + 1, xpixel + Width2Pixel(wlen) - 1,
ypixel + 1);
+ } else {
+ XDrawLine(Xdisplay, draw_buffer, TermWin.gc, xpixel, ypixel - 1,
xpixel + Width2Pixel(wlen) - 1, ypixel - 1);
+ UPDATE_BOX(xpixel, ypixel - 1, xpixel + Width2Pixel(wlen) - 1,
ypixel - 1);
+ }
+ }
if (is_cursor == 1) {
#ifndef NO_CURSORCOLOR
if (PixColors[cursorColor] != PixColors[bgColor]) {
@@ -3338,6 +3347,14 @@
fprintf(stderr, "blink ");
if (rstyle & RS_Uline)
fprintf(stderr, "uline ");
+ if (rstyle & RS_Overscore)
+ fprintf(stderr, "overscore ");
+ if (rstyle & RS_Italic)
+ fprintf(stderr, "italic ");
+ if (rstyle & RS_Dim)
+ fprintf(stderr, "dim ");
+ if (rstyle & RS_Conceal)
+ fprintf(stderr, "conceal ");
fprintf(stderr, "): ");
color = GET_FGCOLOR(rstyle);
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/screen.h,v
retrieving revision 1.20.2.5
retrieving revision 1.20.2.6
diff -u -3 -r1.20.2.5 -r1.20.2.6
--- screen.h 7 Oct 2003 00:48:29 -0000 1.20.2.5
+++ screen.h 3 Mar 2004 17:42:47 -0000 1.20.2.6
@@ -115,11 +115,15 @@
#define RS_multiMask (RS_multi0|RS_multi1) /* multibyte mask */
#endif
#define RS_fgMask 0x00001F00u /* 32 colors */
+#define RS_Overscore 0x00002000u /* overscore */
+#define RS_Italic 0x00004000u /* italic */
#define RS_Bold 0x00008000u /* bold */
#define RS_bgMask 0x001F0000u /* 32 colors */
+#define RS_Dim 0x00200000u /* dim (apply alpha) */
+#define RS_Conceal 0x00400000u /* conceal */
#define RS_Blink 0x00800000u /* blink */
-#define RS_attrMask (0xFF000000u|RS_Bold|RS_Blink)
+#define RS_attrMask
(0xFF000000u|RS_Overscore|RS_Italic|RS_Bold|RS_Dim|RS_Conceal|RS_Blink)
/* how to build & extract colors and attributes */
#define GET_FGCOLOR(r) (((r) & RS_fgMask)>>8)
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/startup.c,v
retrieving revision 1.29.2.8
retrieving revision 1.29.2.9
diff -u -3 -r1.29.2.8 -r1.29.2.9
--- startup.c 19 Jan 2004 19:49:23 -0000 1.29.2.8
+++ startup.c 3 Mar 2004 17:42:48 -0000 1.29.2.9
@@ -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.8 2004/01/19 19:49:23 mej
Exp $";
+static const char cvs_ident[] = "$Id: startup.c,v 1.29.2.9 2004/03/03 17:42:48 mej
Exp $";
#include "config.h"
#include "feature.h"
@@ -156,7 +156,7 @@
sprintf(tmp, "ETERM_THEME_ROOT=%s", theme_dir);
putenv(tmp);
}
- if ((user_dir = conf_parse_theme(&rs_theme, (rs_config_file ? rs_config_file :
USER_CFG), (PARSE_TRY_USER_THEME | PARSE_TRY_NO_THEME))) != NULL) {
+ if ((user_dir = conf_parse_theme(&rs_theme, (rs_config_file ? rs_config_file :
USER_CFG), (PARSE_TRY_USER_THEME))) != NULL) {
char *tmp;
D_OPTIONS(("conf_parse_theme() returned \"%s\"\n", user_dir));
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/term.c,v
retrieving revision 1.78.2.9
retrieving revision 1.78.2.10
diff -u -3 -r1.78.2.9 -r1.78.2.10
--- term.c 19 Jan 2004 19:49:23 -0000 1.78.2.9
+++ term.c 3 Mar 2004 17:42:48 -0000 1.78.2.10
@@ -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.9 2004/01/19 19:49:23 mej Exp
$";
+static const char cvs_ident[] = "$Id: term.c,v 1.78.2.10 2004/03/03 17:42:48 mej Exp
$";
#include "config.h"
#include "feature.h"
@@ -850,7 +850,6 @@
process_print_pipe(void)
{
const char *const escape_seq = "\033[4i";
- const char *const rev_escape_seq = "i4[\033";
int index;
FILE *fd;
@@ -858,14 +857,18 @@
for (index = 0; index < 4; /* nil */ ) {
unsigned char ch = cmd_getc();
- if (ch == escape_seq[index])
+ if (ch == escape_seq[index]) {
index++;
- else if (index)
- for ( /*nil */ ; index > 0; index--)
- fputc(rev_escape_seq[index - 1], fd);
+ } else if (index) {
+ int i;
- if (index == 0)
+ for (i = 0; index > 0; i++, index--) {
+ fputc(escape_seq[i], fd);
+ }
+ }
+ if (index == 0) {
fputc(ch, fd);
+ }
}
pclose_printer(fd);
}
@@ -1597,23 +1600,37 @@
case 1:
scr_rendition(1, RS_Bold);
break;
+ case 2:
+ scr_rendition(1, RS_Dim);
+ break;
+ case 3:
+ scr_rendition(1, RS_Italic);
+ break;
case 4:
scr_rendition(1, RS_Uline);
break;
case 5:
scr_rendition(1, RS_Blink);
break;
+ case 6:
+ scr_rendition(1, RS_Overscore);
+ break;
case 7:
scr_rendition(1, RS_RVid);
break;
+ case 8:
+ scr_rendition(1, RS_Conceal);
+ break;
case 22:
scr_rendition(0, RS_Bold);
+ scr_rendition(0, RS_Dim);
break;
case 24:
scr_rendition(0, RS_Uline);
break;
case 25:
scr_rendition(0, RS_Blink);
+ scr_rendition(0, RS_Overscore);
break;
case 27:
scr_rendition(0, RS_RVid);
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
