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.166 by root, Tue Jan 31 19:53:30 2006 UTC vs.
Revision 1.173 by root, Wed Jul 5 20:31:48 2006 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: init.C 2 * File: init.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
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++)
… …
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 // using a local pointer decreases code size a lot
303 xa = display->xa; 303 xa = display->xa;
304 304
305 set (display);
306 extract_resources ();
307
305#if XFT 308#if XFT
306 if (rs[Rs_depth]) 309 if (rs[Rs_depth])
307 set (display, strtol (rs[Rs_depth], 0, 0)); 310 select_visual (strtol (rs[Rs_depth], 0, 0));
308 else
309#endif 311#endif
310 set (display);
311 312
312 extract_resources (); 313 free (r_argv);
313 314
314 for (int i = NUM_RESOURCES; i--; ) 315 for (int i = NUM_RESOURCES; i--; )
315 if (rs [i] == resval_undef) 316 if (rs [i] == resval_undef)
316 rs [i] = 0; 317 rs [i] = 0;
317
318 free (r_argv);
319 318
320#if ENABLE_PERL 319#if ENABLE_PERL
321 if (!rs[Rs_perl_ext_1]) 320 if (!rs[Rs_perl_ext_1])
322 rs[Rs_perl_ext_1] = "default"; 321 rs[Rs_perl_ext_1] = "default";
323 322
… …
488 val = rxvt_network_display (rs[Rs_display_name]); 487 val = rxvt_network_display (rs[Rs_display_name]);
489 rs[Rs_display_name] = (const char *)val; 488 rs[Rs_display_name] = (const char *)val;
490 489
491 if (val == NULL) 490 if (val == NULL)
492#endif /* DISPLAY_IS_IP */ 491#endif /* DISPLAY_IS_IP */
493 val = XDisplayString (xdisp); 492 val = XDisplayString (dpy);
494 493
495 if (rs[Rs_display_name] == NULL) 494 if (rs[Rs_display_name] == NULL)
496 rs[Rs_display_name] = val; /* use broken `:0' value */ 495 rs[Rs_display_name] = val; /* use broken `:0' value */
497 496
498 i = strlen (val); 497 i = strlen (val);
… …
694#ifndef NO_CURSORCOLOR 693#ifndef NO_CURSORCOLOR
695 case Color_cursor2: 694 case Color_cursor2:
696#endif 695#endif
697 case Color_pointer_fg: 696 case Color_pointer_fg:
698 name = rs[Rs_color + Color_fg]; 697 name = rs[Rs_color + Color_fg];
699 xcol = pix_colors[Color_fg]; 698 xcol.set (this, name);
700 break; 699 break;
701 default: 700 default:
702 name = rs[Rs_color + Color_bg]; 701 name = rs[Rs_color + Color_bg];
703 xcol = pix_colors[Color_bg]; 702 xcol.set (this, name);
704 break; 703 break;
705 } 704 }
706 } 705 }
707 } 706 }
708 707
709 pix_colors[i] = xcol; 708 pix_colors[i] = xcol;
710 rs[Rs_color + i] = name; 709 rs[Rs_color + i] = name;
711 } 710 }
712 711
713#ifdef OFF_FOCUS_FADING
714 if (rs[Rs_fade])
715 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
716 {
717 rgba c;
718 pix_colors[Color_fade].get (c);
719 pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
720 }
721#endif
722
723 if (depth <= 2) 712 if (depth <= 2)
724 { 713 {
725 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 714 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
726 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 715 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
727 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 716 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
728 } 717 }
729 718
730 /* 719 /*
731 * get scrollBar shadow colors 720 * get scrollBar shadow colors
732 * 721 *
733 * The calculations of topShadow/bottomShadow values are adapted 722 * The calculations of topShadow/bottomShadow values are adapted
734 * from the fvwm window manager. 723 * from the fvwm window manager.
735 */ 724 */
736#ifdef KEEP_SCROLLCOLOR 725#ifdef KEEP_SCROLLCOLOR
737
738 if (depth <= 2) 726 if (depth <= 2)
739 { 727 {
740 /* Monochrome */ 728 /* Monochrome */
741 pix_colors[Color_scroll] = pix_colors[Color_fg]; 729 alias_color (Color_scroll, Color_fg);
742 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 730 alias_color (Color_topShadow, Color_bg);
743 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 731 alias_color (Color_bottomShadow, Color_bg);
744 } 732 }
745 else 733 else
746 { 734 {
747 rxvt_color xcol[2]; 735 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
748 /* xcol[0] == white
749 * xcol[1] == top shadow
750 * xcol[2] == bot shadow */
751 736
752 xcol[1] = pix_colors[Color_scroll];
753 xcol[0].set (this, rgba (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC));
754
755 rgba c0, c1; 737 rgba cscroll;
756 738 pix_colors [Color_scroll].get (cscroll);
757 xcol[0].get (c0);
758 xcol[1].get (c1);
759
760 xcol[1].fade (this, 50, pix_colors[Color_bottomShadow]);
761 739
762 /* topShadowColor */ 740 /* topShadowColor */
763 if (!xcol[1].set (this, 741 if (!pix_colors[Color_topShadow].set (this,
764 rgba ( 742 rgba (
765 min (c0.r, max (c1.r / 5, c1.r) * 7 / 5), 743 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
766 min (c0.g, max (c1.g / 5, c1.g) * 7 / 5), 744 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
767 min (c0.b, max (c1.b / 5, c1.b) * 7 / 5), 745 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
768 c1.a) // pa1 vs. pa0: arbitrary 746 cscroll.a)
769 )); 747 ))
770 xcol[1] = pix_colors[Color_White]; 748 alias_color (Color_topShadow, Color_White);
771
772 pix_colors[Color_topShadow] = xcol[1];
773 } 749 }
774#endif /* KEEP_SCROLLCOLOR */ 750#endif /* KEEP_SCROLLCOLOR */
751
752#ifdef OFF_FOCUS_FADING
753 if (rs[Rs_fade])
754 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
755 {
756 rgba c;
757 pix_colors [Color_fade].get (c);
758 pix_colors_focused [i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
759 }
760#endif
775} 761}
776 762
777/*----------------------------------------------------------------------*/ 763/*----------------------------------------------------------------------*/
778/* color aliases, fg/bg bright-bold */ 764/* color aliases, fg/bg bright-bold */
779void 765void
… …
818 804
819 if (rsmod 805 if (rsmod
820 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 806 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
821 requestedmeta = rsmod[3] - '0'; 807 requestedmeta = rsmod[3] - '0';
822 808
823 map = XGetModifierMapping (xdisp); 809 map = XGetModifierMapping (dpy);
824 kc = map->modifiermap; 810 kc = map->modifiermap;
825 811
826 for (i = 1; i < 6; i++) 812 for (i = 1; i < 6; i++)
827 { 813 {
828 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 814 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
830 for (j = map->max_keypermod; j--; k++) 816 for (j = map->max_keypermod; j--; k++)
831 { 817 {
832 if (kc[k] == 0) 818 if (kc[k] == 0)
833 break; 819 break;
834 820
835 switch (XKeycodeToKeysym (xdisp, kc[k], 0)) 821 switch (XKeycodeToKeysym (dpy, kc[k], 0))
836 { 822 {
837 case XK_Num_Lock: 823 case XK_Num_Lock:
838 ModNumLockMask = modmasks[i - 1]; 824 ModNumLockMask = modmasks[i - 1];
839 continue; 825 continue;
840 826
… …
896#endif 882#endif
897 XGCValues gcvalue; 883 XGCValues gcvalue;
898 XSetWindowAttributes attributes; 884 XSetWindowAttributes attributes;
899 Window top, parent; 885 Window top, parent;
900 886
901 dLocal (Display *, xdisp); 887 dLocal (Display *, dpy);
902 888
903 /* grab colors before netscape does */ 889 /* grab colors before netscape does */
904 Get_Colours (); 890 Get_Colours ();
905 891
906 if (!set_fonts ()) 892 if (!set_fonts ())
… …
911 attributes.override_redirect = !!OPTION (Opt_override_redirect); 897 attributes.override_redirect = !!OPTION (Opt_override_redirect);
912 898
913#if ENABLE_FRILLS 899#if ENABLE_FRILLS
914 if (OPTION (Opt_borderLess)) 900 if (OPTION (Opt_borderLess))
915 { 901 {
916 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None) 902 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
917 { 903 {
918 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 904 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
919 attributes.override_redirect = true; 905 attributes.override_redirect = true;
920 mwmhints.flags = 0; 906 mwmhints.flags = 0;
921 } 907 }
… …
934 { 920 {
935 XWindowAttributes wattr; 921 XWindowAttributes wattr;
936 922
937 parent = strtol (rs[Rs_embed], 0, 0); 923 parent = strtol (rs[Rs_embed], 0, 0);
938 924
939 if (!XGetWindowAttributes (xdisp, parent, &wattr)) 925 if (!XGetWindowAttributes (dpy, parent, &wattr))
940 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 926 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
941 927
942 window_calc (wattr.width, wattr.height); 928 window_calc (wattr.width, wattr.height);
943 } 929 }
944#endif 930#endif
… …
948 /* sub-window placement & size in rxvt_resize_subwindows () */ 934 /* sub-window placement & size in rxvt_resize_subwindows () */
949 attributes.background_pixel = pix_colors_focused [Color_border]; 935 attributes.background_pixel = pix_colors_focused [Color_border];
950 attributes.border_pixel = pix_colors_focused [Color_border]; 936 attributes.border_pixel = pix_colors_focused [Color_border];
951 attributes.colormap = cmap; 937 attributes.colormap = cmap;
952 938
953 top = XCreateWindow (xdisp, parent, 939 top = XCreateWindow (dpy, parent,
954 szHint.x, szHint.y, 940 szHint.x, szHint.y,
955 szHint.width, szHint.height, 941 szHint.width, szHint.height,
956 ext_bwidth, 942 ext_bwidth,
957 depth, InputOutput, visual, 943 depth, InputOutput, visual,
958 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 944 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
… …
972 wmHint.flags = InputHint | StateHint | WindowGroupHint; 958 wmHint.flags = InputHint | StateHint | WindowGroupHint;
973 wmHint.input = True; 959 wmHint.input = True;
974 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 960 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
975 wmHint.window_group = top; 961 wmHint.window_group = top;
976 962
977 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc, 963 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
978 &szHint, &wmHint, &classHint); 964 &szHint, &wmHint, &classHint);
979 965
980#if ENABLE_FRILLS 966#if ENABLE_FRILLS
981 if (mwmhints.flags) 967 if (mwmhints.flags)
982 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 968 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
983 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 969 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
984#endif 970#endif
985 971
986 Atom protocols[] = { 972 Atom protocols[] = {
987 xa[XA_WM_DELETE_WINDOW], 973 xa[XA_WM_DELETE_WINDOW],
988#if ENABLE_EWMH 974#if ENABLE_EWMH
989 xa[XA_NET_WM_PING], 975 xa[XA_NET_WM_PING],
990#endif 976#endif
991 }; 977 };
992 978
993 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 979 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
994 980
995#if ENABLE_FRILLS 981#if ENABLE_FRILLS
996 if (rs[Rs_transient_for]) 982 if (rs[Rs_transient_for])
997 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 983 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
998#endif 984#endif
999 985
1000#if ENABLE_EWMH 986#if ENABLE_EWMH
1001 long pid = getpid (); 987 long pid = getpid ();
1002 988
1003 XChangeProperty (xdisp, top, 989 XChangeProperty (dpy, top,
1004 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 990 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1005 PropModeReplace, (unsigned char *)&pid, 1); 991 PropModeReplace, (unsigned char *)&pid, 1);
1006 992
1007 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 993 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1008#endif 994#endif
1009 995
1010 XSelectInput (xdisp, top, 996 XSelectInput (dpy, top,
1011 KeyPressMask 997 KeyPressMask
1012#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 998#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1013 | KeyReleaseMask 999 | KeyReleaseMask
1014#endif 1000#endif
1015 | FocusChangeMask | VisibilityChangeMask 1001 | FocusChangeMask | VisibilityChangeMask
1016 | ExposureMask | StructureNotifyMask); 1002 | ExposureMask | StructureNotifyMask);
1017 1003
1018 termwin_ev.start (display, top); 1004 termwin_ev.start (display, top);
1019 1005
1020 /* vt cursor: Black-on-White is standard, but this is more popular */ 1006 /* vt cursor: Black-on-White is standard, but this is more popular */
1021 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm); 1007 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1022 1008
1023#ifdef HAVE_SCROLLBARS 1009#ifdef HAVE_SCROLLBARS
1024 /* cursor scrollBar: Black-on-White */ 1010 /* cursor scrollBar: Black-on-White */
1025 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr); 1011 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1026#endif 1012#endif
1027 1013
1028 /* the vt window */ 1014 /* the vt window */
1029 vt = XCreateSimpleWindow (xdisp, top, 1015 vt = XCreateSimpleWindow (dpy, top,
1030 window_vt_x, window_vt_y, 1016 window_vt_x, window_vt_y,
1031 width, height, 1017 width, height,
1032 0, 1018 0,
1033 pix_colors_focused[Color_fg], 1019 pix_colors_focused[Color_fg],
1034 pix_colors_focused[Color_bg]); 1020 pix_colors_focused[Color_bg]);
1035 1021
1036 attributes.bit_gravity = NorthWestGravity; 1022 attributes.bit_gravity = NorthWestGravity;
1037 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes); 1023 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1038 1024
1039 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1025 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1040 1026
1041 if (OPTION (Opt_pointerBlank)) 1027 if (OPTION (Opt_pointerBlank))
1042 vt_emask |= PointerMotionMask; 1028 vt_emask |= PointerMotionMask;
… …
1065#endif 1051#endif
1066 1052
1067 /* graphics context for the vt window */ 1053 /* graphics context for the vt window */
1068 gcvalue.foreground = pix_colors[Color_fg]; 1054 gcvalue.foreground = pix_colors[Color_fg];
1069 gcvalue.background = pix_colors[Color_bg]; 1055 gcvalue.background = pix_colors[Color_bg];
1070 gcvalue.graphics_exposures = 1; 1056 gcvalue.graphics_exposures = 0;
1071 1057
1072 gc = XCreateGC (xdisp, vt, 1058 gc = XCreateGC (dpy, vt,
1073 GCForeground | GCBackground | GCGraphicsExposures, 1059 GCForeground | GCBackground | GCGraphicsExposures,
1074 &gcvalue); 1060 &gcvalue);
1075 1061
1076 drawable = new rxvt_drawable (this, vt); 1062 drawable = new rxvt_drawable (this, vt);
1077 1063
1078#ifdef RXVT_SCROLLBAR 1064#ifdef RXVT_SCROLLBAR
1079 gcvalue.foreground = pix_colors[Color_topShadow]; 1065 gcvalue.foreground = pix_colors[Color_topShadow];
1080 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1066 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1081 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1067 gcvalue.foreground = pix_colors[Color_bottomShadow];
1082 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1068 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1083 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)]; 1069 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1084 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1070 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1085#endif 1071#endif
1086 1072
1087#ifdef OFF_FOCUS_FADING 1073#ifdef OFF_FOCUS_FADING
1088 // initially we are in unfocused state 1074 // initially we are in unfocused state
1089 if (rs[Rs_fade]) 1075 if (rs[Rs_fade])

Diff Legend

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