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.143 by root, Mon Jan 16 15:00:20 2006 UTC vs.
Revision 1.153 by root, Wed Jan 25 02:42:06 2006 UTC

174#if OFF_FOCUS_FADING 174#if OFF_FOCUS_FADING
175 "black", 175 "black",
176#endif 176#endif
177 }; 177 };
178 178
179const char *const xa_names[] =
180 {
181 "TEXT",
182 "COMPOUND_TEXT",
183 "UTF8_STRING",
184 "MULTIPLE",
185 "TARGETS",
186 "TIMESTAMP",
187 "VT_SELECTION",
188 "INCR",
189 "WM_PROTOCOLS",
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
204#ifdef TRANSPARENT
205 "_XROOTPMAP_ID",
206 "ESETROOT_PMAP_ID",
207#endif
208#ifdef OFFIX_DND
209 "DndProtocol",
210 "DndSelection",
211#endif
212#if ENABLE_XEMBED
213 "_XEMBED",
214 "_XEMBED_INFO",
215#endif
216 };
217
218bool 179bool
219rxvt_term::init_vars () 180rxvt_term::init_vars ()
220{ 181{
221 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 182 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
222#ifdef OFF_FOCUS_FADING 183#ifdef OFF_FOCUS_FADING
344 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 305 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
345 306
346 extract_resources (); 307 extract_resources ();
347 308
348 free (r_argv); 309 free (r_argv);
310
311#if ENABLE_PERL
312 if (!rs[Rs_perl_ext_1])
313 rs[Rs_perl_ext_1] = "default";
314
315 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
316 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
317 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
318 {
319 rxvt_perl.init (this);
320 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
321 }
322#endif
349 323
350 /* 324 /*
351 * set any defaults not already set 325 * set any defaults not already set
352 */ 326 */
353 if (cmd_argv && cmd_argv[0]) 327 if (cmd_argv && cmd_argv[0])
905rxvt_term::create_windows (int argc, const char *const *argv) 879rxvt_term::create_windows (int argc, const char *const *argv)
906{ 880{
907 XClassHint classHint; 881 XClassHint classHint;
908 XWMHints wmHint; 882 XWMHints wmHint;
909#if ENABLE_FRILLS 883#if ENABLE_FRILLS
910 Atom prop = None;
911 MWMHints mwmhints; 884 MWMHints mwmhints;
912#endif 885#endif
913 XGCValues gcvalue; 886 XGCValues gcvalue;
914 XSetWindowAttributes attributes; 887 XSetWindowAttributes attributes;
915 XWindowAttributes gattr;
916 Window top, parent; 888 Window top, parent;
917 dDisp; 889 dDisp;
918 890
919#ifdef USING_W11LIB 891 xa = display->xa;
920 /* enable W11 callbacks */
921 W11AddEventHandler (disp, rxvt_W11_process_x_event);
922#endif
923 892
924 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 893 /* grab colors before netscape does */
925 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 894 Get_Colours ();
926 895
927 if (OPTION (Opt_transparent)) 896 if (!set_fonts ())
928 { 897 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
929 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 898
930 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 899 parent = display->root;
931 } 900
901 attributes.override_redirect = !!OPTION (Opt_override_redirect);
932 902
933#if ENABLE_FRILLS 903#if ENABLE_FRILLS
934 if (OPTION (Opt_borderLess)) 904 if (OPTION (Opt_borderLess))
935 { 905 {
936 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 906 if (XInternAtom (disp, "_MOTIF_WM_INFO", True) == None)
937
938 if (prop == None)
939 { 907 {
940 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 908 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
941#ifdef PREFER_24BIT
942 attributes.override_redirect = TRUE; 909 attributes.override_redirect = TRUE;
943#endif
944 mwmhints.flags = 0; 910 mwmhints.flags = 0;
945 } 911 }
946 else 912 else
947 { 913 {
948 mwmhints.flags = MWM_HINTS_DECORATIONS; 914 mwmhints.flags = MWM_HINTS_DECORATIONS;
951 } 917 }
952 else 918 else
953 mwmhints.flags = 0; 919 mwmhints.flags = 0;
954#endif 920#endif
955 921
956 /* grab colors before netscape does */
957 Get_Colours ();
958
959 if (!set_fonts ())
960 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
961
962 parent = DefaultRootWindow (disp);
963
964#if ENABLE_XEMBED 922#if ENABLE_XEMBED
965 if (rs[Rs_embed]) 923 if (rs[Rs_embed])
966 { 924 {
967 XWindowAttributes wattr; 925 XWindowAttributes wattr;
968 926
976#endif 934#endif
977 935
978 window_calc (0, 0); 936 window_calc (0, 0);
979 937
980 /* sub-window placement & size in rxvt_resize_subwindows () */ 938 /* sub-window placement & size in rxvt_resize_subwindows () */
981#ifdef PREFER_24BIT
982 attributes.background_pixel = pix_colors_focused[Color_border]; 939 attributes.background_pixel = pix_colors_focused[Color_border];
983 attributes.border_pixel = pix_colors_focused[Color_border]; 940 attributes.border_pixel = pix_colors_focused[Color_border];
984 attributes.colormap = display->cmap; 941 attributes.colormap = display->cmap;
942
985 top = XCreateWindow (disp, parent, 943 top = XCreateWindow (disp, parent,
986 szHint.x, szHint.y, 944 szHint.x, szHint.y,
987 szHint.width, szHint.height, 945 szHint.width, szHint.height,
988 ext_bwidth, 946 ext_bwidth,
989 display->depth, InputOutput, 947 display->depth, InputOutput,
990 display->visual, 948 display->visual,
991 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 949 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
992#else 950 &attributes);
993 top = XCreateSimpleWindow (disp, parent,
994 szHint.x, szHint.y,
995 szHint.width, szHint.height,
996 ext_bwidth,
997 pix_colors_focused[Color_border],
998 pix_colors_focused[Color_border]);
999#endif
1000 951
1001 this->parent[0] = top; 952 this->parent[0] = top;
1002 953
1003 old_width = szHint.width; 954 old_width = szHint.width;
1004 old_height = szHint.height; 955 old_height = szHint.height;
1005 956
1006 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 957 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1007 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 958 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1008 959
1009 classHint.res_name = (char *)rs[Rs_name]; 960 classHint.res_name = (char *)rs[Rs_name];
1010 classHint.res_class = (char *)RESCLASS; 961 classHint.res_class = (char *)RESCLASS;
1011 962
1012 wmHint.flags = InputHint | StateHint | WindowGroupHint; 963 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1013 wmHint.input = True; 964 wmHint.input = True;
1014 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 965 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1015 wmHint.window_group = top; 966 wmHint.window_group = top;
1016 967
1017 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 968 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1018 &szHint, &wmHint, &classHint); 969 &szHint, &wmHint, &classHint);
970
971#if ENABLE_FRILLS
972 if (mwmhints.flags)
973 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
974 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
975#endif
1019 976
1020 Atom protocols[] = { 977 Atom protocols[] = {
1021 xa[XA_WM_DELETE_WINDOW], 978 xa[XA_WM_DELETE_WINDOW],
1022#if ENABLE_EWMH 979#if ENABLE_EWMH
1023 xa[XA_NET_WM_PING], 980 xa[XA_NET_WM_PING],
1049 | FocusChangeMask | VisibilityChangeMask 1006 | FocusChangeMask | VisibilityChangeMask
1050 | ExposureMask | StructureNotifyMask); 1007 | ExposureMask | StructureNotifyMask);
1051 1008
1052 termwin_ev.start (display, top); 1009 termwin_ev.start (display, top);
1053 1010
1054#if ENABLE_FRILLS
1055 if (mwmhints.flags)
1056 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1057 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1058#endif
1059
1060 /* vt cursor: Black-on-White is standard, but this is more popular */ 1011 /* vt cursor: Black-on-White is standard, but this is more popular */
1061 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1012 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1062 1013
1063#ifdef HAVE_SCROLLBARS 1014#ifdef HAVE_SCROLLBARS
1064 /* cursor scrollBar: Black-on-White */ 1015 /* cursor scrollBar: Black-on-White */
1065 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1016 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1066#endif 1017#endif
1067 1018
1068 /* the vt window */ 1019 /* the vt window */
1069 vt = XCreateSimpleWindow (disp, top, 1020 vt = XCreateSimpleWindow (disp, top,
1070 window_vt_x,
1071 window_vt_y, 1021 window_vt_x, window_vt_y,
1072 width,
1073 height, 1022 width, height,
1074 0, 1023 0,
1075 pix_colors_focused[Color_fg], 1024 pix_colors_focused[Color_fg],
1076 pix_colors_focused[Color_bg]); 1025 pix_colors_focused[Color_bg]);
1077#ifdef DEBUG_X
1078 XStoreName (disp, vt, "vt window");
1079#endif
1080 1026
1081 attributes.bit_gravity = NorthWestGravity; 1027 attributes.bit_gravity = NorthWestGravity;
1082 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1028 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1083 1029
1084 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1030 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1108 scr_touch (true); 1054 scr_touch (true);
1109 } 1055 }
1110#endif 1056#endif
1111 1057
1112 /* graphics context for the vt window */ 1058 /* graphics context for the vt window */
1113 gcvalue.foreground = pix_colors[Color_fg]; 1059 gcvalue.foreground = pix_colors[Color_fg];
1114 gcvalue.background = pix_colors[Color_bg]; 1060 gcvalue.background = pix_colors[Color_bg];
1115 gcvalue.graphics_exposures = 1; 1061 gcvalue.graphics_exposures = 1;
1062
1116 gc = XCreateGC (disp, vt, 1063 gc = XCreateGC (disp, vt,
1117 GCForeground | GCBackground | GCGraphicsExposures, 1064 GCForeground | GCBackground | GCGraphicsExposures,
1118 &gcvalue); 1065 &gcvalue);
1119 1066
1120 drawable = new rxvt_drawable (display, vt); 1067 drawable = new rxvt_drawable (display, vt);
1121 1068
1122#ifdef RXVT_SCROLLBAR 1069#ifdef RXVT_SCROLLBAR
1123 gcvalue.foreground = pix_colors[Color_topShadow]; 1070 gcvalue.foreground = pix_colors[Color_topShadow];
1134 pix_colors = pix_colors_unfocused; 1081 pix_colors = pix_colors_unfocused;
1135#endif 1082#endif
1136 1083
1137 pointer_unblank (); 1084 pointer_unblank ();
1138 scr_recolour (); 1085 scr_recolour ();
1139
1140#if ENABLE_XEMBED
1141 if (rs[Rs_embed])
1142 {
1143 long info[2] = { 0, XEMBED_MAPPED };
1144
1145 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1146 32, PropModeReplace, (unsigned char *)&info, 2);
1147 }
1148#endif
1149} 1086}
1150 1087
1151/* ------------------------------------------------------------------------- * 1088/* ------------------------------------------------------------------------- *
1152 * GET TTY CURRENT STATE * 1089 * GET TTY CURRENT STATE *
1153 * ------------------------------------------------------------------------- */ 1090 * ------------------------------------------------------------------------- */
1370rxvt_term::run_command (const char *const *argv) 1307rxvt_term::run_command (const char *const *argv)
1371{ 1308{
1372#if ENABLE_FRILLS 1309#if ENABLE_FRILLS
1373 if (rs[Rs_pty_fd]) 1310 if (rs[Rs_pty_fd])
1374 { 1311 {
1375 pty.pty = atoi (rs[Rs_pty_fd]); 1312 pty->pty = atoi (rs[Rs_pty_fd]);
1376 1313
1377 if (pty.pty >= 0) 1314 if (pty->pty >= 0)
1378 { 1315 {
1379 if (getfd_hook) 1316 if (getfd_hook)
1380 pty.pty = (*getfd_hook) (pty.pty); 1317 pty->pty = (*getfd_hook) (pty->pty);
1381 1318
1382 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK)) 1319 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1383 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1320 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1384 } 1321 }
1385 } 1322 }
1386 else 1323 else
1387#endif 1324#endif
1388 if (!pty.get ()) 1325 if (!pty->get ())
1389 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1326 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1390 1327
1391 pty.set_utf8_mode (enc_utf8); 1328 pty->set_utf8_mode (enc_utf8);
1392 1329
1393 /* set initial window size */ 1330 /* set initial window size */
1394 tt_winch (); 1331 tt_winch ();
1395 1332
1396 int er; 1333 int er;
1409#if ENABLE_FRILLS 1346#if ENABLE_FRILLS
1410 if (rs[Rs_pty_fd]) 1347 if (rs[Rs_pty_fd])
1411 return; 1348 return;
1412#endif 1349#endif
1413 1350
1414#ifndef __QNX__
1415 /* spin off the command interpreter */ 1351 /* spin off the command interpreter */
1416 switch (cmd_pid = fork ()) 1352 switch (cmd_pid = fork ())
1417 { 1353 {
1418 case -1: 1354 case -1:
1419 { 1355 {
1421 rxvt_fatal ("can't fork, aborting.\n"); 1357 rxvt_fatal ("can't fork, aborting.\n");
1422 } 1358 }
1423 case 0: 1359 case 0:
1424 init_env (); 1360 init_env ();
1425 1361
1426 if (!pty.make_controlling_tty ()) 1362 if (!pty->make_controlling_tty ())
1427 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1363 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1428 else 1364 else
1429 { 1365 {
1430 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1366 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1431 dup2 (pty.tty, STDIN_FILENO); 1367 dup2 (pty->tty, STDIN_FILENO);
1432 dup2 (pty.tty, STDOUT_FILENO); 1368 dup2 (pty->tty, STDOUT_FILENO);
1433 dup2 (pty.tty, STDERR_FILENO); 1369 dup2 (pty->tty, STDERR_FILENO);
1434 1370
1435 // close all our file handles that we do no longer need 1371 // close all our file handles that we do no longer need
1436 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1372 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1437 { 1373 {
1438 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1374 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1439 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1375 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1440 } 1376 }
1441 1377
1442 run_child (argv); 1378 run_child (argv);
1443 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1379 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1444 } 1380 }
1445 1381
1446 _exit (EXIT_FAILURE); 1382 _exit (EXIT_FAILURE);
1447 1383
1448 default: 1384 default:
1449 { 1385 if (!OPTION (Opt_utmpInhibit))
1450#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1386 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1451 int fdstdin;
1452 1387
1453 fdstdin = dup (STDIN_FILENO); 1388 pty->close_tty ();
1454 dup2 (pty.tty, STDIN_FILENO);
1455#endif
1456 1389
1457#ifdef UTMP_SUPPORT 1390 child_ev.start (cmd_pid);
1458 privileged_utmp (SAVE);
1459#endif
1460 1391
1461#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1392 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1462
1463 dup2 (fdstdin, STDIN_FILENO);
1464 close (fdstdin);
1465#endif
1466 }
1467
1468 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1469 break; 1393 break;
1470 } 1394 }
1471#else /* __QNX__ uses qnxspawn () */
1472 fchmod (pty.tty, 0622);
1473 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1474 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1475
1476 if (run_child (argv) == -1)
1477 exit (EXIT_FAILURE);
1478#endif
1479} 1395}
1480 1396
1481/* ------------------------------------------------------------------------- * 1397/* ------------------------------------------------------------------------- *
1482 * CHILD PROCESS OPERATIONS * 1398 * CHILD PROCESS OPERATIONS *
1483 * ------------------------------------------------------------------------- */ 1399 * ------------------------------------------------------------------------- */
1527 // unblock signals (signals are blocked by iom.C 1443 // unblock signals (signals are blocked by iom.C
1528 sigset_t ss; 1444 sigset_t ss;
1529 sigemptyset (&ss); 1445 sigemptyset (&ss);
1530 sigprocmask (SIG_SETMASK, &ss, 0); 1446 sigprocmask (SIG_SETMASK, &ss, 0);
1531 1447
1532#ifndef __QNX__
1533 /* command interpreter path */ 1448 /* command interpreter path */
1534 if (argv != NULL) 1449 if (argv != NULL)
1535 { 1450 {
1536# ifdef DEBUG_CMD 1451# ifdef DEBUG_CMD
1537 int i; 1452 int i;
1563 1478
1564 execlp (shell, argv0, NULL); 1479 execlp (shell, argv0, NULL);
1565 /* no error message: STDERR is closed! */ 1480 /* no error message: STDERR is closed! */
1566 } 1481 }
1567 1482
1568#else /* __QNX__ uses qnxspawn () */
1569
1570 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1571 char *command = NULL, fullcommand[_MAX_PATH];
1572 char **arg_v, *arg_a[2] = { NULL, NULL };
1573
1574 if (argv != NULL)
1575 {
1576 if (access (argv[0], X_OK) == -1)
1577 {
1578 if (strchr (argv[0], '/') == NULL)
1579 {
1580 searchenv (argv[0], "PATH", fullcommand);
1581
1582 if (fullcommand[0] != '\0')
1583 command = fullcommand;
1584 }
1585
1586 if (access (command, X_OK) == -1)
1587 return -1;
1588 }
1589 else
1590 command = argv[0];
1591
1592 arg_v = argv;
1593 }
1594 else
1595 {
1596 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1597 command = "/bin/sh";
1598
1599 arg_a[0] = my_basename (command);
1600
1601 if (OPTION (Opt_loginShell))
1602 {
1603 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1604
1605 login[0] = '-';
1606 strcpy (&login[1], arg_a[0]);
1607 arg_a[0] = login;
1608 }
1609
1610 arg_v = arg_a;
1611 }
1612
1613 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1614 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1615 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1616 command, arg_v, environ, iov_a, 0);
1617 if (login)
1618 free (login);
1619
1620 pty.close_tty ();
1621 return pty.pty;
1622#endif
1623
1624 return -1; 1483 return -1;
1625} 1484}
1626 1485
1627/*----------------------- end-of-file (C source) -----------------------*/ 1486/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines