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.51 by pcg, Sun May 9 18:19:49 2004 UTC vs.
Revision 1.57 by root, Mon Jun 21 22:24:07 2004 UTC

324 NULL, /* Color_RV */ 324 NULL, /* Color_RV */
325#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 325#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
326#ifdef OPTION_HC 326#ifdef OPTION_HC
327 NULL, 327 NULL,
328#endif 328#endif
329#if TINTING
330 NULL,
331#endif
332#ifdef KEEP_SCROLLCOLOR 329#ifdef KEEP_SCROLLCOLOR
333 COLOR_SCROLLBAR, 330 COLOR_SCROLLBAR,
334 COLOR_SCROLLTROUGH, 331 COLOR_SCROLLTROUGH,
335#endif /* KEEP_SCROLLCOLOR */ 332#endif /* KEEP_SCROLLCOLOR */
336 333#if TINTING
334 NULL,
335#endif
337 }; 336 };
338 337
339const char *const xa_names[NUM_XA] = 338const char *const xa_names[NUM_XA] =
340 { 339 {
341 "TEXT", 340 "TEXT",
753void 752void
754rxvt_term::set_locale (const char *locale) 753rxvt_term::set_locale (const char *locale)
755{ 754{
756#if HAVE_XSETLOCALE || HAVE_SETLOCALE 755#if HAVE_XSETLOCALE || HAVE_SETLOCALE
757 free (this->locale); 756 free (this->locale);
758 this->locale = rxvt_strdup (setlocale (LC_CTYPE, locale)); 757 this->locale = setlocale (LC_CTYPE, locale);
758
759 if (!this->locale)
760 {
761 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale);
762 setlocale (LC_CTYPE, "");
763 this->locale = "";
764 }
765
766 this->locale = rxvt_strdup (this->locale);
759 SET_LOCALE (this->locale); 767 SET_LOCALE (this->locale);
760 mbstate.reset (); 768 mbstate.reset ();
761#endif 769#endif
762#if 0 770#if 0
763#if HAVE_NL_LANGINFO 771#if HAVE_NL_LANGINFO
826 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); 834 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC);
827#endif 835#endif
828 836
829 get_ourmods (); 837 get_ourmods ();
830 838
831 if (! (Options & Opt_scrollTtyOutput)) 839 if (!(Options & Opt_scrollTtyOutput))
832 PrivateModes |= PrivMode_TtyOutputInh; 840 PrivateModes |= PrivMode_TtyOutputInh;
833 if (Options & Opt_scrollTtyKeypress) 841 if (Options & Opt_scrollTtyKeypress)
834 PrivateModes |= PrivMode_Keypress; 842 PrivateModes |= PrivMode_Keypress;
835 if (! (Options & Opt_jumpScroll)) 843 if (!(Options & Opt_jumpScroll))
836 PrivateModes |= PrivMode_smoothScroll; 844 PrivateModes |= PrivMode_smoothScroll;
837 845
838#ifndef NO_BACKSPACE_KEY 846#ifndef NO_BACKSPACE_KEY
839 if (STRCMP (key_backspace, "DEC") == 0) 847 if (STRCMP (key_backspace, "DEC") == 0)
840 PrivateModes |= PrivMode_HaveBackSpace; 848 PrivateModes |= PrivMode_HaveBackSpace;
930 */ 938 */
931#ifdef KEEP_SCROLLCOLOR 939#ifdef KEEP_SCROLLCOLOR
932 940
933 if (XDEPTH <= 2) 941 if (XDEPTH <= 2)
934 { /* Monochrome */ 942 { /* Monochrome */
935 PixColors[Color_scroll] = PixColors[Color_fg]; 943 PixColors[Color_scroll] = PixColors[Color_fg];
936 PixColors[Color_topShadow] = PixColors[Color_bg]; 944 PixColors[Color_topShadow] = PixColors[Color_bg];
937 PixColors[Color_bottomShadow] = PixColors[Color_bg]; 945 PixColors[Color_bottomShadow] = PixColors[Color_bg];
938 } 946 }
939 else 947 else
940 { 948 {
941 rxvt_color xcol[3]; 949 rxvt_color xcol[3];
942 /* xcol[0] == white 950 /* xcol[0] == white
943 * xcol[1] == top shadow 951 * xcol[1] == top shadow
944 * xcol[2] == bot shadow */ 952 * xcol[2] == bot shadow */
945 953
946 xcol[1] = PixColors[Color_scroll]; 954 xcol[1] = PixColors[Color_scroll];
1174 } 1182 }
1175#endif 1183#endif
1176 1184
1177 /* the vt window */ 1185 /* the vt window */
1178 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1186 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],
1179 window_vt_x, window_vt_y, 1187 window_vt_x,
1188 window_vt_y,
1180 TermWin_TotalWidth (), 1189 TermWin_TotalWidth (),
1181 TermWin_TotalHeight (), 1190 TermWin_TotalHeight (),
1182 0, 1191 0,
1183 PixColors[Color_fg], 1192 PixColors[Color_fg],
1184 PixColors[Color_bg]); 1193 PixColors[Color_bg]);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines