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.97 by root, Wed Dec 15 00:12:58 2004 UTC vs.
Revision 1.118 by root, Wed Aug 10 15:10:06 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,
… …
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",
183 "CLIPBOARD", 188 "CLIPBOARD",
184#if ENABLE_FRILLS 189#if ENABLE_FRILLS
190 "_MOTIF_WM_HINTS",
191#endif
192#if ENABLE_EWMH
185 "_NET_WM_PID", 193 "_NET_WM_PID",
186 "_MOTIF_WM_HINTS",
187 "_NET_WM_NAME", 194 "_NET_WM_NAME",
188 "_NET_WM_ICON_NAME", 195 "_NET_WM_ICON_NAME",
196 "_NET_WM_PING",
189#endif 197#endif
190#if USE_XIM 198#if USE_XIM
191 "WM_LOCALE_NAME", 199 "WM_LOCALE_NAME",
192#endif 200#endif
193#ifdef TRANSPARENT 201#ifdef TRANSPARENT
194 "_XROOTPMAP_ID", 202 "_XROOTPMAP_ID",
195 "_XSETROOT_ID", 203 "ESETROOT_PMAP_ID",
196#endif 204#endif
197#ifdef OFFIX_DND 205#ifdef OFFIX_DND
198 "DndProtocol", 206 "DndProtocol",
199 "DndSelection", 207 "DndSelection",
208#endif
209#if ENABLE_XEMBED
210 "_XEMBED",
211 "_XEMBED_INFO",
200#endif 212#endif
201 }; 213 };
202 214
203bool 215bool
204rxvt_term::init_vars () 216rxvt_term::init_vars ()
205{ 217{
206 sw_term.start (SIGTERM); 218 sw_term.start (SIGTERM);
219 sw_int.start (SIGINT);
207 220
208 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 221 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
209#ifdef OFF_FOCUS_FADING 222#ifdef OFF_FOCUS_FADING
210 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
211#endif 224#endif
… …
220 233
221 MEvent.time = CurrentTime; 234 MEvent.time = CurrentTime;
222 MEvent.button = AnyButton; 235 MEvent.button = AnyButton;
223 options = DEFAULT_OPTIONS; 236 options = DEFAULT_OPTIONS;
224 want_refresh = 1; 237 want_refresh = 1;
225 cmd_pid = -1;
226 pty.pty = pty.tty = -1;
227 priv_modes = SavedModes = PrivMode_Default; 238 priv_modes = SavedModes = PrivMode_Default;
228 TermWin.focus = 0; 239 TermWin.focus = 0;
229 TermWin.ncol = 80; 240 TermWin.ncol = 80;
230 TermWin.nrow = 24; 241 TermWin.nrow = 24;
231 TermWin.int_bwidth = INTERNALBORDERWIDTH; 242 TermWin.int_bwidth = INTERNALBORDERWIDTH;
… …
248 last_bot = last_state = -1; 259 last_bot = last_state = -1;
249 260
250#ifdef MENUBAR 261#ifdef MENUBAR
251 menu_readonly = 1; 262 menu_readonly = 1;
252# if ! (MENUBAR_MAX > 1) 263# if ! (MENUBAR_MAX > 1)
253 CurrentBar = & (BarList); 264 CurrentBar = &BarList;
254# endif /* (MENUBAR_MAX > 1) */ 265# endif /* (MENUBAR_MAX > 1) */
255#endif 266#endif
256 267
257 return true; 268 return true;
258} 269}
… …
332 */ 343 */
333 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 344 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
334 rs[Rs_display_name] = ":0"; 345 rs[Rs_display_name] = ":0";
335 346
336 get_options (r_argc, r_argv); 347 get_options (r_argc, r_argv);
348
349 if (!(display = displays.get (rs[Rs_display_name])))
350 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
351
352 extract_resources ();
337 free (r_argv); 353 free (r_argv);
338
339#ifdef LOCAL_X_IS_UNIX
340 if (rs[Rs_display_name][0] == ':')
341 {
342 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
343 strcpy (val, "unix");
344 strcat (val, rs[Rs_display_name]);
345 display = displays.get (val);
346 free (val);
347 }
348#endif
349
350 if (!display
351 && ! (display = displays.get (rs[Rs_display_name])))
352 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
353
354 extract_resources (display->display, rs[Rs_name]);
355 354
356 /* 355 /*
357 * set any defaults not already set 356 * set any defaults not already set
358 */ 357 */
359 if (cmd_argv && cmd_argv[0]) 358 if (cmd_argv && cmd_argv[0])
… …
377#if ENABLE_FRILLS 376#if ENABLE_FRILLS
378 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 377 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
379 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 378 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */
380 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 379 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
381 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 380 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */
382#endif
383
384#ifndef NO_LINESPACE
385 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 381 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
386 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 382 TermWin.lineSpace = min (i, 100); /* arbitrary limit */
387#endif 383#endif
388 384
389#ifdef POINTER_BLANK 385#ifdef POINTER_BLANK
… …
601 this->locale = rxvt_strdup (this->locale); 597 this->locale = rxvt_strdup (this->locale);
602 SET_LOCALE (this->locale); 598 SET_LOCALE (this->locale);
603 mbstate.reset (); 599 mbstate.reset ();
604#endif 600#endif
605 601
606#if 0
607#if HAVE_NL_LANGINFO 602#if HAVE_NL_LANGINFO
608 char *codeset = strdup (nl_langinfo (CODESET)); 603 char *codeset = strdup (nl_langinfo (CODESET));
609 enc_utf8 = !strcasecmp (codeset, "UTF-8") 604 // /^UTF.?8/i
610 || !strcasecmp (codeset, "UTF8"); 605 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
606 && (codeset[1] == 'T' || codeset[1] == 't')
607 && (codeset[2] == 'F' || codeset[2] == 'f')
608 && (codeset[3] == '8' || codeset[4] == '8');
611 free (codeset); 609 free (codeset);
612#else 610#else
613 enc_utf8 = 0; 611 enc_utf8 = 0;
614#endif
615#endif 612#endif
616} 613}
617 614
618void 615void
619rxvt_term::init_xlocale () 616rxvt_term::init_xlocale ()
… …
670 if (scrollbar_visible ()) 667 if (scrollbar_visible ())
671 { 668 {
672 priv_modes |= PrivMode_scrollBar; 669 priv_modes |= PrivMode_scrollBar;
673 SavedModes |= PrivMode_scrollBar; 670 SavedModes |= PrivMode_scrollBar;
674 } 671 }
672
675 if (menubar_visible ()) 673 if (menubar_visible ())
676 { 674 {
677 priv_modes |= PrivMode_menuBar; 675 priv_modes |= PrivMode_menuBar;
678 SavedModes |= PrivMode_menuBar; 676 SavedModes |= PrivMode_menuBar;
679 } 677 }
… …
762 * from the fvwm window manager. 760 * from the fvwm window manager.
763 */ 761 */
764#ifdef KEEP_SCROLLCOLOR 762#ifdef KEEP_SCROLLCOLOR
765 763
766 if (display->depth <= 2) 764 if (display->depth <= 2)
765 {
767 { /* Monochrome */ 766 /* Monochrome */
768 pix_colors[Color_scroll] = pix_colors[Color_fg]; 767 pix_colors[Color_scroll] = pix_colors[Color_fg];
769 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 768 pix_colors[Color_topShadow] = pix_colors[Color_bg];
770 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 769 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
771 } 770 }
772 else 771 else
… …
827 * Use resource ``modifier'' to override the Meta modifier 826 * Use resource ``modifier'' to override the Meta modifier
828 */ 827 */
829void 828void
830rxvt_term::get_ourmods () 829rxvt_term::get_ourmods ()
831{ 830{
832 int i, j, k; 831 int i, j, k;
833 int requestedmeta, realmeta, realalt; 832 int requestedmeta, realmeta, realalt;
834 const char *cm, *rsmod; 833 const char *cm, *rsmod;
835 XModifierKeymap *map; 834 XModifierKeymap *map;
836 KeyCode *kc; 835 KeyCode *kc;
837 const unsigned int modmasks[] = 836 const unsigned int modmasks[] =
838 { 837 {
839 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 838 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
840 }; 839 };
841 840
842 requestedmeta = realmeta = realalt = 0; 841 requestedmeta = realmeta = realalt = 0;
843 rsmod = rs[Rs_modifier]; 842 rsmod = rs[Rs_modifier];
843
844 if (rsmod 844 if (rsmod
845 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 845 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
846 requestedmeta = rsmod[3] - '0'; 846 requestedmeta = rsmod[3] - '0';
847 847
848 map = XGetModifierMapping (display->display); 848 map = XGetModifierMapping (display->display);
849 kc = map->modifiermap; 849 kc = map->modifiermap;
850
850 for (i = 1; i < 6; i++) 851 for (i = 1; i < 6; i++)
851 { 852 {
852 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 853 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
854
853 for (j = map->max_keypermod; j--; k++) 855 for (j = map->max_keypermod; j--; k++)
854 { 856 {
855 if (kc[k] == 0) 857 if (kc[k] == 0)
856 break; 858 break;
859
857 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 860 switch (XKeycodeToKeysym (display->display, kc[k], 0))
858 { 861 {
859 case XK_Num_Lock: 862 case XK_Num_Lock:
860 ModNumLockMask = modmasks[i - 1]; 863 ModNumLockMask = modmasks[i - 1];
861 /* FALLTHROUGH */ 864 continue;
862 default: 865
863 continue; /* for (;;) */ 866 case XK_ISO_Level3_Shift:
867 ModLevel3Mask = modmasks[i - 1];
868 continue;
869
864 case XK_Meta_L: 870 case XK_Meta_L:
865 case XK_Meta_R: 871 case XK_Meta_R:
866 cm = "meta"; 872 cm = "meta";
867 realmeta = i; 873 realmeta = i;
868 break; 874 break;
875
869 case XK_Alt_L: 876 case XK_Alt_L:
870 case XK_Alt_R: 877 case XK_Alt_R:
871 cm = "alt"; 878 cm = "alt";
872 realalt = i; 879 realalt = i;
873 break; 880 break;
881
874 case XK_Super_L: 882 case XK_Super_L:
875 case XK_Super_R: 883 case XK_Super_R:
876 cm = "super"; 884 cm = "super";
877 break; 885 break;
886
878 case XK_Hyper_L: 887 case XK_Hyper_L:
879 case XK_Hyper_R: 888 case XK_Hyper_R:
880 cm = "hyper"; 889 cm = "hyper";
881 break; 890 break;
891
892 default:
893 continue;
882 } 894 }
895
883 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0) 896 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
884 requestedmeta = i; 897 requestedmeta = i;
885 } 898 }
886 } 899 }
900
887 XFreeModifiermap (map); 901 XFreeModifiermap (map);
902
888 i = (requestedmeta ? requestedmeta 903 i = requestedmeta ? requestedmeta
889 : (realmeta ? realmeta 904 : realmeta ? realmeta
890 : (realalt ? realalt : 0))); 905 : realalt ? realalt
906 : 0;
907
891 if (i) 908 if (i)
892 ModMetaMask = modmasks[i - 1]; 909 ModMetaMask = modmasks[i - 1];
893} 910}
894 911
895/*----------------------------------------------------------------------*/ 912/*----------------------------------------------------------------------*/
… …
905#endif 922#endif
906 XGCValues gcvalue; 923 XGCValues gcvalue;
907 long vt_emask; 924 long vt_emask;
908 XSetWindowAttributes attributes; 925 XSetWindowAttributes attributes;
909 XWindowAttributes gattr; 926 XWindowAttributes gattr;
927 Window top, parent;
928 dDisp;
910 929
911#ifdef USING_W11LIB 930#ifdef USING_W11LIB
912 /* enable W11 callbacks */ 931 /* enable W11 callbacks */
913 W11AddEventHandler (display->display, rxvt_W11_process_x_event); 932 W11AddEventHandler (disp, rxvt_W11_process_x_event);
914#endif 933#endif
915 934
916 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 935 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
917 XInternAtoms (display->display, (char **)xa_names, NUM_XA, False, xa); 936 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
918 937
919 if (options & Opt_transparent) 938 if (options & Opt_transparent)
920 { 939 {
921 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 940 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
922 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 941 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
923 } 942 }
924 943
925#if ENABLE_FRILLS 944#if ENABLE_FRILLS
926 if (options & Opt_borderLess) 945 if (options & Opt_borderLess)
927 { 946 {
928 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 947 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
929 948
930 if (prop == None) 949 if (prop == None)
931 { 950 {
932 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 951 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
933#ifdef PREFER_24BIT 952#ifdef PREFER_24BIT
… …
940 mwmhints.flags = MWM_HINTS_DECORATIONS; 959 mwmhints.flags = MWM_HINTS_DECORATIONS;
941 mwmhints.decorations = 0; 960 mwmhints.decorations = 0;
942 } 961 }
943 } 962 }
944 else 963 else
945 {
946 mwmhints.flags = 0; 964 mwmhints.flags = 0;
947 }
948#endif 965#endif
949 966
950 /* grab colors before netscape does */ 967 /* grab colors before netscape does */
951 Get_Colours (); 968 Get_Colours ();
952 969
953 if (!set_fonts ()) 970 if (!set_fonts ())
954 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 971 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
955 972
973 parent = DefaultRootWindow (disp);
974
975#if ENABLE_XEMBED
976 if (rs[Rs_embed])
977 {
978 XWindowAttributes wattr;
979
980 parent = strtol (rs[Rs_embed], 0, 0);
981
982 if (!XGetWindowAttributes (disp, parent, &wattr))
983 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
984
985 window_calc (wattr.width, wattr.height);
986 }
987
988#endif
956 window_calc (0, 0); 989 window_calc (0, 0);
957 old_width = szHint.width;
958 old_height = szHint.height;
959 990
960 /* sub-window placement & size in rxvt_resize_subwindows () */ 991 /* sub-window placement & size in rxvt_resize_subwindows () */
961
962#ifdef PREFER_24BIT 992#ifdef PREFER_24BIT
963 attributes.background_pixel = pix_colors_focused[Color_border]; 993 attributes.background_pixel = pix_colors_focused[Color_border];
964 attributes.border_pixel = pix_colors_focused[Color_border]; 994 attributes.border_pixel = pix_colors_focused[Color_border];
965 attributes.colormap = display->cmap; 995 attributes.colormap = display->cmap;
966 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 996 top = XCreateWindow (disp, parent,
967 szHint.x, szHint.y, 997 szHint.x, szHint.y,
968 szHint.width, szHint.height, 998 szHint.width, szHint.height,
969 TermWin.ext_bwidth, 999 TermWin.ext_bwidth,
970 display->depth, InputOutput, 1000 display->depth, InputOutput,
971 display->visual, 1001 display->visual,
972 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1002 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
973#else 1003#else
974 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 1004 top = XCreateSimpleWindow (disp, parent,
975 szHint.x, szHint.y, 1005 szHint.x, szHint.y,
976 szHint.width, szHint.height, 1006 szHint.width, szHint.height,
977 TermWin.ext_bwidth, 1007 TermWin.ext_bwidth,
978 pix_colors_focused[Color_border], 1008 pix_colors_focused[Color_border],
979 pix_colors_focused[Color_border]); 1009 pix_colors_focused[Color_border]);
980#endif 1010#endif
1011
1012 TermWin.parent[0] = top;
1013
1014 old_width = szHint.width;
1015 old_height = szHint.height;
981 1016
982 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1017 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
983 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1018 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
984 1019
985 classHint.res_name = (char *)rs[Rs_name]; 1020 classHint.res_name = (char *)rs[Rs_name];
986 classHint.res_class = (char *)RESCLASS; 1021 classHint.res_class = (char *)RESCLASS;
987 1022
988 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1023 wmHint.flags = InputHint | StateHint | WindowGroupHint;
989 wmHint.input = True; 1024 wmHint.input = True;
990 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1025 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
991 wmHint.window_group = TermWin.parent[0]; 1026 wmHint.window_group = top;
992 1027
993 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1028 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
994 (char **)argv, argc, &szHint, &wmHint, &classHint); 1029 &szHint, &wmHint, &classHint);
995 1030
996 /* Enable delete window protocol */ 1031 Atom protocols[] = {
997 XSetWMProtocols (display->display, TermWin.parent[0], 1032 xa[XA_WM_DELETE_WINDOW],
998 &xa[XA_WMDELETEWINDOW], 1); 1033#if ENABLE_EWMH
1034 xa[XA_NET_WM_PING],
1035#endif
1036 };
999 1037
1000#if ENABLE_FRILLS 1038 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1039
1040#if ENABLE_EWMH
1001 long pid = getpid (); 1041 long pid = getpid ();
1002 1042
1003 XChangeProperty (display->display, TermWin.parent[0], 1043 XChangeProperty (disp, top,
1004 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1044 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1005 PropModeReplace, (unsigned char *)&pid, 1); 1045 PropModeReplace, (unsigned char *)&pid, 1);
1006#endif
1007 1046
1008 XSelectInput (display->display, TermWin.parent[0], 1047 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1048#endif
1049
1050 XSelectInput (disp, top,
1009 KeyPressMask 1051 KeyPressMask
1010#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1052#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1011 | KeyReleaseMask 1053 | KeyReleaseMask
1012#endif 1054#endif
1013 | FocusChangeMask | VisibilityChangeMask 1055 | FocusChangeMask | VisibilityChangeMask
1014 | ExposureMask
1015 | StructureNotifyMask); 1056 | ExposureMask | StructureNotifyMask);
1057
1016 termwin_ev.start (display, TermWin.parent[0]); 1058 termwin_ev.start (display, top);
1017 1059
1018#if ENABLE_FRILLS 1060#if ENABLE_FRILLS
1019 if (mwmhints.flags) 1061 if (mwmhints.flags)
1020 XChangeProperty (display->display, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1062 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1021 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1063 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1022#endif 1064#endif
1023 1065
1024 /* vt cursor: Black-on-White is standard, but this is more popular */ 1066 /* vt cursor: Black-on-White is standard, but this is more popular */
1025 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1067 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1026 1068
1027#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1069#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1028 /* cursor (menuBar/scrollBar): Black-on-White */ 1070 /* cursor (menuBar/scrollBar): Black-on-White */
1029 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1071 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1030#endif
1031
1032#ifdef POINTER_BLANK
1033 {
1034 XColor blackcolour;
1035 blackcolour.red = 0;
1036 blackcolour.green = 0;
1037 blackcolour.blue = 0;
1038 Font f = XLoadFont (display->display, "fixed");
1039 blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1040 &blackcolour, &blackcolour);
1041 XUnloadFont (display->display, f);
1042 }
1043#endif 1072#endif
1044 1073
1045 /* the vt window */ 1074 /* the vt window */
1046 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1075 TermWin.vt = XCreateSimpleWindow (disp, top,
1047 window_vt_x, 1076 window_vt_x,
1048 window_vt_y, 1077 window_vt_y,
1049 TermWin_TotalWidth (), 1078 TermWin_TotalWidth (),
1050 TermWin_TotalHeight (), 1079 TermWin_TotalHeight (),
1051 0, 1080 0,
1052 pix_colors_focused[Color_fg], 1081 pix_colors_focused[Color_fg],
1053 pix_colors_focused[Color_bg]); 1082 pix_colors_focused[Color_bg]);
1054#ifdef DEBUG_X 1083#ifdef DEBUG_X
1055 XStoreName (display->display, TermWin.vt, "vt window"); 1084 XStoreName (disp, TermWin.vt, "vt window");
1056#endif 1085#endif
1057 1086
1058 attributes.bit_gravity = NorthWestGravity; 1087 attributes.bit_gravity = NorthWestGravity;
1059 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1088 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);
1060 1089
1061 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1090 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1062
1063 pointer_unblank ();
1064 1091
1065#ifdef POINTER_BLANK 1092#ifdef POINTER_BLANK
1066 if (options & Opt_pointerBlank) 1093 if (options & Opt_pointerBlank)
1067 vt_emask |= PointerMotionMask; 1094 vt_emask |= PointerMotionMask;
1068 else 1095 else
1069#endif 1096#endif
1070 vt_emask |= Button1MotionMask | Button3MotionMask; 1097 vt_emask |= Button1MotionMask | Button3MotionMask;
1071 1098
1072 XSelectInput (display->display, TermWin.vt, vt_emask); 1099 XSelectInput (disp, TermWin.vt, vt_emask);
1073 vt_ev.start (display, TermWin.vt); 1100 vt_ev.start (display, TermWin.vt);
1074 1101
1075#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1102#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1076 if (menuBar_height ()) 1103 if (menuBar_height ())
1077 { 1104 {
1078 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1105 menuBar.win = XCreateSimpleWindow (disp, top,
1079 window_vt_x, 0, 1106 window_vt_x, 0,
1080 TermWin_TotalWidth (), 1107 TermWin_TotalWidth (),
1081 menuBar_TotalHeight (), 1108 menuBar_TotalHeight (),
1082 0, 1109 0,
1083 pix_colors_focused[Color_fg], 1110 pix_colors_focused[Color_fg],
1084 pix_colors_focused[Color_scroll]); 1111 pix_colors_focused[Color_scroll]);
1085 1112
1086#ifdef DEBUG_X 1113#ifdef DEBUG_X
1087 XStoreName (display->display, menuBar.win, "menubar"); 1114 XStoreName (disp, menuBar.win, "menubar");
1088#endif 1115#endif
1089 1116
1090 menuBar.drawable = new rxvt_drawable (display, menuBar.win); 1117 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1091 1118
1092 XDefineCursor (display->display, menuBar.win, 1119 XDefineCursor (disp, menuBar.win,
1093 XCreateFontCursor (display->display, XC_left_ptr)); 1120 XCreateFontCursor (disp, XC_left_ptr));
1094 1121
1095 XSelectInput (display->display, menuBar.win, 1122 XSelectInput (disp, menuBar.win,
1096 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1123 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1097 | Button1MotionMask));
1098 menubar_ev.start (display, menuBar.win); 1124 menubar_ev.start (display, menuBar.win);
1099 } 1125 }
1100#endif 1126#endif
1101 1127
1102#ifdef XPM_BACKGROUND 1128#ifdef XPM_BACKGROUND
… …
1118 1144
1119 /* graphics context for the vt window */ 1145 /* graphics context for the vt window */
1120 gcvalue.foreground = pix_colors[Color_fg]; 1146 gcvalue.foreground = pix_colors[Color_fg];
1121 gcvalue.background = pix_colors[Color_bg]; 1147 gcvalue.background = pix_colors[Color_bg];
1122 gcvalue.graphics_exposures = 1; 1148 gcvalue.graphics_exposures = 1;
1123 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1149 TermWin.gc = XCreateGC (disp, TermWin.vt,
1124 GCForeground | GCBackground | GCGraphicsExposures, 1150 GCForeground | GCBackground | GCGraphicsExposures,
1125 &gcvalue); 1151 &gcvalue);
1126 1152
1127 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1153 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1128 1154
1129#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1155#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1130 gcvalue.foreground = pix_colors[Color_topShadow]; 1156 gcvalue.foreground = pix_colors[Color_topShadow];
1131 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1157 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1132 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1158 gcvalue.foreground = pix_colors[Color_bottomShadow];
1133 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1159 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1134 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1160 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1135 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1161 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1136#endif 1162#endif
1137 1163
1138#ifdef OFF_FOCUS_FADING 1164#ifdef OFF_FOCUS_FADING
1139 // initially we are in unfocused state 1165 // initially we are in unfocused state
1140 if (rs[Rs_fade]) 1166 if (rs[Rs_fade])
1141 pix_colors = pix_colors_unfocused; 1167 pix_colors = pix_colors_unfocused;
1142#endif 1168#endif
1143 1169
1170 pointer_unblank ();
1144 scr_recolour (); 1171 scr_recolour ();
1172
1173#if ENABLE_XEMBED
1174 if (rs[Rs_embed])
1175 {
1176 long info[2] = { 0, XEMBED_MAPPED };
1177
1178 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1179 32, PropModeReplace, (unsigned char *)&info, 2);
1180 }
1181#endif
1145} 1182}
1146 1183
1147/* ------------------------------------------------------------------------- * 1184/* ------------------------------------------------------------------------- *
1148 * GET TTY CURRENT STATE * 1185 * GET TTY CURRENT STATE *
1149 * ------------------------------------------------------------------------- */ 1186 * ------------------------------------------------------------------------- */
… …
1378 * the slave. 1415 * the slave.
1379 */ 1416 */
1380void 1417void
1381rxvt_term::run_command (const char *const *argv) 1418rxvt_term::run_command (const char *const *argv)
1382{ 1419{
1420#if ENABLE_FRILLS
1421 if (rs[Rs_pty_fd])
1422 {
1423 pty.pty = atoi (rs[Rs_pty_fd]);
1424 fcntl (pty.pty, F_SETFL, O_NONBLOCK);
1425 }
1426 else
1427#endif
1428 if (!pty.get ())
1429 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1430
1431 pty.set_utf8_mode (enc_utf8);
1432
1433 /* set initial window size */
1434 tt_winch ();
1435
1383 int er; 1436 int er;
1384
1385 if (!pty.get ())
1386 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1387 1437
1388#ifndef NO_BACKSPACE_KEY 1438#ifndef NO_BACKSPACE_KEY
1389 if (key_backspace[0] && !key_backspace[1]) 1439 if (key_backspace[0] && !key_backspace[1])
1390 er = key_backspace[0]; 1440 er = key_backspace[0];
1391 else if (strcmp (key_backspace, "DEC") == 0) 1441 else if (strcmp (key_backspace, "DEC") == 0)
… …
1394#endif 1444#endif
1395 er = -1; 1445 er = -1;
1396 1446
1397 rxvt_get_ttymode (&tio, er); 1447 rxvt_get_ttymode (&tio, er);
1398 1448
1399 /* set initial window size */ 1449#if ENABLE_FRILLS
1400 tt_winch (); 1450 if (rs[Rs_pty_fd])
1451 return;
1452#endif
1401 1453
1402 sw_chld.start (SIGCHLD); 1454 sw_chld.start (SIGCHLD);
1403 1455
1404#ifndef __QNX__ 1456#ifndef __QNX__
1405 /* spin off the command interpreter */ 1457 /* spin off the command interpreter */
1406 switch (cmd_pid = fork ()) 1458 switch (cmd_pid = fork ())
1407 { 1459 {
1408 case -1: 1460 case -1:
1461 {
1462 cmd_pid = 0;
1409 rxvt_fatal ("can't fork, aborting.\n"); 1463 rxvt_fatal ("can't fork, aborting.\n");
1464 }
1410 case 0: 1465 case 0:
1411 init_env (); 1466 init_env ();
1412 1467
1413 if (!pty.make_controlling_tty ()) 1468 if (!pty.make_controlling_tty ())
1414 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1469 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);

Diff Legend

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