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.162 by root, Tue Jan 31 16:19:16 2006 UTC vs.
Revision 1.170 by root, Sat Feb 18 15:24:39 2006 UTC

… …
297 get_options (r_argc, r_argv); 297 get_options (r_argc, r_argv);
298 298
299 if (!(display = displays.get (rs[Rs_display_name]))) 299 if (!(display = displays.get (rs[Rs_display_name])))
300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
301 301
302 // using a local pointer decreases code size a lot
302 xa = display->xa; 303 xa = display->xa;
303 304
304#if XFT 305#if XFT
305 if (rs[Rs_depth]) 306 if (rs[Rs_depth])
306 set (display, strtol (rs[Rs_depth], 0, 0)); 307 set (display, strtol (rs[Rs_depth], 0, 0));
… …
309 set (display); 310 set (display);
310 311
311 extract_resources (); 312 extract_resources ();
312 313
313 free (r_argv); 314 free (r_argv);
315
316 for (int i = NUM_RESOURCES; i--; )
317 if (rs [i] == resval_undef)
318 rs [i] = 0;
314 319
315#if ENABLE_PERL 320#if ENABLE_PERL
316 if (!rs[Rs_perl_ext_1]) 321 if (!rs[Rs_perl_ext_1])
317 rs[Rs_perl_ext_1] = "default"; 322 rs[Rs_perl_ext_1] = "default";
318 323
… …
421 /* this is how xterm implements reverseVideo */ 426 /* this is how xterm implements reverseVideo */
422 if (OPTION (Opt_reverseVideo)) 427 if (OPTION (Opt_reverseVideo))
423 { 428 {
424 if (!rs[Rs_color + Color_fg]) 429 if (!rs[Rs_color + Color_fg])
425 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 430 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
431
426 if (!rs[Rs_color + Color_bg]) 432 if (!rs[Rs_color + Color_bg])
427 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 433 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
428 } 434 }
429#endif 435#endif
430 436
… …
482 val = rxvt_network_display (rs[Rs_display_name]); 488 val = rxvt_network_display (rs[Rs_display_name]);
483 rs[Rs_display_name] = (const char *)val; 489 rs[Rs_display_name] = (const char *)val;
484 490
485 if (val == NULL) 491 if (val == NULL)
486#endif /* DISPLAY_IS_IP */ 492#endif /* DISPLAY_IS_IP */
487 val = XDisplayString (xdisp); 493 val = XDisplayString (dpy);
488 494
489 if (rs[Rs_display_name] == NULL) 495 if (rs[Rs_display_name] == NULL)
490 rs[Rs_display_name] = val; /* use broken `:0' value */ 496 rs[Rs_display_name] = val; /* use broken `:0' value */
491 497
492 i = strlen (val); 498 i = strlen (val);
… …
655 pix_colors = pix_colors_focused; 661 pix_colors = pix_colors_focused;
656#endif 662#endif
657 663
658 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 664 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
659 { 665 {
666 const char *name = rs[Rs_color + i];
667
668 if (!name)
669 continue;
670
660 rxvt_color xcol; 671 rxvt_color xcol;
661 672
662 if (!rs[Rs_color + i])
663 continue;
664
665 if (!set_color (xcol, rs[Rs_color + i])) 673 if (!set_color (xcol, name))
666 { 674 {
667#ifndef XTERM_REVERSE_VIDEO 675#ifndef XTERM_REVERSE_VIDEO
668 if (i < 2 && OPTION (Opt_reverseVideo)) 676 if (i < 2 && OPTION (Opt_reverseVideo))
669 rs[Rs_color + i] = def_colorName[!i]; 677 name = def_colorName [1 - i];
670 else 678 else
671#endif 679#endif
672 rs[Rs_color + i] = def_colorName[i]; 680 name = def_colorName [i];
673 681
674 if (!rs[Rs_color + i]) 682 if (!name)
675 continue; 683 continue;
676 684
677 if (!set_color (xcol, rs[Rs_color + i])) 685 if (!set_color (xcol, name))
678 { 686 {
679 switch (i) 687 switch (i)
680 { 688 {
681 case Color_fg: 689 case Color_fg:
682 case Color_bg: 690 case Color_bg:
683 /* fatal: need bg/fg color */
684 rxvt_warn ("unable to get foreground/background colour, continuing.\n"); 691 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
692 name = "";
685 break; 693 break;
686#ifndef NO_CURSORCOLOR 694#ifndef NO_CURSORCOLOR
687 case Color_cursor2: 695 case Color_cursor2:
688 xcol = pix_colors[Color_fg]; 696#endif
689 break;
690#endif /* ! NO_CURSORCOLOR */
691 case Color_pointer_fg: 697 case Color_pointer_fg:
692 xcol = pix_colors[Color_fg]; 698 name = rs[Rs_color + Color_fg];
699 xcol.set (this, name);
693 break; 700 break;
694 default: 701 default:
695 xcol = pix_colors[Color_bg]; /* None */ 702 name = rs[Rs_color + Color_bg];
703 xcol.set (this, name);
696 break; 704 break;
697 } 705 }
698 } 706 }
699 } 707 }
700 708
701 pix_colors[i] = xcol; 709 pix_colors[i] = xcol;
702 SET_PIXCOLOR (i); 710 rs[Rs_color + i] = name;
703 }
704
705#ifdef OFF_FOCUS_FADING
706 if (rs[Rs_fade])
707 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
708 {
709 rxvt_rgba c;
710 pix_colors[Color_fade].get (this, c);
711 pix_colors_unfocused[i] = pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), c);
712 } 711 }
713#endif
714 712
715 if (depth <= 2) 713 if (depth <= 2)
716 { 714 {
717 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 715 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
718 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 716 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
719 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 717 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
720 } 718 }
721 719
722 /* 720 /*
723 * get scrollBar shadow colors 721 * get scrollBar shadow colors
724 * 722 *
725 * The calculations of topShadow/bottomShadow values are adapted 723 * The calculations of topShadow/bottomShadow values are adapted
726 * from the fvwm window manager. 724 * from the fvwm window manager.
727 */ 725 */
728#ifdef KEEP_SCROLLCOLOR 726#ifdef KEEP_SCROLLCOLOR
729
730 if (depth <= 2) 727 if (depth <= 2)
731 { 728 {
732 /* Monochrome */ 729 /* Monochrome */
733 pix_colors[Color_scroll] = pix_colors[Color_fg]; 730 alias_color (Color_scroll, Color_fg);
734 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 731 alias_color (Color_topShadow, Color_bg);
735 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 732 alias_color (Color_bottomShadow, Color_bg);
736 } 733 }
737 else 734 else
738 { 735 {
739 rxvt_color xcol[2]; 736 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
740 /* xcol[0] == white
741 * xcol[1] == top shadow
742 * xcol[2] == bot shadow */
743 737
744 xcol[1] = pix_colors[Color_scroll]; 738 rgba cscroll;
745 xcol[0].set (this, rxvt_rgba (rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC)); 739 pix_colors [Color_scroll].get (cscroll);
746
747 rxvt_rgba c0, c1;
748
749 xcol[0].get (this, c0);
750 xcol[1].get (this, c1);
751
752 pix_colors[Color_bottomShadow] = xcol[1].fade (this, 50);
753 740
754 /* topShadowColor */ 741 /* topShadowColor */
755 if (!xcol[1].set (this, 742 if (!pix_colors[Color_topShadow].set (this,
756 rxvt_rgba ( 743 rgba (
757 min (c0.r, max (c1.r / 5, c1.r) * 7 / 5), 744 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
758 min (c0.g, max (c1.g / 5, c1.g) * 7 / 5), 745 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
759 min (c0.b, max (c1.b / 5, c1.b) * 7 / 5), 746 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
760 c1.a) // pa1 vs. pa0: arbitrary 747 cscroll.a)
761 )); 748 ))
762 xcol[1] = pix_colors[Color_White]; 749 alias_color (Color_topShadow, Color_White);
763
764 pix_colors[Color_topShadow] = xcol[1];
765 } 750 }
766#endif /* KEEP_SCROLLCOLOR */ 751#endif /* KEEP_SCROLLCOLOR */
752
753#ifdef OFF_FOCUS_FADING
754 if (rs[Rs_fade])
755 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
756 {
757 rgba c;
758 pix_colors [Color_fade].get (c);
759 pix_colors_focused [i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
760 }
761#endif
767} 762}
768 763
769/*----------------------------------------------------------------------*/ 764/*----------------------------------------------------------------------*/
770/* color aliases, fg/bg bright-bold */ 765/* color aliases, fg/bg bright-bold */
771void 766void
… …
810 805
811 if (rsmod 806 if (rsmod
812 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 807 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
813 requestedmeta = rsmod[3] - '0'; 808 requestedmeta = rsmod[3] - '0';
814 809
815 map = XGetModifierMapping (xdisp); 810 map = XGetModifierMapping (dpy);
816 kc = map->modifiermap; 811 kc = map->modifiermap;
817 812
818 for (i = 1; i < 6; i++) 813 for (i = 1; i < 6; i++)
819 { 814 {
820 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 815 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
822 for (j = map->max_keypermod; j--; k++) 817 for (j = map->max_keypermod; j--; k++)
823 { 818 {
824 if (kc[k] == 0) 819 if (kc[k] == 0)
825 break; 820 break;
826 821
827 switch (XKeycodeToKeysym (xdisp, kc[k], 0)) 822 switch (XKeycodeToKeysym (dpy, kc[k], 0))
828 { 823 {
829 case XK_Num_Lock: 824 case XK_Num_Lock:
830 ModNumLockMask = modmasks[i - 1]; 825 ModNumLockMask = modmasks[i - 1];
831 continue; 826 continue;
832 827
… …
888#endif 883#endif
889 XGCValues gcvalue; 884 XGCValues gcvalue;
890 XSetWindowAttributes attributes; 885 XSetWindowAttributes attributes;
891 Window top, parent; 886 Window top, parent;
892 887
893 dLocal (Display *, xdisp); 888 dLocal (Display *, dpy);
894 889
895 /* grab colors before netscape does */ 890 /* grab colors before netscape does */
896 Get_Colours (); 891 Get_Colours ();
897 892
898 if (!set_fonts ()) 893 if (!set_fonts ())
… …
903 attributes.override_redirect = !!OPTION (Opt_override_redirect); 898 attributes.override_redirect = !!OPTION (Opt_override_redirect);
904 899
905#if ENABLE_FRILLS 900#if ENABLE_FRILLS
906 if (OPTION (Opt_borderLess)) 901 if (OPTION (Opt_borderLess))
907 { 902 {
908 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None) 903 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
909 { 904 {
910 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 905 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
911 attributes.override_redirect = true; 906 attributes.override_redirect = true;
912 mwmhints.flags = 0; 907 mwmhints.flags = 0;
913 } 908 }
… …
926 { 921 {
927 XWindowAttributes wattr; 922 XWindowAttributes wattr;
928 923
929 parent = strtol (rs[Rs_embed], 0, 0); 924 parent = strtol (rs[Rs_embed], 0, 0);
930 925
931 if (!XGetWindowAttributes (xdisp, parent, &wattr)) 926 if (!XGetWindowAttributes (dpy, parent, &wattr))
932 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 927 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
933 928
934 window_calc (wattr.width, wattr.height); 929 window_calc (wattr.width, wattr.height);
935 } 930 }
936#endif 931#endif
… …
940 /* sub-window placement & size in rxvt_resize_subwindows () */ 935 /* sub-window placement & size in rxvt_resize_subwindows () */
941 attributes.background_pixel = pix_colors_focused [Color_border]; 936 attributes.background_pixel = pix_colors_focused [Color_border];
942 attributes.border_pixel = pix_colors_focused [Color_border]; 937 attributes.border_pixel = pix_colors_focused [Color_border];
943 attributes.colormap = cmap; 938 attributes.colormap = cmap;
944 939
945 top = XCreateWindow (xdisp, parent, 940 top = XCreateWindow (dpy, parent,
946 szHint.x, szHint.y, 941 szHint.x, szHint.y,
947 szHint.width, szHint.height, 942 szHint.width, szHint.height,
948 ext_bwidth, 943 ext_bwidth,
949 depth, InputOutput, visual, 944 depth, InputOutput, visual,
950 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 945 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
… …
964 wmHint.flags = InputHint | StateHint | WindowGroupHint; 959 wmHint.flags = InputHint | StateHint | WindowGroupHint;
965 wmHint.input = True; 960 wmHint.input = True;
966 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 961 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
967 wmHint.window_group = top; 962 wmHint.window_group = top;
968 963
969 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc, 964 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
970 &szHint, &wmHint, &classHint); 965 &szHint, &wmHint, &classHint);
971 966
972#if ENABLE_FRILLS 967#if ENABLE_FRILLS
973 if (mwmhints.flags) 968 if (mwmhints.flags)
974 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 969 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
975 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 970 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
976#endif 971#endif
977 972
978 Atom protocols[] = { 973 Atom protocols[] = {
979 xa[XA_WM_DELETE_WINDOW], 974 xa[XA_WM_DELETE_WINDOW],
980#if ENABLE_EWMH 975#if ENABLE_EWMH
981 xa[XA_NET_WM_PING], 976 xa[XA_NET_WM_PING],
982#endif 977#endif
983 }; 978 };
984 979
985 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 980 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
986 981
987#if ENABLE_FRILLS 982#if ENABLE_FRILLS
988 if (rs[Rs_transient_for]) 983 if (rs[Rs_transient_for])
989 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 984 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
990#endif 985#endif
991 986
992#if ENABLE_EWMH 987#if ENABLE_EWMH
993 long pid = getpid (); 988 long pid = getpid ();
994 989
995 XChangeProperty (xdisp, top, 990 XChangeProperty (dpy, top,
996 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 991 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
997 PropModeReplace, (unsigned char *)&pid, 1); 992 PropModeReplace, (unsigned char *)&pid, 1);
998 993
999 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 994 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1000#endif 995#endif
1001 996
1002 XSelectInput (xdisp, top, 997 XSelectInput (dpy, top,
1003 KeyPressMask 998 KeyPressMask
1004#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 999#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1005 | KeyReleaseMask 1000 | KeyReleaseMask
1006#endif 1001#endif
1007 | FocusChangeMask | VisibilityChangeMask 1002 | FocusChangeMask | VisibilityChangeMask
1008 | ExposureMask | StructureNotifyMask); 1003 | ExposureMask | StructureNotifyMask);
1009 1004
1010 termwin_ev.start (display, top); 1005 termwin_ev.start (display, top);
1011 1006
1012 /* vt cursor: Black-on-White is standard, but this is more popular */ 1007 /* vt cursor: Black-on-White is standard, but this is more popular */
1013 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm); 1008 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1014 1009
1015#ifdef HAVE_SCROLLBARS 1010#ifdef HAVE_SCROLLBARS
1016 /* cursor scrollBar: Black-on-White */ 1011 /* cursor scrollBar: Black-on-White */
1017 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr); 1012 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1018#endif 1013#endif
1019 1014
1020 /* the vt window */ 1015 /* the vt window */
1021 vt = XCreateSimpleWindow (xdisp, top, 1016 vt = XCreateSimpleWindow (dpy, top,
1022 window_vt_x, window_vt_y, 1017 window_vt_x, window_vt_y,
1023 width, height, 1018 width, height,
1024 0, 1019 0,
1025 pix_colors_focused[Color_fg], 1020 pix_colors_focused[Color_fg],
1026 pix_colors_focused[Color_bg]); 1021 pix_colors_focused[Color_bg]);
1027 1022
1028 attributes.bit_gravity = NorthWestGravity; 1023 attributes.bit_gravity = NorthWestGravity;
1029 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes); 1024 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1030 1025
1031 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1026 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1032 1027
1033 if (OPTION (Opt_pointerBlank)) 1028 if (OPTION (Opt_pointerBlank))
1034 vt_emask |= PointerMotionMask; 1029 vt_emask |= PointerMotionMask;
… …
1057#endif 1052#endif
1058 1053
1059 /* graphics context for the vt window */ 1054 /* graphics context for the vt window */
1060 gcvalue.foreground = pix_colors[Color_fg]; 1055 gcvalue.foreground = pix_colors[Color_fg];
1061 gcvalue.background = pix_colors[Color_bg]; 1056 gcvalue.background = pix_colors[Color_bg];
1062 gcvalue.graphics_exposures = 1; 1057 gcvalue.graphics_exposures = 0;
1063 1058
1064 gc = XCreateGC (xdisp, vt, 1059 gc = XCreateGC (dpy, vt,
1065 GCForeground | GCBackground | GCGraphicsExposures, 1060 GCForeground | GCBackground | GCGraphicsExposures,
1066 &gcvalue); 1061 &gcvalue);
1067 1062
1068 drawable = new rxvt_drawable (this, vt); 1063 drawable = new rxvt_drawable (this, vt);
1069 1064
1070#ifdef RXVT_SCROLLBAR 1065#ifdef RXVT_SCROLLBAR
1071 gcvalue.foreground = pix_colors[Color_topShadow]; 1066 gcvalue.foreground = pix_colors[Color_topShadow];
1072 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1067 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1073 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1068 gcvalue.foreground = pix_colors[Color_bottomShadow];
1074 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1069 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1075 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)]; 1070 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1076 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1071 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1077#endif 1072#endif
1078 1073
1079#ifdef OFF_FOCUS_FADING 1074#ifdef OFF_FOCUS_FADING
1080 // initially we are in unfocused state 1075 // initially we are in unfocused state
1081 if (rs[Rs_fade]) 1076 if (rs[Rs_fade])

Diff Legend

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