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

Diff Legend

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