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.142 by root, Fri Jan 13 04:59:04 2006 UTC vs.
Revision 1.150 by root, Fri Jan 20 11:02:46 2006 UTC

… …
203#endif 203#endif
204#ifdef TRANSPARENT 204#ifdef TRANSPARENT
205 "_XROOTPMAP_ID", 205 "_XROOTPMAP_ID",
206 "ESETROOT_PMAP_ID", 206 "ESETROOT_PMAP_ID",
207#endif 207#endif
208#ifdef OFFIX_DND
209 "DndProtocol",
210 "DndSelection",
211#endif
212#if ENABLE_XEMBED 208#if ENABLE_XEMBED
213 "_XEMBED", 209 "_XEMBED",
214 "_XEMBED_INFO", 210 "_XEMBED_INFO",
215#endif 211#endif
216 }; 212 };
… …
255 bgPixmap.x = bgPixmap.y = 50; 251 bgPixmap.x = bgPixmap.y = 50;
256 bgPixmap.pixmap = None; 252 bgPixmap.pixmap = None;
257#endif 253#endif
258 254
259 last_bot = last_state = -1; 255 last_bot = last_state = -1;
260
261#ifdef MENUBAR
262 menu_readonly = 1;
263# if ! (MENUBAR_MAX > 1)
264 CurrentBar = &BarList;
265# endif /* (MENUBAR_MAX > 1) */
266#endif
267 256
268 return true; 257 return true;
269} 258}
270 259
271void 260void
… …
670 if (strcmp (key_backspace, "DEC") == 0) 659 if (strcmp (key_backspace, "DEC") == 0)
671 priv_modes |= PrivMode_HaveBackSpace; 660 priv_modes |= PrivMode_HaveBackSpace;
672#endif 661#endif
673 662
674 /* add value for scrollBar */ 663 /* add value for scrollBar */
675 if (scrollbar_visible ()) 664 if (scrollBar.state)
676 { 665 {
677 priv_modes |= PrivMode_scrollBar; 666 priv_modes |= PrivMode_scrollBar;
678 SavedModes |= PrivMode_scrollBar; 667 SavedModes |= PrivMode_scrollBar;
679 }
680
681 if (menubar_visible ())
682 {
683 priv_modes |= PrivMode_menuBar;
684 SavedModes |= PrivMode_menuBar;
685 } 668 }
686 669
687 run_command (argv); 670 run_command (argv);
688} 671}
689 672
… …
757 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 740 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]; 741 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
759 } 742 }
760 743
761 /* 744 /*
762 * get scrollBar/menuBar shadow colors 745 * get scrollBar shadow colors
763 * 746 *
764 * The calculations of topShadow/bottomShadow values are adapted 747 * The calculations of topShadow/bottomShadow values are adapted
765 * from the fvwm window manager. 748 * from the fvwm window manager.
766 */ 749 */
767#ifdef KEEP_SCROLLCOLOR 750#ifdef KEEP_SCROLLCOLOR
… …
941 { 924 {
942 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 925 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
943 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 926 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
944 } 927 }
945 928
929 /* grab colors before netscape does */
930 Get_Colours ();
931
932 if (!set_fonts ())
933 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
934
935 parent = DefaultRootWindow (disp);
936
937 attributes.override_redirect = !!OPTION (Opt_override_redirect);
938
946#if ENABLE_FRILLS 939#if ENABLE_FRILLS
947 if (OPTION (Opt_borderLess)) 940 if (OPTION (Opt_borderLess))
948 { 941 {
949 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 942 prop = XInternAtom (disp, "_MOTIF_WM_INFO", True);
950 943
951 if (prop == None) 944 if (prop == None)
952 { 945 {
953 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 946 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
954#ifdef PREFER_24BIT
955 attributes.override_redirect = TRUE; 947 attributes.override_redirect = TRUE;
956#endif
957 mwmhints.flags = 0; 948 mwmhints.flags = 0;
958 } 949 }
959 else 950 else
960 { 951 {
961 mwmhints.flags = MWM_HINTS_DECORATIONS; 952 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
964 } 955 }
965 else 956 else
966 mwmhints.flags = 0; 957 mwmhints.flags = 0;
967#endif 958#endif
968 959
969 /* grab colors before netscape does */
970 Get_Colours ();
971
972 if (!set_fonts ())
973 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
974
975 parent = DefaultRootWindow (disp);
976
977#if ENABLE_XEMBED 960#if ENABLE_XEMBED
978 if (rs[Rs_embed]) 961 if (rs[Rs_embed])
979 { 962 {
980 XWindowAttributes wattr; 963 XWindowAttributes wattr;
981 964
… …
989#endif 972#endif
990 973
991 window_calc (0, 0); 974 window_calc (0, 0);
992 975
993 /* sub-window placement & size in rxvt_resize_subwindows () */ 976 /* sub-window placement & size in rxvt_resize_subwindows () */
994#ifdef PREFER_24BIT
995 attributes.background_pixel = pix_colors_focused[Color_border]; 977 attributes.background_pixel = pix_colors_focused[Color_border];
996 attributes.border_pixel = pix_colors_focused[Color_border]; 978 attributes.border_pixel = pix_colors_focused[Color_border];
997 attributes.colormap = display->cmap; 979 attributes.colormap = display->cmap;
998 top = XCreateWindow (disp, parent, 980 top = XCreateWindow (disp, parent,
999 szHint.x, szHint.y, 981 szHint.x, szHint.y,
1000 szHint.width, szHint.height, 982 szHint.width, szHint.height,
1001 ext_bwidth, 983 ext_bwidth,
1002 display->depth, InputOutput, 984 display->depth, InputOutput,
1003 display->visual, 985 display->visual,
1004 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 986 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1005#else 987 &attributes);
1006 top = XCreateSimpleWindow (disp, parent,
1007 szHint.x, szHint.y,
1008 szHint.width, szHint.height,
1009 ext_bwidth,
1010 pix_colors_focused[Color_border],
1011 pix_colors_focused[Color_border]);
1012#endif
1013 988
1014 this->parent[0] = top; 989 this->parent[0] = top;
1015 990
1016 old_width = szHint.width; 991 old_width = szHint.width;
1017 old_height = szHint.height; 992 old_height = szHint.height;
… …
1071#endif 1046#endif
1072 1047
1073 /* vt cursor: Black-on-White is standard, but this is more popular */ 1048 /* vt cursor: Black-on-White is standard, but this is more popular */
1074 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1049 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1075 1050
1076#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1051#ifdef HAVE_SCROLLBARS
1077 /* cursor (menuBar/scrollBar): Black-on-White */ 1052 /* cursor scrollBar: Black-on-White */
1078 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1053 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1079#endif 1054#endif
1080 1055
1081 /* the vt window */ 1056 /* the vt window */
1082 vt = XCreateSimpleWindow (disp, top, 1057 vt = XCreateSimpleWindow (disp, top,
… …
1103 1078
1104 vt_select_input (); 1079 vt_select_input ();
1105 1080
1106 vt_ev.start (display, vt); 1081 vt_ev.start (display, vt);
1107 1082
1108#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1109 if (menuBar_height ())
1110 {
1111 menuBar.win = XCreateSimpleWindow (disp, top,
1112 window_vt_x, 0,
1113 width,
1114 menuBar_TotalHeight (),
1115 0,
1116 pix_colors_focused[Color_fg],
1117 pix_colors_focused[Color_scroll]);
1118
1119#ifdef DEBUG_X
1120 XStoreName (disp, menuBar.win, "menubar");
1121#endif
1122
1123 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1124
1125 XDefineCursor (disp, menuBar.win,
1126 XCreateFontCursor (disp, XC_left_ptr));
1127
1128 XSelectInput (disp, menuBar.win,
1129 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1130 menubar_ev.start (display, menuBar.win);
1131 }
1132#endif
1133
1134#ifdef XPM_BACKGROUND 1083#ifdef XPM_BACKGROUND
1135 if (rs[Rs_backgroundPixmap] != NULL 1084 if (rs[Rs_backgroundPixmap] != NULL
1136 && ! OPTION (Opt_transparent)) 1085 && ! OPTION (Opt_transparent))
1137 { 1086 {
1138 const char *p = rs[Rs_backgroundPixmap]; 1087 const char *p = rs[Rs_backgroundPixmap];
… …
1156 GCForeground | GCBackground | GCGraphicsExposures, 1105 GCForeground | GCBackground | GCGraphicsExposures,
1157 &gcvalue); 1106 &gcvalue);
1158 1107
1159 drawable = new rxvt_drawable (display, vt); 1108 drawable = new rxvt_drawable (display, vt);
1160 1109
1161#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1110#ifdef RXVT_SCROLLBAR
1162 gcvalue.foreground = pix_colors[Color_topShadow]; 1111 gcvalue.foreground = pix_colors[Color_topShadow];
1163 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1112 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1164 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1113 gcvalue.foreground = pix_colors[Color_bottomShadow];
1165 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1114 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1166 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1115 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
… …
1409rxvt_term::run_command (const char *const *argv) 1358rxvt_term::run_command (const char *const *argv)
1410{ 1359{
1411#if ENABLE_FRILLS 1360#if ENABLE_FRILLS
1412 if (rs[Rs_pty_fd]) 1361 if (rs[Rs_pty_fd])
1413 { 1362 {
1414 pty.pty = atoi (rs[Rs_pty_fd]); 1363 pty->pty = atoi (rs[Rs_pty_fd]);
1415 1364
1416 if (pty.pty >= 0) 1365 if (pty->pty >= 0)
1417 { 1366 {
1418 if (getfd_hook) 1367 if (getfd_hook)
1419 pty.pty = (*getfd_hook) (pty.pty); 1368 pty->pty = (*getfd_hook) (pty->pty);
1420 1369
1421 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK)) 1370 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1422 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1371 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1423 } 1372 }
1424 } 1373 }
1425 else 1374 else
1426#endif 1375#endif
1427 if (!pty.get ()) 1376 if (!pty->get ())
1428 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1377 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1429 1378
1430 pty.set_utf8_mode (enc_utf8); 1379 pty->set_utf8_mode (enc_utf8);
1431 1380
1432 /* set initial window size */ 1381 /* set initial window size */
1433 tt_winch (); 1382 tt_winch ();
1434 1383
1435 int er; 1384 int er;
… …
1448#if ENABLE_FRILLS 1397#if ENABLE_FRILLS
1449 if (rs[Rs_pty_fd]) 1398 if (rs[Rs_pty_fd])
1450 return; 1399 return;
1451#endif 1400#endif
1452 1401
1453#ifndef __QNX__
1454 /* spin off the command interpreter */ 1402 /* spin off the command interpreter */
1455 switch (cmd_pid = fork ()) 1403 switch (cmd_pid = fork ())
1456 { 1404 {
1457 case -1: 1405 case -1:
1458 { 1406 {
… …
1460 rxvt_fatal ("can't fork, aborting.\n"); 1408 rxvt_fatal ("can't fork, aborting.\n");
1461 } 1409 }
1462 case 0: 1410 case 0:
1463 init_env (); 1411 init_env ();
1464 1412
1465 if (!pty.make_controlling_tty ()) 1413 if (!pty->make_controlling_tty ())
1466 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1414 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1467 else 1415 else
1468 { 1416 {
1469 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1417 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1470 dup2 (pty.tty, STDIN_FILENO); 1418 dup2 (pty->tty, STDIN_FILENO);
1471 dup2 (pty.tty, STDOUT_FILENO); 1419 dup2 (pty->tty, STDOUT_FILENO);
1472 dup2 (pty.tty, STDERR_FILENO); 1420 dup2 (pty->tty, STDERR_FILENO);
1473 1421
1474 // close all our file handles that we do no longer need 1422 // close all our file handles that we do no longer need
1475 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1423 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1476 { 1424 {
1477 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1425 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1478 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1426 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1479 } 1427 }
1480 1428
1481 run_child (argv); 1429 run_child (argv);
1482 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1430 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1483 } 1431 }
1484 1432
1485 _exit (EXIT_FAILURE); 1433 _exit (EXIT_FAILURE);
1486 1434
1487 default: 1435 default:
1488 {
1489#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1490 int fdstdin;
1491
1492 fdstdin = dup (STDIN_FILENO);
1493 dup2 (pty.tty, STDIN_FILENO);
1494#endif
1495
1496#ifdef UTMP_SUPPORT 1436#if UTMP_SUPPORT
1497 privileged_utmp (SAVE); 1437 if (!OPTION (Opt_utmpInhibit))
1438 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1498#endif 1439#endif
1499 1440
1500#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1441 pty->close_tty ();
1501 1442
1502 dup2 (fdstdin, STDIN_FILENO); 1443 child_ev.start (cmd_pid);
1503 close (fdstdin);
1504#endif
1505 }
1506 1444
1507 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */ 1445 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1508 break; 1446 break;
1509 } 1447 }
1510#else /* __QNX__ uses qnxspawn () */
1511 fchmod (pty.tty, 0622);
1512 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1513 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1514
1515 if (run_child (argv) == -1)
1516 exit (EXIT_FAILURE);
1517#endif
1518} 1448}
1519 1449
1520/* ------------------------------------------------------------------------- * 1450/* ------------------------------------------------------------------------- *
1521 * CHILD PROCESS OPERATIONS * 1451 * CHILD PROCESS OPERATIONS *
1522 * ------------------------------------------------------------------------- */ 1452 * ------------------------------------------------------------------------- */
… …
1566 // unblock signals (signals are blocked by iom.C 1496 // unblock signals (signals are blocked by iom.C
1567 sigset_t ss; 1497 sigset_t ss;
1568 sigemptyset (&ss); 1498 sigemptyset (&ss);
1569 sigprocmask (SIG_SETMASK, &ss, 0); 1499 sigprocmask (SIG_SETMASK, &ss, 0);
1570 1500
1571#ifndef __QNX__
1572 /* command interpreter path */ 1501 /* command interpreter path */
1573 if (argv != NULL) 1502 if (argv != NULL)
1574 { 1503 {
1575# ifdef DEBUG_CMD 1504# ifdef DEBUG_CMD
1576 int i; 1505 int i;
… …
1602 1531
1603 execlp (shell, argv0, NULL); 1532 execlp (shell, argv0, NULL);
1604 /* no error message: STDERR is closed! */ 1533 /* no error message: STDERR is closed! */
1605 } 1534 }
1606 1535
1607#else /* __QNX__ uses qnxspawn () */
1608
1609 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1610 char *command = NULL, fullcommand[_MAX_PATH];
1611 char **arg_v, *arg_a[2] = { NULL, NULL };
1612
1613 if (argv != NULL)
1614 {
1615 if (access (argv[0], X_OK) == -1)
1616 {
1617 if (strchr (argv[0], '/') == NULL)
1618 {
1619 searchenv (argv[0], "PATH", fullcommand);
1620
1621 if (fullcommand[0] != '\0')
1622 command = fullcommand;
1623 }
1624
1625 if (access (command, X_OK) == -1)
1626 return -1;
1627 }
1628 else
1629 command = argv[0];
1630
1631 arg_v = argv;
1632 }
1633 else
1634 {
1635 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1636 command = "/bin/sh";
1637
1638 arg_a[0] = my_basename (command);
1639
1640 if (OPTION (Opt_loginShell))
1641 {
1642 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1643
1644 login[0] = '-';
1645 strcpy (&login[1], arg_a[0]);
1646 arg_a[0] = login;
1647 }
1648
1649 arg_v = arg_a;
1650 }
1651
1652 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1653 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1654 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1655 command, arg_v, environ, iov_a, 0);
1656 if (login)
1657 free (login);
1658
1659 pty.close_tty ();
1660 return pty.pty;
1661#endif
1662
1663 return -1; 1536 return -1;
1664} 1537}
1665 1538
1666/*----------------------- end-of-file (C source) -----------------------*/ 1539/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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