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.97 by root, Wed Dec 15 00:12:58 2004 UTC vs.
Revision 1.112 by root, Sat Feb 19 01:07:58 2005 UTC

… …
31 * Initialisation routines. 31 * Initialisation routines.
32 */ 32 */
33 33
34#include "../config.h" /* NECESSARY */ 34#include "../config.h" /* NECESSARY */
35#include "rxvt.h" /* NECESSARY */ 35#include "rxvt.h" /* NECESSARY */
36#include "rxvtutil.h"
36#include "init.h" 37#include "init.h"
37 38
38#include <signal.h> 39#include <csignal>
39 40
40const char *const def_colorName[] = 41const char *const def_colorName[] =
41 { 42 {
42 COLOR_FOREGROUND, 43 COLOR_FOREGROUND,
43 COLOR_BACKGROUND, 44 COLOR_BACKGROUND,
… …
155 NULL, /* Color_BD */ 156 NULL, /* Color_BD */
156 NULL, /* Color_IT */ 157 NULL, /* Color_IT */
157 NULL, /* Color_UL */ 158 NULL, /* Color_UL */
158 NULL, /* Color_RV */ 159 NULL, /* Color_RV */
159#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 160#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161#if ENABLE_FRILLS
162 NULL, // Color_underline
163#endif
160#ifdef OPTION_HC 164#ifdef OPTION_HC
161 NULL, 165 NULL,
162#endif 166#endif
163#ifdef KEEP_SCROLLCOLOR 167#ifdef KEEP_SCROLLCOLOR
164 COLOR_SCROLLBAR, 168 COLOR_SCROLLBAR,
… …
177 "MULTIPLE", 181 "MULTIPLE",
178 "TARGETS", 182 "TARGETS",
179 "TIMESTAMP", 183 "TIMESTAMP",
180 "VT_SELECTION", 184 "VT_SELECTION",
181 "INCR", 185 "INCR",
186 "WM_PROTOCOLS",
182 "WM_DELETE_WINDOW", 187 "WM_DELETE_WINDOW",
183 "CLIPBOARD", 188 "CLIPBOARD",
184#if ENABLE_FRILLS 189#if ENABLE_FRILLS
185 "_NET_WM_PID", 190 "_NET_WM_PID",
186 "_MOTIF_WM_HINTS", 191 "_MOTIF_WM_HINTS",
… …
190#if USE_XIM 195#if USE_XIM
191 "WM_LOCALE_NAME", 196 "WM_LOCALE_NAME",
192#endif 197#endif
193#ifdef TRANSPARENT 198#ifdef TRANSPARENT
194 "_XROOTPMAP_ID", 199 "_XROOTPMAP_ID",
195 "_XSETROOT_ID", 200 "ESETROOT_PMAP_ID",
196#endif 201#endif
197#ifdef OFFIX_DND 202#ifdef OFFIX_DND
198 "DndProtocol", 203 "DndProtocol",
199 "DndSelection", 204 "DndSelection",
205#endif
206#if ENABLE_XEMBED
207 "_XEMBED",
200#endif 208#endif
201 }; 209 };
202 210
203bool 211bool
204rxvt_term::init_vars () 212rxvt_term::init_vars ()
205{ 213{
206 sw_term.start (SIGTERM); 214 sw_term.start (SIGTERM);
215 sw_int.start (SIGINT);
207 216
208 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 217 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
209#ifdef OFF_FOCUS_FADING 218#ifdef OFF_FOCUS_FADING
210 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 219 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
211#endif 220#endif
… …
220 229
221 MEvent.time = CurrentTime; 230 MEvent.time = CurrentTime;
222 MEvent.button = AnyButton; 231 MEvent.button = AnyButton;
223 options = DEFAULT_OPTIONS; 232 options = DEFAULT_OPTIONS;
224 want_refresh = 1; 233 want_refresh = 1;
225 cmd_pid = -1;
226 pty.pty = pty.tty = -1;
227 priv_modes = SavedModes = PrivMode_Default; 234 priv_modes = SavedModes = PrivMode_Default;
228 TermWin.focus = 0; 235 TermWin.focus = 0;
229 TermWin.ncol = 80; 236 TermWin.ncol = 80;
230 TermWin.nrow = 24; 237 TermWin.nrow = 24;
231 TermWin.int_bwidth = INTERNALBORDERWIDTH; 238 TermWin.int_bwidth = INTERNALBORDERWIDTH;
… …
248 last_bot = last_state = -1; 255 last_bot = last_state = -1;
249 256
250#ifdef MENUBAR 257#ifdef MENUBAR
251 menu_readonly = 1; 258 menu_readonly = 1;
252# if ! (MENUBAR_MAX > 1) 259# if ! (MENUBAR_MAX > 1)
253 CurrentBar = & (BarList); 260 CurrentBar = &BarList;
254# endif /* (MENUBAR_MAX > 1) */ 261# endif /* (MENUBAR_MAX > 1) */
255#endif 262#endif
256 263
257 return true; 264 return true;
258} 265}
… …
332 */ 339 */
333 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 340 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
334 rs[Rs_display_name] = ":0"; 341 rs[Rs_display_name] = ":0";
335 342
336 get_options (r_argc, r_argv); 343 get_options (r_argc, r_argv);
337 free (r_argv);
338 344
339#ifdef LOCAL_X_IS_UNIX 345#ifdef LOCAL_X_IS_UNIX
340 if (rs[Rs_display_name][0] == ':') 346 if (rs[Rs_display_name][0] == ':')
341 { 347 {
342 val = rxvt_malloc (5 + strlen (rs[Rs_display_name])); 348 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
… …
349 355
350 if (!display 356 if (!display
351 && ! (display = displays.get (rs[Rs_display_name]))) 357 && ! (display = displays.get (rs[Rs_display_name])))
352 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 358 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
353 359
354 extract_resources (display->display, rs[Rs_name]); 360 extract_resources ();
361 free (r_argv);
355 362
356 /* 363 /*
357 * set any defaults not already set 364 * set any defaults not already set
358 */ 365 */
359 if (cmd_argv && cmd_argv[0]) 366 if (cmd_argv && cmd_argv[0])
… …
377#if ENABLE_FRILLS 384#if ENABLE_FRILLS
378 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 385 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
379 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 386 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */
380 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 387 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
381 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 388 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */
382#endif
383
384#ifndef NO_LINESPACE
385 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 389 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
386 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 390 TermWin.lineSpace = min (i, 100); /* arbitrary limit */
387#endif 391#endif
388 392
389#ifdef POINTER_BLANK 393#ifdef POINTER_BLANK
… …
601 this->locale = rxvt_strdup (this->locale); 605 this->locale = rxvt_strdup (this->locale);
602 SET_LOCALE (this->locale); 606 SET_LOCALE (this->locale);
603 mbstate.reset (); 607 mbstate.reset ();
604#endif 608#endif
605 609
606#if 0
607#if HAVE_NL_LANGINFO 610#if HAVE_NL_LANGINFO
608 char *codeset = strdup (nl_langinfo (CODESET)); 611 char *codeset = strdup (nl_langinfo (CODESET));
609 enc_utf8 = !strcasecmp (codeset, "UTF-8") 612 // /^UTF.?8/i
610 || !strcasecmp (codeset, "UTF8"); 613 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
614 && (codeset[1] == 'T' || codeset[1] == 't')
615 && (codeset[2] == 'F' || codeset[2] == 'f')
616 && (codeset[3] == '8' || codeset[4] == '8');
611 free (codeset); 617 free (codeset);
612#else 618#else
613 enc_utf8 = 0; 619 enc_utf8 = 0;
614#endif
615#endif 620#endif
616} 621}
617 622
618void 623void
619rxvt_term::init_xlocale () 624rxvt_term::init_xlocale ()
… …
670 if (scrollbar_visible ()) 675 if (scrollbar_visible ())
671 { 676 {
672 priv_modes |= PrivMode_scrollBar; 677 priv_modes |= PrivMode_scrollBar;
673 SavedModes |= PrivMode_scrollBar; 678 SavedModes |= PrivMode_scrollBar;
674 } 679 }
680
675 if (menubar_visible ()) 681 if (menubar_visible ())
676 { 682 {
677 priv_modes |= PrivMode_menuBar; 683 priv_modes |= PrivMode_menuBar;
678 SavedModes |= PrivMode_menuBar; 684 SavedModes |= PrivMode_menuBar;
679 } 685 }
… …
827 * Use resource ``modifier'' to override the Meta modifier 833 * Use resource ``modifier'' to override the Meta modifier
828 */ 834 */
829void 835void
830rxvt_term::get_ourmods () 836rxvt_term::get_ourmods ()
831{ 837{
832 int i, j, k; 838 int i, j, k;
833 int requestedmeta, realmeta, realalt; 839 int requestedmeta, realmeta, realalt;
834 const char *cm, *rsmod; 840 const char *cm, *rsmod;
835 XModifierKeymap *map; 841 XModifierKeymap *map;
836 KeyCode *kc; 842 KeyCode *kc;
837 const unsigned int modmasks[] = 843 const unsigned int modmasks[] =
838 { 844 {
839 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 845 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
840 }; 846 };
841 847
842 requestedmeta = realmeta = realalt = 0; 848 requestedmeta = realmeta = realalt = 0;
843 rsmod = rs[Rs_modifier]; 849 rsmod = rs[Rs_modifier];
850
844 if (rsmod 851 if (rsmod
845 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 852 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
846 requestedmeta = rsmod[3] - '0'; 853 requestedmeta = rsmod[3] - '0';
847 854
848 map = XGetModifierMapping (display->display); 855 map = XGetModifierMapping (display->display);
849 kc = map->modifiermap; 856 kc = map->modifiermap;
857
850 for (i = 1; i < 6; i++) 858 for (i = 1; i < 6; i++)
851 { 859 {
852 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 860 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
861
853 for (j = map->max_keypermod; j--; k++) 862 for (j = map->max_keypermod; j--; k++)
854 { 863 {
855 if (kc[k] == 0) 864 if (kc[k] == 0)
856 break; 865 break;
866
857 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 867 switch (XKeycodeToKeysym (display->display, kc[k], 0))
858 { 868 {
859 case XK_Num_Lock: 869 case XK_Num_Lock:
860 ModNumLockMask = modmasks[i - 1]; 870 ModNumLockMask = modmasks[i - 1];
861 /* FALLTHROUGH */ 871 continue;
862 default: 872
863 continue; /* for (;;) */ 873 case XK_ISO_Level3_Shift:
874 ModLevel3Mask = modmasks[i - 1];
875 continue;
876
864 case XK_Meta_L: 877 case XK_Meta_L:
865 case XK_Meta_R: 878 case XK_Meta_R:
866 cm = "meta"; 879 cm = "meta";
867 realmeta = i; 880 realmeta = i;
868 break; 881 break;
882
869 case XK_Alt_L: 883 case XK_Alt_L:
870 case XK_Alt_R: 884 case XK_Alt_R:
871 cm = "alt"; 885 cm = "alt";
872 realalt = i; 886 realalt = i;
873 break; 887 break;
888
874 case XK_Super_L: 889 case XK_Super_L:
875 case XK_Super_R: 890 case XK_Super_R:
876 cm = "super"; 891 cm = "super";
877 break; 892 break;
893
878 case XK_Hyper_L: 894 case XK_Hyper_L:
879 case XK_Hyper_R: 895 case XK_Hyper_R:
880 cm = "hyper"; 896 cm = "hyper";
881 break; 897 break;
898
899 default:
900 continue;
882 } 901 }
902
883 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0) 903 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
884 requestedmeta = i; 904 requestedmeta = i;
885 } 905 }
886 } 906 }
907
887 XFreeModifiermap (map); 908 XFreeModifiermap (map);
909
888 i = (requestedmeta ? requestedmeta 910 i = requestedmeta ? requestedmeta
889 : (realmeta ? realmeta 911 : realmeta ? realmeta
890 : (realalt ? realalt : 0))); 912 : realalt ? realalt
913 : 0;
914
891 if (i) 915 if (i)
892 ModMetaMask = modmasks[i - 1]; 916 ModMetaMask = modmasks[i - 1];
893} 917}
894 918
895/*----------------------------------------------------------------------*/ 919/*----------------------------------------------------------------------*/
… …
905#endif 929#endif
906 XGCValues gcvalue; 930 XGCValues gcvalue;
907 long vt_emask; 931 long vt_emask;
908 XSetWindowAttributes attributes; 932 XSetWindowAttributes attributes;
909 XWindowAttributes gattr; 933 XWindowAttributes gattr;
934 Window top;
935 dDisp;
910 936
911#ifdef USING_W11LIB 937#ifdef USING_W11LIB
912 /* enable W11 callbacks */ 938 /* enable W11 callbacks */
913 W11AddEventHandler (display->display, rxvt_W11_process_x_event); 939 W11AddEventHandler (disp, rxvt_W11_process_x_event);
914#endif 940#endif
915 941
916 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 942 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
917 XInternAtoms (display->display, (char **)xa_names, NUM_XA, False, xa); 943 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
918 944
919 if (options & Opt_transparent) 945 if (options & Opt_transparent)
920 { 946 {
921 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 947 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
922 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 948 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
923 } 949 }
924 950
925#if ENABLE_FRILLS 951#if ENABLE_FRILLS
926 if (options & Opt_borderLess) 952 if (options & Opt_borderLess)
927 { 953 {
928 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 954 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
929 955
930 if (prop == None) 956 if (prop == None)
931 { 957 {
932 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 958 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
933#ifdef PREFER_24BIT 959#ifdef PREFER_24BIT
… …
951 Get_Colours (); 977 Get_Colours ();
952 978
953 if (!set_fonts ()) 979 if (!set_fonts ())
954 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 980 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
955 981
982#if ENABLE_XEMBED
983 if (rs[Rs_embed])
984 {
985 XWindowAttributes wattr;
986
987 top = strtol (rs[Rs_embed], 0, 0);
988
989 if (!XGetWindowAttributes (disp, top, &wattr))
990 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
991
992 window_calc (wattr.width, wattr.height);
993
994#if 0
995 if (wattr.map_state == IsViewable)
996 {
997 TermWin.mapped = 1;
998 refresh_type = FAST_REFRESH;
999 XClearWindow (disp, top);
1000 // TODO: make XMapNotify-event-code a function and call it
1001 // TODO: how can I detetc visibility without unmpa/map?
1002 // TODO: focusin etc.
1003 }
1004#else
1005 // it'S easiets just to unmap/map to get all state correctly set-up
1006 XUnmapWindow (disp, top);
1007#endif
1008 }
1009 else
1010#endif
1011 {
956 window_calc (0, 0); 1012 window_calc (0, 0);
1013
1014 /* sub-window placement & size in rxvt_resize_subwindows () */
1015#ifdef PREFER_24BIT
1016 attributes.background_pixel = pix_colors_focused[Color_border];
1017 attributes.border_pixel = pix_colors_focused[Color_border];
1018 attributes.colormap = display->cmap;
1019 top = XCreateWindow (disp, DefaultRootWindow (disp),
1020 szHint.x, szHint.y,
1021 szHint.width, szHint.height,
1022 TermWin.ext_bwidth,
1023 display->depth, InputOutput,
1024 display->visual,
1025 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1026#else
1027 top = XCreateSimpleWindow (disp, DefaultRootWindow (disp),
1028 szHint.x, szHint.y,
1029 szHint.width, szHint.height,
1030 TermWin.ext_bwidth,
1031 pix_colors_focused[Color_border],
1032 pix_colors_focused[Color_border]);
1033#endif
1034 }
1035
1036 TermWin.parent[0] = top;
1037
957 old_width = szHint.width; 1038 old_width = szHint.width;
958 old_height = szHint.height; 1039 old_height = szHint.height;
959
960 /* sub-window placement & size in rxvt_resize_subwindows () */
961
962#ifdef PREFER_24BIT
963 attributes.background_pixel = pix_colors_focused[Color_border];
964 attributes.border_pixel = pix_colors_focused[Color_border];
965 attributes.colormap = display->cmap;
966 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
967 szHint.x, szHint.y,
968 szHint.width, szHint.height,
969 TermWin.ext_bwidth,
970 display->depth, InputOutput,
971 display->visual,
972 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
973#else
974 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
975 szHint.x, szHint.y,
976 szHint.width, szHint.height,
977 TermWin.ext_bwidth,
978 pix_colors_focused[Color_border],
979 pix_colors_focused[Color_border]);
980#endif
981 1040
982 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1041 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
983 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1042 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
984 1043
985 classHint.res_name = (char *)rs[Rs_name]; 1044 classHint.res_name = (char *)rs[Rs_name];
986 classHint.res_class = (char *)RESCLASS; 1045 classHint.res_class = (char *)RESCLASS;
987 1046
988 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1047 wmHint.flags = InputHint | StateHint | WindowGroupHint;
989 wmHint.input = True; 1048 wmHint.input = True;
990 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1049 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
991 wmHint.window_group = TermWin.parent[0]; 1050 wmHint.window_group = top;
992 1051
993 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1052 XSetWMProperties (disp, top, NULL, NULL,
994 (char **)argv, argc, &szHint, &wmHint, &classHint); 1053 (char **)argv, argc, &szHint, &wmHint, &classHint);
995 1054
996 /* Enable delete window protocol */ 1055 /* Enable delete window protocol */
997 XSetWMProtocols (display->display, TermWin.parent[0], 1056 XSetWMProtocols (disp, top, &xa[XA_WM_DELETE_WINDOW], 1);
998 &xa[XA_WMDELETEWINDOW], 1);
999 1057
1000#if ENABLE_FRILLS 1058#if ENABLE_FRILLS
1001 long pid = getpid (); 1059 long pid = getpid ();
1002 1060
1003 XChangeProperty (display->display, TermWin.parent[0], 1061 XChangeProperty (disp, top,
1004 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1062 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1005 PropModeReplace, (unsigned char *)&pid, 1); 1063 PropModeReplace, (unsigned char *)&pid, 1);
1006#endif 1064#endif
1007 1065
1008 XSelectInput (display->display, TermWin.parent[0], 1066 XSelectInput (disp, top,
1009 KeyPressMask 1067 KeyPressMask
1010#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1068#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1011 | KeyReleaseMask 1069 | KeyReleaseMask
1012#endif 1070#endif
1013 | FocusChangeMask | VisibilityChangeMask 1071 | FocusChangeMask | VisibilityChangeMask
1014 | ExposureMask
1015 | StructureNotifyMask); 1072 | ExposureMask | StructureNotifyMask);
1073
1016 termwin_ev.start (display, TermWin.parent[0]); 1074 termwin_ev.start (display, top);
1017 1075
1018#if ENABLE_FRILLS 1076#if ENABLE_FRILLS
1019 if (mwmhints.flags) 1077 if (mwmhints.flags)
1020 XChangeProperty (display->display, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1078 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1021 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1079 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1022#endif 1080#endif
1023 1081
1024 /* vt cursor: Black-on-White is standard, but this is more popular */ 1082 /* vt cursor: Black-on-White is standard, but this is more popular */
1025 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1083 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1026 1084
1027#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1085#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1028 /* cursor (menuBar/scrollBar): Black-on-White */ 1086 /* cursor (menuBar/scrollBar): Black-on-White */
1029 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1087 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1030#endif
1031
1032#ifdef POINTER_BLANK
1033 {
1034 XColor blackcolour;
1035 blackcolour.red = 0;
1036 blackcolour.green = 0;
1037 blackcolour.blue = 0;
1038 Font f = XLoadFont (display->display, "fixed");
1039 blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1040 &blackcolour, &blackcolour);
1041 XUnloadFont (display->display, f);
1042 }
1043#endif 1088#endif
1044 1089
1045 /* the vt window */ 1090 /* the vt window */
1046 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1091 TermWin.vt = XCreateSimpleWindow (disp, top,
1047 window_vt_x, 1092 window_vt_x,
1048 window_vt_y, 1093 window_vt_y,
1049 TermWin_TotalWidth (), 1094 TermWin_TotalWidth (),
1050 TermWin_TotalHeight (), 1095 TermWin_TotalHeight (),
1051 0, 1096 0,
1052 pix_colors_focused[Color_fg], 1097 pix_colors_focused[Color_fg],
1053 pix_colors_focused[Color_bg]); 1098 pix_colors_focused[Color_bg]);
1054#ifdef DEBUG_X 1099#ifdef DEBUG_X
1055 XStoreName (display->display, TermWin.vt, "vt window"); 1100 XStoreName (disp, TermWin.vt, "vt window");
1056#endif 1101#endif
1057 1102
1058 attributes.bit_gravity = NorthWestGravity; 1103 attributes.bit_gravity = NorthWestGravity;
1059 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1104 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);
1060 1105
1061 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1106 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1062 1107
1063 pointer_unblank (); 1108 pointer_unblank ();
1064 1109
… …
1067 vt_emask |= PointerMotionMask; 1112 vt_emask |= PointerMotionMask;
1068 else 1113 else
1069#endif 1114#endif
1070 vt_emask |= Button1MotionMask | Button3MotionMask; 1115 vt_emask |= Button1MotionMask | Button3MotionMask;
1071 1116
1072 XSelectInput (display->display, TermWin.vt, vt_emask); 1117 XSelectInput (disp, TermWin.vt, vt_emask);
1073 vt_ev.start (display, TermWin.vt); 1118 vt_ev.start (display, TermWin.vt);
1074 1119
1075#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1120#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1076 if (menuBar_height ()) 1121 if (menuBar_height ())
1077 { 1122 {
1078 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1123 menuBar.win = XCreateSimpleWindow (disp, top,
1079 window_vt_x, 0, 1124 window_vt_x, 0,
1080 TermWin_TotalWidth (), 1125 TermWin_TotalWidth (),
1081 menuBar_TotalHeight (), 1126 menuBar_TotalHeight (),
1082 0, 1127 0,
1083 pix_colors_focused[Color_fg], 1128 pix_colors_focused[Color_fg],
1084 pix_colors_focused[Color_scroll]); 1129 pix_colors_focused[Color_scroll]);
1085 1130
1086#ifdef DEBUG_X 1131#ifdef DEBUG_X
1087 XStoreName (display->display, menuBar.win, "menubar"); 1132 XStoreName (disp, menuBar.win, "menubar");
1088#endif 1133#endif
1089 1134
1090 menuBar.drawable = new rxvt_drawable (display, menuBar.win); 1135 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1091 1136
1092 XDefineCursor (display->display, menuBar.win, 1137 XDefineCursor (disp, menuBar.win,
1093 XCreateFontCursor (display->display, XC_left_ptr)); 1138 XCreateFontCursor (disp, XC_left_ptr));
1094 1139
1095 XSelectInput (display->display, menuBar.win, 1140 XSelectInput (disp, menuBar.win,
1096 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1141 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1097 | Button1MotionMask));
1098 menubar_ev.start (display, menuBar.win); 1142 menubar_ev.start (display, menuBar.win);
1099 } 1143 }
1100#endif 1144#endif
1101 1145
1102#ifdef XPM_BACKGROUND 1146#ifdef XPM_BACKGROUND
… …
1118 1162
1119 /* graphics context for the vt window */ 1163 /* graphics context for the vt window */
1120 gcvalue.foreground = pix_colors[Color_fg]; 1164 gcvalue.foreground = pix_colors[Color_fg];
1121 gcvalue.background = pix_colors[Color_bg]; 1165 gcvalue.background = pix_colors[Color_bg];
1122 gcvalue.graphics_exposures = 1; 1166 gcvalue.graphics_exposures = 1;
1123 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1167 TermWin.gc = XCreateGC (disp, TermWin.vt,
1124 GCForeground | GCBackground | GCGraphicsExposures, 1168 GCForeground | GCBackground | GCGraphicsExposures,
1125 &gcvalue); 1169 &gcvalue);
1126 1170
1127 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1171 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1128 1172
1129#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1173#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1130 gcvalue.foreground = pix_colors[Color_topShadow]; 1174 gcvalue.foreground = pix_colors[Color_topShadow];
1131 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1175 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1132 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1176 gcvalue.foreground = pix_colors[Color_bottomShadow];
1133 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1177 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1134 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1178 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1135 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1179 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1136#endif 1180#endif
1137 1181
1138#ifdef OFF_FOCUS_FADING 1182#ifdef OFF_FOCUS_FADING
1139 // initially we are in unfocused state 1183 // initially we are in unfocused state
1140 if (rs[Rs_fade]) 1184 if (rs[Rs_fade])
… …
1378 * the slave. 1422 * the slave.
1379 */ 1423 */
1380void 1424void
1381rxvt_term::run_command (const char *const *argv) 1425rxvt_term::run_command (const char *const *argv)
1382{ 1426{
1427#if ENABLE_FRILLS
1428 if (rs[Rs_pty_fd])
1429 {
1430 pty.pty = atoi (rs[Rs_pty_fd]);
1431 fcntl (pty.pty, F_SETFL, O_NONBLOCK);
1432 }
1433 else
1434#endif
1435 if (!pty.get ())
1436 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1437
1438 pty.set_utf8_mode (enc_utf8);
1439
1440 /* set initial window size */
1441 tt_winch ();
1442
1383 int er; 1443 int er;
1384
1385 if (!pty.get ())
1386 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1387 1444
1388#ifndef NO_BACKSPACE_KEY 1445#ifndef NO_BACKSPACE_KEY
1389 if (key_backspace[0] && !key_backspace[1]) 1446 if (key_backspace[0] && !key_backspace[1])
1390 er = key_backspace[0]; 1447 er = key_backspace[0];
1391 else if (strcmp (key_backspace, "DEC") == 0) 1448 else if (strcmp (key_backspace, "DEC") == 0)
… …
1394#endif 1451#endif
1395 er = -1; 1452 er = -1;
1396 1453
1397 rxvt_get_ttymode (&tio, er); 1454 rxvt_get_ttymode (&tio, er);
1398 1455
1399 /* set initial window size */ 1456#if ENABLE_FRILLS
1400 tt_winch (); 1457 if (rs[Rs_pty_fd])
1458 return;
1459#endif
1401 1460
1402 sw_chld.start (SIGCHLD); 1461 sw_chld.start (SIGCHLD);
1403 1462
1404#ifndef __QNX__ 1463#ifndef __QNX__
1405 /* spin off the command interpreter */ 1464 /* spin off the command interpreter */
1406 switch (cmd_pid = fork ()) 1465 switch (cmd_pid = fork ())
1407 { 1466 {
1408 case -1: 1467 case -1:
1468 {
1469 cmd_pid = 0;
1409 rxvt_fatal ("can't fork, aborting.\n"); 1470 rxvt_fatal ("can't fork, aborting.\n");
1471 }
1410 case 0: 1472 case 0:
1411 init_env (); 1473 init_env ();
1412 1474
1413 if (!pty.make_controlling_tty ()) 1475 if (!pty.make_controlling_tty ())
1414 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1476 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);

Diff Legend

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