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.165 by root, Tue Jan 31 19:11:43 2006 UTC vs.
Revision 1.171 by root, Mon Feb 20 20:44:22 2006 UTC

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

Diff Legend

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