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