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

Diff Legend

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