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