From 1aac26cb3d6b293d7972f3b335d36fe0e68bcaa5 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 28 Nov 2005 19:35:04 +0000 Subject: [PATCH] *** empty log message *** --- doc/rxvtc.1.pod | 7 ++++--- doc/rxvtd.1.pod | 7 ++++--- reconf | 4 ++-- src/keyboard.C | 2 +- src/main.C | 4 ++-- src/rxvtc.C | 4 ++-- src/rxvtfont.C | 2 +- src/rxvtfont.h | 2 +- src/rxvtutil.h | 4 ++-- src/screen.C | 6 +----- src/xdefaults.C | 1 - 11 files changed, 20 insertions(+), 23 deletions(-) diff --git a/doc/rxvtc.1.pod b/doc/rxvtc.1.pod index f0ead4c3..871efaf4 100644 --- a/doc/rxvtc.1.pod +++ b/doc/rxvtc.1.pod @@ -32,9 +32,10 @@ started directly. =item B Both @@RXVT_NAME@@c and @@RXVT_NAME@@d use the environment variable -F to create a listening socket and to contact -the @@RXVT_NAME@@d, respectively. If the variable is missing, -F<<< $HOME/.rxvt-unicode-I<< >> >>> is used. +F to create a listening socket and to contact the +@@RXVT_NAME@@d, respectively. If the variable is missing, +F<<< $HOME/.rxvt-unicode-I<< >> >>> is used. The variable must +specify the absolute path of the socket to create. =back diff --git a/doc/rxvtd.1.pod b/doc/rxvtd.1.pod index a66a0996..4d63037e 100644 --- a/doc/rxvtd.1.pod +++ b/doc/rxvtd.1.pod @@ -71,10 +71,11 @@ B<@@RXVT_NAME@@d> is killed. =item B -Both B<@@RXVT_NAME@@c> and B<@@RXVT_NAME@@d> use the environment variable -F to create a listening socket and to contact +Both B<@@RXVT_NAME@@c> and B<@@RXVT_NAME@@d> use the environment +variable F to create a listening socket and to contact the @@RXVT_NAME@@d, respectively. If the variable is missing, -F<<< $HOME/.rxvt-unicode-I<< >> >>> is used. +F<<< $HOME/.rxvt-unicode-I<< >> >>> is used. The variable must +specify the absolute path of the socket to create. =item B diff --git a/reconf b/reconf index 95f85a74..fb5bed9f 100755 --- a/reconf +++ b/reconf @@ -5,8 +5,8 @@ # just set some compiler options if [ "x$HOSTNAME" = xcerebro -o "x$HOSTNAME" = xfuji ]; then - CC=ccache\ gcc-3.4 - CXX=ccache\ g++-3.4 + CC=ccache\ gcc-4.0 + CXX=ccache\ g++-4.0 export CC CXX fi diff --git a/src/keyboard.C b/src/keyboard.C index 2e58f572..6b84897d 100644 --- a/src/keyboard.C +++ b/src/keyboard.C @@ -117,7 +117,7 @@ format_keyrange_string (const char *str, int keysym_offset, char *buf, int bufsi //////////////////////////////////////////////////////////////////////////////// // return: #bits of '1' #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3) -# define bitcount(n) (__extension__ ({ uint32_t n__ = (n); __builtin_popcount (n); })) +# define bitcount(n) (__extension__ ({ uint32_t n__ = (n); __builtin_popcount (n__); })) #else static int bitcount (uint16_t n) diff --git a/src/main.C b/src/main.C index 0e2ef6bb..6d1af284 100644 --- a/src/main.C +++ b/src/main.C @@ -849,7 +849,7 @@ rxvt_term::tt_winch () /*----------------------------------------------------------------------*/ /* set_fonts () - load and set the various fonts -/* + * * init = 1 - initialize * * fontname == FONT_UP - switch to bigger font @@ -1553,7 +1553,7 @@ foundpet: void rxvt_term::im_cb () { - int i, found, had_im; + int i; const char *p; char **s; char buf[IMBUFSIZ]; diff --git a/src/rxvtc.C b/src/rxvtc.C index f4db4d1b..ff9dbd0e 100644 --- a/src/rxvtc.C +++ b/src/rxvtc.C @@ -86,8 +86,8 @@ main (int argc, const char *const *argv) c.send ("CWD"), c.send (cwd); - for (char **var = environ; *environ; environ++) - c.send ("ENV"), c.send (*environ); + for (char **var = environ; *var; var++) + c.send ("ENV"), c.send (*var); const char *base = strrchr (argv[0], '/'); base = base ? base + 1 : argv[0]; diff --git a/src/rxvtfont.C b/src/rxvtfont.C index c449943b..52d334d4 100644 --- a/src/rxvtfont.C +++ b/src/rxvtfont.C @@ -1314,7 +1314,7 @@ rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, ///////////////////////////////////////////////////////////////////////////// rxvt_fontset::rxvt_fontset (rxvt_t r) -: r (r), fontdesc (0) +: fontdesc (0), r (r) { clear (); } diff --git a/src/rxvtfont.h b/src/rxvtfont.h index 82ee176a..8b8ef86d 100644 --- a/src/rxvtfont.h +++ b/src/rxvtfont.h @@ -40,11 +40,11 @@ struct rxvt_fontprop { struct rxvt_drawable { rxvt_display *display; - Drawable drawable; #if XFT XftDraw *xftdrawable; operator XftDraw *(); #endif + Drawable drawable; rxvt_drawable (rxvt_display *display, Drawable drawable) : display(display), diff --git a/src/rxvtutil.h b/src/rxvtutil.h index 42ea3b65..e4f89bb7 100644 --- a/src/rxvtutil.h +++ b/src/rxvtutil.h @@ -15,9 +15,9 @@ public: } byteorder; template -static inline T min (T a, U b) { return a < b ? a : (T)b; } +static inline T min (T a, U b) { return a < (T)b ? a : (T)b; } template -static inline T max (T a, U b) { return a > b ? a : (T)b; } +static inline T max (T a, U b) { return a > (T)b ? a : (T)b; } template static inline void swap (T& a, T& b) { T t=a; a=b; b=t; } diff --git a/src/screen.C b/src/screen.C index c80f47be..877a4a44 100644 --- a/src/screen.C +++ b/src/screen.C @@ -443,7 +443,6 @@ void rxvt_term::scr_release () { unsigned int total_rows; - int i; total_rows = TermWin.nrow + TermWin.saveLines; @@ -780,7 +779,7 @@ rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) unsigned char checksel; unicode_t c; - int i, row, last_col; + int row, last_col; text_t *stp; rend_t *srp; const unicode_t *strend = str + len; @@ -2163,9 +2162,6 @@ rxvt_term::scr_refresh (unsigned char refresh_type) scr_swap_overlay (); #endif - rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ - text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ - #ifndef NO_SLOW_LINK_SUPPORT /* * D: CopyArea pass - very useful for slower links diff --git a/src/xdefaults.C b/src/xdefaults.C index ec3cf416..ab0e76d2 100644 --- a/src/xdefaults.C +++ b/src/xdefaults.C @@ -909,7 +909,6 @@ rxvt_term::extract_resources () int entry; # ifdef XrmEnumOneLevel - int i; char *displayResource, *xe; XrmName name_prefix[3]; XrmClass class_prefix[3]; -- 2.34.1