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