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

Diff Legend

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