*** empty log message ***

diff --git a/autoconf/config.h.in b/autoconf/config.h.in
index 7d246259050709df1464f7c7a60e3c25f8a1cf61..6ebbdc70aad5eb74801a21be83f5e5a8e5d6c787 100644 (file)
--- a/autoconf/config.h.in
+++ b/autoconf/config.h.in
@@ -328,9 +328,6 @@
 /* Define for second char in devptyXX */
 #undef PTYCHAR2
 
-/* Define if you want Rob Nation's own graphic mode */
-#undef RXVT_GRAPHICS
-
 /* Define if you want your background to use the parent window background */
 #undef TRANSPARENT
 
@@ -391,6 +388,9 @@
 /* Define if you want blinking cursor support */
 #undef CURSOR_BLINK
 
+/* Define if you want blinking text support */
+#undef TEXT_BLINK
+
 /* Define if you want to represent unicode characters outside plane 0 */
 #undef UNICODE_3
 

diff --git a/autoconf/configure.in b/autoconf/configure.in
index aaa71df53be59f57c715f8b3238b2ce62ec7979a..38a3b88beab6d348c221b1dde984f0752a0ba8c7 100644 (file)
--- a/autoconf/configure.in
+++ b/autoconf/configure.in
@@ -1,6 +1,6 @@
 dnl# -*- sh -*-
 dnl#
-dnl# $Id: configure.in,v 1.5 2004-01-16 18:49:33 pcg Exp $
+dnl# $Id: configure.in,v 1.6 2004-01-29 21:34:14 pcg Exp $
 dnl#
 dnl# Process this file with autoconf to produce a configure script.
 dnl#
@@ -44,7 +44,6 @@ MALLOC_TYPE=S
 support_addstrings=no
 support_frills=no
 support_linespace=no
-support_graphics=no
 support_inheritpixmap=no
 support_keepscrolling=no
 support_selectionscrolling=no
@@ -56,6 +55,7 @@ support_utmp=no
 support_wtmp=no
 support_lastlog=no
 support_cursor_blink=no
+support_text_blink=no
 support_pointer_blank=no
 support_scroll_rxvt=no
 support_scroll_next=no
@@ -84,7 +84,6 @@ AC_ARG_ENABLE(everything,
     support_24bit=yes
     support_frills=yes
     support_linespace=yes
-    support_graphics=yes
     support_inheritpixmap=yes
     support_keepscrolling=yes
     support_selectionscrolling=yes
@@ -94,6 +93,7 @@ AC_ARG_ENABLE(everything,
     support_mouseslipwheel=yes
     support_oldselection=yes
     support_cursor_blink=yes
+    support_text_blink=yes
     support_pointer_blank=yes
     support_scroll_rxvt=yes
     support_scroll_next=yes
@@ -116,10 +116,6 @@ if test x$support_xpm = xyes; then
     support_xpm=no
     echo "******* pixmap support disabled, does not work"
 fi
-if test x$support_graphics = xyes; then
-    support_graphics=no
-    echo "******* graphics support disabled, does not work"
-fi
 if test x$support_menubar = xyes; then
     support_menubar=no
     echo "******* menubar support disabled, does not work"
@@ -188,12 +184,6 @@ AC_ARG_ENABLE(menubar,
     support_menubar=$enableval
   fi])
 
-AC_ARG_ENABLE(graphics,
-  [  --enable-graphics       enable rxvt own graphics mode (see src/graphics)    *],
-  [if test x$enableval = xyes -o x$enableval = xno; then
-    support_graphics=$enableval
-  fi])
-
 AC_ARG_ENABLE(rxvt-scroll,
   [  --enable-rxvt-scroll    enable rxvt style scrollbar                         *],
   [if test x$enableval = xyes -o x$enableval = xno; then
@@ -358,13 +348,19 @@ AC_ARG_ENABLE(256-color,
   fi])
 
 AC_ARG_ENABLE(cursor-blink,
-  [  --enable-cursor-blink   enable blinking cursor                              *],
+  [  --enable-cursor-blink   enable blinking cursor],
   [if test x$enableval = xyes -o x$enableval = xno; then
     support_cursor_blink=$enableval
   fi])
 
+AC_ARG_ENABLE(text-blink,
+  [  --enable-text-blink   enable blinking text],
+  [if test x$enableval = xyes -o x$enableval = xno; then
+    support_text_blink=$enableval
+  fi])
+
 AC_ARG_ENABLE(pointer-blank,
-  [  --enable-pointer-blank  enable pointer blank when typing or inactive pointer*],
+  [  --enable-pointer-blank  enable pointer blank when typing or inactive pointer],
   [if test x$enableval = xyes -o x$enableval = xno; then
     support_pointer_blank=$enableval
   fi])
@@ -1135,9 +1131,6 @@ AC_CHECK_LIB(xpg4, setlocale, [LIBS="$LIBS -lxpg4"])
 dnl# --------------------------------------------------------------------------
 dnl# now add and remove other stuff
 dnl# --------------------------------------------------------------------------
-if test x$support_graphics = xyes; then
-  AC_DEFINE(RXVT_GRAPHICS, 1, Define if you want Rob Nation's own graphic mode)
-fi
 if test x$support_inheritpixmap = xyes; then
   AC_DEFINE(TRANSPARENT, 1, Define if you want your background to use the parent window background)
 fi
@@ -1203,6 +1196,9 @@ fi
 if test x$support_cursor_blink = xyes; then
   AC_DEFINE(CURSOR_BLINK, 1, Define if you want blinking cursor support)
 fi
+if test x$support_test_blink = xyes; then
+  AC_DEFINE(TEXT_BLINK, 1, Define if you want blinking text support)
+fi
 if test x$support_unicode3 = xyes; then
   AC_DEFINE(UNICODE_3, 1, Define if you want to represent unicode characters outside plane 0)
 fi
@@ -1302,7 +1298,6 @@ AC_OUTPUT(autoconf/Make.common \
 Makefile \
 doc/Makefile \
 src/Makefile \
-src/graphics/Makefile \
 src/test/Makefile \
 src/rxvtlib.h \
 W11/Makefile \

diff --git a/src/command.C b/src/command.C
index f017ecabf7e814203007319df98cec9c06973500..a821518f5f6ff70298e3d523fa80b50916ebe9ce 100644 (file)
--- a/src/command.C
+++ b/src/command.C
@@ -1,7 +1,7 @@
 /*--------------------------------*-C-*---------------------------------*
  * File:       command.c
  *----------------------------------------------------------------------*
- * $Id: command.C,v 1.29 2004-01-19 17:26:43 pcg Exp $
+ * $Id: command.C,v 1.30 2004-01-29 21:35:58 pcg Exp $
  *
  * All portions of code are copyright by their respective author/s.
  * Copyright (c) 1992      John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
@@ -2693,7 +2693,7 @@ rxvt_process_csi_seq(pR)
 
     case CSI_78:               /* DECREQTPARM */
        if (arg[0] == 0 || arg[0] == 1)
-           R->tt_printf("\033[%d;1;1;112;112;1;0x", arg[0] + 2);
+           R->tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
     /* FALLTHROUGH */
 
     default:

diff --git a/src/rxvt.h b/src/rxvt.h
index 5aecbd48523659b08a55a6c81db9ce7e671743ea..dbb62a6cf707b47090dc5bb75979329cef0f27df 100644 (file)
--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -834,6 +834,9 @@ struct rxvt_term : rxvt_vars {
 #ifdef CURSOR_BLINK
                   hidden_cursor:1,
 #endif
+#ifdef TEXT_BLINK
+                  hidden_text:1,
+#endif
 #ifdef POINTER_BLANK
                   hidden_pointer:1,
 #endif

diff --git a/src/rxvtgrx.h b/src/rxvtgrx.h
deleted file mode 100644 (file)
index 55c5e2c..0000000
--- a/src/rxvtgrx.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*--------------------------------*-C-*---------------------------------*
- * File:       rxvtgrx.h
- *
- * Stuff for text alignment for rxvt special graphics mode
- *
- * alignment
- * Top:
- *     text is placed so that the specified point is at the top of the
- *     capital letters
- * Center:
- *     text is placed so that the specified point is equidistant from the
- *     bottom of descenders and the top of the capital letters
- * Bottom:
- *     text is placed so that the bottom of descenders is on the specified
- *     point
- * Base:
- *     text is placed so that the bottom of the characters with no descenders
- *     is on the specified point
- * Caps_Center:
- *     text is placed so that the specified point is equidistant from the
- *     bottom and tops of capital letters
- *----------------------------------------------------------------------*/
-#ifndef RXVTGRX_H_
-#define RXVTGRX_H_
-
-#define GRX_SCALE              10000
-
-#define RIGHT_TEXT             0x10
-#define HCENTER_TEXT           0x20
-#define LEFT_TEXT              0x30
-#define HORIZONTAL_ALIGNMENT   0x70
-
-#define TOP_TEXT               0x01
-#define VCENTER_TEXT           0x02
-#define BOTTOM_TEXT            0x03
-#define BASE_TEXT              0x04
-#define VCAPS_CENTER_TEXT      0x05
-#define VERTICAL_ALIGNMENT     0x0F
-
-#if 0  /* this would be nicer */
-# define TXT_RIGHT             'r'
-# define TXT_CENTER            'c'
-# define TXT_LEFT              'l'
-
-# define TXT_TOP               't'
-# define TXT_VCENTER           'v'
-# define TXT_BOTTOM            'b'
-# define TXT_BASE              '_'
-# define TXT_VCAPS_CENTER      'C'
-#endif
-
-#endif /* _RXVTGRX_H_ */
-/*----------------------- end-of-file (C header) -----------------------*/