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

Diff Legend

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