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.9 by pcg, Tue Dec 2 21:49:46 2003 UTC vs.
Revision 1.13 by pcg, Thu Dec 18 02:07:12 2003 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: init.c 2 * File: init.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: init.C,v 1.9 2003/12/02 21:49:46 pcg Exp $ 4 * $Id: init.C,v 1.13 2003/12/18 02:07:12 pcg Exp $
5 * 5 *
6 * All portions of code are copyright by their respective author/s. 6 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
8 * - original version 8 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
… …
357 PixColors = new rxvt_color [TOTAL_COLORS]; 357 PixColors = new rxvt_color [TOTAL_COLORS];
358 if (PixColors == NULL) 358 if (PixColors == NULL)
359 return false; 359 return false;
360 360
361#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 361#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
362
363 TermWin.pixmap = None; 362 TermWin.pixmap = None;
364#endif 363#endif
365#ifdef UTMP_SUPPORT 364#ifdef UTMP_SUPPORT
366
367 next_utmp_action = SAVE; 365 next_utmp_action = SAVE;
368#endif 366#endif
369#ifndef NO_SETOWNER_TTYDEV 367#ifndef NO_SETOWNER_TTYDEV
370
371 next_tty_action = SAVE; 368 next_tty_action = SAVE;
372#endif 369#endif
373 370
374 MEvent.time = CurrentTime; 371 MEvent.time = CurrentTime;
375 MEvent.button = AnyButton; 372 MEvent.button = AnyButton;
… …
458 R->ttymode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH; 455 R->ttymode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH;
459 R->ttygid = getgid (); 456 R->ttygid = getgid ();
460 } 457 }
461 458
462#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 459#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
463 R->locale = setlocale (LC_CTYPE, ""); 460 R->locale = strdup (setlocale (LC_CTYPE, ""));
464#endif 461#endif
465 462
466 /* 463 /*
467 * Close all unused file descriptors 464 * Close all unused file descriptors
468 * We don't want them, we don't need them. 465 * We don't want them, we don't need them.
… …
823#ifdef USE_XIM 820#ifdef USE_XIM
824 if (R->locale == NULL) 821 if (R->locale == NULL)
825 rxvt_print_error("Setting locale failed."); 822 rxvt_print_error("Setting locale failed.");
826 else 823 else
827 { 824 {
828 Atom wmlocale; 825 Atom wmlocale;
829 826
830 wmlocale = XInternAtom(R->Xdisplay, "WM_LOCALE_NAME", False); 827 wmlocale = XInternAtom(R->Xdisplay, "WM_LOCALE_NAME", False);
831 XChangeProperty(R->Xdisplay, R->TermWin.parent[0], wmlocale, 828 XChangeProperty(R->Xdisplay, R->TermWin.parent[0], wmlocale,
832 XA_STRING, 8, PropModeReplace, 829 XA_STRING, 8, PropModeReplace,
833 (unsigned char *)R->locale, STRLEN(R->locale)); 830 (unsigned char *)R->locale, STRLEN(R->locale));
… …
835 if (XSupportsLocale() != True) 832 if (XSupportsLocale() != True)
836 { 833 {
837 rxvt_print_error("The locale is not supported by Xlib"); 834 rxvt_print_error("The locale is not supported by Xlib");
838 return; 835 return;
839 } 836 }
837
840 rxvt_setTermFontSet(aR_ 0); 838 rxvt_setTermFontSet(aR_ 0);
841 839
842 /* see if we can connect yet */ 840 /* see if we can connect yet */
843 rxvt_IMInstantiateCallback(R->Xdisplay, NULL, NULL); 841 rxvt_IMInstantiateCallback(R->Xdisplay, NULL, NULL);
844 842
… …
1005 * xcol[1] == top shadow 1003 * xcol[1] == top shadow
1006 * xcol[2] == bot shadow */ 1004 * xcol[2] == bot shadow */
1007 1005
1008 xcol[1] = R->PixColors[Color_scroll]; 1006 xcol[1] = R->PixColors[Color_scroll];
1009# ifdef PREFER_24BIT 1007# ifdef PREFER_24BIT
1010 1008 xcol[0].set (R, 65535, 65535, 65535);
1011 xcol[0].set (r, -1, -1, -1);
1012 /* XFreeColors(R->Xdisplay, XCMAP, &(xcol[0].pixel), 1, ~0); */ 1009 /* XFreeColors(R->Xdisplay, XCMAP, &(xcol[0].pixel), 1, ~0); */
1013# else 1010# else
1014
1015 xcol[0].set (WhitePixel(R->Xdisplay, Xscreen)); 1011 xcol[0].set (WhitePixel(R->Xdisplay, Xscreen));
1016# endif 1012# endif
1017 1013
1018 unsigned short R1, G1, B1, R0, G0, B0; 1014 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
1019 1015
1020 xcol[0].get (r, R0, G0, B0); 1016 xcol[0].get (R, pr0, pg0, pb0);
1021 xcol[1].get (r, R1, G1, B1); 1017 xcol[1].get (R, pr1, pg1, pb1);
1022 1018
1023 /* bottomShadowColor */ 1019 /* bottomShadowColor */
1024 if (!xcol[2].set (aR_ R1 / 2, G1 / 2, B1 / 2)) 1020 if (!xcol[2].set (aR_ pr1 / 2, pg1 / 2, pb1 / 2))
1025 xcol[2] = R->PixColors[Color_Black]; 1021 xcol[2] = R->PixColors[Color_Black];
1026 1022
1027 R->PixColors[Color_bottomShadow] = xcol[2]; 1023 R->PixColors[Color_bottomShadow] = xcol[2];
1028 1024
1029 /* topShadowColor */ 1025 /* topShadowColor */
1030 if (!xcol[1].set (aR_ 1026 if (!xcol[1].set (aR_
1031 min (R0, max (R0 / 5, R1) * 7 / 5), 1027 min (pr0, max (pr0 / 5, pr1) * 7 / 5),
1032 min (G0, max (G0 / 5, G1) * 7 / 5), 1028 min (pg0, max (pg0 / 5, pg1) * 7 / 5),
1033 min (B0, max (B0 / 5, B1) * 7 / 5))) 1029 min (pb0, max (pb0 / 5, pb1) * 7 / 5)))
1034 xcol[1] = R->PixColors[Color_White]; 1030 xcol[1] = R->PixColors[Color_White];
1035 1031
1036 R->PixColors[Color_topShadow] = xcol[1]; 1032 R->PixColors[Color_topShadow] = xcol[1];
1037 } 1033 }
1038#endif /* KEEP_SCROLLCOLOR */ 1034#endif /* KEEP_SCROLLCOLOR */

Diff Legend

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