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