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

Diff Legend

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