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.93 by root, Sun Oct 24 14:02:44 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
… …
590 608
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#if 0 613
596#if HAVE_NL_LANGINFO 614#if HAVE_NL_LANGINFO
615 char *codeset = strdup (nl_langinfo (CODESET));
616 // /^UTF.?8/i
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');
597 free (codeset); 621 free (codeset);
598 codeset = strdup (nl_langinfo (CODESET));
599 enc_utf8 = !strcasecmp (codeset, "UTF-8")
600 || !strcasecmp (codeset, "UTF8");
601#else 622#else
602 enc_utf8 = 1; 623 enc_utf8 = 0;
603#endif
604#endif 624#endif
605} 625}
606 626
607void 627void
608rxvt_term::init_xlocale () 628rxvt_term::init_xlocale ()
… …
610#ifdef USE_XIM 630#ifdef USE_XIM
611 if (!locale) 631 if (!locale)
612 rxvt_warn ("setting locale failed, working without locale support.\n"); 632 rxvt_warn ("setting locale failed, working without locale support.\n");
613 else 633 else
614 { 634 {
615 Atom wmlocale; 635 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
616
617 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
618 XChangeProperty (display->display, TermWin.parent[0], wmlocale,
619 XA_STRING, 8, PropModeReplace,
620 (unsigned char *)locale, strlen (locale));
621 636
622 if (!XSupportsLocale ()) 637 if (!XSupportsLocale ())
623 { 638 {
624 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");
625 return; 640 return;
… …
639{ 654{
640 /* 655 /*
641 * Initialize the command connection. 656 * Initialize the command connection.
642 * This should be called after the X server connection is established. 657 * This should be called after the X server connection is established.
643 */ 658 */
644 int i;
645
646 for (i = 0; i < NUM_XA; i++)
647 xa[i] = XInternAtom (display->display, xa_names[i], False);
648
649 /* Enable delete window protocol */
650 XSetWMProtocols (display->display, TermWin.parent[0],
651 & (xa[XA_WMDELETEWINDOW]), 1);
652
653#ifdef USING_W11LIB
654 /* enable W11 callbacks */
655 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
656#endif
657 659
658#ifdef META8_OPTION 660#ifdef META8_OPTION
659 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 661 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC);
660#endif 662#endif
661 663
… …
677 if (scrollbar_visible ()) 679 if (scrollbar_visible ())
678 { 680 {
679 priv_modes |= PrivMode_scrollBar; 681 priv_modes |= PrivMode_scrollBar;
680 SavedModes |= PrivMode_scrollBar; 682 SavedModes |= PrivMode_scrollBar;
681 } 683 }
684
682 if (menubar_visible ()) 685 if (menubar_visible ())
683 { 686 {
684 priv_modes |= PrivMode_menuBar; 687 priv_modes |= PrivMode_menuBar;
685 SavedModes |= PrivMode_menuBar; 688 SavedModes |= PrivMode_menuBar;
686 } 689 }
… …
834 * Use resource ``modifier'' to override the Meta modifier 837 * Use resource ``modifier'' to override the Meta modifier
835 */ 838 */
836void 839void
837rxvt_term::get_ourmods () 840rxvt_term::get_ourmods ()
838{ 841{
839 int i, j, k; 842 int i, j, k;
840 int requestedmeta, realmeta, realalt; 843 int requestedmeta, realmeta, realalt;
841 const char *cm, *rsmod; 844 const char *cm, *rsmod;
842 XModifierKeymap *map; 845 XModifierKeymap *map;
843 KeyCode *kc; 846 KeyCode *kc;
844 const unsigned int modmasks[] = 847 const unsigned int modmasks[] =
845 { 848 {
846 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 849 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
847 }; 850 };
848 851
849 requestedmeta = realmeta = realalt = 0; 852 requestedmeta = realmeta = realalt = 0;
850 rsmod = rs[Rs_modifier]; 853 rsmod = rs[Rs_modifier];
854
851 if (rsmod 855 if (rsmod
852 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 856 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
853 requestedmeta = rsmod[3] - '0'; 857 requestedmeta = rsmod[3] - '0';
854 858
855 map = XGetModifierMapping (display->display); 859 map = XGetModifierMapping (display->display);
856 kc = map->modifiermap; 860 kc = map->modifiermap;
861
857 for (i = 1; i < 6; i++) 862 for (i = 1; i < 6; i++)
858 { 863 {
859 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 864 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
865
860 for (j = map->max_keypermod; j--; k++) 866 for (j = map->max_keypermod; j--; k++)
861 { 867 {
862 if (kc[k] == 0) 868 if (kc[k] == 0)
863 break; 869 break;
870
864 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 871 switch (XKeycodeToKeysym (display->display, kc[k], 0))
865 { 872 {
866 case XK_Num_Lock: 873 case XK_Num_Lock:
867 ModNumLockMask = modmasks[i - 1]; 874 ModNumLockMask = modmasks[i - 1];
868 /* FALLTHROUGH */ 875 continue;
869 default: 876
870 continue; /* for (;;) */ 877 case XK_ISO_Level3_Shift:
878 ModLevel3Mask = modmasks[i - 1];
879 continue;
880
871 case XK_Meta_L: 881 case XK_Meta_L:
872 case XK_Meta_R: 882 case XK_Meta_R:
873 cm = "meta"; 883 cm = "meta";
874 realmeta = i; 884 realmeta = i;
875 break; 885 break;
886
876 case XK_Alt_L: 887 case XK_Alt_L:
877 case XK_Alt_R: 888 case XK_Alt_R:
878 cm = "alt"; 889 cm = "alt";
879 realalt = i; 890 realalt = i;
880 break; 891 break;
892
881 case XK_Super_L: 893 case XK_Super_L:
882 case XK_Super_R: 894 case XK_Super_R:
883 cm = "super"; 895 cm = "super";
884 break; 896 break;
897
885 case XK_Hyper_L: 898 case XK_Hyper_L:
886 case XK_Hyper_R: 899 case XK_Hyper_R:
887 cm = "hyper"; 900 cm = "hyper";
888 break; 901 break;
902
903 default:
904 continue;
889 } 905 }
906
890 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0) 907 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
891 requestedmeta = i; 908 requestedmeta = i;
892 } 909 }
893 } 910 }
911
894 XFreeModifiermap (map); 912 XFreeModifiermap (map);
913
895 i = (requestedmeta ? requestedmeta 914 i = requestedmeta ? requestedmeta
896 : (realmeta ? realmeta 915 : realmeta ? realmeta
897 : (realalt ? realalt : 0))); 916 : realalt ? realalt
917 : 0;
918
898 if (i) 919 if (i)
899 ModMetaMask = modmasks[i - 1]; 920 ModMetaMask = modmasks[i - 1];
900} 921}
901 922
902/*----------------------------------------------------------------------*/ 923/*----------------------------------------------------------------------*/
… …
912#endif 933#endif
913 XGCValues gcvalue; 934 XGCValues gcvalue;
914 long vt_emask; 935 long vt_emask;
915 XSetWindowAttributes attributes; 936 XSetWindowAttributes attributes;
916 XWindowAttributes gattr; 937 XWindowAttributes gattr;
938 Window top, parent;
939 dDisp;
940
941#ifdef USING_W11LIB
942 /* enable W11 callbacks */
943 W11AddEventHandler (disp, rxvt_W11_process_x_event);
944#endif
945
946 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
947 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
917 948
918 if (options & Opt_transparent) 949 if (options & Opt_transparent)
919 { 950 {
920 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 951 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
921 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 952 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
922 } 953 }
923 954
924#if ENABLE_FRILLS 955#if ENABLE_FRILLS
925 if (options & Opt_borderLess) 956 if (options & Opt_borderLess)
926 { 957 {
927 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 958 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
928 959
929 if (prop == None) 960 if (prop == None)
930 { 961 {
931 /* 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");*/
932#ifdef PREFER_24BIT 963#ifdef PREFER_24BIT
… …
939 mwmhints.flags = MWM_HINTS_DECORATIONS; 970 mwmhints.flags = MWM_HINTS_DECORATIONS;
940 mwmhints.decorations = 0; 971 mwmhints.decorations = 0;
941 } 972 }
942 } 973 }
943 else 974 else
944 {
945 mwmhints.flags = 0; 975 mwmhints.flags = 0;
946 }
947#endif 976#endif
948 977
949 /* grab colors before netscape does */ 978 /* grab colors before netscape does */
950 Get_Colours (); 979 Get_Colours ();
951 980
952 if (!set_fonts ()) 981 if (!set_fonts ())
953 rxvt_fatal ("unable to load base fontset, please specify one using -fn, aborting.\n"); 982 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
954 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
955 window_calc (0, 0); 1000 window_calc (0, 0);
956 old_width = szHint.width;
957 old_height = szHint.height;
958 1001
959 /* sub-window placement & size in rxvt_resize_subwindows () */ 1002 /* sub-window placement & size in rxvt_resize_subwindows () */
960
961#ifdef PREFER_24BIT 1003#ifdef PREFER_24BIT
962 attributes.background_pixel = pix_colors_focused[Color_border]; 1004 attributes.background_pixel = pix_colors_focused[Color_border];
963 attributes.border_pixel = pix_colors_focused[Color_border]; 1005 attributes.border_pixel = pix_colors_focused[Color_border];
964 attributes.colormap = display->cmap; 1006 attributes.colormap = display->cmap;
965 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 1007 top = XCreateWindow (disp, parent,
966 szHint.x, szHint.y, 1008 szHint.x, szHint.y,
967 szHint.width, szHint.height, 1009 szHint.width, szHint.height,
968 TermWin.ext_bwidth, 1010 TermWin.ext_bwidth,
969 display->depth, InputOutput, 1011 display->depth, InputOutput,
970 display->visual, 1012 display->visual,
971 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1013 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
972#else 1014#else
973 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 1015 top = XCreateSimpleWindow (disp, parent,
974 szHint.x, szHint.y, 1016 szHint.x, szHint.y,
975 szHint.width, szHint.height, 1017 szHint.width, szHint.height,
976 TermWin.ext_bwidth, 1018 TermWin.ext_bwidth,
977 pix_colors_focused[Color_border], 1019 pix_colors_focused[Color_border],
978 pix_colors_focused[Color_border]); 1020 pix_colors_focused[Color_border]);
979#endif 1021#endif
1022
1023 TermWin.parent[0] = top;
1024
1025 old_width = szHint.width;
1026 old_height = szHint.height;
980 1027
981 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1028 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
982 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1029 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
983 1030
984 classHint.res_name = (char *)rs[Rs_name]; 1031 classHint.res_name = (char *)rs[Rs_name];
985 classHint.res_class = (char *)RESCLASS; 1032 classHint.res_class = (char *)RESCLASS;
986 1033
987 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1034 wmHint.flags = InputHint | StateHint | WindowGroupHint;
988 wmHint.input = True; 1035 wmHint.input = True;
989 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1036 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
990 wmHint.window_group = TermWin.parent[0]; 1037 wmHint.window_group = top;
991 1038
992 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1039 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
993 (char **)argv, argc, &szHint, &wmHint, &classHint); 1040 &szHint, &wmHint, &classHint);
994 1041
995#if ENABLE_FRILLS 1042 Atom protocols[] = {
1043 xa[XA_WM_DELETE_WINDOW],
1044#if ENABLE_EWMH
1045 xa[XA_NET_WM_PING],
1046#endif
1047 };
1048
1049 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1050
1051#if ENABLE_EWMH
996 long pid = getpid (); 1052 long pid = getpid ();
997 1053
998 XChangeProperty (display->display, TermWin.parent[0], 1054 XChangeProperty (disp, top,
999 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32, 1055 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1000 PropModeReplace, (unsigned char *)&pid, 1); 1056 PropModeReplace, (unsigned char *)&pid, 1);
1001#endif
1002 1057
1003 XSelectInput (display->display, TermWin.parent[0], 1058 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1059#endif
1060
1061 XSelectInput (disp, top,
1004 KeyPressMask 1062 KeyPressMask
1005#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1063#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1006 | KeyReleaseMask 1064 | KeyReleaseMask
1007#endif 1065#endif
1008 | FocusChangeMask | VisibilityChangeMask 1066 | FocusChangeMask | VisibilityChangeMask
1009 | ExposureMask
1010 | StructureNotifyMask); 1067 | ExposureMask | StructureNotifyMask);
1068
1011 termwin_ev.start (display, TermWin.parent[0]); 1069 termwin_ev.start (display, top);
1012 1070
1013#if ENABLE_FRILLS 1071#if ENABLE_FRILLS
1014 if (mwmhints.flags) 1072 if (mwmhints.flags)
1015 { 1073 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1016 prop = XInternAtom (display->display, "_MOTIF_WM_HINTS", False);
1017 XChangeProperty (display->display, TermWin.parent[0], prop, prop, 32,
1018 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1074 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1019 }
1020#endif 1075#endif
1021 1076
1022 /* 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 */
1023 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1078 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1024 1079
1025#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1080#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1026 /* cursor (menuBar/scrollBar): Black-on-White */ 1081 /* cursor (menuBar/scrollBar): Black-on-White */
1027 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1082 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1028#endif
1029
1030#ifdef POINTER_BLANK
1031 {
1032 XColor blackcolour;
1033 blackcolour.red = 0;
1034 blackcolour.green = 0;
1035 blackcolour.blue = 0;
1036 Font f = XLoadFont (display->display, "fixed");
1037 blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1038 &blackcolour, &blackcolour);
1039 XUnloadFont (display->display, f);
1040 }
1041#endif 1083#endif
1042 1084
1043 /* the vt window */ 1085 /* the vt window */
1044 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1086 TermWin.vt = XCreateSimpleWindow (disp, top,
1045 window_vt_x, 1087 window_vt_x,
1046 window_vt_y, 1088 window_vt_y,
1047 TermWin_TotalWidth (), 1089 TermWin_TotalWidth (),
1048 TermWin_TotalHeight (), 1090 TermWin_TotalHeight (),
1049 0, 1091 0,
1050 pix_colors_focused[Color_fg], 1092 pix_colors_focused[Color_fg],
1051 pix_colors_focused[Color_bg]); 1093 pix_colors_focused[Color_bg]);
1052#ifdef DEBUG_X 1094#ifdef DEBUG_X
1053 XStoreName (display->display, TermWin.vt, "vt window"); 1095 XStoreName (disp, TermWin.vt, "vt window");
1054#endif 1096#endif
1055 1097
1056 attributes.bit_gravity = NorthWestGravity; 1098 attributes.bit_gravity = NorthWestGravity;
1057 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1099 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);
1058 1100
1059 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1101 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1060
1061 pointer_unblank ();
1062 1102
1063#ifdef POINTER_BLANK 1103#ifdef POINTER_BLANK
1064 if (options & Opt_pointerBlank) 1104 if (options & Opt_pointerBlank)
1065 vt_emask |= PointerMotionMask; 1105 vt_emask |= PointerMotionMask;
1066 else 1106 else
1067#endif 1107#endif
1068 vt_emask |= Button1MotionMask | Button3MotionMask; 1108 vt_emask |= Button1MotionMask | Button3MotionMask;
1069 1109
1070 XSelectInput (display->display, TermWin.vt, vt_emask); 1110 XSelectInput (disp, TermWin.vt, vt_emask);
1071 vt_ev.start (display, TermWin.vt); 1111 vt_ev.start (display, TermWin.vt);
1072 1112
1073#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1113#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1074 if (menuBar_height ()) 1114 if (menuBar_height ())
1075 { 1115 {
1076 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1116 menuBar.win = XCreateSimpleWindow (disp, top,
1077 window_vt_x, 0, 1117 window_vt_x, 0,
1078 TermWin_TotalWidth (), 1118 TermWin_TotalWidth (),
1079 menuBar_TotalHeight (), 1119 menuBar_TotalHeight (),
1080 0, 1120 0,
1081 pix_colors_focused[Color_fg], 1121 pix_colors_focused[Color_fg],
1082 pix_colors_focused[Color_scroll]); 1122 pix_colors_focused[Color_scroll]);
1083 1123
1084#ifdef DEBUG_X 1124#ifdef DEBUG_X
1085 XStoreName (display->display, menuBar.win, "menubar"); 1125 XStoreName (disp, menuBar.win, "menubar");
1086#endif 1126#endif
1087 1127
1088 menuBar.drawable = new rxvt_drawable (display, menuBar.win); 1128 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1089 1129
1090 XDefineCursor (display->display, menuBar.win, 1130 XDefineCursor (disp, menuBar.win,
1091 XCreateFontCursor (display->display, XC_left_ptr)); 1131 XCreateFontCursor (disp, XC_left_ptr));
1092 1132
1093 XSelectInput (display->display, menuBar.win, 1133 XSelectInput (disp, menuBar.win,
1094 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1134 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1095 | Button1MotionMask));
1096 menubar_ev.start (display, menuBar.win); 1135 menubar_ev.start (display, menuBar.win);
1097 } 1136 }
1098#endif 1137#endif
1099 1138
1100#ifdef XPM_BACKGROUND 1139#ifdef XPM_BACKGROUND
… …
1116 1155
1117 /* graphics context for the vt window */ 1156 /* graphics context for the vt window */
1118 gcvalue.foreground = pix_colors[Color_fg]; 1157 gcvalue.foreground = pix_colors[Color_fg];
1119 gcvalue.background = pix_colors[Color_bg]; 1158 gcvalue.background = pix_colors[Color_bg];
1120 gcvalue.graphics_exposures = 1; 1159 gcvalue.graphics_exposures = 1;
1121 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1160 TermWin.gc = XCreateGC (disp, TermWin.vt,
1122 GCForeground | GCBackground | GCGraphicsExposures, 1161 GCForeground | GCBackground | GCGraphicsExposures,
1123 &gcvalue); 1162 &gcvalue);
1124 1163
1125 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1164 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1126 1165
1127#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1166#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1128 gcvalue.foreground = pix_colors[Color_topShadow]; 1167 gcvalue.foreground = pix_colors[Color_topShadow];
1129 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1168 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1130 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1169 gcvalue.foreground = pix_colors[Color_bottomShadow];
1131 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1170 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1132 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1171 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1133 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1172 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1134#endif 1173#endif
1135 1174
1136#ifdef OFF_FOCUS_FADING 1175#ifdef OFF_FOCUS_FADING
1137 // initially we are in unfocused state 1176 // initially we are in unfocused state
1138 if (rs[Rs_fade]) 1177 if (rs[Rs_fade])
1139 pix_colors = pix_colors_unfocused; 1178 pix_colors = pix_colors_unfocused;
1140#endif 1179#endif
1141 1180
1181 pointer_unblank ();
1142 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
1143} 1193}
1144 1194
1145/* ------------------------------------------------------------------------- * 1195/* ------------------------------------------------------------------------- *
1146 * GET TTY CURRENT STATE * 1196 * GET TTY CURRENT STATE *
1147 * ------------------------------------------------------------------------- */ 1197 * ------------------------------------------------------------------------- */
… …
1376 * the slave. 1426 * the slave.
1377 */ 1427 */
1378void 1428void
1379rxvt_term::run_command (const char *const *argv) 1429rxvt_term::run_command (const char *const *argv)
1380{ 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
1381 int er; 1447 int er;
1382
1383 if (!pty.get ())
1384 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1385 1448
1386#ifndef NO_BACKSPACE_KEY 1449#ifndef NO_BACKSPACE_KEY
1387 if (key_backspace[0] && !key_backspace[1]) 1450 if (key_backspace[0] && !key_backspace[1])
1388 er = key_backspace[0]; 1451 er = key_backspace[0];
1389 else if (strcmp (key_backspace, "DEC") == 0) 1452 else if (strcmp (key_backspace, "DEC") == 0)
… …
1392#endif 1455#endif
1393 er = -1; 1456 er = -1;
1394 1457
1395 rxvt_get_ttymode (&tio, er); 1458 rxvt_get_ttymode (&tio, er);
1396 1459
1397 /* set initial window size */ 1460#if ENABLE_FRILLS
1398 tt_winch (); 1461 if (rs[Rs_pty_fd])
1462 return;
1463#endif
1399 1464
1400 sw_chld.start (SIGCHLD); 1465 sw_chld.start (SIGCHLD);
1401 1466
1402#ifndef __QNX__ 1467#ifndef __QNX__
1403 /* spin off the command interpreter */ 1468 /* spin off the command interpreter */
1404 switch (cmd_pid = fork ()) 1469 switch (cmd_pid = fork ())
1405 { 1470 {
1406 case -1: 1471 case -1:
1472 {
1473 cmd_pid = 0;
1407 rxvt_fatal ("can't fork, aborting.\n"); 1474 rxvt_fatal ("can't fork, aborting.\n");
1475 }
1408 case 0: 1476 case 0:
1409 init_env (); 1477 init_env ();
1410 1478
1411 if (!pty.make_controlling_tty ()) 1479 if (!pty.make_controlling_tty ())
1412 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