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

Diff Legend

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