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.108 by root, Fri Feb 4 11:41:23 2005 UTC vs.
Revision 1.119 by root, Thu Aug 11 02:05:07 2005 UTC

… …
169 COLOR_SCROLLTROUGH, 169 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 171#if TINTING
172 NULL, 172 NULL,
173#endif 173#endif
174#if OFF_FOCUS_FADING
175 "black",
176#endif
174 }; 177 };
175 178
176const char *const xa_names[] = 179const char *const xa_names[] =
177 { 180 {
178 "TEXT", 181 "TEXT",
… …
181 "MULTIPLE", 184 "MULTIPLE",
182 "TARGETS", 185 "TARGETS",
183 "TIMESTAMP", 186 "TIMESTAMP",
184 "VT_SELECTION", 187 "VT_SELECTION",
185 "INCR", 188 "INCR",
189 "WM_PROTOCOLS",
186 "WM_DELETE_WINDOW", 190 "WM_DELETE_WINDOW",
187 "CLIPBOARD", 191 "CLIPBOARD",
188#if ENABLE_FRILLS 192#if ENABLE_FRILLS
193 "_MOTIF_WM_HINTS",
194#endif
195#if ENABLE_EWMH
189 "_NET_WM_PID", 196 "_NET_WM_PID",
190 "_MOTIF_WM_HINTS",
191 "_NET_WM_NAME", 197 "_NET_WM_NAME",
192 "_NET_WM_ICON_NAME", 198 "_NET_WM_ICON_NAME",
199 "_NET_WM_PING",
193#endif 200#endif
194#if USE_XIM 201#if USE_XIM
195 "WM_LOCALE_NAME", 202 "WM_LOCALE_NAME",
196#endif 203#endif
197#ifdef TRANSPARENT 204#ifdef TRANSPARENT
… …
199 "ESETROOT_PMAP_ID", 206 "ESETROOT_PMAP_ID",
200#endif 207#endif
201#ifdef OFFIX_DND 208#ifdef OFFIX_DND
202 "DndProtocol", 209 "DndProtocol",
203 "DndSelection", 210 "DndSelection",
211#endif
212#if ENABLE_XEMBED
213 "_XEMBED",
214 "_XEMBED_INFO",
204#endif 215#endif
205 }; 216 };
206 217
207bool 218bool
208rxvt_term::init_vars () 219rxvt_term::init_vars ()
… …
225 236
226 MEvent.time = CurrentTime; 237 MEvent.time = CurrentTime;
227 MEvent.button = AnyButton; 238 MEvent.button = AnyButton;
228 options = DEFAULT_OPTIONS; 239 options = DEFAULT_OPTIONS;
229 want_refresh = 1; 240 want_refresh = 1;
230 cmd_pid = -1;
231 pty.pty = pty.tty = -1;
232 priv_modes = SavedModes = PrivMode_Default; 241 priv_modes = SavedModes = PrivMode_Default;
233 TermWin.focus = 0; 242 TermWin.focus = 0;
234 TermWin.ncol = 80; 243 TermWin.ncol = 80;
235 TermWin.nrow = 24; 244 TermWin.nrow = 24;
236 TermWin.int_bwidth = INTERNALBORDERWIDTH; 245 TermWin.int_bwidth = INTERNALBORDERWIDTH;
… …
338 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 347 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
339 rs[Rs_display_name] = ":0"; 348 rs[Rs_display_name] = ":0";
340 349
341 get_options (r_argc, r_argv); 350 get_options (r_argc, r_argv);
342 351
343#ifdef LOCAL_X_IS_UNIX
344 if (rs[Rs_display_name][0] == ':')
345 {
346 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
347 strcpy (val, "unix");
348 strcat (val, rs[Rs_display_name]);
349 display = displays.get (val);
350 free (val);
351 }
352#endif
353
354 if (!display
355 && ! (display = displays.get (rs[Rs_display_name]))) 352 if (!(display = displays.get (rs[Rs_display_name])))
356 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 353 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
357 354
358 extract_resources (); 355 extract_resources ();
359 free (r_argv); 356 free (r_argv);
360 357
… …
673 if (scrollbar_visible ()) 670 if (scrollbar_visible ())
674 { 671 {
675 priv_modes |= PrivMode_scrollBar; 672 priv_modes |= PrivMode_scrollBar;
676 SavedModes |= PrivMode_scrollBar; 673 SavedModes |= PrivMode_scrollBar;
677 } 674 }
675
678 if (menubar_visible ()) 676 if (menubar_visible ())
679 { 677 {
680 priv_modes |= PrivMode_menuBar; 678 priv_modes |= PrivMode_menuBar;
681 SavedModes |= PrivMode_menuBar; 679 SavedModes |= PrivMode_menuBar;
682 } 680 }
… …
742 } 740 }
743 } 741 }
744 } 742 }
745 743
746 pix_colors[i] = xcol; 744 pix_colors[i] = xcol;
745 SET_PIXCOLOR (i);
746 }
747
747#ifdef OFF_FOCUS_FADING 748#ifdef OFF_FOCUS_FADING
748 if (rs[Rs_fade]) 749 if (rs[Rs_fade])
750 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
749 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]);
750#endif 752#endif
751 SET_PIXCOLOR (i);
752 }
753 753
754 if (display->depth <= 2) 754 if (display->depth <= 2)
755 { 755 {
756 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];
757 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];
… …
765 * from the fvwm window manager. 765 * from the fvwm window manager.
766 */ 766 */
767#ifdef KEEP_SCROLLCOLOR 767#ifdef KEEP_SCROLLCOLOR
768 768
769 if (display->depth <= 2) 769 if (display->depth <= 2)
770 {
770 { /* Monochrome */ 771 /* Monochrome */
771 pix_colors[Color_scroll] = pix_colors[Color_fg]; 772 pix_colors[Color_scroll] = pix_colors[Color_fg];
772 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 773 pix_colors[Color_topShadow] = pix_colors[Color_bg];
773 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 774 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
774 } 775 }
775 else 776 else
… …
926#endif 927#endif
927 XGCValues gcvalue; 928 XGCValues gcvalue;
928 long vt_emask; 929 long vt_emask;
929 XSetWindowAttributes attributes; 930 XSetWindowAttributes attributes;
930 XWindowAttributes gattr; 931 XWindowAttributes gattr;
932 Window top, parent;
931 dDisp; 933 dDisp;
932 934
933#ifdef USING_W11LIB 935#ifdef USING_W11LIB
934 /* enable W11 callbacks */ 936 /* enable W11 callbacks */
935 W11AddEventHandler (disp, rxvt_W11_process_x_event); 937 W11AddEventHandler (disp, rxvt_W11_process_x_event);
… …
962 mwmhints.flags = MWM_HINTS_DECORATIONS; 964 mwmhints.flags = MWM_HINTS_DECORATIONS;
963 mwmhints.decorations = 0; 965 mwmhints.decorations = 0;
964 } 966 }
965 } 967 }
966 else 968 else
967 {
968 mwmhints.flags = 0; 969 mwmhints.flags = 0;
969 }
970#endif 970#endif
971 971
972 /* grab colors before netscape does */ 972 /* grab colors before netscape does */
973 Get_Colours (); 973 Get_Colours ();
974 974
975 if (!set_fonts ()) 975 if (!set_fonts ())
976 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");
977 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
978 window_calc (0, 0); 994 window_calc (0, 0);
979 old_width = szHint.width;
980 old_height = szHint.height;
981 995
982 /* sub-window placement & size in rxvt_resize_subwindows () */ 996 /* sub-window placement & size in rxvt_resize_subwindows () */
983
984#ifdef PREFER_24BIT 997#ifdef PREFER_24BIT
985 attributes.background_pixel = pix_colors_focused[Color_border]; 998 attributes.background_pixel = pix_colors_focused[Color_border];
986 attributes.border_pixel = pix_colors_focused[Color_border]; 999 attributes.border_pixel = pix_colors_focused[Color_border];
987 attributes.colormap = display->cmap; 1000 attributes.colormap = display->cmap;
988 TermWin.parent[0] = XCreateWindow (disp, DefaultRootWindow (disp), 1001 top = XCreateWindow (disp, parent,
989 szHint.x, szHint.y, 1002 szHint.x, szHint.y,
990 szHint.width, szHint.height, 1003 szHint.width, szHint.height,
991 TermWin.ext_bwidth, 1004 TermWin.ext_bwidth,
992 display->depth, InputOutput, 1005 display->depth, InputOutput,
993 display->visual, 1006 display->visual,
994 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1007 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
995#else 1008#else
996 TermWin.parent[0] = XCreateSimpleWindow (disp, DefaultRootWindow (disp), 1009 top = XCreateSimpleWindow (disp, parent,
997 szHint.x, szHint.y, 1010 szHint.x, szHint.y,
998 szHint.width, szHint.height, 1011 szHint.width, szHint.height,
999 TermWin.ext_bwidth, 1012 TermWin.ext_bwidth,
1000 pix_colors_focused[Color_border], 1013 pix_colors_focused[Color_border],
1001 pix_colors_focused[Color_border]); 1014 pix_colors_focused[Color_border]);
1002#endif 1015#endif
1016
1017 TermWin.parent[0] = top;
1018
1019 old_width = szHint.width;
1020 old_height = szHint.height;
1003 1021
1004 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1022 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1005 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1023 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1006 1024
1007 classHint.res_name = (char *)rs[Rs_name]; 1025 classHint.res_name = (char *)rs[Rs_name];
1008 classHint.res_class = (char *)RESCLASS; 1026 classHint.res_class = (char *)RESCLASS;
1009 1027
1010 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1028 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1011 wmHint.input = True; 1029 wmHint.input = True;
1012 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1030 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
1013 wmHint.window_group = TermWin.parent[0]; 1031 wmHint.window_group = top;
1014 1032
1015 XSetWMProperties (disp, TermWin.parent[0], NULL, NULL, 1033 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1016 (char **)argv, argc, &szHint, &wmHint, &classHint); 1034 &szHint, &wmHint, &classHint);
1017 1035
1018 /* Enable delete window protocol */ 1036 Atom protocols[] = {
1019 XSetWMProtocols (disp, TermWin.parent[0], 1037 xa[XA_WM_DELETE_WINDOW],
1020 &xa[XA_WMDELETEWINDOW], 1); 1038#if ENABLE_EWMH
1039 xa[XA_NET_WM_PING],
1040#endif
1041 };
1021 1042
1022#if ENABLE_FRILLS 1043 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1044
1045#if ENABLE_EWMH
1023 long pid = getpid (); 1046 long pid = getpid ();
1024 1047
1025 XChangeProperty (disp, TermWin.parent[0], 1048 XChangeProperty (disp, top,
1026 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1049 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1027 PropModeReplace, (unsigned char *)&pid, 1); 1050 PropModeReplace, (unsigned char *)&pid, 1);
1028#endif
1029 1051
1030 XSelectInput (disp, TermWin.parent[0], 1052 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1053#endif
1054
1055 XSelectInput (disp, top,
1031 KeyPressMask 1056 KeyPressMask
1032#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1057#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1033 | KeyReleaseMask 1058 | KeyReleaseMask
1034#endif 1059#endif
1035 | FocusChangeMask | VisibilityChangeMask 1060 | FocusChangeMask | VisibilityChangeMask
1036 | ExposureMask
1037 | StructureNotifyMask); 1061 | ExposureMask | StructureNotifyMask);
1062
1038 termwin_ev.start (display, TermWin.parent[0]); 1063 termwin_ev.start (display, top);
1039 1064
1040#if ENABLE_FRILLS 1065#if ENABLE_FRILLS
1041 if (mwmhints.flags) 1066 if (mwmhints.flags)
1042 XChangeProperty (disp, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1067 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1043 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1068 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1044#endif 1069#endif
1045 1070
1046 /* 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 */
1047 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1072 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
… …
1050 /* cursor (menuBar/scrollBar): Black-on-White */ 1075 /* cursor (menuBar/scrollBar): Black-on-White */
1051 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1076 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1052#endif 1077#endif
1053 1078
1054 /* the vt window */ 1079 /* the vt window */
1055 TermWin.vt = XCreateSimpleWindow (disp, TermWin.parent[0], 1080 TermWin.vt = XCreateSimpleWindow (disp, top,
1056 window_vt_x, 1081 window_vt_x,
1057 window_vt_y, 1082 window_vt_y,
1058 TermWin_TotalWidth (), 1083 TermWin_TotalWidth (),
1059 TermWin_TotalHeight (), 1084 TermWin_TotalHeight (),
1060 0, 1085 0,
… …
1067 attributes.bit_gravity = NorthWestGravity; 1092 attributes.bit_gravity = NorthWestGravity;
1068 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes); 1093 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);
1069 1094
1070 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1095 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1071 1096
1072 pointer_unblank ();
1073
1074#ifdef POINTER_BLANK 1097#ifdef POINTER_BLANK
1075 if (options & Opt_pointerBlank) 1098 if (options & Opt_pointerBlank)
1076 vt_emask |= PointerMotionMask; 1099 vt_emask |= PointerMotionMask;
1077 else 1100 else
1078#endif 1101#endif
… …
1082 vt_ev.start (display, TermWin.vt); 1105 vt_ev.start (display, TermWin.vt);
1083 1106
1084#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1107#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1085 if (menuBar_height ()) 1108 if (menuBar_height ())
1086 { 1109 {
1087 menuBar.win = XCreateSimpleWindow (disp, TermWin.parent[0], 1110 menuBar.win = XCreateSimpleWindow (disp, top,
1088 window_vt_x, 0, 1111 window_vt_x, 0,
1089 TermWin_TotalWidth (), 1112 TermWin_TotalWidth (),
1090 menuBar_TotalHeight (), 1113 menuBar_TotalHeight (),
1091 0, 1114 0,
1092 pix_colors_focused[Color_fg], 1115 pix_colors_focused[Color_fg],
… …
1147 // initially we are in unfocused state 1170 // initially we are in unfocused state
1148 if (rs[Rs_fade]) 1171 if (rs[Rs_fade])
1149 pix_colors = pix_colors_unfocused; 1172 pix_colors = pix_colors_unfocused;
1150#endif 1173#endif
1151 1174
1175 pointer_unblank ();
1152 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
1153} 1187}
1154 1188
1155/* ------------------------------------------------------------------------- * 1189/* ------------------------------------------------------------------------- *
1156 * GET TTY CURRENT STATE * 1190 * GET TTY CURRENT STATE *
1157 * ------------------------------------------------------------------------- */ 1191 * ------------------------------------------------------------------------- */
… …
1386 * the slave. 1420 * the slave.
1387 */ 1421 */
1388void 1422void
1389rxvt_term::run_command (const char *const *argv) 1423rxvt_term::run_command (const char *const *argv)
1390{ 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
1391 if (!pty.get ()) 1433 if (!pty.get ())
1392 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1434 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1393 1435
1394 pty.set_utf8_mode (enc_utf8); 1436 pty.set_utf8_mode (enc_utf8);
1395 1437
1396 /* set initial window size */ 1438 /* set initial window size */
1397 tt_winch (); 1439 tt_winch ();
… …
1407#endif 1449#endif
1408 er = -1; 1450 er = -1;
1409 1451
1410 rxvt_get_ttymode (&tio, er); 1452 rxvt_get_ttymode (&tio, er);
1411 1453
1454#if ENABLE_FRILLS
1455 if (rs[Rs_pty_fd])
1456 return;
1457#endif
1458
1412 sw_chld.start (SIGCHLD); 1459 sw_chld.start (SIGCHLD);
1413 1460
1414#ifndef __QNX__ 1461#ifndef __QNX__
1415 /* spin off the command interpreter */ 1462 /* spin off the command interpreter */
1416 switch (cmd_pid = fork ()) 1463 switch (cmd_pid = fork ())
1417 { 1464 {
1418 case -1: 1465 case -1:
1466 {
1467 cmd_pid = 0;
1419 rxvt_fatal ("can't fork, aborting.\n"); 1468 rxvt_fatal ("can't fork, aborting.\n");
1469 }
1420 case 0: 1470 case 0:
1421 init_env (); 1471 init_env ();
1422 1472
1423 if (!pty.make_controlling_tty ()) 1473 if (!pty.make_controlling_tty ())
1424 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