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.140 by root, Thu Jan 12 01:30:53 2006 UTC vs.
Revision 1.149 by root, Thu Jan 19 09:47:15 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
… …
922#if ENABLE_FRILLS 909#if ENABLE_FRILLS
923 Atom prop = None; 910 Atom prop = None;
924 MWMHints mwmhints; 911 MWMHints mwmhints;
925#endif 912#endif
926 XGCValues gcvalue; 913 XGCValues gcvalue;
927 long vt_emask;
928 XSetWindowAttributes attributes; 914 XSetWindowAttributes attributes;
929 XWindowAttributes gattr; 915 XWindowAttributes gattr;
930 Window top, parent; 916 Window top, parent;
931 dDisp; 917 dDisp;
932 918
… …
942 { 928 {
943 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 929 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
944 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 930 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
945 } 931 }
946 932
933 /* grab colors before netscape does */
934 Get_Colours ();
935
936 if (!set_fonts ())
937 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
938
939 parent = DefaultRootWindow (disp);
940
941 attributes.override_redirect = !!OPTION (Opt_override_redirect);
942
947#if ENABLE_FRILLS 943#if ENABLE_FRILLS
948 if (OPTION (Opt_borderLess)) 944 if (OPTION (Opt_borderLess))
949 { 945 {
950 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 946 prop = XInternAtom (disp, "_MOTIF_WM_INFO", True);
951 947
952 if (prop == None) 948 if (prop == None)
953 { 949 {
954 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 950 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
955#ifdef PREFER_24BIT
956 attributes.override_redirect = TRUE; 951 attributes.override_redirect = TRUE;
957#endif
958 mwmhints.flags = 0; 952 mwmhints.flags = 0;
959 } 953 }
960 else 954 else
961 { 955 {
962 mwmhints.flags = MWM_HINTS_DECORATIONS; 956 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
965 } 959 }
966 else 960 else
967 mwmhints.flags = 0; 961 mwmhints.flags = 0;
968#endif 962#endif
969 963
970 /* grab colors before netscape does */
971 Get_Colours ();
972
973 if (!set_fonts ())
974 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
975
976 parent = DefaultRootWindow (disp);
977
978#if ENABLE_XEMBED 964#if ENABLE_XEMBED
979 if (rs[Rs_embed]) 965 if (rs[Rs_embed])
980 { 966 {
981 XWindowAttributes wattr; 967 XWindowAttributes wattr;
982 968
… …
990#endif 976#endif
991 977
992 window_calc (0, 0); 978 window_calc (0, 0);
993 979
994 /* sub-window placement & size in rxvt_resize_subwindows () */ 980 /* sub-window placement & size in rxvt_resize_subwindows () */
995#ifdef PREFER_24BIT
996 attributes.background_pixel = pix_colors_focused[Color_border]; 981 attributes.background_pixel = pix_colors_focused[Color_border];
997 attributes.border_pixel = pix_colors_focused[Color_border]; 982 attributes.border_pixel = pix_colors_focused[Color_border];
998 attributes.colormap = display->cmap; 983 attributes.colormap = display->cmap;
999 top = XCreateWindow (disp, parent, 984 top = XCreateWindow (disp, parent,
1000 szHint.x, szHint.y, 985 szHint.x, szHint.y,
1001 szHint.width, szHint.height, 986 szHint.width, szHint.height,
1002 ext_bwidth, 987 ext_bwidth,
1003 display->depth, InputOutput, 988 display->depth, InputOutput,
1004 display->visual, 989 display->visual,
1005 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 990 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1006#else 991 &attributes);
1007 top = XCreateSimpleWindow (disp, parent,
1008 szHint.x, szHint.y,
1009 szHint.width, szHint.height,
1010 ext_bwidth,
1011 pix_colors_focused[Color_border],
1012 pix_colors_focused[Color_border]);
1013#endif
1014 992
1015 this->parent[0] = top; 993 this->parent[0] = top;
1016 994
1017 old_width = szHint.width; 995 old_width = szHint.width;
1018 old_height = szHint.height; 996 old_height = szHint.height;
… …
1072#endif 1050#endif
1073 1051
1074 /* vt cursor: Black-on-White is standard, but this is more popular */ 1052 /* vt cursor: Black-on-White is standard, but this is more popular */
1075 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1053 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1076 1054
1077#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1055#ifdef HAVE_SCROLLBARS
1078 /* cursor (menuBar/scrollBar): Black-on-White */ 1056 /* cursor scrollBar: Black-on-White */
1079 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1057 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1080#endif 1058#endif
1081 1059
1082 /* the vt window */ 1060 /* the vt window */
1083 vt = XCreateSimpleWindow (disp, top, 1061 vt = XCreateSimpleWindow (disp, top,
… …
1095 attributes.bit_gravity = NorthWestGravity; 1073 attributes.bit_gravity = NorthWestGravity;
1096 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1074 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1097 1075
1098 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1076 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1099 1077
1100 if (OPTION (Opt_pointerBlank) 1078 if (OPTION (Opt_pointerBlank))
1101#ifdef ENABLE_PERL
1102 || perl.self
1103#endif
1104 )
1105 vt_emask |= PointerMotionMask; 1079 vt_emask |= PointerMotionMask;
1106 else 1080 else
1107 vt_emask |= Button1MotionMask | Button3MotionMask; 1081 vt_emask |= Button1MotionMask | Button3MotionMask;
1108 1082
1109 XSelectInput (disp, vt, vt_emask); 1083 vt_select_input ();
1084
1110 vt_ev.start (display, vt); 1085 vt_ev.start (display, vt);
1111
1112#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1113 if (menuBar_height ())
1114 {
1115 menuBar.win = XCreateSimpleWindow (disp, top,
1116 window_vt_x, 0,
1117 width,
1118 menuBar_TotalHeight (),
1119 0,
1120 pix_colors_focused[Color_fg],
1121 pix_colors_focused[Color_scroll]);
1122
1123#ifdef DEBUG_X
1124 XStoreName (disp, menuBar.win, "menubar");
1125#endif
1126
1127 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1128
1129 XDefineCursor (disp, menuBar.win,
1130 XCreateFontCursor (disp, XC_left_ptr));
1131
1132 XSelectInput (disp, menuBar.win,
1133 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1134 menubar_ev.start (display, menuBar.win);
1135 }
1136#endif
1137 1086
1138#ifdef XPM_BACKGROUND 1087#ifdef XPM_BACKGROUND
1139 if (rs[Rs_backgroundPixmap] != NULL 1088 if (rs[Rs_backgroundPixmap] != NULL
1140 && ! OPTION (Opt_transparent)) 1089 && ! OPTION (Opt_transparent))
1141 { 1090 {
… …
1160 GCForeground | GCBackground | GCGraphicsExposures, 1109 GCForeground | GCBackground | GCGraphicsExposures,
1161 &gcvalue); 1110 &gcvalue);
1162 1111
1163 drawable = new rxvt_drawable (display, vt); 1112 drawable = new rxvt_drawable (display, vt);
1164 1113
1165#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1114#ifdef RXVT_SCROLLBAR
1166 gcvalue.foreground = pix_colors[Color_topShadow]; 1115 gcvalue.foreground = pix_colors[Color_topShadow];
1167 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1116 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1168 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1117 gcvalue.foreground = pix_colors[Color_bottomShadow];
1169 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1118 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1170 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1119 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
… …
1413rxvt_term::run_command (const char *const *argv) 1362rxvt_term::run_command (const char *const *argv)
1414{ 1363{
1415#if ENABLE_FRILLS 1364#if ENABLE_FRILLS
1416 if (rs[Rs_pty_fd]) 1365 if (rs[Rs_pty_fd])
1417 { 1366 {
1418 pty.pty = atoi (rs[Rs_pty_fd]); 1367 pty->pty = atoi (rs[Rs_pty_fd]);
1419 1368
1420 if (pty.pty >= 0) 1369 if (pty->pty >= 0)
1421 { 1370 {
1422 if (getfd_hook) 1371 if (getfd_hook)
1423 pty.pty = (*getfd_hook) (pty.pty); 1372 pty->pty = (*getfd_hook) (pty->pty);
1424 1373
1425 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK)) 1374 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1426 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1375 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1427 } 1376 }
1428 } 1377 }
1429 else 1378 else
1430#endif 1379#endif
1431 if (!pty.get ()) 1380 if (!pty->get ())
1432 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1381 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1433 1382
1434 pty.set_utf8_mode (enc_utf8); 1383 pty->set_utf8_mode (enc_utf8);
1435 1384
1436 /* set initial window size */ 1385 /* set initial window size */
1437 tt_winch (); 1386 tt_winch ();
1438 1387
1439 int er; 1388 int er;
… …
1452#if ENABLE_FRILLS 1401#if ENABLE_FRILLS
1453 if (rs[Rs_pty_fd]) 1402 if (rs[Rs_pty_fd])
1454 return; 1403 return;
1455#endif 1404#endif
1456 1405
1457#ifndef __QNX__
1458 /* spin off the command interpreter */ 1406 /* spin off the command interpreter */
1459 switch (cmd_pid = fork ()) 1407 switch (cmd_pid = fork ())
1460 { 1408 {
1461 case -1: 1409 case -1:
1462 { 1410 {
… …
1464 rxvt_fatal ("can't fork, aborting.\n"); 1412 rxvt_fatal ("can't fork, aborting.\n");
1465 } 1413 }
1466 case 0: 1414 case 0:
1467 init_env (); 1415 init_env ();
1468 1416
1469 if (!pty.make_controlling_tty ()) 1417 if (!pty->make_controlling_tty ())
1470 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1418 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1471 else 1419 else
1472 { 1420 {
1473 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1421 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1474 dup2 (pty.tty, STDIN_FILENO); 1422 dup2 (pty->tty, STDIN_FILENO);
1475 dup2 (pty.tty, STDOUT_FILENO); 1423 dup2 (pty->tty, STDOUT_FILENO);
1476 dup2 (pty.tty, STDERR_FILENO); 1424 dup2 (pty->tty, STDERR_FILENO);
1477 1425
1478 // close all our file handles that we do no longer need 1426 // close all our file handles that we do no longer need
1479 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1427 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1480 { 1428 {
1481 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1429 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1482 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1430 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1483 } 1431 }
1484 1432
1485 run_child (argv); 1433 run_child (argv);
1486 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1434 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1487 } 1435 }
1488 1436
1489 _exit (EXIT_FAILURE); 1437 _exit (EXIT_FAILURE);
1490 1438
1491 default: 1439 default:
1492 {
1493#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1494 int fdstdin;
1495
1496 fdstdin = dup (STDIN_FILENO);
1497 dup2 (pty.tty, STDIN_FILENO);
1498#endif
1499
1500#ifdef UTMP_SUPPORT 1440#if UTMP_SUPPORT
1501 privileged_utmp (SAVE); 1441 if (!OPTION (Opt_utmpInhibit))
1442 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1502#endif 1443#endif
1503 1444
1504#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1445 pty->close_tty ();
1505 1446
1506 dup2 (fdstdin, STDIN_FILENO); 1447 child_ev.start (cmd_pid);
1507 close (fdstdin);
1508#endif
1509 }
1510 1448
1511 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */ 1449 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1512 break; 1450 break;
1513 } 1451 }
1514#else /* __QNX__ uses qnxspawn () */
1515 fchmod (pty.tty, 0622);
1516 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1517 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1518
1519 if (run_child (argv) == -1)
1520 exit (EXIT_FAILURE);
1521#endif
1522} 1452}
1523 1453
1524/* ------------------------------------------------------------------------- * 1454/* ------------------------------------------------------------------------- *
1525 * CHILD PROCESS OPERATIONS * 1455 * CHILD PROCESS OPERATIONS *
1526 * ------------------------------------------------------------------------- */ 1456 * ------------------------------------------------------------------------- */
… …
1570 // unblock signals (signals are blocked by iom.C 1500 // unblock signals (signals are blocked by iom.C
1571 sigset_t ss; 1501 sigset_t ss;
1572 sigemptyset (&ss); 1502 sigemptyset (&ss);
1573 sigprocmask (SIG_SETMASK, &ss, 0); 1503 sigprocmask (SIG_SETMASK, &ss, 0);
1574 1504
1575#ifndef __QNX__
1576 /* command interpreter path */ 1505 /* command interpreter path */
1577 if (argv != NULL) 1506 if (argv != NULL)
1578 { 1507 {
1579# ifdef DEBUG_CMD 1508# ifdef DEBUG_CMD
1580 int i; 1509 int i;
… …
1606 1535
1607 execlp (shell, argv0, NULL); 1536 execlp (shell, argv0, NULL);
1608 /* no error message: STDERR is closed! */ 1537 /* no error message: STDERR is closed! */
1609 } 1538 }
1610 1539
1611#else /* __QNX__ uses qnxspawn () */
1612
1613 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1614 char *command = NULL, fullcommand[_MAX_PATH];
1615 char **arg_v, *arg_a[2] = { NULL, NULL };
1616
1617 if (argv != NULL)
1618 {
1619 if (access (argv[0], X_OK) == -1)
1620 {
1621 if (strchr (argv[0], '/') == NULL)
1622 {
1623 searchenv (argv[0], "PATH", fullcommand);
1624
1625 if (fullcommand[0] != '\0')
1626 command = fullcommand;
1627 }
1628
1629 if (access (command, X_OK) == -1)
1630 return -1;
1631 }
1632 else
1633 command = argv[0];
1634
1635 arg_v = argv;
1636 }
1637 else
1638 {
1639 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1640 command = "/bin/sh";
1641
1642 arg_a[0] = my_basename (command);
1643
1644 if (OPTION (Opt_loginShell))
1645 {
1646 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1647
1648 login[0] = '-';
1649 strcpy (&login[1], arg_a[0]);
1650 arg_a[0] = login;
1651 }
1652
1653 arg_v = arg_a;
1654 }
1655
1656 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1657 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1658 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1659 command, arg_v, environ, iov_a, 0);
1660 if (login)
1661 free (login);
1662
1663 pty.close_tty ();
1664 return pty.pty;
1665#endif
1666
1667 return -1; 1540 return -1;
1668} 1541}
1669 1542
1670/*----------------------- end-of-file (C source) -----------------------*/ 1543/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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