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.168 by root, Wed Feb 1 21:15:33 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++)
… …
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 extract_resources ();
313 312
314 free (r_argv); 313 free (r_argv);
315 314
316 for (int i = NUM_RESOURCES; i--; ) 315 for (int i = NUM_RESOURCES; i--; )
317 if (rs [i] == resval_undef) 316 if (rs [i] == resval_undef)
… …
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);
… …
749 alias_color (Color_topShadow, Color_White); 748 alias_color (Color_topShadow, Color_White);
750 } 749 }
751#endif /* KEEP_SCROLLCOLOR */ 750#endif /* KEEP_SCROLLCOLOR */
752 751
753#ifdef OFF_FOCUS_FADING 752#ifdef OFF_FOCUS_FADING
754 if (rs[Rs_fade])
755 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 753 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
756 { 754 update_fade_color (i);
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 755#endif
762} 756}
763 757
764/*----------------------------------------------------------------------*/ 758/*----------------------------------------------------------------------*/
765/* color aliases, fg/bg bright-bold */ 759/* color aliases, fg/bg bright-bold */
… …
805 799
806 if (rsmod 800 if (rsmod
807 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 801 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
808 requestedmeta = rsmod[3] - '0'; 802 requestedmeta = rsmod[3] - '0';
809 803
810 map = XGetModifierMapping (xdisp); 804 map = XGetModifierMapping (dpy);
811 kc = map->modifiermap; 805 kc = map->modifiermap;
812 806
813 for (i = 1; i < 6; i++) 807 for (i = 1; i < 6; i++)
814 { 808 {
815 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 809 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
817 for (j = map->max_keypermod; j--; k++) 811 for (j = map->max_keypermod; j--; k++)
818 { 812 {
819 if (kc[k] == 0) 813 if (kc[k] == 0)
820 break; 814 break;
821 815
822 switch (XKeycodeToKeysym (xdisp, kc[k], 0)) 816 switch (XKeycodeToKeysym (dpy, kc[k], 0))
823 { 817 {
824 case XK_Num_Lock: 818 case XK_Num_Lock:
825 ModNumLockMask = modmasks[i - 1]; 819 ModNumLockMask = modmasks[i - 1];
826 continue; 820 continue;
827 821
… …
883#endif 877#endif
884 XGCValues gcvalue; 878 XGCValues gcvalue;
885 XSetWindowAttributes attributes; 879 XSetWindowAttributes attributes;
886 Window top, parent; 880 Window top, parent;
887 881
888 dLocal (Display *, xdisp); 882 dLocal (Display *, dpy);
889 883
890 /* grab colors before netscape does */ 884 /* grab colors before netscape does */
891 Get_Colours (); 885 Get_Colours ();
892 886
893 if (!set_fonts ()) 887 if (!set_fonts ())
… …
898 attributes.override_redirect = !!OPTION (Opt_override_redirect); 892 attributes.override_redirect = !!OPTION (Opt_override_redirect);
899 893
900#if ENABLE_FRILLS 894#if ENABLE_FRILLS
901 if (OPTION (Opt_borderLess)) 895 if (OPTION (Opt_borderLess))
902 { 896 {
903 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None) 897 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
904 { 898 {
905 /* 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");*/
906 attributes.override_redirect = true; 900 attributes.override_redirect = true;
907 mwmhints.flags = 0; 901 mwmhints.flags = 0;
908 } 902 }
… …
921 { 915 {
922 XWindowAttributes wattr; 916 XWindowAttributes wattr;
923 917
924 parent = strtol (rs[Rs_embed], 0, 0); 918 parent = strtol (rs[Rs_embed], 0, 0);
925 919
926 if (!XGetWindowAttributes (xdisp, parent, &wattr)) 920 if (!XGetWindowAttributes (dpy, parent, &wattr))
927 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 921 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
928 922
929 window_calc (wattr.width, wattr.height); 923 window_calc (wattr.width, wattr.height);
930 } 924 }
931#endif 925#endif
… …
935 /* sub-window placement & size in rxvt_resize_subwindows () */ 929 /* sub-window placement & size in rxvt_resize_subwindows () */
936 attributes.background_pixel = pix_colors_focused [Color_border]; 930 attributes.background_pixel = pix_colors_focused [Color_border];
937 attributes.border_pixel = pix_colors_focused [Color_border]; 931 attributes.border_pixel = pix_colors_focused [Color_border];
938 attributes.colormap = cmap; 932 attributes.colormap = cmap;
939 933
940 top = XCreateWindow (xdisp, parent, 934 top = XCreateWindow (dpy, parent,
941 szHint.x, szHint.y, 935 szHint.x, szHint.y,
942 szHint.width, szHint.height, 936 szHint.width, szHint.height,
943 ext_bwidth, 937 ext_bwidth,
944 depth, InputOutput, visual, 938 depth, InputOutput, visual,
945 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 939 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
… …
959 wmHint.flags = InputHint | StateHint | WindowGroupHint; 953 wmHint.flags = InputHint | StateHint | WindowGroupHint;
960 wmHint.input = True; 954 wmHint.input = True;
961 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 955 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
962 wmHint.window_group = top; 956 wmHint.window_group = top;
963 957
964 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc, 958 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
965 &szHint, &wmHint, &classHint); 959 &szHint, &wmHint, &classHint);
966 960
967#if ENABLE_FRILLS 961#if ENABLE_FRILLS
968 if (mwmhints.flags) 962 if (mwmhints.flags)
969 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,
970 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 964 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
971#endif 965#endif
972 966
973 Atom protocols[] = { 967 Atom protocols[] = {
974 xa[XA_WM_DELETE_WINDOW], 968 xa[XA_WM_DELETE_WINDOW],
975#if ENABLE_EWMH 969#if ENABLE_EWMH
976 xa[XA_NET_WM_PING], 970 xa[XA_NET_WM_PING],
977#endif 971#endif
978 }; 972 };
979 973
980 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 974 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
981 975
982#if ENABLE_FRILLS 976#if ENABLE_FRILLS
983 if (rs[Rs_transient_for]) 977 if (rs[Rs_transient_for])
984 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 978 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
985#endif 979#endif
986 980
987#if ENABLE_EWMH 981#if ENABLE_EWMH
988 long pid = getpid (); 982 long pid = getpid ();
989 983
990 XChangeProperty (xdisp, top, 984 XChangeProperty (dpy, top,
991 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 985 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
992 PropModeReplace, (unsigned char *)&pid, 1); 986 PropModeReplace, (unsigned char *)&pid, 1);
993 987
994 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 988 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
995#endif 989#endif
996 990
997 XSelectInput (xdisp, top, 991 XSelectInput (dpy, top,
998 KeyPressMask 992 KeyPressMask
999#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 993#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1000 | KeyReleaseMask 994 | KeyReleaseMask
1001#endif 995#endif
1002 | FocusChangeMask | VisibilityChangeMask 996 | FocusChangeMask | VisibilityChangeMask
1003 | ExposureMask | StructureNotifyMask); 997 | ExposureMask | StructureNotifyMask);
1004 998
1005 termwin_ev.start (display, top); 999 termwin_ev.start (display, top);
1006 1000
1007 /* 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 */
1008 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm); 1002 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1009 1003
1010#ifdef HAVE_SCROLLBARS 1004#ifdef HAVE_SCROLLBARS
1011 /* cursor scrollBar: Black-on-White */ 1005 /* cursor scrollBar: Black-on-White */
1012 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr); 1006 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1013#endif 1007#endif
1014 1008
1015 /* the vt window */ 1009 /* the vt window */
1016 vt = XCreateSimpleWindow (xdisp, top, 1010 vt = XCreateSimpleWindow (dpy, top,
1017 window_vt_x, window_vt_y, 1011 window_vt_x, window_vt_y,
1018 width, height, 1012 width, height,
1019 0, 1013 0,
1020 pix_colors_focused[Color_fg], 1014 pix_colors_focused[Color_fg],
1021 pix_colors_focused[Color_bg]); 1015 pix_colors_focused[Color_bg]);
1022 1016
1023 attributes.bit_gravity = NorthWestGravity; 1017 attributes.bit_gravity = NorthWestGravity;
1024 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes); 1018 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1025 1019
1026 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1020 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1027 1021
1028 if (OPTION (Opt_pointerBlank)) 1022 if (OPTION (Opt_pointerBlank))
1029 vt_emask |= PointerMotionMask; 1023 vt_emask |= PointerMotionMask;
… …
1052#endif 1046#endif
1053 1047
1054 /* graphics context for the vt window */ 1048 /* graphics context for the vt window */
1055 gcvalue.foreground = pix_colors[Color_fg]; 1049 gcvalue.foreground = pix_colors[Color_fg];
1056 gcvalue.background = pix_colors[Color_bg]; 1050 gcvalue.background = pix_colors[Color_bg];
1057 gcvalue.graphics_exposures = 1; 1051 gcvalue.graphics_exposures = 0;
1058 1052
1059 gc = XCreateGC (xdisp, vt, 1053 gc = XCreateGC (dpy, vt,
1060 GCForeground | GCBackground | GCGraphicsExposures, 1054 GCForeground | GCBackground | GCGraphicsExposures,
1061 &gcvalue); 1055 &gcvalue);
1062 1056
1063 drawable = new rxvt_drawable (this, vt); 1057 drawable = new rxvt_drawable (this, vt);
1064 1058
1065#ifdef RXVT_SCROLLBAR 1059#ifdef RXVT_SCROLLBAR
1066 gcvalue.foreground = pix_colors[Color_topShadow]; 1060 gcvalue.foreground = pix_colors[Color_topShadow];
1067 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1061 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1068 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1062 gcvalue.foreground = pix_colors[Color_bottomShadow];
1069 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1063 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1070 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)]; 1064 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1071 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1065 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1072#endif 1066#endif
1073 1067
1074#ifdef OFF_FOCUS_FADING 1068#ifdef OFF_FOCUS_FADING
1075 // initially we are in unfocused state 1069 // initially we are in unfocused state
1076 if (rs[Rs_fade]) 1070 if (rs[Rs_fade])

Diff Legend

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