#ifdef OPTION_HC
NULL,
#endif
-#if TINTING
- NULL,
-#endif
#ifdef KEEP_SCROLLCOLOR
COLOR_SCROLLBAR,
COLOR_SCROLLTROUGH,
#endif /* KEEP_SCROLLCOLOR */
-
+#if TINTING
+ NULL,
+#endif
};
const char *const xa_names[NUM_XA] =
{
#if HAVE_XSETLOCALE || HAVE_SETLOCALE
free (this->locale);
- this->locale = rxvt_strdup (setlocale (LC_CTYPE, locale));
+ this->locale = setlocale (LC_CTYPE, locale);
+
+ if (!this->locale)
+ {
+ rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale);
+ setlocale (LC_CTYPE, "");
+ this->locale = "";
+ }
+
+ this->locale = rxvt_strdup (this->locale);
SET_LOCALE (this->locale);
mbstate.reset ();
#endif
get_ourmods ();
- if (! (Options & Opt_scrollTtyOutput))
+ if (!(Options & Opt_scrollTtyOutput))
PrivateModes |= PrivMode_TtyOutputInh;
if (Options & Opt_scrollTtyKeypress)
PrivateModes |= PrivMode_Keypress;
- if (! (Options & Opt_jumpScroll))
+ if (!(Options & Opt_jumpScroll))
PrivateModes |= PrivMode_smoothScroll;
#ifndef NO_BACKSPACE_KEY
if (XDEPTH <= 2)
{ /* Monochrome */
- PixColors[Color_scroll] = PixColors[Color_fg];
- PixColors[Color_topShadow] = PixColors[Color_bg];
+ PixColors[Color_scroll] = PixColors[Color_fg];
+ PixColors[Color_topShadow] = PixColors[Color_bg];
PixColors[Color_bottomShadow] = PixColors[Color_bg];
}
else
{
- rxvt_color xcol[3];
+ rxvt_color xcol[3];
/* xcol[0] == white
* xcol[1] == top shadow
* xcol[2] == bot shadow */
/* the vt window */
TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],
- window_vt_x, window_vt_y,
+ window_vt_x,
+ window_vt_y,
TermWin_TotalWidth (),
TermWin_TotalHeight (),
0,
pt[0].y = pt[1].y = y;
pt[2].y = y + sz - 1;
}
+
XFillPolygon (display->display, scrollBar.win, scrollbarGC,
- pt, 3, Convex, CoordModeOrigin);
+ pt, 3, Convex, CoordModeOrigin);
/* draw base */
XDrawLine (display->display, scrollBar.win, (dirn == UP ? bot : top),
- pt[0].x, pt[0].y, pt[1].x, pt[1].y);
+ pt[0].x, pt[0].y, pt[1].x, pt[1].y);
/* draw shadow on left */
pt[1].x = x + sz2 - 1;
pt[1].y = y + (dirn == UP ? 0 : sz - 1);
XDrawLine (display->display, scrollBar.win, top,
- pt[0].x, pt[0].y, pt[1].x, pt[1].y);
+ pt[0].x, pt[0].y, pt[1].x, pt[1].y);
#if (SHADOW > 1)
/* doubled */
pt[1].y--;
}
XDrawLine (display->display, scrollBar.win, top,
- pt[0].x, pt[0].y, pt[1].x, pt[1].y);
+ pt[0].x, pt[0].y, pt[1].x, pt[1].y);
#endif
/* draw shadow on right */
pt[1].x = x + sz - 1;
pt[1].y = y + (dirn == UP ? sz - 1 : 0);
pt[2].y = y + (dirn == UP ? 0 : sz - 1);
XDrawLine (display->display, scrollBar.win, bot,
- pt[2].x, pt[2].y, pt[1].x, pt[1].y);
+ pt[2].x, pt[2].y, pt[1].x, pt[1].y);
#if (SHADOW > 1)
/* doubled */
pt[1].x--;
pt[2].y--;
pt[1].y++;
}
+
XDrawLine (display->display, scrollBar.win, bot,
- pt[2].x, pt[2].y, pt[1].x, pt[1].y);
+ pt[2].x, pt[2].y, pt[1].x, pt[1].y);
#endif
}
if ((scrollBar.init & R_SB_RXVT) == 0)
{
- XGCValues gcvalue;
-
scrollBar.init |= R_SB_RXVT;
- gcvalue.foreground = PixColors[Color_trough];
if (sbshadow)
{
- XSetWindowBackground (display->display, scrollBar.win,
- gcvalue.foreground);
+ XSetWindowBackground (display->display, scrollBar.win, PixColors[Color_trough]);
XClearWindow (display->display, scrollBar.win);
}
}
/* instead of XClearWindow (display->display, scrollBar.win); */
if (last_top < scrollBar.top)
XClearArea (display->display, scrollBar.win,
- sbshadow, last_top,
- sbwidth, (scrollBar.top - last_top),
- False);
+ sbshadow, last_top,
+ sbwidth, (scrollBar.top - last_top),
+ False);
if (scrollBar.bot < last_bot)
XClearArea (display->display, scrollBar.win,
- sbshadow, scrollBar.bot,
- sbwidth, (last_bot - scrollBar.bot),
- False);
+ sbshadow, scrollBar.bot,
+ sbwidth, (last_bot - scrollBar.bot),
+ False);
}
/* scrollbar slider */
#ifdef SB_BORDER
{
- int xofs;
+ int xofs;
if (Options & Opt_scrollBar_right)
xofs = 0;
xofs = sbshadow ? sbwidth : sbwidth - 1;
XDrawLine (display->display, scrollBar.win, botShadowGC,
- xofs, 0, xofs, scrollBar.end + sbwidth);
+ xofs, 0, xofs, scrollBar.end + sbwidth);
}
#endif
+
XFillRectangle (display->display, scrollBar.win, scrollbarGC,
- sbshadow, scrollBar.top, sbwidth,
- scrollbar_len);
+ sbshadow, scrollBar.top, sbwidth,
+ scrollbar_len);
if (sbshadow)
/* trough shadow */
0, 0,
sbwidth + 2 * sbshadow, /* scrollbar_TotalWidth () */
scrollBar.end + (sbwidth + 1) + sbshadow);
+
/* shadow for scrollbar slider */
rxvt_Draw_Shadow (display->display, scrollBar.win,
topShadowGC, botShadowGC,
sbshadow, scrollBar.top, sbwidth,
scrollbar_len);
- /*
- * Redraw scrollbar arrows
- */
- Draw_button (sbshadow, sbshadow,
- (scrollbar_isUp () ? -1 : +1), UP);
- Draw_button (sbshadow, (scrollBar.end + 1),
- (scrollbar_isDn () ? -1 : +1), DN);
+ /* Redraw scrollbar arrows */
+ Draw_button (sbshadow, sbshadow, (scrollbar_isUp () ? -1 : +1), UP);
+ Draw_button (sbshadow, scrollBar.end + 1, (scrollbar_isDn () ? -1 : +1), DN);
+
return 1;
}
#endif /* RXVT_SCROLLBAR */