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.94 by root, Mon Nov 29 13:37:20 2004 UTC vs.
Revision 1.119 by root, Thu Aug 11 02:05:07 2005 UTC

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

Diff Legend

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