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.113 by root, Sat Feb 19 04:16:49 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",
186 "WM_PROTOCOLS",
182 "WM_DELETE_WINDOW", 187 "WM_DELETE_WINDOW",
188 "CLIPBOARD",
189#if ENABLE_FRILLS
190 "_NET_WM_PID",
191 "_MOTIF_WM_HINTS",
192 "_NET_WM_NAME",
193 "_NET_WM_ICON_NAME",
194#endif
195#if USE_XIM
196 "WM_LOCALE_NAME",
197#endif
183#ifdef TRANSPARENT 198#ifdef TRANSPARENT
184 "_XROOTPMAP_ID", 199 "_XROOTPMAP_ID",
200 "ESETROOT_PMAP_ID",
185#endif 201#endif
186#ifdef OFFIX_DND 202#ifdef OFFIX_DND
187 "DndProtocol", 203 "DndProtocol",
188 "DndSelection", 204 "DndSelection",
189#endif 205#endif
190 "CLIPBOARD" 206#if ENABLE_XEMBED
207 "_XEMBED",
208#endif
191 }; 209 };
192 210
193bool 211bool
194rxvt_term::init_vars () 212rxvt_term::init_vars ()
195{ 213{
214 sw_term.start (SIGTERM);
215 sw_int.start (SIGINT);
216
196 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 217 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
197#ifdef OFF_FOCUS_FADING 218#ifdef OFF_FOCUS_FADING
198 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 219 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
199#endif 220#endif
200 pix_colors = pix_colors_focused; 221 pix_colors = pix_colors_focused;
… …
208 229
209 MEvent.time = CurrentTime; 230 MEvent.time = CurrentTime;
210 MEvent.button = AnyButton; 231 MEvent.button = AnyButton;
211 options = DEFAULT_OPTIONS; 232 options = DEFAULT_OPTIONS;
212 want_refresh = 1; 233 want_refresh = 1;
213 cmd_pid = -1;
214 pty.pty = pty.tty = -1;
215 priv_modes = SavedModes = PrivMode_Default; 234 priv_modes = SavedModes = PrivMode_Default;
216 TermWin.focus = 0; 235 TermWin.focus = 0;
217 TermWin.ncol = 80; 236 TermWin.ncol = 80;
218 TermWin.nrow = 24; 237 TermWin.nrow = 24;
219 TermWin.int_bwidth = INTERNALBORDERWIDTH; 238 TermWin.int_bwidth = INTERNALBORDERWIDTH;
… …
236 last_bot = last_state = -1; 255 last_bot = last_state = -1;
237 256
238#ifdef MENUBAR 257#ifdef MENUBAR
239 menu_readonly = 1; 258 menu_readonly = 1;
240# if ! (MENUBAR_MAX > 1) 259# if ! (MENUBAR_MAX > 1)
241 CurrentBar = & (BarList); 260 CurrentBar = &BarList;
242# endif /* (MENUBAR_MAX > 1) */ 261# endif /* (MENUBAR_MAX > 1) */
243#endif 262#endif
244 263
245 return true; 264 return true;
246} 265}
… …
320 */ 339 */
321 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 340 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
322 rs[Rs_display_name] = ":0"; 341 rs[Rs_display_name] = ":0";
323 342
324 get_options (r_argc, r_argv); 343 get_options (r_argc, r_argv);
325 free (r_argv);
326 344
327#ifdef LOCAL_X_IS_UNIX 345#ifdef LOCAL_X_IS_UNIX
328 if (rs[Rs_display_name][0] == ':') 346 if (rs[Rs_display_name][0] == ':')
329 { 347 {
330 val = rxvt_malloc (5 + strlen (rs[Rs_display_name])); 348 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
… …
337 355
338 if (!display 356 if (!display
339 && ! (display = displays.get (rs[Rs_display_name]))) 357 && ! (display = displays.get (rs[Rs_display_name])))
340 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 358 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
341 359
342 extract_resources (display->display, rs[Rs_name]); 360 extract_resources ();
361 free (r_argv);
343 362
344 /* 363 /*
345 * set any defaults not already set 364 * set any defaults not already set
346 */ 365 */
347 if (cmd_argv && cmd_argv[0]) 366 if (cmd_argv && cmd_argv[0])
… …
365#if ENABLE_FRILLS 384#if ENABLE_FRILLS
366 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 385 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
367 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 386 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */
368 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 387 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
369 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 388 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) 389 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
374 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 390 TermWin.lineSpace = min (i, 100); /* arbitrary limit */
375#endif 391#endif
376 392
377#ifdef POINTER_BLANK 393#ifdef POINTER_BLANK
… …
588 604
589 this->locale = rxvt_strdup (this->locale); 605 this->locale = rxvt_strdup (this->locale);
590 SET_LOCALE (this->locale); 606 SET_LOCALE (this->locale);
591 mbstate.reset (); 607 mbstate.reset ();
592#endif 608#endif
593#if 0 609
594#if HAVE_NL_LANGINFO 610#if HAVE_NL_LANGINFO
611 char *codeset = strdup (nl_langinfo (CODESET));
612 // /^UTF.?8/i
613 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
614 && (codeset[1] == 'T' || codeset[1] == 't')
615 && (codeset[2] == 'F' || codeset[2] == 'f')
616 && (codeset[3] == '8' || codeset[4] == '8');
595 free (codeset); 617 free (codeset);
596 codeset = strdup (nl_langinfo (CODESET));
597 enc_utf8 = !strcasecmp (codeset, "UTF-8")
598 || !strcasecmp (codeset, "UTF8");
599#else 618#else
600 enc_utf8 = 1; 619 enc_utf8 = 0;
601#endif
602#endif 620#endif
603} 621}
604 622
605void 623void
606rxvt_term::init_xlocale () 624rxvt_term::init_xlocale ()
… …
608#ifdef USE_XIM 626#ifdef USE_XIM
609 if (!locale) 627 if (!locale)
610 rxvt_warn ("setting locale failed, working without locale support.\n"); 628 rxvt_warn ("setting locale failed, working without locale support.\n");
611 else 629 else
612 { 630 {
613 Atom wmlocale; 631 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 632
620 if (!XSupportsLocale ()) 633 if (!XSupportsLocale ())
621 { 634 {
622 rxvt_warn ("the locale is not supported by Xlib, working withotu locale support.\n"); 635 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n");
623 return; 636 return;
624 } 637 }
625 638
626 im_ev.start (display); 639 im_ev.start (display);
627 640
… …
637{ 650{
638 /* 651 /*
639 * Initialize the command connection. 652 * Initialize the command connection.
640 * This should be called after the X server connection is established. 653 * This should be called after the X server connection is established.
641 */ 654 */
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 655
656#ifdef META8_OPTION 656#ifdef META8_OPTION
657 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 657 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC);
658#endif 658#endif
659 659
… …
675 if (scrollbar_visible ()) 675 if (scrollbar_visible ())
676 { 676 {
677 priv_modes |= PrivMode_scrollBar; 677 priv_modes |= PrivMode_scrollBar;
678 SavedModes |= PrivMode_scrollBar; 678 SavedModes |= PrivMode_scrollBar;
679 } 679 }
680
680 if (menubar_visible ()) 681 if (menubar_visible ())
681 { 682 {
682 priv_modes |= PrivMode_menuBar; 683 priv_modes |= PrivMode_menuBar;
683 SavedModes |= PrivMode_menuBar; 684 SavedModes |= PrivMode_menuBar;
684 } 685 }
… …
832 * Use resource ``modifier'' to override the Meta modifier 833 * Use resource ``modifier'' to override the Meta modifier
833 */ 834 */
834void 835void
835rxvt_term::get_ourmods () 836rxvt_term::get_ourmods ()
836{ 837{
837 int i, j, k; 838 int i, j, k;
838 int requestedmeta, realmeta, realalt; 839 int requestedmeta, realmeta, realalt;
839 const char *cm, *rsmod; 840 const char *cm, *rsmod;
840 XModifierKeymap *map; 841 XModifierKeymap *map;
841 KeyCode *kc; 842 KeyCode *kc;
842 const unsigned int modmasks[] = 843 const unsigned int modmasks[] =
843 { 844 {
844 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 845 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
845 }; 846 };
846 847
847 requestedmeta = realmeta = realalt = 0; 848 requestedmeta = realmeta = realalt = 0;
848 rsmod = rs[Rs_modifier]; 849 rsmod = rs[Rs_modifier];
850
849 if (rsmod 851 if (rsmod
850 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 852 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
851 requestedmeta = rsmod[3] - '0'; 853 requestedmeta = rsmod[3] - '0';
852 854
853 map = XGetModifierMapping (display->display); 855 map = XGetModifierMapping (display->display);
854 kc = map->modifiermap; 856 kc = map->modifiermap;
857
855 for (i = 1; i < 6; i++) 858 for (i = 1; i < 6; i++)
856 { 859 {
857 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 860 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
861
858 for (j = map->max_keypermod; j--; k++) 862 for (j = map->max_keypermod; j--; k++)
859 { 863 {
860 if (kc[k] == 0) 864 if (kc[k] == 0)
861 break; 865 break;
866
862 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 867 switch (XKeycodeToKeysym (display->display, kc[k], 0))
863 { 868 {
864 case XK_Num_Lock: 869 case XK_Num_Lock:
865 ModNumLockMask = modmasks[i - 1]; 870 ModNumLockMask = modmasks[i - 1];
866 /* FALLTHROUGH */ 871 continue;
867 default: 872
868 continue; /* for (;;) */ 873 case XK_ISO_Level3_Shift:
874 ModLevel3Mask = modmasks[i - 1];
875 continue;
876
869 case XK_Meta_L: 877 case XK_Meta_L:
870 case XK_Meta_R: 878 case XK_Meta_R:
871 cm = "meta"; 879 cm = "meta";
872 realmeta = i; 880 realmeta = i;
873 break; 881 break;
882
874 case XK_Alt_L: 883 case XK_Alt_L:
875 case XK_Alt_R: 884 case XK_Alt_R:
876 cm = "alt"; 885 cm = "alt";
877 realalt = i; 886 realalt = i;
878 break; 887 break;
888
879 case XK_Super_L: 889 case XK_Super_L:
880 case XK_Super_R: 890 case XK_Super_R:
881 cm = "super"; 891 cm = "super";
882 break; 892 break;
893
883 case XK_Hyper_L: 894 case XK_Hyper_L:
884 case XK_Hyper_R: 895 case XK_Hyper_R:
885 cm = "hyper"; 896 cm = "hyper";
886 break; 897 break;
898
899 default:
900 continue;
887 } 901 }
902
888 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0) 903 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
889 requestedmeta = i; 904 requestedmeta = i;
890 } 905 }
891 } 906 }
907
892 XFreeModifiermap (map); 908 XFreeModifiermap (map);
909
893 i = (requestedmeta ? requestedmeta 910 i = requestedmeta ? requestedmeta
894 : (realmeta ? realmeta 911 : realmeta ? realmeta
895 : (realalt ? realalt : 0))); 912 : realalt ? realalt
913 : 0;
914
896 if (i) 915 if (i)
897 ModMetaMask = modmasks[i - 1]; 916 ModMetaMask = modmasks[i - 1];
898} 917}
899 918
900/*----------------------------------------------------------------------*/ 919/*----------------------------------------------------------------------*/
… …
910#endif 929#endif
911 XGCValues gcvalue; 930 XGCValues gcvalue;
912 long vt_emask; 931 long vt_emask;
913 XSetWindowAttributes attributes; 932 XSetWindowAttributes attributes;
914 XWindowAttributes gattr; 933 XWindowAttributes gattr;
934 Window top;
935 dDisp;
936
937#ifdef USING_W11LIB
938 /* enable W11 callbacks */
939 W11AddEventHandler (disp, rxvt_W11_process_x_event);
940#endif
941
942 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
943 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
915 944
916 if (options & Opt_transparent) 945 if (options & Opt_transparent)
917 { 946 {
918 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 947 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
919 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 948 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
920 } 949 }
921 950
922#if ENABLE_FRILLS 951#if ENABLE_FRILLS
923 if (options & Opt_borderLess) 952 if (options & Opt_borderLess)
924 { 953 {
925 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 954 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
955
926 if (prop == None) 956 if (prop == None)
927 { 957 {
928 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 958 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
929#ifdef PREFER_24BIT 959#ifdef PREFER_24BIT
930 attributes.override_redirect = TRUE; 960 attributes.override_redirect = TRUE;
… …
945 975
946 /* grab colors before netscape does */ 976 /* grab colors before netscape does */
947 Get_Colours (); 977 Get_Colours ();
948 978
949 if (!set_fonts ()) 979 if (!set_fonts ())
950 rxvt_fatal ("unable to load base fontset, please specify one using -fn, aborting.\n"); 980 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
951 981
982#if ENABLE_XEMBED
983 if (rs[Rs_embed])
984 {
985 XWindowAttributes wattr;
986
987 top = strtol (rs[Rs_embed], 0, 0);
988
989 if (!XGetWindowAttributes (disp, top, &wattr))
990 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
991
992 window_calc (wattr.width, wattr.height);
993
994#if 0
995 if (wattr.map_state == IsViewable)
996 {
997 TermWin.mapped = 1;
998 refresh_type = FAST_REFRESH;
999 XClearWindow (disp, top);
1000 // TODO: make XMapNotify-event-code a function and call it
1001 // TODO: how can I detect visibility without unmap/map?
1002 // TODO: focusin etc.
1003 }
1004#else
1005 // it's easiest just to unmap/map to get all state correctly set-up
1006 XUnmapWindow (disp, top);
1007#endif
1008 }
1009 else
1010#endif
1011 {
952 window_calc (0, 0); 1012 window_calc (0, 0);
1013
1014 /* sub-window placement & size in rxvt_resize_subwindows () */
1015#ifdef PREFER_24BIT
1016 attributes.background_pixel = pix_colors_focused[Color_border];
1017 attributes.border_pixel = pix_colors_focused[Color_border];
1018 attributes.colormap = display->cmap;
1019 top = XCreateWindow (disp, DefaultRootWindow (disp),
1020 szHint.x, szHint.y,
1021 szHint.width, szHint.height,
1022 TermWin.ext_bwidth,
1023 display->depth, InputOutput,
1024 display->visual,
1025 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1026#else
1027 top = XCreateSimpleWindow (disp, DefaultRootWindow (disp),
1028 szHint.x, szHint.y,
1029 szHint.width, szHint.height,
1030 TermWin.ext_bwidth,
1031 pix_colors_focused[Color_border],
1032 pix_colors_focused[Color_border]);
1033#endif
1034 }
1035
1036 TermWin.parent[0] = top;
1037
953 old_width = szHint.width; 1038 old_width = szHint.width;
954 old_height = szHint.height; 1039 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 1040
978 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1041 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
979 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1042 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
980 1043
981 classHint.res_name = (char *)rs[Rs_name]; 1044 classHint.res_name = (char *)rs[Rs_name];
982 classHint.res_class = (char *)RESCLASS; 1045 classHint.res_class = (char *)RESCLASS;
983 1046
984 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1047 wmHint.flags = InputHint | StateHint | WindowGroupHint;
985 wmHint.input = True; 1048 wmHint.input = True;
986 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1049 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
987 wmHint.window_group = TermWin.parent[0]; 1050 wmHint.window_group = top;
988 1051
989 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1052 XSetWMProperties (disp, top, NULL, NULL,
990 (char **)argv, argc, &szHint, &wmHint, &classHint); 1053 (char **)argv, argc, &szHint, &wmHint, &classHint);
1054
1055 /* Enable delete window protocol */
1056 XSetWMProtocols (disp, top, &xa[XA_WM_DELETE_WINDOW], 1);
991 1057
992#if ENABLE_FRILLS 1058#if ENABLE_FRILLS
993 long pid = getpid (); 1059 long pid = getpid ();
994 XChangeProperty (display->display, TermWin.parent[0], 1060
1061 XChangeProperty (disp, top,
995 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32, 1062 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
996 PropModeReplace, (unsigned char *)&pid, 1); 1063 PropModeReplace, (unsigned char *)&pid, 1);
997#endif 1064#endif
998 1065
999 XSelectInput (display->display, TermWin.parent[0], 1066 XSelectInput (disp, top,
1000 KeyPressMask 1067 KeyPressMask
1001#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1068#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1002 | KeyReleaseMask 1069 | KeyReleaseMask
1003#endif 1070#endif
1004 | FocusChangeMask | VisibilityChangeMask 1071 | FocusChangeMask | VisibilityChangeMask
1005 | ExposureMask
1006 | StructureNotifyMask); 1072 | ExposureMask | StructureNotifyMask);
1073
1007 termwin_ev.start (display, TermWin.parent[0]); 1074 termwin_ev.start (display, top);
1008 1075
1009#if ENABLE_FRILLS 1076#if ENABLE_FRILLS
1010 if (mwmhints.flags) 1077 if (mwmhints.flags)
1011 { 1078 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1012 prop = XInternAtom (display->display, "_MOTIF_WM_HINTS", False); 1079 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 1080#endif
1016 1081
1017 /* vt cursor: Black-on-White is standard, but this is more popular */ 1082 /* vt cursor: Black-on-White is standard, but this is more popular */
1018 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1083 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1019 1084
1020#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1085#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1021 /* cursor (menuBar/scrollBar): Black-on-White */ 1086 /* cursor (menuBar/scrollBar): Black-on-White */
1022 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1087 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 1088#endif
1037 1089
1038 /* the vt window */ 1090 /* the vt window */
1039 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1091 TermWin.vt = XCreateSimpleWindow (disp, top,
1040 window_vt_x, 1092 window_vt_x,
1041 window_vt_y, 1093 window_vt_y,
1042 TermWin_TotalWidth (), 1094 TermWin_TotalWidth (),
1043 TermWin_TotalHeight (), 1095 TermWin_TotalHeight (),
1044 0, 1096 0,
1045 pix_colors_focused[Color_fg], 1097 pix_colors_focused[Color_fg],
1046 pix_colors_focused[Color_bg]); 1098 pix_colors_focused[Color_bg]);
1047#ifdef DEBUG_X 1099#ifdef DEBUG_X
1048 XStoreName (display->display, TermWin.vt, "vt window"); 1100 XStoreName (disp, TermWin.vt, "vt window");
1049#endif 1101#endif
1050 1102
1051 attributes.bit_gravity = NorthWestGravity; 1103 attributes.bit_gravity = NorthWestGravity;
1052 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1104 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);
1053 1105
1054 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1106 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1055
1056 pointer_unblank ();
1057 1107
1058#ifdef POINTER_BLANK 1108#ifdef POINTER_BLANK
1059 if (options & Opt_pointerBlank) 1109 if (options & Opt_pointerBlank)
1060 vt_emask |= PointerMotionMask; 1110 vt_emask |= PointerMotionMask;
1061 else 1111 else
1062#endif 1112#endif
1063 vt_emask |= Button1MotionMask | Button3MotionMask; 1113 vt_emask |= Button1MotionMask | Button3MotionMask;
1064 1114
1065 XSelectInput (display->display, TermWin.vt, vt_emask); 1115 XSelectInput (disp, TermWin.vt, vt_emask);
1066 vt_ev.start (display, TermWin.vt); 1116 vt_ev.start (display, TermWin.vt);
1067 1117
1068#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1118#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1069 if (menuBar_height ()) 1119 if (menuBar_height ())
1070 { 1120 {
1071 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1121 menuBar.win = XCreateSimpleWindow (disp, top,
1072 window_vt_x, 0, 1122 window_vt_x, 0,
1073 TermWin_TotalWidth (), 1123 TermWin_TotalWidth (),
1074 menuBar_TotalHeight (), 1124 menuBar_TotalHeight (),
1075 0, 1125 0,
1076 pix_colors_focused[Color_fg], 1126 pix_colors_focused[Color_fg],
1077 pix_colors_focused[Color_scroll]); 1127 pix_colors_focused[Color_scroll]);
1078 1128
1079#ifdef DEBUG_X 1129#ifdef DEBUG_X
1080 XStoreName (display->display, menuBar.win, "menubar"); 1130 XStoreName (disp, menuBar.win, "menubar");
1081#endif 1131#endif
1082 1132
1083 menuBar.drawable = new rxvt_drawable (display, menuBar.win); 1133 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1084 1134
1085 XDefineCursor (display->display, menuBar.win, 1135 XDefineCursor (disp, menuBar.win,
1086 XCreateFontCursor (display->display, XC_left_ptr)); 1136 XCreateFontCursor (disp, XC_left_ptr));
1087 1137
1088 XSelectInput (display->display, menuBar.win, 1138 XSelectInput (disp, menuBar.win,
1089 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1139 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1090 | Button1MotionMask));
1091 menubar_ev.start (display, menuBar.win); 1140 menubar_ev.start (display, menuBar.win);
1092 } 1141 }
1093#endif 1142#endif
1094 1143
1095#ifdef XPM_BACKGROUND 1144#ifdef XPM_BACKGROUND
… …
1111 1160
1112 /* graphics context for the vt window */ 1161 /* graphics context for the vt window */
1113 gcvalue.foreground = pix_colors[Color_fg]; 1162 gcvalue.foreground = pix_colors[Color_fg];
1114 gcvalue.background = pix_colors[Color_bg]; 1163 gcvalue.background = pix_colors[Color_bg];
1115 gcvalue.graphics_exposures = 1; 1164 gcvalue.graphics_exposures = 1;
1116 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1165 TermWin.gc = XCreateGC (disp, TermWin.vt,
1117 GCForeground | GCBackground | GCGraphicsExposures, 1166 GCForeground | GCBackground | GCGraphicsExposures,
1118 &gcvalue); 1167 &gcvalue);
1119 1168
1120 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1169 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1121 1170
1122#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1171#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1123 gcvalue.foreground = pix_colors[Color_topShadow]; 1172 gcvalue.foreground = pix_colors[Color_topShadow];
1124 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1173 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1125 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1174 gcvalue.foreground = pix_colors[Color_bottomShadow];
1126 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1175 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1127 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1176 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1128 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1177 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1129#endif 1178#endif
1130 1179
1131#ifdef OFF_FOCUS_FADING 1180#ifdef OFF_FOCUS_FADING
1132 // initially we are in unfocused state 1181 // initially we are in unfocused state
1133 if (rs[Rs_fade]) 1182 if (rs[Rs_fade])
1134 pix_colors = pix_colors_unfocused; 1183 pix_colors = pix_colors_unfocused;
1135#endif 1184#endif
1136 1185
1186 pointer_unblank ();
1137 scr_recolour (); 1187 scr_recolour ();
1188
1189#if ENABLE_XEMBED
1190 // why this is necessary, I don't know, race condition??
1191 XMoveWindow (disp, TermWin.vt, window_vt_x, window_vt_y);
1192#endif
1138} 1193}
1139 1194
1140/* ------------------------------------------------------------------------- * 1195/* ------------------------------------------------------------------------- *
1141 * GET TTY CURRENT STATE * 1196 * GET TTY CURRENT STATE *
1142 * ------------------------------------------------------------------------- */ 1197 * ------------------------------------------------------------------------- */
… …
1371 * the slave. 1426 * the slave.
1372 */ 1427 */
1373void 1428void
1374rxvt_term::run_command (const char *const *argv) 1429rxvt_term::run_command (const char *const *argv)
1375{ 1430{
1431#if ENABLE_FRILLS
1432 if (rs[Rs_pty_fd])
1433 {
1434 pty.pty = atoi (rs[Rs_pty_fd]);
1435 fcntl (pty.pty, F_SETFL, O_NONBLOCK);
1436 }
1437 else
1438#endif
1439 if (!pty.get ())
1440 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1441
1442 pty.set_utf8_mode (enc_utf8);
1443
1444 /* set initial window size */
1445 tt_winch ();
1446
1376 int er; 1447 int er;
1377
1378 if (!pty.get ())
1379 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1380 1448
1381#ifndef NO_BACKSPACE_KEY 1449#ifndef NO_BACKSPACE_KEY
1382 if (key_backspace[0] && !key_backspace[1]) 1450 if (key_backspace[0] && !key_backspace[1])
1383 er = key_backspace[0]; 1451 er = key_backspace[0];
1384 else if (strcmp (key_backspace, "DEC") == 0) 1452 else if (strcmp (key_backspace, "DEC") == 0)
… …
1387#endif 1455#endif
1388 er = -1; 1456 er = -1;
1389 1457
1390 rxvt_get_ttymode (&tio, er); 1458 rxvt_get_ttymode (&tio, er);
1391 1459
1392 /* set initial window size */ 1460#if ENABLE_FRILLS
1393 tt_winch (); 1461 if (rs[Rs_pty_fd])
1462 return;
1463#endif
1464
1465 sw_chld.start (SIGCHLD);
1394 1466
1395#ifndef __QNX__ 1467#ifndef __QNX__
1396 /* spin off the command interpreter */ 1468 /* spin off the command interpreter */
1397 switch (cmd_pid = fork ()) 1469 switch (cmd_pid = fork ())
1398 { 1470 {
1399 case -1: 1471 case -1:
1472 {
1473 cmd_pid = 0;
1400 rxvt_fatal ("can't fork, aborting.\n"); 1474 rxvt_fatal ("can't fork, aborting.\n");
1475 }
1401 case 0: 1476 case 0:
1402 init_env (); 1477 init_env ();
1403 1478
1404 if (!pty.make_controlling_tty ()) 1479 if (!pty.make_controlling_tty ())
1405 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1480 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);

Diff Legend

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