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.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
… …
922#if ENABLE_FRILLS 905#if ENABLE_FRILLS
923 Atom prop = None; 906 Atom prop = None;
924 MWMHints mwmhints; 907 MWMHints mwmhints;
925#endif 908#endif
926 XGCValues gcvalue; 909 XGCValues gcvalue;
927 long vt_emask;
928 XSetWindowAttributes attributes; 910 XSetWindowAttributes attributes;
929 XWindowAttributes gattr; 911 XWindowAttributes gattr;
930 Window top, parent; 912 Window top, parent;
931 dDisp; 913 dDisp;
932 914
… …
942 { 924 {
943 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 925 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
944 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 926 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
945 } 927 }
946 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
947#if ENABLE_FRILLS 939#if ENABLE_FRILLS
948 if (OPTION (Opt_borderLess)) 940 if (OPTION (Opt_borderLess))
949 { 941 {
950 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 942 prop = XInternAtom (disp, "_MOTIF_WM_INFO", True);
951 943
952 if (prop == None) 944 if (prop == None)
953 { 945 {
954 /* 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");*/
955#ifdef PREFER_24BIT
956 attributes.override_redirect = TRUE; 947 attributes.override_redirect = TRUE;
957#endif
958 mwmhints.flags = 0; 948 mwmhints.flags = 0;
959 } 949 }
960 else 950 else
961 { 951 {
962 mwmhints.flags = MWM_HINTS_DECORATIONS; 952 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
965 } 955 }
966 else 956 else
967 mwmhints.flags = 0; 957 mwmhints.flags = 0;
968#endif 958#endif
969 959
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 960#if ENABLE_XEMBED
979 if (rs[Rs_embed]) 961 if (rs[Rs_embed])
980 { 962 {
981 XWindowAttributes wattr; 963 XWindowAttributes wattr;
982 964
… …
990#endif 972#endif
991 973
992 window_calc (0, 0); 974 window_calc (0, 0);
993 975
994 /* sub-window placement & size in rxvt_resize_subwindows () */ 976 /* sub-window placement & size in rxvt_resize_subwindows () */
995#ifdef PREFER_24BIT
996 attributes.background_pixel = pix_colors_focused[Color_border]; 977 attributes.background_pixel = pix_colors_focused[Color_border];
997 attributes.border_pixel = pix_colors_focused[Color_border]; 978 attributes.border_pixel = pix_colors_focused[Color_border];
998 attributes.colormap = display->cmap; 979 attributes.colormap = display->cmap;
999 top = XCreateWindow (disp, parent, 980 top = XCreateWindow (disp, parent,
1000 szHint.x, szHint.y, 981 szHint.x, szHint.y,
1001 szHint.width, szHint.height, 982 szHint.width, szHint.height,
1002 ext_bwidth, 983 ext_bwidth,
1003 display->depth, InputOutput, 984 display->depth, InputOutput,
1004 display->visual, 985 display->visual,
1005 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 986 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1006#else 987 &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 988
1015 this->parent[0] = top; 989 this->parent[0] = top;
1016 990
1017 old_width = szHint.width; 991 old_width = szHint.width;
1018 old_height = szHint.height; 992 old_height = szHint.height;
… …
1072#endif 1046#endif
1073 1047
1074 /* 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 */
1075 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1049 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1076 1050
1077#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1051#ifdef HAVE_SCROLLBARS
1078 /* cursor (menuBar/scrollBar): Black-on-White */ 1052 /* cursor scrollBar: Black-on-White */
1079 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1053 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1080#endif 1054#endif
1081 1055
1082 /* the vt window */ 1056 /* the vt window */
1083 vt = XCreateSimpleWindow (disp, top, 1057 vt = XCreateSimpleWindow (disp, top,
… …
1095 attributes.bit_gravity = NorthWestGravity; 1069 attributes.bit_gravity = NorthWestGravity;
1096 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1070 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1097 1071
1098 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1072 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1099 1073
1100 if (OPTION (Opt_pointerBlank) 1074 if (OPTION (Opt_pointerBlank))
1101#ifdef ENABLE_PERL
1102 || perl.self
1103#endif
1104 )
1105 vt_emask |= PointerMotionMask; 1075 vt_emask |= PointerMotionMask;
1106 else 1076 else
1107 vt_emask |= Button1MotionMask | Button3MotionMask; 1077 vt_emask |= Button1MotionMask | Button3MotionMask;
1108 1078
1109 XSelectInput (disp, vt, vt_emask); 1079 vt_select_input ();
1080
1110 vt_ev.start (display, vt); 1081 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 1082
1138#ifdef XPM_BACKGROUND 1083#ifdef XPM_BACKGROUND
1139 if (rs[Rs_backgroundPixmap] != NULL 1084 if (rs[Rs_backgroundPixmap] != NULL
1140 && ! OPTION (Opt_transparent)) 1085 && ! OPTION (Opt_transparent))
1141 { 1086 {
… …
1160 GCForeground | GCBackground | GCGraphicsExposures, 1105 GCForeground | GCBackground | GCGraphicsExposures,
1161 &gcvalue); 1106 &gcvalue);
1162 1107
1163 drawable = new rxvt_drawable (display, vt); 1108 drawable = new rxvt_drawable (display, vt);
1164 1109
1165#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1110#ifdef RXVT_SCROLLBAR
1166 gcvalue.foreground = pix_colors[Color_topShadow]; 1111 gcvalue.foreground = pix_colors[Color_topShadow];
1167 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1112 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1168 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1113 gcvalue.foreground = pix_colors[Color_bottomShadow];
1169 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1114 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1170 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1115 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
… …
1413rxvt_term::run_command (const char *const *argv) 1358rxvt_term::run_command (const char *const *argv)
1414{ 1359{
1415#if ENABLE_FRILLS 1360#if ENABLE_FRILLS
1416 if (rs[Rs_pty_fd]) 1361 if (rs[Rs_pty_fd])
1417 { 1362 {
1418 pty.pty = atoi (rs[Rs_pty_fd]); 1363 pty->pty = atoi (rs[Rs_pty_fd]);
1419 1364
1420 if (pty.pty >= 0) 1365 if (pty->pty >= 0)
1421 { 1366 {
1422 if (getfd_hook) 1367 if (getfd_hook)
1423 pty.pty = (*getfd_hook) (pty.pty); 1368 pty->pty = (*getfd_hook) (pty->pty);
1424 1369
1425 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK)) 1370 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1426 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1371 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1427 } 1372 }
1428 } 1373 }
1429 else 1374 else
1430#endif 1375#endif
1431 if (!pty.get ()) 1376 if (!pty->get ())
1432 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1377 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1433 1378
1434 pty.set_utf8_mode (enc_utf8); 1379 pty->set_utf8_mode (enc_utf8);
1435 1380
1436 /* set initial window size */ 1381 /* set initial window size */
1437 tt_winch (); 1382 tt_winch ();
1438 1383
1439 int er; 1384 int er;
… …
1452#if ENABLE_FRILLS 1397#if ENABLE_FRILLS
1453 if (rs[Rs_pty_fd]) 1398 if (rs[Rs_pty_fd])
1454 return; 1399 return;
1455#endif 1400#endif
1456 1401
1457#ifndef __QNX__
1458 /* spin off the command interpreter */ 1402 /* spin off the command interpreter */
1459 switch (cmd_pid = fork ()) 1403 switch (cmd_pid = fork ())
1460 { 1404 {
1461 case -1: 1405 case -1:
1462 { 1406 {
… …
1464 rxvt_fatal ("can't fork, aborting.\n"); 1408 rxvt_fatal ("can't fork, aborting.\n");
1465 } 1409 }
1466 case 0: 1410 case 0:
1467 init_env (); 1411 init_env ();
1468 1412
1469 if (!pty.make_controlling_tty ()) 1413 if (!pty->make_controlling_tty ())
1470 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1414 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1471 else 1415 else
1472 { 1416 {
1473 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1417 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1474 dup2 (pty.tty, STDIN_FILENO); 1418 dup2 (pty->tty, STDIN_FILENO);
1475 dup2 (pty.tty, STDOUT_FILENO); 1419 dup2 (pty->tty, STDOUT_FILENO);
1476 dup2 (pty.tty, STDERR_FILENO); 1420 dup2 (pty->tty, STDERR_FILENO);
1477 1421
1478 // close all our file handles that we do no longer need 1422 // close all our file handles that we do no longer need
1479 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1423 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1480 { 1424 {
1481 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1425 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1482 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1426 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1483 } 1427 }
1484 1428
1485 run_child (argv); 1429 run_child (argv);
1486 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1430 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1487 } 1431 }
1488 1432
1489 _exit (EXIT_FAILURE); 1433 _exit (EXIT_FAILURE);
1490 1434
1491 default: 1435 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 1436#if UTMP_SUPPORT
1501 privileged_utmp (SAVE); 1437 if (!OPTION (Opt_utmpInhibit))
1438 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1502#endif 1439#endif
1503 1440
1504#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1441 pty->close_tty ();
1505 1442
1506 dup2 (fdstdin, STDIN_FILENO); 1443 child_ev.start (cmd_pid);
1507 close (fdstdin);
1508#endif
1509 }
1510 1444
1511 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */ 1445 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1512 break; 1446 break;
1513 } 1447 }
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} 1448}
1523 1449
1524/* ------------------------------------------------------------------------- * 1450/* ------------------------------------------------------------------------- *
1525 * CHILD PROCESS OPERATIONS * 1451 * CHILD PROCESS OPERATIONS *
1526 * ------------------------------------------------------------------------- */ 1452 * ------------------------------------------------------------------------- */
… …
1570 // unblock signals (signals are blocked by iom.C 1496 // unblock signals (signals are blocked by iom.C
1571 sigset_t ss; 1497 sigset_t ss;
1572 sigemptyset (&ss); 1498 sigemptyset (&ss);
1573 sigprocmask (SIG_SETMASK, &ss, 0); 1499 sigprocmask (SIG_SETMASK, &ss, 0);
1574 1500
1575#ifndef __QNX__
1576 /* command interpreter path */ 1501 /* command interpreter path */
1577 if (argv != NULL) 1502 if (argv != NULL)
1578 { 1503 {
1579# ifdef DEBUG_CMD 1504# ifdef DEBUG_CMD
1580 int i; 1505 int i;
… …
1606 1531
1607 execlp (shell, argv0, NULL); 1532 execlp (shell, argv0, NULL);
1608 /* no error message: STDERR is closed! */ 1533 /* no error message: STDERR is closed! */
1609 } 1534 }
1610 1535
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; 1536 return -1;
1668} 1537}
1669 1538
1670/*----------------------- end-of-file (C source) -----------------------*/ 1539/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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