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.141 by root, Fri Jan 13 04:19:41 2006 UTC vs.
Revision 1.147 by root, Tue Jan 17 16:50:42 2006 UTC

… …
256 bgPixmap.pixmap = None; 256 bgPixmap.pixmap = None;
257#endif 257#endif
258 258
259 last_bot = last_state = -1; 259 last_bot = last_state = -1;
260 260
261#ifdef MENUBAR
262 menu_readonly = 1;
263# if ! (MENUBAR_MAX > 1)
264 CurrentBar = &BarList;
265# endif /* (MENUBAR_MAX > 1) */
266#endif
267
268 return true; 261 return true;
269} 262}
270 263
271void 264void
272rxvt_term::init_secondary () 265rxvt_term::init_secondary ()
… …
670 if (strcmp (key_backspace, "DEC") == 0) 663 if (strcmp (key_backspace, "DEC") == 0)
671 priv_modes |= PrivMode_HaveBackSpace; 664 priv_modes |= PrivMode_HaveBackSpace;
672#endif 665#endif
673 666
674 /* add value for scrollBar */ 667 /* add value for scrollBar */
675 if (scrollbar_visible ()) 668 if (scrollBar.state)
676 { 669 {
677 priv_modes |= PrivMode_scrollBar; 670 priv_modes |= PrivMode_scrollBar;
678 SavedModes |= PrivMode_scrollBar; 671 SavedModes |= PrivMode_scrollBar;
679 }
680
681 if (menubar_visible ())
682 {
683 priv_modes |= PrivMode_menuBar;
684 SavedModes |= PrivMode_menuBar;
685 } 672 }
686 673
687 run_command (argv); 674 run_command (argv);
688} 675}
689 676
… …
757 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 744 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
758 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 745 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
759 } 746 }
760 747
761 /* 748 /*
762 * get scrollBar/menuBar shadow colors 749 * get scrollBar shadow colors
763 * 750 *
764 * The calculations of topShadow/bottomShadow values are adapted 751 * The calculations of topShadow/bottomShadow values are adapted
765 * from the fvwm window manager. 752 * from the fvwm window manager.
766 */ 753 */
767#ifdef KEEP_SCROLLCOLOR 754#ifdef KEEP_SCROLLCOLOR
… …
1071#endif 1058#endif
1072 1059
1073 /* vt cursor: Black-on-White is standard, but this is more popular */ 1060 /* vt cursor: Black-on-White is standard, but this is more popular */
1074 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1061 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1075 1062
1076#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1063#ifdef HAVE_SCROLLBARS
1077 /* cursor (menuBar/scrollBar): Black-on-White */ 1064 /* cursor scrollBar: Black-on-White */
1078 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1065 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1079#endif 1066#endif
1080 1067
1081 /* the vt window */ 1068 /* the vt window */
1082 vt = XCreateSimpleWindow (disp, top, 1069 vt = XCreateSimpleWindow (disp, top,
… …
1094 attributes.bit_gravity = NorthWestGravity; 1081 attributes.bit_gravity = NorthWestGravity;
1095 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1082 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1096 1083
1097 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1084 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1098 1085
1099 if (OPTION (Opt_pointerBlank) 1086 if (OPTION (Opt_pointerBlank))
1100#ifdef ENABLE_PERL
1101 || perl.self
1102#endif
1103 )
1104 vt_emask |= PointerMotionMask; 1087 vt_emask |= PointerMotionMask;
1105 else 1088 else
1106 vt_emask |= Button1MotionMask | Button3MotionMask; 1089 vt_emask |= Button1MotionMask | Button3MotionMask;
1107 1090
1108 XSelectInput (disp, vt, vt_emask); 1091 vt_select_input ();
1092
1109 vt_ev.start (display, vt); 1093 vt_ev.start (display, vt);
1110
1111#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1112 if (menuBar_height ())
1113 {
1114 menuBar.win = XCreateSimpleWindow (disp, top,
1115 window_vt_x, 0,
1116 width,
1117 menuBar_TotalHeight (),
1118 0,
1119 pix_colors_focused[Color_fg],
1120 pix_colors_focused[Color_scroll]);
1121
1122#ifdef DEBUG_X
1123 XStoreName (disp, menuBar.win, "menubar");
1124#endif
1125
1126 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1127
1128 XDefineCursor (disp, menuBar.win,
1129 XCreateFontCursor (disp, XC_left_ptr));
1130
1131 XSelectInput (disp, menuBar.win,
1132 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1133 menubar_ev.start (display, menuBar.win);
1134 }
1135#endif
1136 1094
1137#ifdef XPM_BACKGROUND 1095#ifdef XPM_BACKGROUND
1138 if (rs[Rs_backgroundPixmap] != NULL 1096 if (rs[Rs_backgroundPixmap] != NULL
1139 && ! OPTION (Opt_transparent)) 1097 && ! OPTION (Opt_transparent))
1140 { 1098 {
… …
1159 GCForeground | GCBackground | GCGraphicsExposures, 1117 GCForeground | GCBackground | GCGraphicsExposures,
1160 &gcvalue); 1118 &gcvalue);
1161 1119
1162 drawable = new rxvt_drawable (display, vt); 1120 drawable = new rxvt_drawable (display, vt);
1163 1121
1164#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1122#ifdef RXVT_SCROLLBAR
1165 gcvalue.foreground = pix_colors[Color_topShadow]; 1123 gcvalue.foreground = pix_colors[Color_topShadow];
1166 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1124 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1167 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1125 gcvalue.foreground = pix_colors[Color_bottomShadow];
1168 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1126 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1169 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1127 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
… …
1412rxvt_term::run_command (const char *const *argv) 1370rxvt_term::run_command (const char *const *argv)
1413{ 1371{
1414#if ENABLE_FRILLS 1372#if ENABLE_FRILLS
1415 if (rs[Rs_pty_fd]) 1373 if (rs[Rs_pty_fd])
1416 { 1374 {
1417 pty.pty = atoi (rs[Rs_pty_fd]); 1375 pty->pty = atoi (rs[Rs_pty_fd]);
1418 1376
1419 if (pty.pty >= 0) 1377 if (pty->pty >= 0)
1420 { 1378 {
1421 if (getfd_hook) 1379 if (getfd_hook)
1422 pty.pty = (*getfd_hook) (pty.pty); 1380 pty->pty = (*getfd_hook) (pty->pty);
1423 1381
1424 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK)) 1382 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1425 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1383 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1426 } 1384 }
1427 } 1385 }
1428 else 1386 else
1429#endif 1387#endif
1430 if (!pty.get ()) 1388 if (!pty->get ())
1431 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1389 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1432 1390
1433 pty.set_utf8_mode (enc_utf8); 1391 pty->set_utf8_mode (enc_utf8);
1434 1392
1435 /* set initial window size */ 1393 /* set initial window size */
1436 tt_winch (); 1394 tt_winch ();
1437 1395
1438 int er; 1396 int er;
… …
1451#if ENABLE_FRILLS 1409#if ENABLE_FRILLS
1452 if (rs[Rs_pty_fd]) 1410 if (rs[Rs_pty_fd])
1453 return; 1411 return;
1454#endif 1412#endif
1455 1413
1456#ifndef __QNX__
1457 /* spin off the command interpreter */ 1414 /* spin off the command interpreter */
1458 switch (cmd_pid = fork ()) 1415 switch (cmd_pid = fork ())
1459 { 1416 {
1460 case -1: 1417 case -1:
1461 { 1418 {
… …
1463 rxvt_fatal ("can't fork, aborting.\n"); 1420 rxvt_fatal ("can't fork, aborting.\n");
1464 } 1421 }
1465 case 0: 1422 case 0:
1466 init_env (); 1423 init_env ();
1467 1424
1468 if (!pty.make_controlling_tty ()) 1425 if (!pty->make_controlling_tty ())
1469 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1426 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1470 else 1427 else
1471 { 1428 {
1472 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1429 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1473 dup2 (pty.tty, STDIN_FILENO); 1430 dup2 (pty->tty, STDIN_FILENO);
1474 dup2 (pty.tty, STDOUT_FILENO); 1431 dup2 (pty->tty, STDOUT_FILENO);
1475 dup2 (pty.tty, STDERR_FILENO); 1432 dup2 (pty->tty, STDERR_FILENO);
1476 1433
1477 // close all our file handles that we do no longer need 1434 // close all our file handles that we do no longer need
1478 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1435 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1479 { 1436 {
1480 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1437 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1481 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1438 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1482 } 1439 }
1483 1440
1484 run_child (argv); 1441 run_child (argv);
1485 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1442 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1486 } 1443 }
1487 1444
1488 _exit (EXIT_FAILURE); 1445 _exit (EXIT_FAILURE);
1489 1446
1490 default: 1447 default:
1491 {
1492#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1493 int fdstdin;
1494
1495 fdstdin = dup (STDIN_FILENO);
1496 dup2 (pty.tty, STDIN_FILENO);
1497#endif
1498
1499#ifdef UTMP_SUPPORT 1448#if UTMP_SUPPORT
1500 privileged_utmp (SAVE); 1449 if (!OPTION (Opt_utmpInhibit))
1450 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1501#endif 1451#endif
1502 1452
1503#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1453 pty->close_tty ();
1504
1505 dup2 (fdstdin, STDIN_FILENO);
1506 close (fdstdin);
1507#endif
1508 }
1509
1510 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1511 break; 1454 break;
1512 } 1455 }
1513#else /* __QNX__ uses qnxspawn () */
1514 fchmod (pty.tty, 0622);
1515 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1516 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1517
1518 if (run_child (argv) == -1)
1519 exit (EXIT_FAILURE);
1520#endif
1521} 1456}
1522 1457
1523/* ------------------------------------------------------------------------- * 1458/* ------------------------------------------------------------------------- *
1524 * CHILD PROCESS OPERATIONS * 1459 * CHILD PROCESS OPERATIONS *
1525 * ------------------------------------------------------------------------- */ 1460 * ------------------------------------------------------------------------- */
… …
1569 // unblock signals (signals are blocked by iom.C 1504 // unblock signals (signals are blocked by iom.C
1570 sigset_t ss; 1505 sigset_t ss;
1571 sigemptyset (&ss); 1506 sigemptyset (&ss);
1572 sigprocmask (SIG_SETMASK, &ss, 0); 1507 sigprocmask (SIG_SETMASK, &ss, 0);
1573 1508
1574#ifndef __QNX__
1575 /* command interpreter path */ 1509 /* command interpreter path */
1576 if (argv != NULL) 1510 if (argv != NULL)
1577 { 1511 {
1578# ifdef DEBUG_CMD 1512# ifdef DEBUG_CMD
1579 int i; 1513 int i;
… …
1605 1539
1606 execlp (shell, argv0, NULL); 1540 execlp (shell, argv0, NULL);
1607 /* no error message: STDERR is closed! */ 1541 /* no error message: STDERR is closed! */
1608 } 1542 }
1609 1543
1610#else /* __QNX__ uses qnxspawn () */
1611
1612 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1613 char *command = NULL, fullcommand[_MAX_PATH];
1614 char **arg_v, *arg_a[2] = { NULL, NULL };
1615
1616 if (argv != NULL)
1617 {
1618 if (access (argv[0], X_OK) == -1)
1619 {
1620 if (strchr (argv[0], '/') == NULL)
1621 {
1622 searchenv (argv[0], "PATH", fullcommand);
1623
1624 if (fullcommand[0] != '\0')
1625 command = fullcommand;
1626 }
1627
1628 if (access (command, X_OK) == -1)
1629 return -1;
1630 }
1631 else
1632 command = argv[0];
1633
1634 arg_v = argv;
1635 }
1636 else
1637 {
1638 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1639 command = "/bin/sh";
1640
1641 arg_a[0] = my_basename (command);
1642
1643 if (OPTION (Opt_loginShell))
1644 {
1645 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1646
1647 login[0] = '-';
1648 strcpy (&login[1], arg_a[0]);
1649 arg_a[0] = login;
1650 }
1651
1652 arg_v = arg_a;
1653 }
1654
1655 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1656 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1657 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1658 command, arg_v, environ, iov_a, 0);
1659 if (login)
1660 free (login);
1661
1662 pty.close_tty ();
1663 return pty.pty;
1664#endif
1665
1666 return -1; 1544 return -1;
1667} 1545}
1668 1546
1669/*----------------------- end-of-file (C source) -----------------------*/ 1547/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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