From 7cd02c2f6b29beaafe1597e0db59acb6f368d305 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 16 Jan 2006 15:12:48 +0000 Subject: [PATCH] *** empty log message *** --- autoconf/configure.in | 10 +++++----- doc/rxvt.1.html | 13 ------------- doc/rxvt.1.man.in | 7 ------- doc/rxvt.1.pod | 9 --------- doc/rxvt.1.txt | 7 ------- doc/rxvt.7.html | 4 ++-- doc/rxvt.7.man.in | 4 ++-- doc/rxvt.7.pod | 4 ++-- doc/rxvt.7.txt | 4 ++-- src/rxvt.h | 11 ++--------- src/scrollbar-rxvt.C | 9 ++++++--- src/scrollbar.C | 4 ++-- 12 files changed, 23 insertions(+), 63 deletions(-) diff --git a/autoconf/configure.in b/autoconf/configure.in index b3962577..2f9d9686 100644 --- a/autoconf/configure.in +++ b/autoconf/configure.in @@ -301,11 +301,11 @@ AC_ARG_ENABLE(plain-scroll, support_scroll_plain=$enableval fi]) -AC_ARG_ENABLE(half-shadow, - [ --enable-half-shadow use half width/height shadow on rxvt scrollbar], - [if test x$enableval = xyes; then - AC_DEFINE(HALFSHADOW, 1, Define if you want the depth of scrollbars and menus to be less) - fi]) +dnl AC_ARG_ENABLE(half-shadow, +dnl [ --enable-half-shadow use half width/height shadow on rxvt scrollbar], +dnl [if test x$enableval = xyes; then +dnl AC_DEFINE(HALFSHADOW, 1, Define if you want the depth of scrollbars and menus to be less) +dnl fi]) AC_ARG_WITH(codesets, [ --with-codesets=NAME,.. compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)], diff --git a/doc/rxvt.1.html b/doc/rxvt.1.html index 4a36485c..50b9fcc1 100644 --- a/doc/rxvt.1.html +++ b/doc/rxvt.1.html @@ -1759,19 +1759,6 @@ display in it's child processes. The shell to be used for command execution, defaults to /bin/sh.

-
RXVTPATH
-
-
-The path where rxvt looks for support files such as menu and xpm -files. -
-

-
PATH
-
-
-Used in the same way as RXVTPATH. -
-

RXVT_SOCKET
diff --git a/doc/rxvt.1.man.in b/doc/rxvt.1.man.in index a71c9fe0..2c4ba35a 100644 --- a/doc/rxvt.1.man.in +++ b/doc/rxvt.1.man.in @@ -1356,13 +1356,6 @@ display in it's child processes. .IP "\fB\s-1SHELL\s0\fR" 4 .IX Item "SHELL" The shell to be used for command execution, defaults to \f(CW\*(C`/bin/sh\*(C'\fR. -.IP "\fB\s-1RXVTPATH\s0\fR" 4 -.IX Item "RXVTPATH" -The path where @@RXVT_NAME@@ looks for support files such as menu and xpm -files. -.IP "\fB\s-1PATH\s0\fR" 4 -.IX Item "PATH" -Used in the same way as \f(CW\*(C`RXVTPATH\*(C'\fR. .IP "\fB\s-1RXVT_SOCKET\s0\fR" 4 .IX Item "RXVT_SOCKET" The unix domain socket path used by @@RXVT_NAME@@c(1) and diff --git a/doc/rxvt.1.pod b/doc/rxvt.1.pod index a989585a..04df795a 100644 --- a/doc/rxvt.1.pod +++ b/doc/rxvt.1.pod @@ -1372,15 +1372,6 @@ display in it's child processes. The shell to be used for command execution, defaults to C. -=item B - -The path where @@RXVT_NAME@@ looks for support files such as menu and xpm -files. - -=item B - -Used in the same way as C. - =item B The unix domain socket path used by @@RXVT_NAME@@c(1) and diff --git a/doc/rxvt.1.txt b/doc/rxvt.1.txt index 9982958d..1d86a652 100644 --- a/doc/rxvt.1.txt +++ b/doc/rxvt.1.txt @@ -1187,13 +1187,6 @@ ENVIRONMENT SHELL The shell to be used for command execution, defaults to "/bin/sh". - RXVTPATH - The path where rxvt looks for support files such as menu and xpm - files. - - PATH - Used in the same way as "RXVTPATH". - RXVT_SOCKET The unix domain socket path used by rxvtc(1) and rxvtd(1). diff --git a/doc/rxvt.7.html b/doc/rxvt.7.html index fdbbd324..a1464c72 100644 --- a/doc/rxvt.7.html +++ b/doc/rxvt.7.html @@ -1185,8 +1185,8 @@ interested in learning about new and exciting problems (but not FAQs :).

DESCRIPTION

The rest of this document describes various technical aspects of rxvt-unicode. First the description of supported command sequences, -followed by menu and pixmap support and last by a description of all -features selectable at configure time.

+followed by pixmap support and last by a description of all features +selectable at configure time.

diff --git a/doc/rxvt.7.man.in b/doc/rxvt.7.man.in index 4465bce5..4721ad3d 100644 --- a/doc/rxvt.7.man.in +++ b/doc/rxvt.7.man.in @@ -1060,8 +1060,8 @@ interested in learning about new and exciting problems (but not FAQs :). .IX Header "DESCRIPTION" The rest of this document describes various technical aspects of \&\fBrxvt-unicode\fR. First the description of supported command sequences, -followed by menu and pixmap support and last by a description of all -features selectable at \f(CW\*(C`configure\*(C'\fR time. +followed by pixmap support and last by a description of all features +selectable at \f(CW\*(C`configure\*(C'\fR time. .SH "Definitions" .IX Header "Definitions" .ie n .IP "\fB\fB""c""\fB\fR" 4 diff --git a/doc/rxvt.7.pod b/doc/rxvt.7.pod index f3a8f0d8..dea22928 100644 --- a/doc/rxvt.7.pod +++ b/doc/rxvt.7.pod @@ -901,8 +901,8 @@ interested in learning about new and exciting problems (but not FAQs :). The rest of this document describes various technical aspects of B. First the description of supported command sequences, -followed by menu and pixmap support and last by a description of all -features selectable at C time. +followed by pixmap support and last by a description of all features +selectable at C time. =head1 Definitions diff --git a/doc/rxvt.7.txt b/doc/rxvt.7.txt index c7657d12..b805c7c9 100644 --- a/doc/rxvt.7.txt +++ b/doc/rxvt.7.txt @@ -874,8 +874,8 @@ RXVT TECHNICAL REFERENCE DESCRIPTION The rest of this document describes various technical aspects of rxvt-unicode. First the description of supported command sequences, - followed by menu and pixmap support and last by a description of all - features selectable at "configure" time. + followed by pixmap support and last by a description of all features + selectable at "configure" time. Definitions "c" The literal character c. diff --git a/src/rxvt.h b/src/rxvt.h index 1158d41a..4fbeb019 100644 --- a/src/rxvt.h +++ b/src/rxvt.h @@ -160,7 +160,7 @@ inline void set_environ (char **envv) */ struct grwin_t; -/* If we're using either the rxvt scrollbar or menu bars, keep the +/* If we're using either the rxvt scrollbar, keep the * scrollColor resource. */ #if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR) @@ -260,13 +260,6 @@ typedef struct _mwmhints { # define HAVE_SCROLLBARS 1 #endif -/* width of scrollBar shadow, must be 1 or 2 */ -#ifdef HALFSHADOW -# define MENU_SHADOW 1 -#else -# define MENU_SHADOW 2 -#endif - #define R_SB_ALIGN_CENTRE 0 #define R_SB_ALIGN_TOP 1 #define R_SB_ALIGN_BOTTOM 2 @@ -483,7 +476,7 @@ enum { Rxvt_dumpscreen = 55, // dump scrollback and all of screen URxvt_locale = 701, // change locale - URxvt_Menu = 703, // set menu item + URxvt_Color_IT = 704, // change actual 'Italic' colour URxvt_Color_tint = 705, // change actual tint colour URxvt_Color_BD = 706, diff --git a/src/scrollbar-rxvt.C b/src/scrollbar-rxvt.C index c7512d93..9e1bcf58 100644 --- a/src/scrollbar-rxvt.C +++ b/src/scrollbar-rxvt.C @@ -27,7 +27,9 @@ /*----------------------------------------------------------------------*/ #if defined(RXVT_SCROLLBAR) -/* draw triangular button with a shadow of MENU_SHADOW (1 or 2) pixels */ +#define DOUBLED 1 + +/* draw triangular button with a shadow of 2 pixels */ void rxvt_term::Draw_button (int x, int y, int state, int dirn) { @@ -80,7 +82,7 @@ rxvt_term::Draw_button (int x, int y, int state, int dirn) XDrawLine (display->display, scrollBar.win, top, pt[0].x, pt[0].y, pt[1].x, pt[1].y); -#if (MENU_SHADOW > 1) +#if DOUBLED /* doubled */ pt[0].x++; @@ -98,6 +100,7 @@ rxvt_term::Draw_button (int x, int y, int state, int dirn) XDrawLine (display->display, scrollBar.win, top, pt[0].x, pt[0].y, pt[1].x, pt[1].y); #endif + /* draw shadow on right */ pt[1].x = x + sz - 1; /* pt[2].x = x + sz2; */ @@ -106,7 +109,7 @@ rxvt_term::Draw_button (int x, int y, int state, int dirn) XDrawLine (display->display, scrollBar.win, bot, pt[2].x, pt[2].y, pt[1].x, pt[1].y); -#if (MENU_SHADOW > 1) +#if DOUBLED /* doubled */ pt[1].x--; if (dirn == UP) diff --git a/src/scrollbar.C b/src/scrollbar.C index 941620f0..ae4c71d9 100644 --- a/src/scrollbar.C +++ b/src/scrollbar.C @@ -231,9 +231,9 @@ rxvt_term::setup_scrollbar (const char *scrollalign, const char *scrollstyle, co if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM) width = min (i, SB_WIDTH_MAXIMUM); -# if defined(RXVT_SCROLLBAR) +# ifdef RXVT_SCROLLBAR if (! OPTION (Opt_scrollBar_floating) && style == R_SB_RXVT) - sb_shadow = MENU_SHADOW; + sb_shadow = 2; # endif scrollBar.style = style; -- 2.34.1