ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/init.C
(Generate patch)

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.32 by pcg, Sun Feb 22 08:28:36 2004 UTC vs.
Revision 1.36 by pcg, Tue Feb 24 16:25:44 2004 UTC

… …
402#endif 402#endif
403 403
404 refresh_limit = 1; 404 refresh_limit = 1;
405 refresh_type = SLOW_REFRESH; 405 refresh_type = SLOW_REFRESH;
406 prev_nrow = prev_ncol = 0; 406 prev_nrow = prev_ncol = 0;
407#ifdef MULTICHAR_SET
408# ifdef MULTICHAR_ENCODING
409 encoding_method = MULTICHAR_ENCODING;
410# endif
411 multichar_decode = rxvt_euc2jis;
412#endif
413 407
414 oldcursor.row = oldcursor.col = -1; 408 oldcursor.row = oldcursor.col = -1;
415#ifdef XPM_BACKGROUND 409#ifdef XPM_BACKGROUND
416 /* bgPixmap.w = bgPixmap.h = 0; */ 410 /* bgPixmap.w = bgPixmap.h = 0; */
417 bgPixmap.x = bgPixmap.y = 50; 411 bgPixmap.x = bgPixmap.y = 50;
… …
796void 790void
797rxvt_term::set_locale (const char *locale) 791rxvt_term::set_locale (const char *locale)
798{ 792{
799#if HAVE_XSETLOCALE || HAVE_SETLOCALE 793#if HAVE_XSETLOCALE || HAVE_SETLOCALE
800 free (this->locale); 794 free (this->locale);
801 this->locale = rxvt_strdup (setlocale (LC_CTYPE, "")); 795 this->locale = rxvt_strdup (setlocale (LC_CTYPE, locale));
802 SET_LOCALE (this->locale); 796 SET_LOCALE (this->locale);
803 mbstate.reset (); 797 mbstate.reset ();
804#endif 798#endif
805#if HAVE_NL_LANGINFO 799#if HAVE_NL_LANGINFO
806 free (codeset); 800 free (codeset);
… …
1252 TermWin_TotalWidth (), 1246 TermWin_TotalWidth (),
1253 menuBar_TotalHeight (), 1247 menuBar_TotalHeight (),
1254 0, 1248 0,
1255 PixColors[Color_fg], 1249 PixColors[Color_fg],
1256 PixColors[Color_scroll]); 1250 PixColors[Color_scroll]);
1251
1257#ifdef DEBUG_X 1252#ifdef DEBUG_X
1258 XStoreName (display->display, menuBar.win, "menubar"); 1253 XStoreName (display->display, menuBar.win, "menubar");
1259#endif 1254#endif
1260 1255
1256 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1257
1261 XDefineCursor (display->display, menuBar.win, pointer_leftptr); 1258 XDefineCursor (display->display, menuBar.win,
1259 XCreateFontCursor (display->display, XC_left_ptr));
1262 1260
1263 XSelectInput (display->display, menuBar.win, 1261 XSelectInput (display->display, menuBar.win,
1264 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1262 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1265 | Button1MotionMask)); 1263 | Button1MotionMask));
1266 menubar_ev.start (display, menuBar.win); 1264 menubar_ev.start (display, menuBar.win);
… …
1289 gcvalue.graphics_exposures = 1; 1287 gcvalue.graphics_exposures = 1;
1290 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1288 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1291 GCForeground | GCBackground 1289 GCForeground | GCBackground
1292 | GCGraphicsExposures, &gcvalue); 1290 | GCGraphicsExposures, &gcvalue);
1293 1291
1292 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1293
1294#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1294#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1295 gcvalue.foreground = PixColors[Color_topShadow]; 1295 gcvalue.foreground = PixColors[Color_topShadow];
1296 topShadowGC = XCreateGC (display->display, TermWin.vt, 1296 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1297 GCForeground, &gcvalue);
1298 gcvalue.foreground = PixColors[Color_bottomShadow]; 1297 gcvalue.foreground = PixColors[Color_bottomShadow];
1299 botShadowGC = XCreateGC (display->display, TermWin.vt, 1298 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1300 GCForeground, &gcvalue);
1301 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg 1299 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg : Color_scroll)];
1302 : Color_scroll)];
1303 scrollbarGC = XCreateGC (display->display, TermWin.vt, 1300 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1304 GCForeground, &gcvalue);
1305#endif 1301#endif
1306} 1302}
1307 1303
1308/*----------------------------------------------------------------------*/ 1304/*----------------------------------------------------------------------*/
1309/* 1305/*

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines