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.96 by root, Sat Dec 11 23:01:36 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,
… …
155 NULL, /* Color_BD */ 156 NULL, /* Color_BD */
156 NULL, /* Color_IT */ 157 NULL, /* Color_IT */
157 NULL, /* Color_UL */ 158 NULL, /* Color_UL */
158 NULL, /* Color_RV */ 159 NULL, /* Color_RV */
159#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 160#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161#if ENABLE_FRILLS
162 NULL, // Color_underline
163#endif
160#ifdef OPTION_HC 164#ifdef OPTION_HC
161 NULL, 165 NULL,
162#endif 166#endif
163#ifdef KEEP_SCROLLCOLOR 167#ifdef KEEP_SCROLLCOLOR
164 COLOR_SCROLLBAR, 168 COLOR_SCROLLBAR,
… …
167#if TINTING 171#if TINTING
168 NULL, 172 NULL,
169#endif 173#endif
170 }; 174 };
171 175
172const char *const xa_names[NUM_XA] = 176const char *const xa_names[] =
173 { 177 {
174 "TEXT", 178 "TEXT",
175 "COMPOUND_TEXT", 179 "COMPOUND_TEXT",
176 "UTF8_STRING", 180 "UTF8_STRING",
177 "MULTIPLE", 181 "MULTIPLE",
178 "TARGETS", 182 "TARGETS",
179 "TIMESTAMP", 183 "TIMESTAMP",
180 "VT_SELECTION", 184 "VT_SELECTION",
181 "INCR", 185 "INCR",
186 "WM_PROTOCOLS",
182 "WM_DELETE_WINDOW", 187 "WM_DELETE_WINDOW",
188 "CLIPBOARD",
189#if ENABLE_FRILLS
190 "_MOTIF_WM_HINTS",
191#endif
192#if ENABLE_EWMH
193 "_NET_WM_PID",
194 "_NET_WM_NAME",
195 "_NET_WM_ICON_NAME",
196 "_NET_WM_PING",
197#endif
198#if USE_XIM
199 "WM_LOCALE_NAME",
200#endif
183#ifdef TRANSPARENT 201#ifdef TRANSPARENT
184 "_XROOTPMAP_ID", 202 "_XROOTPMAP_ID",
203 "ESETROOT_PMAP_ID",
185#endif 204#endif
186#ifdef OFFIX_DND 205#ifdef OFFIX_DND
187 "DndProtocol", 206 "DndProtocol",
188 "DndSelection", 207 "DndSelection",
189#endif 208#endif
190 "CLIPBOARD" 209#if ENABLE_XEMBED
210 "_XEMBED",
211 "_XEMBED_INFO",
212#endif
191 }; 213 };
192 214
193bool 215bool
194rxvt_term::init_vars () 216rxvt_term::init_vars ()
195{ 217{
196 sw_term.start (SIGTERM); 218 sw_term.start (SIGTERM);
219 sw_int.start (SIGINT);
197 220
198 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 221 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
199#ifdef OFF_FOCUS_FADING 222#ifdef OFF_FOCUS_FADING
200 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
201#endif 224#endif
… …
210 233
211 MEvent.time = CurrentTime; 234 MEvent.time = CurrentTime;
212 MEvent.button = AnyButton; 235 MEvent.button = AnyButton;
213 options = DEFAULT_OPTIONS; 236 options = DEFAULT_OPTIONS;
214 want_refresh = 1; 237 want_refresh = 1;
215 cmd_pid = -1;
216 pty.pty = pty.tty = -1;
217 priv_modes = SavedModes = PrivMode_Default; 238 priv_modes = SavedModes = PrivMode_Default;
218 TermWin.focus = 0; 239 TermWin.focus = 0;
219 TermWin.ncol = 80; 240 TermWin.ncol = 80;
220 TermWin.nrow = 24; 241 TermWin.nrow = 24;
221 TermWin.int_bwidth = INTERNALBORDERWIDTH; 242 TermWin.int_bwidth = INTERNALBORDERWIDTH;
… …
238 last_bot = last_state = -1; 259 last_bot = last_state = -1;
239 260
240#ifdef MENUBAR 261#ifdef MENUBAR
241 menu_readonly = 1; 262 menu_readonly = 1;
242# if ! (MENUBAR_MAX > 1) 263# if ! (MENUBAR_MAX > 1)
243 CurrentBar = & (BarList); 264 CurrentBar = &BarList;
244# endif /* (MENUBAR_MAX > 1) */ 265# endif /* (MENUBAR_MAX > 1) */
245#endif 266#endif
246 267
247 return true; 268 return true;
248} 269}
… …
322 */ 343 */
323 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 344 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
324 rs[Rs_display_name] = ":0"; 345 rs[Rs_display_name] = ":0";
325 346
326 get_options (r_argc, r_argv); 347 get_options (r_argc, r_argv);
327 free (r_argv);
328 348
329#ifdef LOCAL_X_IS_UNIX 349#ifdef LOCAL_X_IS_UNIX
330 if (rs[Rs_display_name][0] == ':') 350 if (rs[Rs_display_name][0] == ':')
331 { 351 {
332 val = rxvt_malloc (5 + strlen (rs[Rs_display_name])); 352 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
… …
339 359
340 if (!display 360 if (!display
341 && ! (display = displays.get (rs[Rs_display_name]))) 361 && ! (display = displays.get (rs[Rs_display_name])))
342 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]);
343 363
344 extract_resources (display->display, rs[Rs_name]); 364 extract_resources ();
365 free (r_argv);
345 366
346 /* 367 /*
347 * set any defaults not already set 368 * set any defaults not already set
348 */ 369 */
349 if (cmd_argv && cmd_argv[0]) 370 if (cmd_argv && cmd_argv[0])
… …
367#if ENABLE_FRILLS 388#if ENABLE_FRILLS
368 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)
369 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 390 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */
370 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)
371 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 392 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */
372#endif
373
374#ifndef NO_LINESPACE
375 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 393 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
376 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 394 TermWin.lineSpace = min (i, 100); /* arbitrary limit */
377#endif 395#endif
378 396
379#ifdef POINTER_BLANK 397#ifdef POINTER_BLANK
… …
591 this->locale = rxvt_strdup (this->locale); 609 this->locale = rxvt_strdup (this->locale);
592 SET_LOCALE (this->locale); 610 SET_LOCALE (this->locale);
593 mbstate.reset (); 611 mbstate.reset ();
594#endif 612#endif
595 613
596#if 0
597#if HAVE_NL_LANGINFO 614#if HAVE_NL_LANGINFO
598 char *codeset = strdup (nl_langinfo (CODESET)); 615 char *codeset = strdup (nl_langinfo (CODESET));
599 enc_utf8 = !strcasecmp (codeset, "UTF-8") 616 // /^UTF.?8/i
600 || !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');
601 free (codeset); 621 free (codeset);
602#else 622#else
603 enc_utf8 = 0; 623 enc_utf8 = 0;
604#endif
605#endif 624#endif
606} 625}
607 626
608void 627void
609rxvt_term::init_xlocale () 628rxvt_term::init_xlocale ()
… …
611#ifdef USE_XIM 630#ifdef USE_XIM
612 if (!locale) 631 if (!locale)
613 rxvt_warn ("setting locale failed, working without locale support.\n"); 632 rxvt_warn ("setting locale failed, working without locale support.\n");
614 else 633 else
615 { 634 {
616 set_string_property (display->atom ("WM_LOCALE_NAME"), locale); 635 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
617 636
618 if (!XSupportsLocale ()) 637 if (!XSupportsLocale ())
619 { 638 {
620 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 639 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n");
621 return; 640 return;
… …
660 if (scrollbar_visible ()) 679 if (scrollbar_visible ())
661 { 680 {
662 priv_modes |= PrivMode_scrollBar; 681 priv_modes |= PrivMode_scrollBar;
663 SavedModes |= PrivMode_scrollBar; 682 SavedModes |= PrivMode_scrollBar;
664 } 683 }
684
665 if (menubar_visible ()) 685 if (menubar_visible ())
666 { 686 {
667 priv_modes |= PrivMode_menuBar; 687 priv_modes |= PrivMode_menuBar;
668 SavedModes |= PrivMode_menuBar; 688 SavedModes |= PrivMode_menuBar;
669 } 689 }
… …
817 * Use resource ``modifier'' to override the Meta modifier 837 * Use resource ``modifier'' to override the Meta modifier
818 */ 838 */
819void 839void
820rxvt_term::get_ourmods () 840rxvt_term::get_ourmods ()
821{ 841{
822 int i, j, k; 842 int i, j, k;
823 int requestedmeta, realmeta, realalt; 843 int requestedmeta, realmeta, realalt;
824 const char *cm, *rsmod; 844 const char *cm, *rsmod;
825 XModifierKeymap *map; 845 XModifierKeymap *map;
826 KeyCode *kc; 846 KeyCode *kc;
827 const unsigned int modmasks[] = 847 const unsigned int modmasks[] =
828 { 848 {
829 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 849 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
830 }; 850 };
831 851
832 requestedmeta = realmeta = realalt = 0; 852 requestedmeta = realmeta = realalt = 0;
833 rsmod = rs[Rs_modifier]; 853 rsmod = rs[Rs_modifier];
854
834 if (rsmod 855 if (rsmod
835 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 856 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
836 requestedmeta = rsmod[3] - '0'; 857 requestedmeta = rsmod[3] - '0';
837 858
838 map = XGetModifierMapping (display->display); 859 map = XGetModifierMapping (display->display);
839 kc = map->modifiermap; 860 kc = map->modifiermap;
861
840 for (i = 1; i < 6; i++) 862 for (i = 1; i < 6; i++)
841 { 863 {
842 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 864 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
865
843 for (j = map->max_keypermod; j--; k++) 866 for (j = map->max_keypermod; j--; k++)
844 { 867 {
845 if (kc[k] == 0) 868 if (kc[k] == 0)
846 break; 869 break;
870
847 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 871 switch (XKeycodeToKeysym (display->display, kc[k], 0))
848 { 872 {
849 case XK_Num_Lock: 873 case XK_Num_Lock:
850 ModNumLockMask = modmasks[i - 1]; 874 ModNumLockMask = modmasks[i - 1];
851 /* FALLTHROUGH */ 875 continue;
852 default: 876
853 continue; /* for (;;) */ 877 case XK_ISO_Level3_Shift:
878 ModLevel3Mask = modmasks[i - 1];
879 continue;
880
854 case XK_Meta_L: 881 case XK_Meta_L:
855 case XK_Meta_R: 882 case XK_Meta_R:
856 cm = "meta"; 883 cm = "meta";
857 realmeta = i; 884 realmeta = i;
858 break; 885 break;
886
859 case XK_Alt_L: 887 case XK_Alt_L:
860 case XK_Alt_R: 888 case XK_Alt_R:
861 cm = "alt"; 889 cm = "alt";
862 realalt = i; 890 realalt = i;
863 break; 891 break;
892
864 case XK_Super_L: 893 case XK_Super_L:
865 case XK_Super_R: 894 case XK_Super_R:
866 cm = "super"; 895 cm = "super";
867 break; 896 break;
897
868 case XK_Hyper_L: 898 case XK_Hyper_L:
869 case XK_Hyper_R: 899 case XK_Hyper_R:
870 cm = "hyper"; 900 cm = "hyper";
871 break; 901 break;
902
903 default:
904 continue;
872 } 905 }
906
873 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0) 907 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
874 requestedmeta = i; 908 requestedmeta = i;
875 } 909 }
876 } 910 }
911
877 XFreeModifiermap (map); 912 XFreeModifiermap (map);
913
878 i = (requestedmeta ? requestedmeta 914 i = requestedmeta ? requestedmeta
879 : (realmeta ? realmeta 915 : realmeta ? realmeta
880 : (realalt ? realalt : 0))); 916 : realalt ? realalt
917 : 0;
918
881 if (i) 919 if (i)
882 ModMetaMask = modmasks[i - 1]; 920 ModMetaMask = modmasks[i - 1];
883} 921}
884 922
885/*----------------------------------------------------------------------*/ 923/*----------------------------------------------------------------------*/
… …
895#endif 933#endif
896 XGCValues gcvalue; 934 XGCValues gcvalue;
897 long vt_emask; 935 long vt_emask;
898 XSetWindowAttributes attributes; 936 XSetWindowAttributes attributes;
899 XWindowAttributes gattr; 937 XWindowAttributes gattr;
900 938 Window top, parent;
901 for (int i = 0; i < NUM_XA; i++) 939 dDisp;
902 xa[i] = XInternAtom (display->display, xa_names[i], False);
903 940
904#ifdef USING_W11LIB 941#ifdef USING_W11LIB
905 /* enable W11 callbacks */ 942 /* enable W11 callbacks */
906 W11AddEventHandler (display->display, rxvt_W11_process_x_event); 943 W11AddEventHandler (disp, rxvt_W11_process_x_event);
907#endif 944#endif
945
946 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
947 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
908 948
909 if (options & Opt_transparent) 949 if (options & Opt_transparent)
910 { 950 {
911 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 951 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
912 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 952 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
913 } 953 }
914 954
915#if ENABLE_FRILLS 955#if ENABLE_FRILLS
916 if (options & Opt_borderLess) 956 if (options & Opt_borderLess)
917 { 957 {
918 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 958 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
919 959
920 if (prop == None) 960 if (prop == None)
921 { 961 {
922 /* 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");*/
923#ifdef PREFER_24BIT 963#ifdef PREFER_24BIT
… …
930 mwmhints.flags = MWM_HINTS_DECORATIONS; 970 mwmhints.flags = MWM_HINTS_DECORATIONS;
931 mwmhints.decorations = 0; 971 mwmhints.decorations = 0;
932 } 972 }
933 } 973 }
934 else 974 else
935 {
936 mwmhints.flags = 0; 975 mwmhints.flags = 0;
937 }
938#endif 976#endif
939 977
940 /* grab colors before netscape does */ 978 /* grab colors before netscape does */
941 Get_Colours (); 979 Get_Colours ();
942 980
943 if (!set_fonts ()) 981 if (!set_fonts ())
944 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");
945 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
946 window_calc (0, 0); 1000 window_calc (0, 0);
947 old_width = szHint.width;
948 old_height = szHint.height;
949 1001
950 /* sub-window placement & size in rxvt_resize_subwindows () */ 1002 /* sub-window placement & size in rxvt_resize_subwindows () */
951
952#ifdef PREFER_24BIT 1003#ifdef PREFER_24BIT
953 attributes.background_pixel = pix_colors_focused[Color_border]; 1004 attributes.background_pixel = pix_colors_focused[Color_border];
954 attributes.border_pixel = pix_colors_focused[Color_border]; 1005 attributes.border_pixel = pix_colors_focused[Color_border];
955 attributes.colormap = display->cmap; 1006 attributes.colormap = display->cmap;
956 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 1007 top = XCreateWindow (disp, parent,
957 szHint.x, szHint.y, 1008 szHint.x, szHint.y,
958 szHint.width, szHint.height, 1009 szHint.width, szHint.height,
959 TermWin.ext_bwidth, 1010 TermWin.ext_bwidth,
960 display->depth, InputOutput, 1011 display->depth, InputOutput,
961 display->visual, 1012 display->visual,
962 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1013 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
963#else 1014#else
964 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 1015 top = XCreateSimpleWindow (disp, parent,
965 szHint.x, szHint.y, 1016 szHint.x, szHint.y,
966 szHint.width, szHint.height, 1017 szHint.width, szHint.height,
967 TermWin.ext_bwidth, 1018 TermWin.ext_bwidth,
968 pix_colors_focused[Color_border], 1019 pix_colors_focused[Color_border],
969 pix_colors_focused[Color_border]); 1020 pix_colors_focused[Color_border]);
970#endif 1021#endif
1022
1023 TermWin.parent[0] = top;
1024
1025 old_width = szHint.width;
1026 old_height = szHint.height;
971 1027
972 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1028 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
973 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1029 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
974 1030
975 classHint.res_name = (char *)rs[Rs_name]; 1031 classHint.res_name = (char *)rs[Rs_name];
976 classHint.res_class = (char *)RESCLASS; 1032 classHint.res_class = (char *)RESCLASS;
977 1033
978 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1034 wmHint.flags = InputHint | StateHint | WindowGroupHint;
979 wmHint.input = True; 1035 wmHint.input = True;
980 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1036 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
981 wmHint.window_group = TermWin.parent[0]; 1037 wmHint.window_group = top;
982 1038
983 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1039 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
984 (char **)argv, argc, &szHint, &wmHint, &classHint); 1040 &szHint, &wmHint, &classHint);
985 1041
986 /* Enable delete window protocol */ 1042 Atom protocols[] = {
987 XSetWMProtocols (display->display, TermWin.parent[0], 1043 xa[XA_WM_DELETE_WINDOW],
988 &xa[XA_WMDELETEWINDOW], 1); 1044#if ENABLE_EWMH
1045 xa[XA_NET_WM_PING],
1046#endif
1047 };
989 1048
990#if ENABLE_FRILLS 1049 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1050
1051#if ENABLE_EWMH
991 long pid = getpid (); 1052 long pid = getpid ();
992 1053
993 XChangeProperty (display->display, TermWin.parent[0], 1054 XChangeProperty (disp, top,
994 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32, 1055 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
995 PropModeReplace, (unsigned char *)&pid, 1); 1056 PropModeReplace, (unsigned char *)&pid, 1);
996#endif
997 1057
998 XSelectInput (display->display, TermWin.parent[0], 1058 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1059#endif
1060
1061 XSelectInput (disp, top,
999 KeyPressMask 1062 KeyPressMask
1000#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1063#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1001 | KeyReleaseMask 1064 | KeyReleaseMask
1002#endif 1065#endif
1003 | FocusChangeMask | VisibilityChangeMask 1066 | FocusChangeMask | VisibilityChangeMask
1004 | ExposureMask
1005 | StructureNotifyMask); 1067 | ExposureMask | StructureNotifyMask);
1068
1006 termwin_ev.start (display, TermWin.parent[0]); 1069 termwin_ev.start (display, top);
1007 1070
1008#if ENABLE_FRILLS 1071#if ENABLE_FRILLS
1009 if (mwmhints.flags) 1072 if (mwmhints.flags)
1010 { 1073 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1011 prop = XInternAtom (display->display, "_MOTIF_WM_HINTS", False);
1012 XChangeProperty (display->display, TermWin.parent[0], prop, prop, 32,
1013 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1074 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1014 }
1015#endif 1075#endif
1016 1076
1017 /* 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 */
1018 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1078 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1019 1079
1020#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1080#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1021 /* cursor (menuBar/scrollBar): Black-on-White */ 1081 /* cursor (menuBar/scrollBar): Black-on-White */
1022 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1082 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1023#endif
1024
1025#ifdef POINTER_BLANK
1026 {
1027 XColor blackcolour;
1028 blackcolour.red = 0;
1029 blackcolour.green = 0;
1030 blackcolour.blue = 0;
1031 Font f = XLoadFont (display->display, "fixed");
1032 blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1033 &blackcolour, &blackcolour);
1034 XUnloadFont (display->display, f);
1035 }
1036#endif 1083#endif
1037 1084
1038 /* the vt window */ 1085 /* the vt window */
1039 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1086 TermWin.vt = XCreateSimpleWindow (disp, top,
1040 window_vt_x, 1087 window_vt_x,
1041 window_vt_y, 1088 window_vt_y,
1042 TermWin_TotalWidth (), 1089 TermWin_TotalWidth (),
1043 TermWin_TotalHeight (), 1090 TermWin_TotalHeight (),
1044 0, 1091 0,
1045 pix_colors_focused[Color_fg], 1092 pix_colors_focused[Color_fg],
1046 pix_colors_focused[Color_bg]); 1093 pix_colors_focused[Color_bg]);
1047#ifdef DEBUG_X 1094#ifdef DEBUG_X
1048 XStoreName (display->display, TermWin.vt, "vt window"); 1095 XStoreName (disp, TermWin.vt, "vt window");
1049#endif 1096#endif
1050 1097
1051 attributes.bit_gravity = NorthWestGravity; 1098 attributes.bit_gravity = NorthWestGravity;
1052 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1099 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);
1053 1100
1054 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1101 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1055
1056 pointer_unblank ();
1057 1102
1058#ifdef POINTER_BLANK 1103#ifdef POINTER_BLANK
1059 if (options & Opt_pointerBlank) 1104 if (options & Opt_pointerBlank)
1060 vt_emask |= PointerMotionMask; 1105 vt_emask |= PointerMotionMask;
1061 else 1106 else
1062#endif 1107#endif
1063 vt_emask |= Button1MotionMask | Button3MotionMask; 1108 vt_emask |= Button1MotionMask | Button3MotionMask;
1064 1109
1065 XSelectInput (display->display, TermWin.vt, vt_emask); 1110 XSelectInput (disp, TermWin.vt, vt_emask);
1066 vt_ev.start (display, TermWin.vt); 1111 vt_ev.start (display, TermWin.vt);
1067 1112
1068#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1113#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1069 if (menuBar_height ()) 1114 if (menuBar_height ())
1070 { 1115 {
1071 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1116 menuBar.win = XCreateSimpleWindow (disp, top,
1072 window_vt_x, 0, 1117 window_vt_x, 0,
1073 TermWin_TotalWidth (), 1118 TermWin_TotalWidth (),
1074 menuBar_TotalHeight (), 1119 menuBar_TotalHeight (),
1075 0, 1120 0,
1076 pix_colors_focused[Color_fg], 1121 pix_colors_focused[Color_fg],
1077 pix_colors_focused[Color_scroll]); 1122 pix_colors_focused[Color_scroll]);
1078 1123
1079#ifdef DEBUG_X 1124#ifdef DEBUG_X
1080 XStoreName (display->display, menuBar.win, "menubar"); 1125 XStoreName (disp, menuBar.win, "menubar");
1081#endif 1126#endif
1082 1127
1083 menuBar.drawable = new rxvt_drawable (display, menuBar.win); 1128 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1084 1129
1085 XDefineCursor (display->display, menuBar.win, 1130 XDefineCursor (disp, menuBar.win,
1086 XCreateFontCursor (display->display, XC_left_ptr)); 1131 XCreateFontCursor (disp, XC_left_ptr));
1087 1132
1088 XSelectInput (display->display, menuBar.win, 1133 XSelectInput (disp, menuBar.win,
1089 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1134 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1090 | Button1MotionMask));
1091 menubar_ev.start (display, menuBar.win); 1135 menubar_ev.start (display, menuBar.win);
1092 } 1136 }
1093#endif 1137#endif
1094 1138
1095#ifdef XPM_BACKGROUND 1139#ifdef XPM_BACKGROUND
… …
1111 1155
1112 /* graphics context for the vt window */ 1156 /* graphics context for the vt window */
1113 gcvalue.foreground = pix_colors[Color_fg]; 1157 gcvalue.foreground = pix_colors[Color_fg];
1114 gcvalue.background = pix_colors[Color_bg]; 1158 gcvalue.background = pix_colors[Color_bg];
1115 gcvalue.graphics_exposures = 1; 1159 gcvalue.graphics_exposures = 1;
1116 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1160 TermWin.gc = XCreateGC (disp, TermWin.vt,
1117 GCForeground | GCBackground | GCGraphicsExposures, 1161 GCForeground | GCBackground | GCGraphicsExposures,
1118 &gcvalue); 1162 &gcvalue);
1119 1163
1120 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1164 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1121 1165
1122#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1166#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1123 gcvalue.foreground = pix_colors[Color_topShadow]; 1167 gcvalue.foreground = pix_colors[Color_topShadow];
1124 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1168 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1125 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1169 gcvalue.foreground = pix_colors[Color_bottomShadow];
1126 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1170 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1127 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1171 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1128 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1172 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1129#endif 1173#endif
1130 1174
1131#ifdef OFF_FOCUS_FADING 1175#ifdef OFF_FOCUS_FADING
1132 // initially we are in unfocused state 1176 // initially we are in unfocused state
1133 if (rs[Rs_fade]) 1177 if (rs[Rs_fade])
1134 pix_colors = pix_colors_unfocused; 1178 pix_colors = pix_colors_unfocused;
1135#endif 1179#endif
1136 1180
1181 pointer_unblank ();
1137 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
1138} 1193}
1139 1194
1140/* ------------------------------------------------------------------------- * 1195/* ------------------------------------------------------------------------- *
1141 * GET TTY CURRENT STATE * 1196 * GET TTY CURRENT STATE *
1142 * ------------------------------------------------------------------------- */ 1197 * ------------------------------------------------------------------------- */
… …
1371 * the slave. 1426 * the slave.
1372 */ 1427 */
1373void 1428void
1374rxvt_term::run_command (const char *const *argv) 1429rxvt_term::run_command (const char *const *argv)
1375{ 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
1376 int er; 1447 int er;
1377
1378 if (!pty.get ())
1379 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1380 1448
1381#ifndef NO_BACKSPACE_KEY 1449#ifndef NO_BACKSPACE_KEY
1382 if (key_backspace[0] && !key_backspace[1]) 1450 if (key_backspace[0] && !key_backspace[1])
1383 er = key_backspace[0]; 1451 er = key_backspace[0];
1384 else if (strcmp (key_backspace, "DEC") == 0) 1452 else if (strcmp (key_backspace, "DEC") == 0)
… …
1387#endif 1455#endif
1388 er = -1; 1456 er = -1;
1389 1457
1390 rxvt_get_ttymode (&tio, er); 1458 rxvt_get_ttymode (&tio, er);
1391 1459
1392 /* set initial window size */ 1460#if ENABLE_FRILLS
1393 tt_winch (); 1461 if (rs[Rs_pty_fd])
1462 return;
1463#endif
1394 1464
1395 sw_chld.start (SIGCHLD); 1465 sw_chld.start (SIGCHLD);
1396 1466
1397#ifndef __QNX__ 1467#ifndef __QNX__
1398 /* spin off the command interpreter */ 1468 /* spin off the command interpreter */
1399 switch (cmd_pid = fork ()) 1469 switch (cmd_pid = fork ())
1400 { 1470 {
1401 case -1: 1471 case -1:
1472 {
1473 cmd_pid = 0;
1402 rxvt_fatal ("can't fork, aborting.\n"); 1474 rxvt_fatal ("can't fork, aborting.\n");
1475 }
1403 case 0: 1476 case 0:
1404 init_env (); 1477 init_env ();
1405 1478
1406 if (!pty.make_controlling_tty ()) 1479 if (!pty.make_controlling_tty ())
1407 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