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.117 by root, Thu Jul 7 19:37:47 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);
348
349 if (!(display = displays.get (rs[Rs_display_name])))
350 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
351
352 extract_resources ();
327 free (r_argv); 353 free (r_argv);
328
329#ifdef LOCAL_X_IS_UNIX
330 if (rs[Rs_display_name][0] == ':')
331 {
332 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
333 strcpy (val, "unix");
334 strcat (val, rs[Rs_display_name]);
335 display = displays.get (val);
336 free (val);
337 }
338#endif
339
340 if (!display
341 && ! (display = displays.get (rs[Rs_display_name])))
342 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
343
344 extract_resources (display->display, rs[Rs_name]);
345 354
346 /* 355 /*
347 * set any defaults not already set 356 * set any defaults not already set
348 */ 357 */
349 if (cmd_argv && cmd_argv[0]) 358 if (cmd_argv && cmd_argv[0])
… …
367#if ENABLE_FRILLS 376#if ENABLE_FRILLS
368 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 377 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
369 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 378 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */
370 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 379 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
371 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 380 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) 381 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
376 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 382 TermWin.lineSpace = min (i, 100); /* arbitrary limit */
377#endif 383#endif
378 384
379#ifdef POINTER_BLANK 385#ifdef POINTER_BLANK
… …
591 this->locale = rxvt_strdup (this->locale); 597 this->locale = rxvt_strdup (this->locale);
592 SET_LOCALE (this->locale); 598 SET_LOCALE (this->locale);
593 mbstate.reset (); 599 mbstate.reset ();
594#endif 600#endif
595 601
596#if 0
597#if HAVE_NL_LANGINFO 602#if HAVE_NL_LANGINFO
598 char *codeset = strdup (nl_langinfo (CODESET)); 603 char *codeset = strdup (nl_langinfo (CODESET));
599 enc_utf8 = !strcasecmp (codeset, "UTF-8") 604 // /^UTF.?8/i
600 || !strcasecmp (codeset, "UTF8"); 605 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
606 && (codeset[1] == 'T' || codeset[1] == 't')
607 && (codeset[2] == 'F' || codeset[2] == 'f')
608 && (codeset[3] == '8' || codeset[4] == '8');
601 free (codeset); 609 free (codeset);
602#else 610#else
603 enc_utf8 = 0; 611 enc_utf8 = 0;
604#endif
605#endif 612#endif
606} 613}
607 614
608void 615void
609rxvt_term::init_xlocale () 616rxvt_term::init_xlocale ()
… …
611#ifdef USE_XIM 618#ifdef USE_XIM
612 if (!locale) 619 if (!locale)
613 rxvt_warn ("setting locale failed, working without locale support.\n"); 620 rxvt_warn ("setting locale failed, working without locale support.\n");
614 else 621 else
615 { 622 {
616 set_string_property (display->atom ("WM_LOCALE_NAME"), locale); 623 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
617 624
618 if (!XSupportsLocale ()) 625 if (!XSupportsLocale ())
619 { 626 {
620 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 627 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n");
621 return; 628 return;
… …
660 if (scrollbar_visible ()) 667 if (scrollbar_visible ())
661 { 668 {
662 priv_modes |= PrivMode_scrollBar; 669 priv_modes |= PrivMode_scrollBar;
663 SavedModes |= PrivMode_scrollBar; 670 SavedModes |= PrivMode_scrollBar;
664 } 671 }
672
665 if (menubar_visible ()) 673 if (menubar_visible ())
666 { 674 {
667 priv_modes |= PrivMode_menuBar; 675 priv_modes |= PrivMode_menuBar;
668 SavedModes |= PrivMode_menuBar; 676 SavedModes |= PrivMode_menuBar;
669 } 677 }
… …
817 * Use resource ``modifier'' to override the Meta modifier 825 * Use resource ``modifier'' to override the Meta modifier
818 */ 826 */
819void 827void
820rxvt_term::get_ourmods () 828rxvt_term::get_ourmods ()
821{ 829{
822 int i, j, k; 830 int i, j, k;
823 int requestedmeta, realmeta, realalt; 831 int requestedmeta, realmeta, realalt;
824 const char *cm, *rsmod; 832 const char *cm, *rsmod;
825 XModifierKeymap *map; 833 XModifierKeymap *map;
826 KeyCode *kc; 834 KeyCode *kc;
827 const unsigned int modmasks[] = 835 const unsigned int modmasks[] =
828 { 836 {
829 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 837 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
830 }; 838 };
831 839
832 requestedmeta = realmeta = realalt = 0; 840 requestedmeta = realmeta = realalt = 0;
833 rsmod = rs[Rs_modifier]; 841 rsmod = rs[Rs_modifier];
842
834 if (rsmod 843 if (rsmod
835 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 844 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
836 requestedmeta = rsmod[3] - '0'; 845 requestedmeta = rsmod[3] - '0';
837 846
838 map = XGetModifierMapping (display->display); 847 map = XGetModifierMapping (display->display);
839 kc = map->modifiermap; 848 kc = map->modifiermap;
849
840 for (i = 1; i < 6; i++) 850 for (i = 1; i < 6; i++)
841 { 851 {
842 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 852 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
853
843 for (j = map->max_keypermod; j--; k++) 854 for (j = map->max_keypermod; j--; k++)
844 { 855 {
845 if (kc[k] == 0) 856 if (kc[k] == 0)
846 break; 857 break;
858
847 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 859 switch (XKeycodeToKeysym (display->display, kc[k], 0))
848 { 860 {
849 case XK_Num_Lock: 861 case XK_Num_Lock:
850 ModNumLockMask = modmasks[i - 1]; 862 ModNumLockMask = modmasks[i - 1];
851 /* FALLTHROUGH */ 863 continue;
852 default: 864
853 continue; /* for (;;) */ 865 case XK_ISO_Level3_Shift:
866 ModLevel3Mask = modmasks[i - 1];
867 continue;
868
854 case XK_Meta_L: 869 case XK_Meta_L:
855 case XK_Meta_R: 870 case XK_Meta_R:
856 cm = "meta"; 871 cm = "meta";
857 realmeta = i; 872 realmeta = i;
858 break; 873 break;
874
859 case XK_Alt_L: 875 case XK_Alt_L:
860 case XK_Alt_R: 876 case XK_Alt_R:
861 cm = "alt"; 877 cm = "alt";
862 realalt = i; 878 realalt = i;
863 break; 879 break;
880
864 case XK_Super_L: 881 case XK_Super_L:
865 case XK_Super_R: 882 case XK_Super_R:
866 cm = "super"; 883 cm = "super";
867 break; 884 break;
885
868 case XK_Hyper_L: 886 case XK_Hyper_L:
869 case XK_Hyper_R: 887 case XK_Hyper_R:
870 cm = "hyper"; 888 cm = "hyper";
871 break; 889 break;
890
891 default:
892 continue;
872 } 893 }
894
873 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0) 895 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
874 requestedmeta = i; 896 requestedmeta = i;
875 } 897 }
876 } 898 }
899
877 XFreeModifiermap (map); 900 XFreeModifiermap (map);
901
878 i = (requestedmeta ? requestedmeta 902 i = requestedmeta ? requestedmeta
879 : (realmeta ? realmeta 903 : realmeta ? realmeta
880 : (realalt ? realalt : 0))); 904 : realalt ? realalt
905 : 0;
906
881 if (i) 907 if (i)
882 ModMetaMask = modmasks[i - 1]; 908 ModMetaMask = modmasks[i - 1];
883} 909}
884 910
885/*----------------------------------------------------------------------*/ 911/*----------------------------------------------------------------------*/
… …
895#endif 921#endif
896 XGCValues gcvalue; 922 XGCValues gcvalue;
897 long vt_emask; 923 long vt_emask;
898 XSetWindowAttributes attributes; 924 XSetWindowAttributes attributes;
899 XWindowAttributes gattr; 925 XWindowAttributes gattr;
900 926 Window top, parent;
901 for (int i = 0; i < NUM_XA; i++) 927 dDisp;
902 xa[i] = XInternAtom (display->display, xa_names[i], False);
903 928
904#ifdef USING_W11LIB 929#ifdef USING_W11LIB
905 /* enable W11 callbacks */ 930 /* enable W11 callbacks */
906 W11AddEventHandler (display->display, rxvt_W11_process_x_event); 931 W11AddEventHandler (disp, rxvt_W11_process_x_event);
907#endif 932#endif
933
934 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
935 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
908 936
909 if (options & Opt_transparent) 937 if (options & Opt_transparent)
910 { 938 {
911 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 939 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
912 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 940 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
913 } 941 }
914 942
915#if ENABLE_FRILLS 943#if ENABLE_FRILLS
916 if (options & Opt_borderLess) 944 if (options & Opt_borderLess)
917 { 945 {
918 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 946 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
919 947
920 if (prop == None) 948 if (prop == None)
921 { 949 {
922 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 950 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
923#ifdef PREFER_24BIT 951#ifdef PREFER_24BIT
… …
930 mwmhints.flags = MWM_HINTS_DECORATIONS; 958 mwmhints.flags = MWM_HINTS_DECORATIONS;
931 mwmhints.decorations = 0; 959 mwmhints.decorations = 0;
932 } 960 }
933 } 961 }
934 else 962 else
935 {
936 mwmhints.flags = 0; 963 mwmhints.flags = 0;
937 }
938#endif 964#endif
939 965
940 /* grab colors before netscape does */ 966 /* grab colors before netscape does */
941 Get_Colours (); 967 Get_Colours ();
942 968
943 if (!set_fonts ()) 969 if (!set_fonts ())
944 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 970 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
945 971
972 parent = DefaultRootWindow (disp);
973
974#if ENABLE_XEMBED
975 if (rs[Rs_embed])
976 {
977 XWindowAttributes wattr;
978
979 parent = strtol (rs[Rs_embed], 0, 0);
980
981 if (!XGetWindowAttributes (disp, parent, &wattr))
982 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
983
984 window_calc (wattr.width, wattr.height);
985 }
986
987#endif
946 window_calc (0, 0); 988 window_calc (0, 0);
947 old_width = szHint.width;
948 old_height = szHint.height;
949 989
950 /* sub-window placement & size in rxvt_resize_subwindows () */ 990 /* sub-window placement & size in rxvt_resize_subwindows () */
951
952#ifdef PREFER_24BIT 991#ifdef PREFER_24BIT
953 attributes.background_pixel = pix_colors_focused[Color_border]; 992 attributes.background_pixel = pix_colors_focused[Color_border];
954 attributes.border_pixel = pix_colors_focused[Color_border]; 993 attributes.border_pixel = pix_colors_focused[Color_border];
955 attributes.colormap = display->cmap; 994 attributes.colormap = display->cmap;
956 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 995 top = XCreateWindow (disp, parent,
957 szHint.x, szHint.y, 996 szHint.x, szHint.y,
958 szHint.width, szHint.height, 997 szHint.width, szHint.height,
959 TermWin.ext_bwidth, 998 TermWin.ext_bwidth,
960 display->depth, InputOutput, 999 display->depth, InputOutput,
961 display->visual, 1000 display->visual,
962 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1001 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
963#else 1002#else
964 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 1003 top = XCreateSimpleWindow (disp, parent,
965 szHint.x, szHint.y, 1004 szHint.x, szHint.y,
966 szHint.width, szHint.height, 1005 szHint.width, szHint.height,
967 TermWin.ext_bwidth, 1006 TermWin.ext_bwidth,
968 pix_colors_focused[Color_border], 1007 pix_colors_focused[Color_border],
969 pix_colors_focused[Color_border]); 1008 pix_colors_focused[Color_border]);
970#endif 1009#endif
1010
1011 TermWin.parent[0] = top;
1012
1013 old_width = szHint.width;
1014 old_height = szHint.height;
971 1015
972 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1016 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
973 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1017 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
974 1018
975 classHint.res_name = (char *)rs[Rs_name]; 1019 classHint.res_name = (char *)rs[Rs_name];
976 classHint.res_class = (char *)RESCLASS; 1020 classHint.res_class = (char *)RESCLASS;
977 1021
978 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1022 wmHint.flags = InputHint | StateHint | WindowGroupHint;
979 wmHint.input = True; 1023 wmHint.input = True;
980 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1024 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
981 wmHint.window_group = TermWin.parent[0]; 1025 wmHint.window_group = top;
982 1026
983 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1027 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
984 (char **)argv, argc, &szHint, &wmHint, &classHint); 1028 &szHint, &wmHint, &classHint);
985 1029
986 /* Enable delete window protocol */ 1030 Atom protocols[] = {
987 XSetWMProtocols (display->display, TermWin.parent[0], 1031 xa[XA_WM_DELETE_WINDOW],
988 &xa[XA_WMDELETEWINDOW], 1); 1032#if ENABLE_EWMH
1033 xa[XA_NET_WM_PING],
1034#endif
1035 };
989 1036
990#if ENABLE_FRILLS 1037 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1038
1039#if ENABLE_EWMH
991 long pid = getpid (); 1040 long pid = getpid ();
992 1041
993 XChangeProperty (display->display, TermWin.parent[0], 1042 XChangeProperty (disp, top,
994 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32, 1043 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
995 PropModeReplace, (unsigned char *)&pid, 1); 1044 PropModeReplace, (unsigned char *)&pid, 1);
996#endif
997 1045
998 XSelectInput (display->display, TermWin.parent[0], 1046 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1047#endif
1048
1049 XSelectInput (disp, top,
999 KeyPressMask 1050 KeyPressMask
1000#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1051#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1001 | KeyReleaseMask 1052 | KeyReleaseMask
1002#endif 1053#endif
1003 | FocusChangeMask | VisibilityChangeMask 1054 | FocusChangeMask | VisibilityChangeMask
1004 | ExposureMask
1005 | StructureNotifyMask); 1055 | ExposureMask | StructureNotifyMask);
1056
1006 termwin_ev.start (display, TermWin.parent[0]); 1057 termwin_ev.start (display, top);
1007 1058
1008#if ENABLE_FRILLS 1059#if ENABLE_FRILLS
1009 if (mwmhints.flags) 1060 if (mwmhints.flags)
1010 { 1061 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); 1062 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1014 }
1015#endif 1063#endif
1016 1064
1017 /* vt cursor: Black-on-White is standard, but this is more popular */ 1065 /* vt cursor: Black-on-White is standard, but this is more popular */
1018 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1066 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1019 1067
1020#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1068#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1021 /* cursor (menuBar/scrollBar): Black-on-White */ 1069 /* cursor (menuBar/scrollBar): Black-on-White */
1022 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1070 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 1071#endif
1037 1072
1038 /* the vt window */ 1073 /* the vt window */
1039 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1074 TermWin.vt = XCreateSimpleWindow (disp, top,
1040 window_vt_x, 1075 window_vt_x,
1041 window_vt_y, 1076 window_vt_y,
1042 TermWin_TotalWidth (), 1077 TermWin_TotalWidth (),
1043 TermWin_TotalHeight (), 1078 TermWin_TotalHeight (),
1044 0, 1079 0,
1045 pix_colors_focused[Color_fg], 1080 pix_colors_focused[Color_fg],
1046 pix_colors_focused[Color_bg]); 1081 pix_colors_focused[Color_bg]);
1047#ifdef DEBUG_X 1082#ifdef DEBUG_X
1048 XStoreName (display->display, TermWin.vt, "vt window"); 1083 XStoreName (disp, TermWin.vt, "vt window");
1049#endif 1084#endif
1050 1085
1051 attributes.bit_gravity = NorthWestGravity; 1086 attributes.bit_gravity = NorthWestGravity;
1052 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1087 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);
1053 1088
1054 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1089 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1055
1056 pointer_unblank ();
1057 1090
1058#ifdef POINTER_BLANK 1091#ifdef POINTER_BLANK
1059 if (options & Opt_pointerBlank) 1092 if (options & Opt_pointerBlank)
1060 vt_emask |= PointerMotionMask; 1093 vt_emask |= PointerMotionMask;
1061 else 1094 else
1062#endif 1095#endif
1063 vt_emask |= Button1MotionMask | Button3MotionMask; 1096 vt_emask |= Button1MotionMask | Button3MotionMask;
1064 1097
1065 XSelectInput (display->display, TermWin.vt, vt_emask); 1098 XSelectInput (disp, TermWin.vt, vt_emask);
1066 vt_ev.start (display, TermWin.vt); 1099 vt_ev.start (display, TermWin.vt);
1067 1100
1068#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1101#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1069 if (menuBar_height ()) 1102 if (menuBar_height ())
1070 { 1103 {
1071 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1104 menuBar.win = XCreateSimpleWindow (disp, top,
1072 window_vt_x, 0, 1105 window_vt_x, 0,
1073 TermWin_TotalWidth (), 1106 TermWin_TotalWidth (),
1074 menuBar_TotalHeight (), 1107 menuBar_TotalHeight (),
1075 0, 1108 0,
1076 pix_colors_focused[Color_fg], 1109 pix_colors_focused[Color_fg],
1077 pix_colors_focused[Color_scroll]); 1110 pix_colors_focused[Color_scroll]);
1078 1111
1079#ifdef DEBUG_X 1112#ifdef DEBUG_X
1080 XStoreName (display->display, menuBar.win, "menubar"); 1113 XStoreName (disp, menuBar.win, "menubar");
1081#endif 1114#endif
1082 1115
1083 menuBar.drawable = new rxvt_drawable (display, menuBar.win); 1116 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1084 1117
1085 XDefineCursor (display->display, menuBar.win, 1118 XDefineCursor (disp, menuBar.win,
1086 XCreateFontCursor (display->display, XC_left_ptr)); 1119 XCreateFontCursor (disp, XC_left_ptr));
1087 1120
1088 XSelectInput (display->display, menuBar.win, 1121 XSelectInput (disp, menuBar.win,
1089 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1122 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1090 | Button1MotionMask));
1091 menubar_ev.start (display, menuBar.win); 1123 menubar_ev.start (display, menuBar.win);
1092 } 1124 }
1093#endif 1125#endif
1094 1126
1095#ifdef XPM_BACKGROUND 1127#ifdef XPM_BACKGROUND
… …
1111 1143
1112 /* graphics context for the vt window */ 1144 /* graphics context for the vt window */
1113 gcvalue.foreground = pix_colors[Color_fg]; 1145 gcvalue.foreground = pix_colors[Color_fg];
1114 gcvalue.background = pix_colors[Color_bg]; 1146 gcvalue.background = pix_colors[Color_bg];
1115 gcvalue.graphics_exposures = 1; 1147 gcvalue.graphics_exposures = 1;
1116 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1148 TermWin.gc = XCreateGC (disp, TermWin.vt,
1117 GCForeground | GCBackground | GCGraphicsExposures, 1149 GCForeground | GCBackground | GCGraphicsExposures,
1118 &gcvalue); 1150 &gcvalue);
1119 1151
1120 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1152 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1121 1153
1122#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1154#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1123 gcvalue.foreground = pix_colors[Color_topShadow]; 1155 gcvalue.foreground = pix_colors[Color_topShadow];
1124 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1156 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1125 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1157 gcvalue.foreground = pix_colors[Color_bottomShadow];
1126 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1158 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1127 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1159 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1128 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1160 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1129#endif 1161#endif
1130 1162
1131#ifdef OFF_FOCUS_FADING 1163#ifdef OFF_FOCUS_FADING
1132 // initially we are in unfocused state 1164 // initially we are in unfocused state
1133 if (rs[Rs_fade]) 1165 if (rs[Rs_fade])
1134 pix_colors = pix_colors_unfocused; 1166 pix_colors = pix_colors_unfocused;
1135#endif 1167#endif
1136 1168
1169 pointer_unblank ();
1137 scr_recolour (); 1170 scr_recolour ();
1171
1172#if ENABLE_XEMBED
1173 if (rs[Rs_embed])
1174 {
1175 long info[2] = { 0, XEMBED_MAPPED };
1176
1177 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1178 32, PropModeReplace, (unsigned char *)&info, 2);
1179 }
1180#endif
1138} 1181}
1139 1182
1140/* ------------------------------------------------------------------------- * 1183/* ------------------------------------------------------------------------- *
1141 * GET TTY CURRENT STATE * 1184 * GET TTY CURRENT STATE *
1142 * ------------------------------------------------------------------------- */ 1185 * ------------------------------------------------------------------------- */
… …
1371 * the slave. 1414 * the slave.
1372 */ 1415 */
1373void 1416void
1374rxvt_term::run_command (const char *const *argv) 1417rxvt_term::run_command (const char *const *argv)
1375{ 1418{
1419#if ENABLE_FRILLS
1420 if (rs[Rs_pty_fd])
1421 {
1422 pty.pty = atoi (rs[Rs_pty_fd]);
1423 fcntl (pty.pty, F_SETFL, O_NONBLOCK);
1424 }
1425 else
1426#endif
1427 if (!pty.get ())
1428 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1429
1430 pty.set_utf8_mode (enc_utf8);
1431
1432 /* set initial window size */
1433 tt_winch ();
1434
1376 int er; 1435 int er;
1377
1378 if (!pty.get ())
1379 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1380 1436
1381#ifndef NO_BACKSPACE_KEY 1437#ifndef NO_BACKSPACE_KEY
1382 if (key_backspace[0] && !key_backspace[1]) 1438 if (key_backspace[0] && !key_backspace[1])
1383 er = key_backspace[0]; 1439 er = key_backspace[0];
1384 else if (strcmp (key_backspace, "DEC") == 0) 1440 else if (strcmp (key_backspace, "DEC") == 0)
… …
1387#endif 1443#endif
1388 er = -1; 1444 er = -1;
1389 1445
1390 rxvt_get_ttymode (&tio, er); 1446 rxvt_get_ttymode (&tio, er);
1391 1447
1392 /* set initial window size */ 1448#if ENABLE_FRILLS
1393 tt_winch (); 1449 if (rs[Rs_pty_fd])
1450 return;
1451#endif
1394 1452
1395 sw_chld.start (SIGCHLD); 1453 sw_chld.start (SIGCHLD);
1396 1454
1397#ifndef __QNX__ 1455#ifndef __QNX__
1398 /* spin off the command interpreter */ 1456 /* spin off the command interpreter */
1399 switch (cmd_pid = fork ()) 1457 switch (cmd_pid = fork ())
1400 { 1458 {
1401 case -1: 1459 case -1:
1460 {
1461 cmd_pid = 0;
1402 rxvt_fatal ("can't fork, aborting.\n"); 1462 rxvt_fatal ("can't fork, aborting.\n");
1463 }
1403 case 0: 1464 case 0:
1404 init_env (); 1465 init_env ();
1405 1466
1406 if (!pty.make_controlling_tty ()) 1467 if (!pty.make_controlling_tty ())
1407 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1468 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);

Diff Legend

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