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.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
… …
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 604
596#if 0
597#if HAVE_NL_LANGINFO 605#if HAVE_NL_LANGINFO
598 char *codeset = strdup (nl_langinfo (CODESET)); 606 char *codeset = strdup (nl_langinfo (CODESET));
599 enc_utf8 = !strcasecmp (codeset, "UTF-8") 607 // /^UTF.?8/i
600 || !strcasecmp (codeset, "UTF8"); 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');
601 free (codeset); 612 free (codeset);
602#else 613#else
603 enc_utf8 = 0; 614 enc_utf8 = 0;
604#endif
605#endif 615#endif
606} 616}
607 617
608void 618void
609rxvt_term::init_xlocale () 619rxvt_term::init_xlocale ()
… …
611#ifdef USE_XIM 621#ifdef USE_XIM
612 if (!locale) 622 if (!locale)
613 rxvt_warn ("setting locale failed, working without locale support.\n"); 623 rxvt_warn ("setting locale failed, working without locale support.\n");
614 else 624 else
615 { 625 {
616 set_string_property (display->atom ("WM_LOCALE_NAME"), locale); 626 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
617 627
618 if (!XSupportsLocale ()) 628 if (!XSupportsLocale ())
619 { 629 {
620 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");
621 return; 631 return;
… …
660 if (scrollbar_visible ()) 670 if (scrollbar_visible ())
661 { 671 {
662 priv_modes |= PrivMode_scrollBar; 672 priv_modes |= PrivMode_scrollBar;
663 SavedModes |= PrivMode_scrollBar; 673 SavedModes |= PrivMode_scrollBar;
664 } 674 }
675
665 if (menubar_visible ()) 676 if (menubar_visible ())
666 { 677 {
667 priv_modes |= PrivMode_menuBar; 678 priv_modes |= PrivMode_menuBar;
668 SavedModes |= PrivMode_menuBar; 679 SavedModes |= PrivMode_menuBar;
669 } 680 }
… …
729 } 740 }
730 } 741 }
731 } 742 }
732 743
733 pix_colors[i] = xcol; 744 pix_colors[i] = xcol;
745 SET_PIXCOLOR (i);
746 }
747
734#ifdef OFF_FOCUS_FADING 748#ifdef OFF_FOCUS_FADING
735 if (rs[Rs_fade]) 749 if (rs[Rs_fade])
750 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
736 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]);
737#endif 752#endif
738 SET_PIXCOLOR (i);
739 }
740 753
741 if (display->depth <= 2) 754 if (display->depth <= 2)
742 { 755 {
743 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];
744 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];
… …
752 * from the fvwm window manager. 765 * from the fvwm window manager.
753 */ 766 */
754#ifdef KEEP_SCROLLCOLOR 767#ifdef KEEP_SCROLLCOLOR
755 768
756 if (display->depth <= 2) 769 if (display->depth <= 2)
770 {
757 { /* Monochrome */ 771 /* Monochrome */
758 pix_colors[Color_scroll] = pix_colors[Color_fg]; 772 pix_colors[Color_scroll] = pix_colors[Color_fg];
759 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 773 pix_colors[Color_topShadow] = pix_colors[Color_bg];
760 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 774 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
761 } 775 }
762 else 776 else
… …
817 * Use resource ``modifier'' to override the Meta modifier 831 * Use resource ``modifier'' to override the Meta modifier
818 */ 832 */
819void 833void
820rxvt_term::get_ourmods () 834rxvt_term::get_ourmods ()
821{ 835{
822 int i, j, k; 836 int i, j, k;
823 int requestedmeta, realmeta, realalt; 837 int requestedmeta, realmeta, realalt;
824 const char *cm, *rsmod; 838 const char *cm, *rsmod;
825 XModifierKeymap *map; 839 XModifierKeymap *map;
826 KeyCode *kc; 840 KeyCode *kc;
827 const unsigned int modmasks[] = 841 const unsigned int modmasks[] =
828 { 842 {
829 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 843 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
830 }; 844 };
831 845
832 requestedmeta = realmeta = realalt = 0; 846 requestedmeta = realmeta = realalt = 0;
833 rsmod = rs[Rs_modifier]; 847 rsmod = rs[Rs_modifier];
848
834 if (rsmod 849 if (rsmod
835 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 850 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
836 requestedmeta = rsmod[3] - '0'; 851 requestedmeta = rsmod[3] - '0';
837 852
838 map = XGetModifierMapping (display->display); 853 map = XGetModifierMapping (display->display);
839 kc = map->modifiermap; 854 kc = map->modifiermap;
855
840 for (i = 1; i < 6; i++) 856 for (i = 1; i < 6; i++)
841 { 857 {
842 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 858 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
859
843 for (j = map->max_keypermod; j--; k++) 860 for (j = map->max_keypermod; j--; k++)
844 { 861 {
845 if (kc[k] == 0) 862 if (kc[k] == 0)
846 break; 863 break;
864
847 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 865 switch (XKeycodeToKeysym (display->display, kc[k], 0))
848 { 866 {
849 case XK_Num_Lock: 867 case XK_Num_Lock:
850 ModNumLockMask = modmasks[i - 1]; 868 ModNumLockMask = modmasks[i - 1];
851 /* FALLTHROUGH */ 869 continue;
852 default: 870
853 continue; /* for (;;) */ 871 case XK_ISO_Level3_Shift:
872 ModLevel3Mask = modmasks[i - 1];
873 continue;
874
854 case XK_Meta_L: 875 case XK_Meta_L:
855 case XK_Meta_R: 876 case XK_Meta_R:
856 cm = "meta"; 877 cm = "meta";
857 realmeta = i; 878 realmeta = i;
858 break; 879 break;
880
859 case XK_Alt_L: 881 case XK_Alt_L:
860 case XK_Alt_R: 882 case XK_Alt_R:
861 cm = "alt"; 883 cm = "alt";
862 realalt = i; 884 realalt = i;
863 break; 885 break;
886
864 case XK_Super_L: 887 case XK_Super_L:
865 case XK_Super_R: 888 case XK_Super_R:
866 cm = "super"; 889 cm = "super";
867 break; 890 break;
891
868 case XK_Hyper_L: 892 case XK_Hyper_L:
869 case XK_Hyper_R: 893 case XK_Hyper_R:
870 cm = "hyper"; 894 cm = "hyper";
871 break; 895 break;
896
897 default:
898 continue;
872 } 899 }
900
873 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0) 901 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
874 requestedmeta = i; 902 requestedmeta = i;
875 } 903 }
876 } 904 }
905
877 XFreeModifiermap (map); 906 XFreeModifiermap (map);
907
878 i = (requestedmeta ? requestedmeta 908 i = requestedmeta ? requestedmeta
879 : (realmeta ? realmeta 909 : realmeta ? realmeta
880 : (realalt ? realalt : 0))); 910 : realalt ? realalt
911 : 0;
912
881 if (i) 913 if (i)
882 ModMetaMask = modmasks[i - 1]; 914 ModMetaMask = modmasks[i - 1];
883} 915}
884 916
885/*----------------------------------------------------------------------*/ 917/*----------------------------------------------------------------------*/
… …
895#endif 927#endif
896 XGCValues gcvalue; 928 XGCValues gcvalue;
897 long vt_emask; 929 long vt_emask;
898 XSetWindowAttributes attributes; 930 XSetWindowAttributes attributes;
899 XWindowAttributes gattr; 931 XWindowAttributes gattr;
900 932 Window top, parent;
901 for (int i = 0; i < NUM_XA; i++) 933 dDisp;
902 xa[i] = XInternAtom (display->display, xa_names[i], False);
903 934
904#ifdef USING_W11LIB 935#ifdef USING_W11LIB
905 /* enable W11 callbacks */ 936 /* enable W11 callbacks */
906 W11AddEventHandler (display->display, rxvt_W11_process_x_event); 937 W11AddEventHandler (disp, rxvt_W11_process_x_event);
907#endif 938#endif
939
940 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
941 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
908 942
909 if (options & Opt_transparent) 943 if (options & Opt_transparent)
910 { 944 {
911 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 945 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
912 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 946 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
913 } 947 }
914 948
915#if ENABLE_FRILLS 949#if ENABLE_FRILLS
916 if (options & Opt_borderLess) 950 if (options & Opt_borderLess)
917 { 951 {
918 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 952 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
919 953
920 if (prop == None) 954 if (prop == None)
921 { 955 {
922 /* 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");*/
923#ifdef PREFER_24BIT 957#ifdef PREFER_24BIT
… …
930 mwmhints.flags = MWM_HINTS_DECORATIONS; 964 mwmhints.flags = MWM_HINTS_DECORATIONS;
931 mwmhints.decorations = 0; 965 mwmhints.decorations = 0;
932 } 966 }
933 } 967 }
934 else 968 else
935 {
936 mwmhints.flags = 0; 969 mwmhints.flags = 0;
937 }
938#endif 970#endif
939 971
940 /* grab colors before netscape does */ 972 /* grab colors before netscape does */
941 Get_Colours (); 973 Get_Colours ();
942 974
943 if (!set_fonts ()) 975 if (!set_fonts ())
944 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");
945 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
946 window_calc (0, 0); 994 window_calc (0, 0);
947 old_width = szHint.width;
948 old_height = szHint.height;
949 995
950 /* sub-window placement & size in rxvt_resize_subwindows () */ 996 /* sub-window placement & size in rxvt_resize_subwindows () */
951
952#ifdef PREFER_24BIT 997#ifdef PREFER_24BIT
953 attributes.background_pixel = pix_colors_focused[Color_border]; 998 attributes.background_pixel = pix_colors_focused[Color_border];
954 attributes.border_pixel = pix_colors_focused[Color_border]; 999 attributes.border_pixel = pix_colors_focused[Color_border];
955 attributes.colormap = display->cmap; 1000 attributes.colormap = display->cmap;
956 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 1001 top = XCreateWindow (disp, parent,
957 szHint.x, szHint.y, 1002 szHint.x, szHint.y,
958 szHint.width, szHint.height, 1003 szHint.width, szHint.height,
959 TermWin.ext_bwidth, 1004 TermWin.ext_bwidth,
960 display->depth, InputOutput, 1005 display->depth, InputOutput,
961 display->visual, 1006 display->visual,
962 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1007 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
963#else 1008#else
964 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 1009 top = XCreateSimpleWindow (disp, parent,
965 szHint.x, szHint.y, 1010 szHint.x, szHint.y,
966 szHint.width, szHint.height, 1011 szHint.width, szHint.height,
967 TermWin.ext_bwidth, 1012 TermWin.ext_bwidth,
968 pix_colors_focused[Color_border], 1013 pix_colors_focused[Color_border],
969 pix_colors_focused[Color_border]); 1014 pix_colors_focused[Color_border]);
970#endif 1015#endif
1016
1017 TermWin.parent[0] = top;
1018
1019 old_width = szHint.width;
1020 old_height = szHint.height;
971 1021
972 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1022 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
973 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1023 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
974 1024
975 classHint.res_name = (char *)rs[Rs_name]; 1025 classHint.res_name = (char *)rs[Rs_name];
976 classHint.res_class = (char *)RESCLASS; 1026 classHint.res_class = (char *)RESCLASS;
977 1027
978 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1028 wmHint.flags = InputHint | StateHint | WindowGroupHint;
979 wmHint.input = True; 1029 wmHint.input = True;
980 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1030 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
981 wmHint.window_group = TermWin.parent[0]; 1031 wmHint.window_group = top;
982 1032
983 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1033 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
984 (char **)argv, argc, &szHint, &wmHint, &classHint); 1034 &szHint, &wmHint, &classHint);
985 1035
986 /* Enable delete window protocol */ 1036 Atom protocols[] = {
987 XSetWMProtocols (display->display, TermWin.parent[0], 1037 xa[XA_WM_DELETE_WINDOW],
988 &xa[XA_WMDELETEWINDOW], 1); 1038#if ENABLE_EWMH
1039 xa[XA_NET_WM_PING],
1040#endif
1041 };
989 1042
990#if ENABLE_FRILLS 1043 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1044
1045#if ENABLE_EWMH
991 long pid = getpid (); 1046 long pid = getpid ();
992 1047
993 XChangeProperty (display->display, TermWin.parent[0], 1048 XChangeProperty (disp, top,
994 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32, 1049 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
995 PropModeReplace, (unsigned char *)&pid, 1); 1050 PropModeReplace, (unsigned char *)&pid, 1);
996#endif
997 1051
998 XSelectInput (display->display, TermWin.parent[0], 1052 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1053#endif
1054
1055 XSelectInput (disp, top,
999 KeyPressMask 1056 KeyPressMask
1000#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1057#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1001 | KeyReleaseMask 1058 | KeyReleaseMask
1002#endif 1059#endif
1003 | FocusChangeMask | VisibilityChangeMask 1060 | FocusChangeMask | VisibilityChangeMask
1004 | ExposureMask
1005 | StructureNotifyMask); 1061 | ExposureMask | StructureNotifyMask);
1062
1006 termwin_ev.start (display, TermWin.parent[0]); 1063 termwin_ev.start (display, top);
1007 1064
1008#if ENABLE_FRILLS 1065#if ENABLE_FRILLS
1009 if (mwmhints.flags) 1066 if (mwmhints.flags)
1010 { 1067 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); 1068 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1014 }
1015#endif 1069#endif
1016 1070
1017 /* 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 */
1018 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1072 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1019 1073
1020#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1074#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1021 /* cursor (menuBar/scrollBar): Black-on-White */ 1075 /* cursor (menuBar/scrollBar): Black-on-White */
1022 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1076 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 1077#endif
1037 1078
1038 /* the vt window */ 1079 /* the vt window */
1039 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1080 TermWin.vt = XCreateSimpleWindow (disp, top,
1040 window_vt_x, 1081 window_vt_x,
1041 window_vt_y, 1082 window_vt_y,
1042 TermWin_TotalWidth (), 1083 TermWin_TotalWidth (),
1043 TermWin_TotalHeight (), 1084 TermWin_TotalHeight (),
1044 0, 1085 0,
1045 pix_colors_focused[Color_fg], 1086 pix_colors_focused[Color_fg],
1046 pix_colors_focused[Color_bg]); 1087 pix_colors_focused[Color_bg]);
1047#ifdef DEBUG_X 1088#ifdef DEBUG_X
1048 XStoreName (display->display, TermWin.vt, "vt window"); 1089 XStoreName (disp, TermWin.vt, "vt window");
1049#endif 1090#endif
1050 1091
1051 attributes.bit_gravity = NorthWestGravity; 1092 attributes.bit_gravity = NorthWestGravity;
1052 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1093 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);
1053 1094
1054 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1095 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1055
1056 pointer_unblank ();
1057 1096
1058#ifdef POINTER_BLANK 1097#ifdef POINTER_BLANK
1059 if (options & Opt_pointerBlank) 1098 if (options & Opt_pointerBlank)
1060 vt_emask |= PointerMotionMask; 1099 vt_emask |= PointerMotionMask;
1061 else 1100 else
1062#endif 1101#endif
1063 vt_emask |= Button1MotionMask | Button3MotionMask; 1102 vt_emask |= Button1MotionMask | Button3MotionMask;
1064 1103
1065 XSelectInput (display->display, TermWin.vt, vt_emask); 1104 XSelectInput (disp, TermWin.vt, vt_emask);
1066 vt_ev.start (display, TermWin.vt); 1105 vt_ev.start (display, TermWin.vt);
1067 1106
1068#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1107#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1069 if (menuBar_height ()) 1108 if (menuBar_height ())
1070 { 1109 {
1071 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1110 menuBar.win = XCreateSimpleWindow (disp, top,
1072 window_vt_x, 0, 1111 window_vt_x, 0,
1073 TermWin_TotalWidth (), 1112 TermWin_TotalWidth (),
1074 menuBar_TotalHeight (), 1113 menuBar_TotalHeight (),
1075 0, 1114 0,
1076 pix_colors_focused[Color_fg], 1115 pix_colors_focused[Color_fg],
1077 pix_colors_focused[Color_scroll]); 1116 pix_colors_focused[Color_scroll]);
1078 1117
1079#ifdef DEBUG_X 1118#ifdef DEBUG_X
1080 XStoreName (display->display, menuBar.win, "menubar"); 1119 XStoreName (disp, menuBar.win, "menubar");
1081#endif 1120#endif
1082 1121
1083 menuBar.drawable = new rxvt_drawable (display, menuBar.win); 1122 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1084 1123
1085 XDefineCursor (display->display, menuBar.win, 1124 XDefineCursor (disp, menuBar.win,
1086 XCreateFontCursor (display->display, XC_left_ptr)); 1125 XCreateFontCursor (disp, XC_left_ptr));
1087 1126
1088 XSelectInput (display->display, menuBar.win, 1127 XSelectInput (disp, menuBar.win,
1089 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1128 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1090 | Button1MotionMask));
1091 menubar_ev.start (display, menuBar.win); 1129 menubar_ev.start (display, menuBar.win);
1092 } 1130 }
1093#endif 1131#endif
1094 1132
1095#ifdef XPM_BACKGROUND 1133#ifdef XPM_BACKGROUND
… …
1111 1149
1112 /* graphics context for the vt window */ 1150 /* graphics context for the vt window */
1113 gcvalue.foreground = pix_colors[Color_fg]; 1151 gcvalue.foreground = pix_colors[Color_fg];
1114 gcvalue.background = pix_colors[Color_bg]; 1152 gcvalue.background = pix_colors[Color_bg];
1115 gcvalue.graphics_exposures = 1; 1153 gcvalue.graphics_exposures = 1;
1116 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1154 TermWin.gc = XCreateGC (disp, TermWin.vt,
1117 GCForeground | GCBackground | GCGraphicsExposures, 1155 GCForeground | GCBackground | GCGraphicsExposures,
1118 &gcvalue); 1156 &gcvalue);
1119 1157
1120 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1158 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1121 1159
1122#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1160#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1123 gcvalue.foreground = pix_colors[Color_topShadow]; 1161 gcvalue.foreground = pix_colors[Color_topShadow];
1124 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1162 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1125 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1163 gcvalue.foreground = pix_colors[Color_bottomShadow];
1126 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1164 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1127 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1165 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1128 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1166 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1129#endif 1167#endif
1130 1168
1131#ifdef OFF_FOCUS_FADING 1169#ifdef OFF_FOCUS_FADING
1132 // initially we are in unfocused state 1170 // initially we are in unfocused state
1133 if (rs[Rs_fade]) 1171 if (rs[Rs_fade])
1134 pix_colors = pix_colors_unfocused; 1172 pix_colors = pix_colors_unfocused;
1135#endif 1173#endif
1136 1174
1175 pointer_unblank ();
1137 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
1138} 1187}
1139 1188
1140/* ------------------------------------------------------------------------- * 1189/* ------------------------------------------------------------------------- *
1141 * GET TTY CURRENT STATE * 1190 * GET TTY CURRENT STATE *
1142 * ------------------------------------------------------------------------- */ 1191 * ------------------------------------------------------------------------- */
… …
1371 * the slave. 1420 * the slave.
1372 */ 1421 */
1373void 1422void
1374rxvt_term::run_command (const char *const *argv) 1423rxvt_term::run_command (const char *const *argv)
1375{ 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
1376 int er; 1441 int er;
1377
1378 if (!pty.get ())
1379 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1380 1442
1381#ifndef NO_BACKSPACE_KEY 1443#ifndef NO_BACKSPACE_KEY
1382 if (key_backspace[0] && !key_backspace[1]) 1444 if (key_backspace[0] && !key_backspace[1])
1383 er = key_backspace[0]; 1445 er = key_backspace[0];
1384 else if (strcmp (key_backspace, "DEC") == 0) 1446 else if (strcmp (key_backspace, "DEC") == 0)
… …
1387#endif 1449#endif
1388 er = -1; 1450 er = -1;
1389 1451
1390 rxvt_get_ttymode (&tio, er); 1452 rxvt_get_ttymode (&tio, er);
1391 1453
1392 /* set initial window size */ 1454#if ENABLE_FRILLS
1393 tt_winch (); 1455 if (rs[Rs_pty_fd])
1456 return;
1457#endif
1394 1458
1395 sw_chld.start (SIGCHLD); 1459 sw_chld.start (SIGCHLD);
1396 1460
1397#ifndef __QNX__ 1461#ifndef __QNX__
1398 /* spin off the command interpreter */ 1462 /* spin off the command interpreter */
1399 switch (cmd_pid = fork ()) 1463 switch (cmd_pid = fork ())
1400 { 1464 {
1401 case -1: 1465 case -1:
1466 {
1467 cmd_pid = 0;
1402 rxvt_fatal ("can't fork, aborting.\n"); 1468 rxvt_fatal ("can't fork, aborting.\n");
1469 }
1403 case 0: 1470 case 0:
1404 init_env (); 1471 init_env ();
1405 1472
1406 if (!pty.make_controlling_tty ()) 1473 if (!pty.make_controlling_tty ())
1407 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