From 8d54047c6fff9fef25524eabdb48027d8838c53a Mon Sep 17 00:00:00 2001 From: root Date: Sun, 2 Jan 2005 10:55:43 +0000 Subject: [PATCH] *** empty log message *** --- src/init.h | 26 +++++++++++++------------- src/menubar.h | 6 +++--- src/scrollbar.C | 4 ++-- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/init.h b/src/init.h index dbc1b508..e8259fa5 100644 --- a/src/init.h +++ b/src/init.h @@ -33,20 +33,20 @@ # ifdef TCSANOW /* POSIX */ # define GET_TERMIOS(fd,tios) tcgetattr (fd, tios) # define SET_TERMIOS(fd,tios) \ - cfsetospeed (tios, BAUDRATE), \ - cfsetispeed (tios, BAUDRATE), \ - tcsetattr (fd, TCSANOW, tios) + cfsetospeed (tios, BAUDRATE), \ + cfsetispeed (tios, BAUDRATE), \ + tcsetattr (fd, TCSANOW, tios) # else # ifdef TIOCSETA # define GET_TERMIOS(fd,tios) ioctl (fd, TIOCGETA, tios) # define SET_TERMIOS(fd,tios) \ - tios->c_cflag |= BAUDRATE, \ - ioctl (fd, TIOCSETA, tios) + tios->c_cflag |= BAUDRATE, \ + ioctl (fd, TIOCSETA, tios) # else # define GET_TERMIOS(fd,tios) ioctl (fd, TCGETS, tios) # define SET_TERMIOS(fd,tios) \ - tios->c_cflag |= BAUDRATE, \ - ioctl (fd, TCSETS, tios) + tios->c_cflag |= BAUDRATE, \ + ioctl (fd, TCSETS, tios) # endif # endif # define SET_TTYMODE(fd,tios) SET_TERMIOS (fd, tios) @@ -54,12 +54,12 @@ /* sgtty interface */ # define SET_TTYMODE(fd,tt) \ - tt->sg.sg_ispeed = tt->sg.sg_ospeed = BAUDRATE, \ - ioctl (fd, TIOCSETP, & (tt->sg)), \ - ioctl (fd, TIOCSETC, & (tt->tc)), \ - ioctl (fd, TIOCSLTC, & (tt->lc)), \ - ioctl (fd, TIOCSETD, & (tt->line)), \ - ioctl (fd, TIOCLSET, & (tt->local)) + tt->sg.sg_ispeed = tt->sg.sg_ospeed = BAUDRATE, \ + ioctl (fd, TIOCSETP, & (tt->sg)), \ + ioctl (fd, TIOCSETC, & (tt->tc)), \ + ioctl (fd, TIOCSLTC, & (tt->lc)), \ + ioctl (fd, TIOCSETD, & (tt->line)), \ + ioctl (fd, TIOCLSET, & (tt->local)) #endif /* HAVE_TERMIOS_H */ /* use the fastest baud-rate */ diff --git a/src/menubar.h b/src/menubar.h index d2eea614..be058306 100644 --- a/src/menubar.h +++ b/src/menubar.h @@ -20,9 +20,9 @@ typedef struct menuitem_t { short len; /* strlen (name) */ short len2; /* strlen (name) */ union { - short type; /* must not be changed; first element */ - action_t action; - submenu_t submenu; + short type; /* must not be changed; first element */ + action_t action; + submenu_t submenu; } entry; } menuitem_t; diff --git a/src/scrollbar.C b/src/scrollbar.C index 2e6feb5b..3b21ef32 100644 --- a/src/scrollbar.C +++ b/src/scrollbar.C @@ -70,10 +70,10 @@ rxvt_term::resize_scrollbar () #define R_SCROLLEND_XTERM szHint.height #define R_SCROLLBEG_NEXT 0 #define R_SCROLLEND_NEXT szHint.height - (SB_BUTTON_TOTAL_HEIGHT + \ - SB_PADDING) + SB_PADDING) #define R_SCROLLBEG_RXVT (scrollBar.width + 1) + sb_shadow #define R_SCROLLEND_RXVT szHint.height - R_SCROLLBEG_RXVT - \ - (2 * sb_shadow) + (2 * sb_shadow) #if defined(PLAIN_SCROLLBAR) if (scrollBar.style == R_SB_PLAIN) -- 2.34.1