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.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{
196 sw_term.start (SIGTERM); 214 sw_term.start (SIGTERM);
215 sw_int.start (SIGINT);
197 216
198 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 217 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
199#ifdef OFF_FOCUS_FADING 218#ifdef OFF_FOCUS_FADING
200 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 219 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
201#endif 220#endif
… …
210 229
211 MEvent.time = CurrentTime; 230 MEvent.time = CurrentTime;
212 MEvent.button = AnyButton; 231 MEvent.button = AnyButton;
213 options = DEFAULT_OPTIONS; 232 options = DEFAULT_OPTIONS;
214 want_refresh = 1; 233 want_refresh = 1;
215 cmd_pid = -1;
216 pty.pty = pty.tty = -1;
217 priv_modes = SavedModes = PrivMode_Default; 234 priv_modes = SavedModes = PrivMode_Default;
218 TermWin.focus = 0; 235 TermWin.focus = 0;
219 TermWin.ncol = 80; 236 TermWin.ncol = 80;
220 TermWin.nrow = 24; 237 TermWin.nrow = 24;
221 TermWin.int_bwidth = INTERNALBORDERWIDTH; 238 TermWin.int_bwidth = INTERNALBORDERWIDTH;
… …
238 last_bot = last_state = -1; 255 last_bot = last_state = -1;
239 256
240#ifdef MENUBAR 257#ifdef MENUBAR
241 menu_readonly = 1; 258 menu_readonly = 1;
242# if ! (MENUBAR_MAX > 1) 259# if ! (MENUBAR_MAX > 1)
243 CurrentBar = & (BarList); 260 CurrentBar = &BarList;
244# endif /* (MENUBAR_MAX > 1) */ 261# endif /* (MENUBAR_MAX > 1) */
245#endif 262#endif
246 263
247 return true; 264 return true;
248} 265}
… …
322 */ 339 */
323 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 340 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
324 rs[Rs_display_name] = ":0"; 341 rs[Rs_display_name] = ":0";
325 342
326 get_options (r_argc, r_argv); 343 get_options (r_argc, r_argv);
327 free (r_argv);
328 344
329#ifdef LOCAL_X_IS_UNIX 345#ifdef LOCAL_X_IS_UNIX
330 if (rs[Rs_display_name][0] == ':') 346 if (rs[Rs_display_name][0] == ':')
331 { 347 {
332 val = rxvt_malloc (5 + strlen (rs[Rs_display_name])); 348 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
… …
339 355
340 if (!display 356 if (!display
341 && ! (display = displays.get (rs[Rs_display_name]))) 357 && ! (display = displays.get (rs[Rs_display_name])))
342 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]);
343 359
344 extract_resources (display->display, rs[Rs_name]); 360 extract_resources ();
361 free (r_argv);
345 362
346 /* 363 /*
347 * set any defaults not already set 364 * set any defaults not already set
348 */ 365 */
349 if (cmd_argv && cmd_argv[0]) 366 if (cmd_argv && cmd_argv[0])
… …
367#if ENABLE_FRILLS 384#if ENABLE_FRILLS
368 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)
369 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 386 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */
370 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)
371 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 388 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) 389 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
376 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 390 TermWin.lineSpace = min (i, 100); /* arbitrary limit */
377#endif 391#endif
378 392
379#ifdef POINTER_BLANK 393#ifdef POINTER_BLANK
… …
590 604
591 this->locale = rxvt_strdup (this->locale); 605 this->locale = rxvt_strdup (this->locale);
592 SET_LOCALE (this->locale); 606 SET_LOCALE (this->locale);
593 mbstate.reset (); 607 mbstate.reset ();
594#endif 608#endif
595#if 0 609
596#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');
597 free (codeset); 617 free (codeset);
598 codeset = strdup (nl_langinfo (CODESET));
599 enc_utf8 = !strcasecmp (codeset, "UTF-8")
600 || !strcasecmp (codeset, "UTF8");
601#else 618#else
602 enc_utf8 = 1; 619 enc_utf8 = 0;
603#endif
604#endif 620#endif
605} 621}
606 622
607void 623void
608rxvt_term::init_xlocale () 624rxvt_term::init_xlocale ()
… …
610#ifdef USE_XIM 626#ifdef USE_XIM
611 if (!locale) 627 if (!locale)
612 rxvt_warn ("setting locale failed, working without locale support.\n"); 628 rxvt_warn ("setting locale failed, working without locale support.\n");
613 else 629 else
614 { 630 {
615 Atom wmlocale; 631 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 632
622 if (!XSupportsLocale ()) 633 if (!XSupportsLocale ())
623 { 634 {
624 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 635 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n");
625 return; 636 return;
… …
639{ 650{
640 /* 651 /*
641 * Initialize the command connection. 652 * Initialize the command connection.
642 * This should be called after the X server connection is established. 653 * This should be called after the X server connection is established.
643 */ 654 */
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 655
658#ifdef META8_OPTION 656#ifdef META8_OPTION
659 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 657 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC);
660#endif 658#endif
661 659
… …
677 if (scrollbar_visible ()) 675 if (scrollbar_visible ())
678 { 676 {
679 priv_modes |= PrivMode_scrollBar; 677 priv_modes |= PrivMode_scrollBar;
680 SavedModes |= PrivMode_scrollBar; 678 SavedModes |= PrivMode_scrollBar;
681 } 679 }
680
682 if (menubar_visible ()) 681 if (menubar_visible ())
683 { 682 {
684 priv_modes |= PrivMode_menuBar; 683 priv_modes |= PrivMode_menuBar;
685 SavedModes |= PrivMode_menuBar; 684 SavedModes |= PrivMode_menuBar;
686 } 685 }
… …
834 * Use resource ``modifier'' to override the Meta modifier 833 * Use resource ``modifier'' to override the Meta modifier
835 */ 834 */
836void 835void
837rxvt_term::get_ourmods () 836rxvt_term::get_ourmods ()
838{ 837{
839 int i, j, k; 838 int i, j, k;
840 int requestedmeta, realmeta, realalt; 839 int requestedmeta, realmeta, realalt;
841 const char *cm, *rsmod; 840 const char *cm, *rsmod;
842 XModifierKeymap *map; 841 XModifierKeymap *map;
843 KeyCode *kc; 842 KeyCode *kc;
844 const unsigned int modmasks[] = 843 const unsigned int modmasks[] =
845 { 844 {
846 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 845 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
847 }; 846 };
848 847
849 requestedmeta = realmeta = realalt = 0; 848 requestedmeta = realmeta = realalt = 0;
850 rsmod = rs[Rs_modifier]; 849 rsmod = rs[Rs_modifier];
850
851 if (rsmod 851 if (rsmod
852 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 852 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
853 requestedmeta = rsmod[3] - '0'; 853 requestedmeta = rsmod[3] - '0';
854 854
855 map = XGetModifierMapping (display->display); 855 map = XGetModifierMapping (display->display);
856 kc = map->modifiermap; 856 kc = map->modifiermap;
857
857 for (i = 1; i < 6; i++) 858 for (i = 1; i < 6; i++)
858 { 859 {
859 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 860 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
861
860 for (j = map->max_keypermod; j--; k++) 862 for (j = map->max_keypermod; j--; k++)
861 { 863 {
862 if (kc[k] == 0) 864 if (kc[k] == 0)
863 break; 865 break;
866
864 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 867 switch (XKeycodeToKeysym (display->display, kc[k], 0))
865 { 868 {
866 case XK_Num_Lock: 869 case XK_Num_Lock:
867 ModNumLockMask = modmasks[i - 1]; 870 ModNumLockMask = modmasks[i - 1];
868 /* FALLTHROUGH */ 871 continue;
869 default: 872
870 continue; /* for (;;) */ 873 case XK_ISO_Level3_Shift:
874 ModLevel3Mask = modmasks[i - 1];
875 continue;
876
871 case XK_Meta_L: 877 case XK_Meta_L:
872 case XK_Meta_R: 878 case XK_Meta_R:
873 cm = "meta"; 879 cm = "meta";
874 realmeta = i; 880 realmeta = i;
875 break; 881 break;
882
876 case XK_Alt_L: 883 case XK_Alt_L:
877 case XK_Alt_R: 884 case XK_Alt_R:
878 cm = "alt"; 885 cm = "alt";
879 realalt = i; 886 realalt = i;
880 break; 887 break;
888
881 case XK_Super_L: 889 case XK_Super_L:
882 case XK_Super_R: 890 case XK_Super_R:
883 cm = "super"; 891 cm = "super";
884 break; 892 break;
893
885 case XK_Hyper_L: 894 case XK_Hyper_L:
886 case XK_Hyper_R: 895 case XK_Hyper_R:
887 cm = "hyper"; 896 cm = "hyper";
888 break; 897 break;
898
899 default:
900 continue;
889 } 901 }
902
890 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0) 903 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
891 requestedmeta = i; 904 requestedmeta = i;
892 } 905 }
893 } 906 }
907
894 XFreeModifiermap (map); 908 XFreeModifiermap (map);
909
895 i = (requestedmeta ? requestedmeta 910 i = requestedmeta ? requestedmeta
896 : (realmeta ? realmeta 911 : realmeta ? realmeta
897 : (realalt ? realalt : 0))); 912 : realalt ? realalt
913 : 0;
914
898 if (i) 915 if (i)
899 ModMetaMask = modmasks[i - 1]; 916 ModMetaMask = modmasks[i - 1];
900} 917}
901 918
902/*----------------------------------------------------------------------*/ 919/*----------------------------------------------------------------------*/
… …
912#endif 929#endif
913 XGCValues gcvalue; 930 XGCValues gcvalue;
914 long vt_emask; 931 long vt_emask;
915 XSetWindowAttributes attributes; 932 XSetWindowAttributes attributes;
916 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);
917 944
918 if (options & Opt_transparent) 945 if (options & Opt_transparent)
919 { 946 {
920 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 947 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
921 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 948 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
922 } 949 }
923 950
924#if ENABLE_FRILLS 951#if ENABLE_FRILLS
925 if (options & Opt_borderLess) 952 if (options & Opt_borderLess)
926 { 953 {
927 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 954 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
928 955
929 if (prop == None) 956 if (prop == None)
930 { 957 {
931 /* 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");*/
932#ifdef PREFER_24BIT 959#ifdef PREFER_24BIT
… …
948 975
949 /* grab colors before netscape does */ 976 /* grab colors before netscape does */
950 Get_Colours (); 977 Get_Colours ();
951 978
952 if (!set_fonts ()) 979 if (!set_fonts ())
953 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");
954 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 {
955 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
956 old_width = szHint.width; 1038 old_width = szHint.width;
957 old_height = szHint.height; 1039 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 1040
981 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1041 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
982 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1042 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
983 1043
984 classHint.res_name = (char *)rs[Rs_name]; 1044 classHint.res_name = (char *)rs[Rs_name];
985 classHint.res_class = (char *)RESCLASS; 1045 classHint.res_class = (char *)RESCLASS;
986 1046
987 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1047 wmHint.flags = InputHint | StateHint | WindowGroupHint;
988 wmHint.input = True; 1048 wmHint.input = True;
989 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1049 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
990 wmHint.window_group = TermWin.parent[0]; 1050 wmHint.window_group = top;
991 1051
992 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1052 XSetWMProperties (disp, top, NULL, NULL,
993 (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);
994 1057
995#if ENABLE_FRILLS 1058#if ENABLE_FRILLS
996 long pid = getpid (); 1059 long pid = getpid ();
997 1060
998 XChangeProperty (display->display, TermWin.parent[0], 1061 XChangeProperty (disp, top,
999 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32, 1062 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1000 PropModeReplace, (unsigned char *)&pid, 1); 1063 PropModeReplace, (unsigned char *)&pid, 1);
1001#endif 1064#endif
1002 1065
1003 XSelectInput (display->display, TermWin.parent[0], 1066 XSelectInput (disp, top,
1004 KeyPressMask 1067 KeyPressMask
1005#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1068#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1006 | KeyReleaseMask 1069 | KeyReleaseMask
1007#endif 1070#endif
1008 | FocusChangeMask | VisibilityChangeMask 1071 | FocusChangeMask | VisibilityChangeMask
1009 | ExposureMask
1010 | StructureNotifyMask); 1072 | ExposureMask | StructureNotifyMask);
1073
1011 termwin_ev.start (display, TermWin.parent[0]); 1074 termwin_ev.start (display, top);
1012 1075
1013#if ENABLE_FRILLS 1076#if ENABLE_FRILLS
1014 if (mwmhints.flags) 1077 if (mwmhints.flags)
1015 { 1078 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); 1079 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1019 }
1020#endif 1080#endif
1021 1081
1022 /* 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 */
1023 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1083 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1024 1084
1025#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1085#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1026 /* cursor (menuBar/scrollBar): Black-on-White */ 1086 /* cursor (menuBar/scrollBar): Black-on-White */
1027 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1087 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 1088#endif
1042 1089
1043 /* the vt window */ 1090 /* the vt window */
1044 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1091 TermWin.vt = XCreateSimpleWindow (disp, top,
1045 window_vt_x, 1092 window_vt_x,
1046 window_vt_y, 1093 window_vt_y,
1047 TermWin_TotalWidth (), 1094 TermWin_TotalWidth (),
1048 TermWin_TotalHeight (), 1095 TermWin_TotalHeight (),
1049 0, 1096 0,
1050 pix_colors_focused[Color_fg], 1097 pix_colors_focused[Color_fg],
1051 pix_colors_focused[Color_bg]); 1098 pix_colors_focused[Color_bg]);
1052#ifdef DEBUG_X 1099#ifdef DEBUG_X
1053 XStoreName (display->display, TermWin.vt, "vt window"); 1100 XStoreName (disp, TermWin.vt, "vt window");
1054#endif 1101#endif
1055 1102
1056 attributes.bit_gravity = NorthWestGravity; 1103 attributes.bit_gravity = NorthWestGravity;
1057 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1104 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);
1058 1105
1059 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1106 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1060
1061 pointer_unblank ();
1062 1107
1063#ifdef POINTER_BLANK 1108#ifdef POINTER_BLANK
1064 if (options & Opt_pointerBlank) 1109 if (options & Opt_pointerBlank)
1065 vt_emask |= PointerMotionMask; 1110 vt_emask |= PointerMotionMask;
1066 else 1111 else
1067#endif 1112#endif
1068 vt_emask |= Button1MotionMask | Button3MotionMask; 1113 vt_emask |= Button1MotionMask | Button3MotionMask;
1069 1114
1070 XSelectInput (display->display, TermWin.vt, vt_emask); 1115 XSelectInput (disp, TermWin.vt, vt_emask);
1071 vt_ev.start (display, TermWin.vt); 1116 vt_ev.start (display, TermWin.vt);
1072 1117
1073#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1118#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1074 if (menuBar_height ()) 1119 if (menuBar_height ())
1075 { 1120 {
1076 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1121 menuBar.win = XCreateSimpleWindow (disp, top,
1077 window_vt_x, 0, 1122 window_vt_x, 0,
1078 TermWin_TotalWidth (), 1123 TermWin_TotalWidth (),
1079 menuBar_TotalHeight (), 1124 menuBar_TotalHeight (),
1080 0, 1125 0,
1081 pix_colors_focused[Color_fg], 1126 pix_colors_focused[Color_fg],
1082 pix_colors_focused[Color_scroll]); 1127 pix_colors_focused[Color_scroll]);
1083 1128
1084#ifdef DEBUG_X 1129#ifdef DEBUG_X
1085 XStoreName (display->display, menuBar.win, "menubar"); 1130 XStoreName (disp, menuBar.win, "menubar");
1086#endif 1131#endif
1087 1132
1088 menuBar.drawable = new rxvt_drawable (display, menuBar.win); 1133 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1089 1134
1090 XDefineCursor (display->display, menuBar.win, 1135 XDefineCursor (disp, menuBar.win,
1091 XCreateFontCursor (display->display, XC_left_ptr)); 1136 XCreateFontCursor (disp, XC_left_ptr));
1092 1137
1093 XSelectInput (display->display, menuBar.win, 1138 XSelectInput (disp, menuBar.win,
1094 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1139 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1095 | Button1MotionMask));
1096 menubar_ev.start (display, menuBar.win); 1140 menubar_ev.start (display, menuBar.win);
1097 } 1141 }
1098#endif 1142#endif
1099 1143
1100#ifdef XPM_BACKGROUND 1144#ifdef XPM_BACKGROUND
… …
1116 1160
1117 /* graphics context for the vt window */ 1161 /* graphics context for the vt window */
1118 gcvalue.foreground = pix_colors[Color_fg]; 1162 gcvalue.foreground = pix_colors[Color_fg];
1119 gcvalue.background = pix_colors[Color_bg]; 1163 gcvalue.background = pix_colors[Color_bg];
1120 gcvalue.graphics_exposures = 1; 1164 gcvalue.graphics_exposures = 1;
1121 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1165 TermWin.gc = XCreateGC (disp, TermWin.vt,
1122 GCForeground | GCBackground | GCGraphicsExposures, 1166 GCForeground | GCBackground | GCGraphicsExposures,
1123 &gcvalue); 1167 &gcvalue);
1124 1168
1125 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1169 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1126 1170
1127#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1171#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1128 gcvalue.foreground = pix_colors[Color_topShadow]; 1172 gcvalue.foreground = pix_colors[Color_topShadow];
1129 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1173 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1130 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1174 gcvalue.foreground = pix_colors[Color_bottomShadow];
1131 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1175 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1132 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1176 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1133 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1177 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1134#endif 1178#endif
1135 1179
1136#ifdef OFF_FOCUS_FADING 1180#ifdef OFF_FOCUS_FADING
1137 // initially we are in unfocused state 1181 // initially we are in unfocused state
1138 if (rs[Rs_fade]) 1182 if (rs[Rs_fade])
1139 pix_colors = pix_colors_unfocused; 1183 pix_colors = pix_colors_unfocused;
1140#endif 1184#endif
1141 1185
1186 pointer_unblank ();
1142 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
1143} 1193}
1144 1194
1145/* ------------------------------------------------------------------------- * 1195/* ------------------------------------------------------------------------- *
1146 * GET TTY CURRENT STATE * 1196 * GET TTY CURRENT STATE *
1147 * ------------------------------------------------------------------------- */ 1197 * ------------------------------------------------------------------------- */
… …
1376 * the slave. 1426 * the slave.
1377 */ 1427 */
1378void 1428void
1379rxvt_term::run_command (const char *const *argv) 1429rxvt_term::run_command (const char *const *argv)
1380{ 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
1381 int er; 1447 int er;
1382
1383 if (!pty.get ())
1384 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1385 1448
1386#ifndef NO_BACKSPACE_KEY 1449#ifndef NO_BACKSPACE_KEY
1387 if (key_backspace[0] && !key_backspace[1]) 1450 if (key_backspace[0] && !key_backspace[1])
1388 er = key_backspace[0]; 1451 er = key_backspace[0];
1389 else if (strcmp (key_backspace, "DEC") == 0) 1452 else if (strcmp (key_backspace, "DEC") == 0)
… …
1392#endif 1455#endif
1393 er = -1; 1456 er = -1;
1394 1457
1395 rxvt_get_ttymode (&tio, er); 1458 rxvt_get_ttymode (&tio, er);
1396 1459
1397 /* set initial window size */ 1460#if ENABLE_FRILLS
1398 tt_winch (); 1461 if (rs[Rs_pty_fd])
1462 return;
1463#endif
1399 1464
1400 sw_chld.start (SIGCHLD); 1465 sw_chld.start (SIGCHLD);
1401 1466
1402#ifndef __QNX__ 1467#ifndef __QNX__
1403 /* spin off the command interpreter */ 1468 /* spin off the command interpreter */
1404 switch (cmd_pid = fork ()) 1469 switch (cmd_pid = fork ())
1405 { 1470 {
1406 case -1: 1471 case -1:
1472 {
1473 cmd_pid = 0;
1407 rxvt_fatal ("can't fork, aborting.\n"); 1474 rxvt_fatal ("can't fork, aborting.\n");
1475 }
1408 case 0: 1476 case 0:
1409 init_env (); 1477 init_env ();
1410 1478
1411 if (!pty.make_controlling_tty ()) 1479 if (!pty.make_controlling_tty ())
1412 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