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.93 by root, Sun Oct 24 14:02:44 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 <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,
… …
167#if TINTING 171#if TINTING
168 NULL, 172 NULL,
169#endif 173#endif
170 }; 174 };
171 175
172const char *const xa_names[NUM_XA] = 176const char *const xa_names[] =
173 { 177 {
174 "TEXT", 178 "TEXT",
175 "COMPOUND_TEXT", 179 "COMPOUND_TEXT",
176 "UTF8_STRING", 180 "UTF8_STRING",
177 "MULTIPLE", 181 "MULTIPLE",
178 "TARGETS", 182 "TARGETS",
179 "TIMESTAMP", 183 "TIMESTAMP",
180 "VT_SELECTION", 184 "VT_SELECTION",
181 "INCR", 185 "INCR",
182 "WM_DELETE_WINDOW", 186 "WM_DELETE_WINDOW",
187 "CLIPBOARD",
188#if ENABLE_FRILLS
189 "_NET_WM_PID",
190 "_MOTIF_WM_HINTS",
191 "_NET_WM_NAME",
192 "_NET_WM_ICON_NAME",
193#endif
194#if USE_XIM
195 "WM_LOCALE_NAME",
196#endif
183#ifdef TRANSPARENT 197#ifdef TRANSPARENT
184 "_XROOTPMAP_ID", 198 "_XROOTPMAP_ID",
199 "ESETROOT_PMAP_ID",
185#endif 200#endif
186#ifdef OFFIX_DND 201#ifdef OFFIX_DND
187 "DndProtocol", 202 "DndProtocol",
188 "DndSelection", 203 "DndSelection",
189#endif 204#endif
190 "CLIPBOARD"
191 }; 205 };
192 206
193bool 207bool
194rxvt_term::init_vars () 208rxvt_term::init_vars ()
195{ 209{
196 sw_term.start (SIGTERM); 210 sw_term.start (SIGTERM);
211 sw_int.start (SIGINT);
197 212
198 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 213 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
199#ifdef OFF_FOCUS_FADING 214#ifdef OFF_FOCUS_FADING
200 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 215 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
201#endif 216#endif
… …
210 225
211 MEvent.time = CurrentTime; 226 MEvent.time = CurrentTime;
212 MEvent.button = AnyButton; 227 MEvent.button = AnyButton;
213 options = DEFAULT_OPTIONS; 228 options = DEFAULT_OPTIONS;
214 want_refresh = 1; 229 want_refresh = 1;
215 cmd_pid = -1;
216 pty.pty = pty.tty = -1;
217 priv_modes = SavedModes = PrivMode_Default; 230 priv_modes = SavedModes = PrivMode_Default;
218 TermWin.focus = 0; 231 TermWin.focus = 0;
219 TermWin.ncol = 80; 232 TermWin.ncol = 80;
220 TermWin.nrow = 24; 233 TermWin.nrow = 24;
221 TermWin.int_bwidth = INTERNALBORDERWIDTH; 234 TermWin.int_bwidth = INTERNALBORDERWIDTH;
… …
238 last_bot = last_state = -1; 251 last_bot = last_state = -1;
239 252
240#ifdef MENUBAR 253#ifdef MENUBAR
241 menu_readonly = 1; 254 menu_readonly = 1;
242# if ! (MENUBAR_MAX > 1) 255# if ! (MENUBAR_MAX > 1)
243 CurrentBar = & (BarList); 256 CurrentBar = &BarList;
244# endif /* (MENUBAR_MAX > 1) */ 257# endif /* (MENUBAR_MAX > 1) */
245#endif 258#endif
246 259
247 return true; 260 return true;
248} 261}
… …
322 */ 335 */
323 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 336 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
324 rs[Rs_display_name] = ":0"; 337 rs[Rs_display_name] = ":0";
325 338
326 get_options (r_argc, r_argv); 339 get_options (r_argc, r_argv);
327 free (r_argv);
328 340
329#ifdef LOCAL_X_IS_UNIX 341#ifdef LOCAL_X_IS_UNIX
330 if (rs[Rs_display_name][0] == ':') 342 if (rs[Rs_display_name][0] == ':')
331 { 343 {
332 val = rxvt_malloc (5 + strlen (rs[Rs_display_name])); 344 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
… …
339 351
340 if (!display 352 if (!display
341 && ! (display = displays.get (rs[Rs_display_name]))) 353 && ! (display = displays.get (rs[Rs_display_name])))
342 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]);
343 355
344 extract_resources (display->display, rs[Rs_name]); 356 extract_resources ();
357 free (r_argv);
345 358
346 /* 359 /*
347 * set any defaults not already set 360 * set any defaults not already set
348 */ 361 */
349 if (cmd_argv && cmd_argv[0]) 362 if (cmd_argv && cmd_argv[0])
… …
367#if ENABLE_FRILLS 380#if ENABLE_FRILLS
368 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)
369 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 382 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */
370 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)
371 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 384 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */
372#endif
373
374#ifndef NO_LINESPACE
375 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 385 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
376 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 386 TermWin.lineSpace = min (i, 100); /* arbitrary limit */
377#endif 387#endif
378 388
379#ifdef POINTER_BLANK 389#ifdef POINTER_BLANK
… …
590 600
591 this->locale = rxvt_strdup (this->locale); 601 this->locale = rxvt_strdup (this->locale);
592 SET_LOCALE (this->locale); 602 SET_LOCALE (this->locale);
593 mbstate.reset (); 603 mbstate.reset ();
594#endif 604#endif
595#if 0 605
596#if HAVE_NL_LANGINFO 606#if HAVE_NL_LANGINFO
607 char *codeset = strdup (nl_langinfo (CODESET));
608 // /^UTF.?8/i
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');
597 free (codeset); 613 free (codeset);
598 codeset = strdup (nl_langinfo (CODESET));
599 enc_utf8 = !strcasecmp (codeset, "UTF-8")
600 || !strcasecmp (codeset, "UTF8");
601#else 614#else
602 enc_utf8 = 1; 615 enc_utf8 = 0;
603#endif
604#endif 616#endif
605} 617}
606 618
607void 619void
608rxvt_term::init_xlocale () 620rxvt_term::init_xlocale ()
… …
610#ifdef USE_XIM 622#ifdef USE_XIM
611 if (!locale) 623 if (!locale)
612 rxvt_warn ("setting locale failed, working without locale support.\n"); 624 rxvt_warn ("setting locale failed, working without locale support.\n");
613 else 625 else
614 { 626 {
615 Atom wmlocale; 627 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
616
617 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
618 XChangeProperty (display->display, TermWin.parent[0], wmlocale,
619 XA_STRING, 8, PropModeReplace,
620 (unsigned char *)locale, strlen (locale));
621 628
622 if (!XSupportsLocale ()) 629 if (!XSupportsLocale ())
623 { 630 {
624 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 631 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n");
625 return; 632 return;
… …
639{ 646{
640 /* 647 /*
641 * Initialize the command connection. 648 * Initialize the command connection.
642 * This should be called after the X server connection is established. 649 * This should be called after the X server connection is established.
643 */ 650 */
644 int i;
645
646 for (i = 0; i < NUM_XA; i++)
647 xa[i] = XInternAtom (display->display, xa_names[i], False);
648
649 /* Enable delete window protocol */
650 XSetWMProtocols (display->display, TermWin.parent[0],
651 & (xa[XA_WMDELETEWINDOW]), 1);
652
653#ifdef USING_W11LIB
654 /* enable W11 callbacks */
655 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
656#endif
657 651
658#ifdef META8_OPTION 652#ifdef META8_OPTION
659 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 653 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC);
660#endif 654#endif
661 655
… …
677 if (scrollbar_visible ()) 671 if (scrollbar_visible ())
678 { 672 {
679 priv_modes |= PrivMode_scrollBar; 673 priv_modes |= PrivMode_scrollBar;
680 SavedModes |= PrivMode_scrollBar; 674 SavedModes |= PrivMode_scrollBar;
681 } 675 }
676
682 if (menubar_visible ()) 677 if (menubar_visible ())
683 { 678 {
684 priv_modes |= PrivMode_menuBar; 679 priv_modes |= PrivMode_menuBar;
685 SavedModes |= PrivMode_menuBar; 680 SavedModes |= PrivMode_menuBar;
686 } 681 }
… …
834 * Use resource ``modifier'' to override the Meta modifier 829 * Use resource ``modifier'' to override the Meta modifier
835 */ 830 */
836void 831void
837rxvt_term::get_ourmods () 832rxvt_term::get_ourmods ()
838{ 833{
839 int i, j, k; 834 int i, j, k;
840 int requestedmeta, realmeta, realalt; 835 int requestedmeta, realmeta, realalt;
841 const char *cm, *rsmod; 836 const char *cm, *rsmod;
842 XModifierKeymap *map; 837 XModifierKeymap *map;
843 KeyCode *kc; 838 KeyCode *kc;
844 const unsigned int modmasks[] = 839 const unsigned int modmasks[] =
845 { 840 {
846 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 841 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
847 }; 842 };
848 843
849 requestedmeta = realmeta = realalt = 0; 844 requestedmeta = realmeta = realalt = 0;
850 rsmod = rs[Rs_modifier]; 845 rsmod = rs[Rs_modifier];
846
851 if (rsmod 847 if (rsmod
852 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 848 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
853 requestedmeta = rsmod[3] - '0'; 849 requestedmeta = rsmod[3] - '0';
854 850
855 map = XGetModifierMapping (display->display); 851 map = XGetModifierMapping (display->display);
856 kc = map->modifiermap; 852 kc = map->modifiermap;
853
857 for (i = 1; i < 6; i++) 854 for (i = 1; i < 6; i++)
858 { 855 {
859 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 856 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
857
860 for (j = map->max_keypermod; j--; k++) 858 for (j = map->max_keypermod; j--; k++)
861 { 859 {
862 if (kc[k] == 0) 860 if (kc[k] == 0)
863 break; 861 break;
862
864 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 863 switch (XKeycodeToKeysym (display->display, kc[k], 0))
865 { 864 {
866 case XK_Num_Lock: 865 case XK_Num_Lock:
867 ModNumLockMask = modmasks[i - 1]; 866 ModNumLockMask = modmasks[i - 1];
868 /* FALLTHROUGH */ 867 continue;
869 default: 868
870 continue; /* for (;;) */ 869 case XK_ISO_Level3_Shift:
870 ModLevel3Mask = modmasks[i - 1];
871 continue;
872
871 case XK_Meta_L: 873 case XK_Meta_L:
872 case XK_Meta_R: 874 case XK_Meta_R:
873 cm = "meta"; 875 cm = "meta";
874 realmeta = i; 876 realmeta = i;
875 break; 877 break;
878
876 case XK_Alt_L: 879 case XK_Alt_L:
877 case XK_Alt_R: 880 case XK_Alt_R:
878 cm = "alt"; 881 cm = "alt";
879 realalt = i; 882 realalt = i;
880 break; 883 break;
884
881 case XK_Super_L: 885 case XK_Super_L:
882 case XK_Super_R: 886 case XK_Super_R:
883 cm = "super"; 887 cm = "super";
884 break; 888 break;
889
885 case XK_Hyper_L: 890 case XK_Hyper_L:
886 case XK_Hyper_R: 891 case XK_Hyper_R:
887 cm = "hyper"; 892 cm = "hyper";
888 break; 893 break;
894
895 default:
896 continue;
889 } 897 }
898
890 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0) 899 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
891 requestedmeta = i; 900 requestedmeta = i;
892 } 901 }
893 } 902 }
903
894 XFreeModifiermap (map); 904 XFreeModifiermap (map);
905
895 i = (requestedmeta ? requestedmeta 906 i = requestedmeta ? requestedmeta
896 : (realmeta ? realmeta 907 : realmeta ? realmeta
897 : (realalt ? realalt : 0))); 908 : realalt ? realalt
909 : 0;
910
898 if (i) 911 if (i)
899 ModMetaMask = modmasks[i - 1]; 912 ModMetaMask = modmasks[i - 1];
900} 913}
901 914
902/*----------------------------------------------------------------------*/ 915/*----------------------------------------------------------------------*/
… …
912#endif 925#endif
913 XGCValues gcvalue; 926 XGCValues gcvalue;
914 long vt_emask; 927 long vt_emask;
915 XSetWindowAttributes attributes; 928 XSetWindowAttributes attributes;
916 XWindowAttributes gattr; 929 XWindowAttributes gattr;
930 Window top;
931 dDisp;
932
933#ifdef USING_W11LIB
934 /* enable W11 callbacks */
935 W11AddEventHandler (disp, rxvt_W11_process_x_event);
936#endif
937
938 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
939 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
917 940
918 if (options & Opt_transparent) 941 if (options & Opt_transparent)
919 { 942 {
920 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 943 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
921 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 944 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
922 } 945 }
923 946
924#if ENABLE_FRILLS 947#if ENABLE_FRILLS
925 if (options & Opt_borderLess) 948 if (options & Opt_borderLess)
926 { 949 {
927 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 950 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
928 951
929 if (prop == None) 952 if (prop == None)
930 { 953 {
931 /* 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");*/
932#ifdef PREFER_24BIT 955#ifdef PREFER_24BIT
… …
948 971
949 /* grab colors before netscape does */ 972 /* grab colors before netscape does */
950 Get_Colours (); 973 Get_Colours ();
951 974
952 if (!set_fonts ()) 975 if (!set_fonts ())
953 rxvt_fatal ("unable to load base fontset, please specify one using -fn, aborting.\n"); 976 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
954 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 {
955 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
956 old_width = szHint.width; 1032 old_width = szHint.width;
957 old_height = szHint.height; 1033 old_height = szHint.height;
958
959 /* sub-window placement & size in rxvt_resize_subwindows () */
960
961#ifdef PREFER_24BIT
962 attributes.background_pixel = pix_colors_focused[Color_border];
963 attributes.border_pixel = pix_colors_focused[Color_border];
964 attributes.colormap = display->cmap;
965 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
966 szHint.x, szHint.y,
967 szHint.width, szHint.height,
968 TermWin.ext_bwidth,
969 display->depth, InputOutput,
970 display->visual,
971 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
972#else
973 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
974 szHint.x, szHint.y,
975 szHint.width, szHint.height,
976 TermWin.ext_bwidth,
977 pix_colors_focused[Color_border],
978 pix_colors_focused[Color_border]);
979#endif
980 1034
981 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1035 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
982 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1036 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
983 1037
984 classHint.res_name = (char *)rs[Rs_name]; 1038 classHint.res_name = (char *)rs[Rs_name];
985 classHint.res_class = (char *)RESCLASS; 1039 classHint.res_class = (char *)RESCLASS;
986 1040
987 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1041 wmHint.flags = InputHint | StateHint | WindowGroupHint;
988 wmHint.input = True; 1042 wmHint.input = True;
989 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1043 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
990 wmHint.window_group = TermWin.parent[0]; 1044 wmHint.window_group = top;
991 1045
992 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1046 XSetWMProperties (disp, top, NULL, NULL,
993 (char **)argv, argc, &szHint, &wmHint, &classHint); 1047 (char **)argv, argc, &szHint, &wmHint, &classHint);
1048
1049 /* Enable delete window protocol */
1050 XSetWMProtocols (disp, top, &xa[XA_WMDELETEWINDOW], 1);
994 1051
995#if ENABLE_FRILLS 1052#if ENABLE_FRILLS
996 long pid = getpid (); 1053 long pid = getpid ();
997 1054
998 XChangeProperty (display->display, TermWin.parent[0], 1055 XChangeProperty (disp, top,
999 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32, 1056 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1000 PropModeReplace, (unsigned char *)&pid, 1); 1057 PropModeReplace, (unsigned char *)&pid, 1);
1001#endif 1058#endif
1002 1059
1003 XSelectInput (display->display, TermWin.parent[0], 1060 XSelectInput (disp, top,
1004 KeyPressMask 1061 KeyPressMask
1005#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1062#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1006 | KeyReleaseMask 1063 | KeyReleaseMask
1007#endif 1064#endif
1008 | FocusChangeMask | VisibilityChangeMask 1065 | FocusChangeMask | VisibilityChangeMask
1009 | ExposureMask 1066 | ExposureMask
1010 | StructureNotifyMask); 1067 | StructureNotifyMask);
1011 termwin_ev.start (display, TermWin.parent[0]); 1068 termwin_ev.start (display, top);
1012 1069
1013#if ENABLE_FRILLS 1070#if ENABLE_FRILLS
1014 if (mwmhints.flags) 1071 if (mwmhints.flags)
1015 { 1072 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1016 prop = XInternAtom (display->display, "_MOTIF_WM_HINTS", False);
1017 XChangeProperty (display->display, TermWin.parent[0], prop, prop, 32,
1018 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1073 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1019 }
1020#endif 1074#endif
1021 1075
1022 /* 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 */
1023 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1077 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1024 1078
1025#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1079#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1026 /* cursor (menuBar/scrollBar): Black-on-White */ 1080 /* cursor (menuBar/scrollBar): Black-on-White */
1027 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1081 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1028#endif
1029
1030#ifdef POINTER_BLANK
1031 {
1032 XColor blackcolour;
1033 blackcolour.red = 0;
1034 blackcolour.green = 0;
1035 blackcolour.blue = 0;
1036 Font f = XLoadFont (display->display, "fixed");
1037 blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1038 &blackcolour, &blackcolour);
1039 XUnloadFont (display->display, f);
1040 }
1041#endif 1082#endif
1042 1083
1043 /* the vt window */ 1084 /* the vt window */
1044 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1085 TermWin.vt = XCreateSimpleWindow (disp, top,
1045 window_vt_x, 1086 window_vt_x,
1046 window_vt_y, 1087 window_vt_y,
1047 TermWin_TotalWidth (), 1088 TermWin_TotalWidth (),
1048 TermWin_TotalHeight (), 1089 TermWin_TotalHeight (),
1049 0, 1090 0,
1050 pix_colors_focused[Color_fg], 1091 pix_colors_focused[Color_fg],
1051 pix_colors_focused[Color_bg]); 1092 pix_colors_focused[Color_bg]);
1052#ifdef DEBUG_X 1093#ifdef DEBUG_X
1053 XStoreName (display->display, TermWin.vt, "vt window"); 1094 XStoreName (disp, TermWin.vt, "vt window");
1054#endif 1095#endif
1055 1096
1056 attributes.bit_gravity = NorthWestGravity; 1097 attributes.bit_gravity = NorthWestGravity;
1057 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1098 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);
1058 1099
1059 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1100 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1060 1101
1061 pointer_unblank (); 1102 pointer_unblank ();
1062 1103
… …
1065 vt_emask |= PointerMotionMask; 1106 vt_emask |= PointerMotionMask;
1066 else 1107 else
1067#endif 1108#endif
1068 vt_emask |= Button1MotionMask | Button3MotionMask; 1109 vt_emask |= Button1MotionMask | Button3MotionMask;
1069 1110
1070 XSelectInput (display->display, TermWin.vt, vt_emask); 1111 XSelectInput (disp, TermWin.vt, vt_emask);
1071 vt_ev.start (display, TermWin.vt); 1112 vt_ev.start (display, TermWin.vt);
1072 1113
1073#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1114#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1074 if (menuBar_height ()) 1115 if (menuBar_height ())
1075 { 1116 {
1076 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1117 menuBar.win = XCreateSimpleWindow (disp, top,
1077 window_vt_x, 0, 1118 window_vt_x, 0,
1078 TermWin_TotalWidth (), 1119 TermWin_TotalWidth (),
1079 menuBar_TotalHeight (), 1120 menuBar_TotalHeight (),
1080 0, 1121 0,
1081 pix_colors_focused[Color_fg], 1122 pix_colors_focused[Color_fg],
1082 pix_colors_focused[Color_scroll]); 1123 pix_colors_focused[Color_scroll]);
1083 1124
1084#ifdef DEBUG_X 1125#ifdef DEBUG_X
1085 XStoreName (display->display, menuBar.win, "menubar"); 1126 XStoreName (disp, menuBar.win, "menubar");
1086#endif 1127#endif
1087 1128
1088 menuBar.drawable = new rxvt_drawable (display, menuBar.win); 1129 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1089 1130
1090 XDefineCursor (display->display, menuBar.win, 1131 XDefineCursor (disp, menuBar.win,
1091 XCreateFontCursor (display->display, XC_left_ptr)); 1132 XCreateFontCursor (disp, XC_left_ptr));
1092 1133
1093 XSelectInput (display->display, menuBar.win, 1134 XSelectInput (disp, menuBar.win,
1094 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1135 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1095 | Button1MotionMask));
1096 menubar_ev.start (display, menuBar.win); 1136 menubar_ev.start (display, menuBar.win);
1097 } 1137 }
1098#endif 1138#endif
1099 1139
1100#ifdef XPM_BACKGROUND 1140#ifdef XPM_BACKGROUND
… …
1116 1156
1117 /* graphics context for the vt window */ 1157 /* graphics context for the vt window */
1118 gcvalue.foreground = pix_colors[Color_fg]; 1158 gcvalue.foreground = pix_colors[Color_fg];
1119 gcvalue.background = pix_colors[Color_bg]; 1159 gcvalue.background = pix_colors[Color_bg];
1120 gcvalue.graphics_exposures = 1; 1160 gcvalue.graphics_exposures = 1;
1121 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1161 TermWin.gc = XCreateGC (disp, TermWin.vt,
1122 GCForeground | GCBackground | GCGraphicsExposures, 1162 GCForeground | GCBackground | GCGraphicsExposures,
1123 &gcvalue); 1163 &gcvalue);
1124 1164
1125 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1165 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1126 1166
1127#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1167#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1128 gcvalue.foreground = pix_colors[Color_topShadow]; 1168 gcvalue.foreground = pix_colors[Color_topShadow];
1129 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1169 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1130 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1170 gcvalue.foreground = pix_colors[Color_bottomShadow];
1131 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1171 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1132 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1172 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1133 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1173 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1134#endif 1174#endif
1135 1175
1136#ifdef OFF_FOCUS_FADING 1176#ifdef OFF_FOCUS_FADING
1137 // initially we are in unfocused state 1177 // initially we are in unfocused state
1138 if (rs[Rs_fade]) 1178 if (rs[Rs_fade])
… …
1376 * the slave. 1416 * the slave.
1377 */ 1417 */
1378void 1418void
1379rxvt_term::run_command (const char *const *argv) 1419rxvt_term::run_command (const char *const *argv)
1380{ 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
1381 int er; 1437 int er;
1382
1383 if (!pty.get ())
1384 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1385 1438
1386#ifndef NO_BACKSPACE_KEY 1439#ifndef NO_BACKSPACE_KEY
1387 if (key_backspace[0] && !key_backspace[1]) 1440 if (key_backspace[0] && !key_backspace[1])
1388 er = key_backspace[0]; 1441 er = key_backspace[0];
1389 else if (strcmp (key_backspace, "DEC") == 0) 1442 else if (strcmp (key_backspace, "DEC") == 0)
… …
1392#endif 1445#endif
1393 er = -1; 1446 er = -1;
1394 1447
1395 rxvt_get_ttymode (&tio, er); 1448 rxvt_get_ttymode (&tio, er);
1396 1449
1397 /* set initial window size */ 1450#if ENABLE_FRILLS
1398 tt_winch (); 1451 if (rs[Rs_pty_fd])
1452 return;
1453#endif
1399 1454
1400 sw_chld.start (SIGCHLD); 1455 sw_chld.start (SIGCHLD);
1401 1456
1402#ifndef __QNX__ 1457#ifndef __QNX__
1403 /* spin off the command interpreter */ 1458 /* spin off the command interpreter */
1404 switch (cmd_pid = fork ()) 1459 switch (cmd_pid = fork ())
1405 { 1460 {
1406 case -1: 1461 case -1:
1462 {
1463 cmd_pid = 0;
1407 rxvt_fatal ("can't fork, aborting.\n"); 1464 rxvt_fatal ("can't fork, aborting.\n");
1465 }
1408 case 0: 1466 case 0:
1409 init_env (); 1467 init_env ();
1410 1468
1411 if (!pty.make_controlling_tty ()) 1469 if (!pty.make_controlling_tty ())
1412 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