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

Diff Legend

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