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.164 by root, Tue Jan 31 18:36:35 2006 UTC vs.
Revision 1.169 by root, Thu Feb 2 18:04:46 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);
… …
688#ifndef NO_CURSORCOLOR 694#ifndef NO_CURSORCOLOR
689 case Color_cursor2: 695 case Color_cursor2:
690#endif 696#endif
691 case Color_pointer_fg: 697 case Color_pointer_fg:
692 name = rs[Rs_color + Color_fg]; 698 name = rs[Rs_color + Color_fg];
693 xcol = pix_colors[Color_fg]; 699 xcol.set (this, name);
694 break; 700 break;
695 default: 701 default:
696 name = rs[Rs_color + Color_bg]; 702 name = rs[Rs_color + Color_bg];
697 xcol = pix_colors[Color_bg]; 703 xcol.set (this, name);
698 break; 704 break;
699 } 705 }
700 } 706 }
701 } 707 }
702 708
703 pix_colors[i] = xcol; 709 pix_colors[i] = xcol;
704 rs[Rs_color + i] = name; 710 rs[Rs_color + i] = name;
705 } 711 }
706 712
707#ifdef OFF_FOCUS_FADING
708 if (rs[Rs_fade])
709 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
710 {
711 rgba c;
712 pix_colors[Color_fade].get (this, c);
713 pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
714 }
715#endif
716
717 if (depth <= 2) 713 if (depth <= 2)
718 { 714 {
719 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);
720 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);
721 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);
722 } 718 }
723 719
724 /* 720 /*
725 * get scrollBar shadow colors 721 * get scrollBar shadow colors
726 * 722 *
727 * The calculations of topShadow/bottomShadow values are adapted 723 * The calculations of topShadow/bottomShadow values are adapted
728 * from the fvwm window manager. 724 * from the fvwm window manager.
729 */ 725 */
730#ifdef KEEP_SCROLLCOLOR 726#ifdef KEEP_SCROLLCOLOR
731
732 if (depth <= 2) 727 if (depth <= 2)
733 { 728 {
734 /* Monochrome */ 729 /* Monochrome */
735 pix_colors[Color_scroll] = pix_colors[Color_fg]; 730 alias_color (Color_scroll, Color_fg);
736 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 731 alias_color (Color_topShadow, Color_bg);
737 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 732 alias_color (Color_bottomShadow, Color_bg);
738 } 733 }
739 else 734 else
740 { 735 {
741 rxvt_color xcol[2]; 736 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
742 /* xcol[0] == white
743 * xcol[1] == top shadow
744 * xcol[2] == bot shadow */
745 737
746 xcol[1] = pix_colors[Color_scroll];
747 xcol[0].set (this, rgba (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC));
748
749 rgba c0, c1; 738 rgba cscroll;
750 739 pix_colors [Color_scroll].get (cscroll);
751 xcol[0].get (this, c0);
752 xcol[1].get (this, c1);
753
754 xcol[1].fade (this, 50, pix_colors[Color_bottomShadow]);
755 740
756 /* topShadowColor */ 741 /* topShadowColor */
757 if (!xcol[1].set (this, 742 if (!pix_colors[Color_topShadow].set (this,
758 rgba ( 743 rgba (
759 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),
760 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),
761 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),
762 c1.a) // pa1 vs. pa0: arbitrary 747 cscroll.a)
763 )); 748 ))
764 xcol[1] = pix_colors[Color_White]; 749 alias_color (Color_topShadow, Color_White);
765
766 pix_colors[Color_topShadow] = xcol[1];
767 } 750 }
768#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
769} 762}
770 763
771/*----------------------------------------------------------------------*/ 764/*----------------------------------------------------------------------*/
772/* color aliases, fg/bg bright-bold */ 765/* color aliases, fg/bg bright-bold */
773void 766void
… …
812 805
813 if (rsmod 806 if (rsmod
814 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 807 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
815 requestedmeta = rsmod[3] - '0'; 808 requestedmeta = rsmod[3] - '0';
816 809
817 map = XGetModifierMapping (xdisp); 810 map = XGetModifierMapping (dpy);
818 kc = map->modifiermap; 811 kc = map->modifiermap;
819 812
820 for (i = 1; i < 6; i++) 813 for (i = 1; i < 6; i++)
821 { 814 {
822 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 815 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
824 for (j = map->max_keypermod; j--; k++) 817 for (j = map->max_keypermod; j--; k++)
825 { 818 {
826 if (kc[k] == 0) 819 if (kc[k] == 0)
827 break; 820 break;
828 821
829 switch (XKeycodeToKeysym (xdisp, kc[k], 0)) 822 switch (XKeycodeToKeysym (dpy, kc[k], 0))
830 { 823 {
831 case XK_Num_Lock: 824 case XK_Num_Lock:
832 ModNumLockMask = modmasks[i - 1]; 825 ModNumLockMask = modmasks[i - 1];
833 continue; 826 continue;
834 827
… …
890#endif 883#endif
891 XGCValues gcvalue; 884 XGCValues gcvalue;
892 XSetWindowAttributes attributes; 885 XSetWindowAttributes attributes;
893 Window top, parent; 886 Window top, parent;
894 887
895 dLocal (Display *, xdisp); 888 dLocal (Display *, dpy);
896 889
897 /* grab colors before netscape does */ 890 /* grab colors before netscape does */
898 Get_Colours (); 891 Get_Colours ();
899 892
900 if (!set_fonts ()) 893 if (!set_fonts ())
… …
905 attributes.override_redirect = !!OPTION (Opt_override_redirect); 898 attributes.override_redirect = !!OPTION (Opt_override_redirect);
906 899
907#if ENABLE_FRILLS 900#if ENABLE_FRILLS
908 if (OPTION (Opt_borderLess)) 901 if (OPTION (Opt_borderLess))
909 { 902 {
910 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None) 903 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
911 { 904 {
912 /* 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");*/
913 attributes.override_redirect = true; 906 attributes.override_redirect = true;
914 mwmhints.flags = 0; 907 mwmhints.flags = 0;
915 } 908 }
… …
928 { 921 {
929 XWindowAttributes wattr; 922 XWindowAttributes wattr;
930 923
931 parent = strtol (rs[Rs_embed], 0, 0); 924 parent = strtol (rs[Rs_embed], 0, 0);
932 925
933 if (!XGetWindowAttributes (xdisp, parent, &wattr)) 926 if (!XGetWindowAttributes (dpy, parent, &wattr))
934 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 927 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
935 928
936 window_calc (wattr.width, wattr.height); 929 window_calc (wattr.width, wattr.height);
937 } 930 }
938#endif 931#endif
… …
942 /* sub-window placement & size in rxvt_resize_subwindows () */ 935 /* sub-window placement & size in rxvt_resize_subwindows () */
943 attributes.background_pixel = pix_colors_focused [Color_border]; 936 attributes.background_pixel = pix_colors_focused [Color_border];
944 attributes.border_pixel = pix_colors_focused [Color_border]; 937 attributes.border_pixel = pix_colors_focused [Color_border];
945 attributes.colormap = cmap; 938 attributes.colormap = cmap;
946 939
947 top = XCreateWindow (xdisp, parent, 940 top = XCreateWindow (dpy, parent,
948 szHint.x, szHint.y, 941 szHint.x, szHint.y,
949 szHint.width, szHint.height, 942 szHint.width, szHint.height,
950 ext_bwidth, 943 ext_bwidth,
951 depth, InputOutput, visual, 944 depth, InputOutput, visual,
952 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 945 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
… …
966 wmHint.flags = InputHint | StateHint | WindowGroupHint; 959 wmHint.flags = InputHint | StateHint | WindowGroupHint;
967 wmHint.input = True; 960 wmHint.input = True;
968 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 961 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
969 wmHint.window_group = top; 962 wmHint.window_group = top;
970 963
971 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc, 964 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
972 &szHint, &wmHint, &classHint); 965 &szHint, &wmHint, &classHint);
973 966
974#if ENABLE_FRILLS 967#if ENABLE_FRILLS
975 if (mwmhints.flags) 968 if (mwmhints.flags)
976 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,
977 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 970 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
978#endif 971#endif
979 972
980 Atom protocols[] = { 973 Atom protocols[] = {
981 xa[XA_WM_DELETE_WINDOW], 974 xa[XA_WM_DELETE_WINDOW],
982#if ENABLE_EWMH 975#if ENABLE_EWMH
983 xa[XA_NET_WM_PING], 976 xa[XA_NET_WM_PING],
984#endif 977#endif
985 }; 978 };
986 979
987 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 980 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
988 981
989#if ENABLE_FRILLS 982#if ENABLE_FRILLS
990 if (rs[Rs_transient_for]) 983 if (rs[Rs_transient_for])
991 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 984 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
992#endif 985#endif
993 986
994#if ENABLE_EWMH 987#if ENABLE_EWMH
995 long pid = getpid (); 988 long pid = getpid ();
996 989
997 XChangeProperty (xdisp, top, 990 XChangeProperty (dpy, top,
998 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 991 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
999 PropModeReplace, (unsigned char *)&pid, 1); 992 PropModeReplace, (unsigned char *)&pid, 1);
1000 993
1001 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 994 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1002#endif 995#endif
1003 996
1004 XSelectInput (xdisp, top, 997 XSelectInput (dpy, top,
1005 KeyPressMask 998 KeyPressMask
1006#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 999#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1007 | KeyReleaseMask 1000 | KeyReleaseMask
1008#endif 1001#endif
1009 | FocusChangeMask | VisibilityChangeMask 1002 | FocusChangeMask | VisibilityChangeMask
1010 | ExposureMask | StructureNotifyMask); 1003 | ExposureMask | StructureNotifyMask);
1011 1004
1012 termwin_ev.start (display, top); 1005 termwin_ev.start (display, top);
1013 1006
1014 /* 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 */
1015 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm); 1008 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1016 1009
1017#ifdef HAVE_SCROLLBARS 1010#ifdef HAVE_SCROLLBARS
1018 /* cursor scrollBar: Black-on-White */ 1011 /* cursor scrollBar: Black-on-White */
1019 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr); 1012 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1020#endif 1013#endif
1021 1014
1022 /* the vt window */ 1015 /* the vt window */
1023 vt = XCreateSimpleWindow (xdisp, top, 1016 vt = XCreateSimpleWindow (dpy, top,
1024 window_vt_x, window_vt_y, 1017 window_vt_x, window_vt_y,
1025 width, height, 1018 width, height,
1026 0, 1019 0,
1027 pix_colors_focused[Color_fg], 1020 pix_colors_focused[Color_fg],
1028 pix_colors_focused[Color_bg]); 1021 pix_colors_focused[Color_bg]);
1029 1022
1030 attributes.bit_gravity = NorthWestGravity; 1023 attributes.bit_gravity = NorthWestGravity;
1031 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes); 1024 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1032 1025
1033 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1026 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1034 1027
1035 if (OPTION (Opt_pointerBlank)) 1028 if (OPTION (Opt_pointerBlank))
1036 vt_emask |= PointerMotionMask; 1029 vt_emask |= PointerMotionMask;
… …
1061 /* graphics context for the vt window */ 1054 /* graphics context for the vt window */
1062 gcvalue.foreground = pix_colors[Color_fg]; 1055 gcvalue.foreground = pix_colors[Color_fg];
1063 gcvalue.background = pix_colors[Color_bg]; 1056 gcvalue.background = pix_colors[Color_bg];
1064 gcvalue.graphics_exposures = 1; 1057 gcvalue.graphics_exposures = 1;
1065 1058
1066 gc = XCreateGC (xdisp, vt, 1059 gc = XCreateGC (dpy, vt,
1067 GCForeground | GCBackground | GCGraphicsExposures, 1060 GCForeground | GCBackground | GCGraphicsExposures,
1068 &gcvalue); 1061 &gcvalue);
1069 1062
1070 drawable = new rxvt_drawable (this, vt); 1063 drawable = new rxvt_drawable (this, vt);
1071 1064
1072#ifdef RXVT_SCROLLBAR 1065#ifdef RXVT_SCROLLBAR
1073 gcvalue.foreground = pix_colors[Color_topShadow]; 1066 gcvalue.foreground = pix_colors[Color_topShadow];
1074 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1067 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1075 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1068 gcvalue.foreground = pix_colors[Color_bottomShadow];
1076 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1069 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1077 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)]; 1070 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1078 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1071 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1079#endif 1072#endif
1080 1073
1081#ifdef OFF_FOCUS_FADING 1074#ifdef OFF_FOCUS_FADING
1082 // initially we are in unfocused state 1075 // initially we are in unfocused state
1083 if (rs[Rs_fade]) 1076 if (rs[Rs_fade])

Diff Legend

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