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.152 by root, Sat Jan 21 22:38:05 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 };
… …
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 256
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; 257 return true;
269} 258}
270 259
271void 260void
272rxvt_term::init_secondary () 261rxvt_term::init_secondary ()
… …
351 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 340 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
352 341
353 extract_resources (); 342 extract_resources ();
354 343
355 free (r_argv); 344 free (r_argv);
345
346#if ENABLE_PERL
347 if (!rs[Rs_perl_ext_1])
348 rs[Rs_perl_ext_1] = "default";
349
350 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
351 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
352 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
353 {
354 rxvt_perl.init (this);
355 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
356 }
357#endif
356 358
357 /* 359 /*
358 * set any defaults not already set 360 * set any defaults not already set
359 */ 361 */
360 if (cmd_argv && cmd_argv[0]) 362 if (cmd_argv && cmd_argv[0])
… …
670 if (strcmp (key_backspace, "DEC") == 0) 672 if (strcmp (key_backspace, "DEC") == 0)
671 priv_modes |= PrivMode_HaveBackSpace; 673 priv_modes |= PrivMode_HaveBackSpace;
672#endif 674#endif
673 675
674 /* add value for scrollBar */ 676 /* add value for scrollBar */
675 if (scrollbar_visible ()) 677 if (scrollBar.state)
676 { 678 {
677 priv_modes |= PrivMode_scrollBar; 679 priv_modes |= PrivMode_scrollBar;
678 SavedModes |= PrivMode_scrollBar; 680 SavedModes |= PrivMode_scrollBar;
679 }
680
681 if (menubar_visible ())
682 {
683 priv_modes |= PrivMode_menuBar;
684 SavedModes |= PrivMode_menuBar;
685 } 681 }
686 682
687 run_command (argv); 683 run_command (argv);
688} 684}
689 685
… …
757 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 753 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]; 754 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
759 } 755 }
760 756
761 /* 757 /*
762 * get scrollBar/menuBar shadow colors 758 * get scrollBar shadow colors
763 * 759 *
764 * The calculations of topShadow/bottomShadow values are adapted 760 * The calculations of topShadow/bottomShadow values are adapted
765 * from the fvwm window manager. 761 * from the fvwm window manager.
766 */ 762 */
767#ifdef KEEP_SCROLLCOLOR 763#ifdef KEEP_SCROLLCOLOR
… …
941 { 937 {
942 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 938 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
943 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 939 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
944 } 940 }
945 941
942 /* grab colors before netscape does */
943 Get_Colours ();
944
945 if (!set_fonts ())
946 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
947
948 parent = DefaultRootWindow (disp);
949
950 attributes.override_redirect = !!OPTION (Opt_override_redirect);
951
946#if ENABLE_FRILLS 952#if ENABLE_FRILLS
947 if (OPTION (Opt_borderLess)) 953 if (OPTION (Opt_borderLess))
948 { 954 {
949 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 955 prop = XInternAtom (disp, "_MOTIF_WM_INFO", True);
950 956
951 if (prop == None) 957 if (prop == None)
952 { 958 {
953 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 959 /* 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; 960 attributes.override_redirect = TRUE;
956#endif
957 mwmhints.flags = 0; 961 mwmhints.flags = 0;
958 } 962 }
959 else 963 else
960 { 964 {
961 mwmhints.flags = MWM_HINTS_DECORATIONS; 965 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
964 } 968 }
965 else 969 else
966 mwmhints.flags = 0; 970 mwmhints.flags = 0;
967#endif 971#endif
968 972
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 973#if ENABLE_XEMBED
978 if (rs[Rs_embed]) 974 if (rs[Rs_embed])
979 { 975 {
980 XWindowAttributes wattr; 976 XWindowAttributes wattr;
981 977
… …
989#endif 985#endif
990 986
991 window_calc (0, 0); 987 window_calc (0, 0);
992 988
993 /* sub-window placement & size in rxvt_resize_subwindows () */ 989 /* sub-window placement & size in rxvt_resize_subwindows () */
994#ifdef PREFER_24BIT
995 attributes.background_pixel = pix_colors_focused[Color_border]; 990 attributes.background_pixel = pix_colors_focused[Color_border];
996 attributes.border_pixel = pix_colors_focused[Color_border]; 991 attributes.border_pixel = pix_colors_focused[Color_border];
997 attributes.colormap = display->cmap; 992 attributes.colormap = display->cmap;
998 top = XCreateWindow (disp, parent, 993 top = XCreateWindow (disp, parent,
999 szHint.x, szHint.y, 994 szHint.x, szHint.y,
1000 szHint.width, szHint.height, 995 szHint.width, szHint.height,
1001 ext_bwidth, 996 ext_bwidth,
1002 display->depth, InputOutput, 997 display->depth, InputOutput,
1003 display->visual, 998 display->visual,
1004 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 999 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1005#else 1000 &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 1001
1014 this->parent[0] = top; 1002 this->parent[0] = top;
1015 1003
1016 old_width = szHint.width; 1004 old_width = szHint.width;
1017 old_height = szHint.height; 1005 old_height = szHint.height;
… …
1071#endif 1059#endif
1072 1060
1073 /* vt cursor: Black-on-White is standard, but this is more popular */ 1061 /* vt cursor: Black-on-White is standard, but this is more popular */
1074 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1062 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1075 1063
1076#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1064#ifdef HAVE_SCROLLBARS
1077 /* cursor (menuBar/scrollBar): Black-on-White */ 1065 /* cursor scrollBar: Black-on-White */
1078 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1066 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1079#endif 1067#endif
1080 1068
1081 /* the vt window */ 1069 /* the vt window */
1082 vt = XCreateSimpleWindow (disp, top, 1070 vt = XCreateSimpleWindow (disp, top,
… …
1094 attributes.bit_gravity = NorthWestGravity; 1082 attributes.bit_gravity = NorthWestGravity;
1095 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1083 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1096 1084
1097 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1085 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1098 1086
1099 if (OPTION (Opt_pointerBlank) 1087 if (OPTION (Opt_pointerBlank))
1100#ifdef ENABLE_PERL
1101 || perl.self
1102#endif
1103 )
1104 vt_emask |= PointerMotionMask; 1088 vt_emask |= PointerMotionMask;
1105 else 1089 else
1106 vt_emask |= Button1MotionMask | Button3MotionMask; 1090 vt_emask |= Button1MotionMask | Button3MotionMask;
1107 1091
1108 XSelectInput (disp, vt, vt_emask); 1092 vt_select_input ();
1093
1109 vt_ev.start (display, vt); 1094 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 1095
1137#ifdef XPM_BACKGROUND 1096#ifdef XPM_BACKGROUND
1138 if (rs[Rs_backgroundPixmap] != NULL 1097 if (rs[Rs_backgroundPixmap] != NULL
1139 && ! OPTION (Opt_transparent)) 1098 && ! OPTION (Opt_transparent))
1140 { 1099 {
… …
1159 GCForeground | GCBackground | GCGraphicsExposures, 1118 GCForeground | GCBackground | GCGraphicsExposures,
1160 &gcvalue); 1119 &gcvalue);
1161 1120
1162 drawable = new rxvt_drawable (display, vt); 1121 drawable = new rxvt_drawable (display, vt);
1163 1122
1164#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1123#ifdef RXVT_SCROLLBAR
1165 gcvalue.foreground = pix_colors[Color_topShadow]; 1124 gcvalue.foreground = pix_colors[Color_topShadow];
1166 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1125 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1167 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1126 gcvalue.foreground = pix_colors[Color_bottomShadow];
1168 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1127 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1169 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1128 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
… …
1412rxvt_term::run_command (const char *const *argv) 1371rxvt_term::run_command (const char *const *argv)
1413{ 1372{
1414#if ENABLE_FRILLS 1373#if ENABLE_FRILLS
1415 if (rs[Rs_pty_fd]) 1374 if (rs[Rs_pty_fd])
1416 { 1375 {
1417 pty.pty = atoi (rs[Rs_pty_fd]); 1376 pty->pty = atoi (rs[Rs_pty_fd]);
1418 1377
1419 if (pty.pty >= 0) 1378 if (pty->pty >= 0)
1420 { 1379 {
1421 if (getfd_hook) 1380 if (getfd_hook)
1422 pty.pty = (*getfd_hook) (pty.pty); 1381 pty->pty = (*getfd_hook) (pty->pty);
1423 1382
1424 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK)) 1383 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1425 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1384 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1426 } 1385 }
1427 } 1386 }
1428 else 1387 else
1429#endif 1388#endif
1430 if (!pty.get ()) 1389 if (!pty->get ())
1431 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1390 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1432 1391
1433 pty.set_utf8_mode (enc_utf8); 1392 pty->set_utf8_mode (enc_utf8);
1434 1393
1435 /* set initial window size */ 1394 /* set initial window size */
1436 tt_winch (); 1395 tt_winch ();
1437 1396
1438 int er; 1397 int er;
… …
1451#if ENABLE_FRILLS 1410#if ENABLE_FRILLS
1452 if (rs[Rs_pty_fd]) 1411 if (rs[Rs_pty_fd])
1453 return; 1412 return;
1454#endif 1413#endif
1455 1414
1456#ifndef __QNX__
1457 /* spin off the command interpreter */ 1415 /* spin off the command interpreter */
1458 switch (cmd_pid = fork ()) 1416 switch (cmd_pid = fork ())
1459 { 1417 {
1460 case -1: 1418 case -1:
1461 { 1419 {
… …
1463 rxvt_fatal ("can't fork, aborting.\n"); 1421 rxvt_fatal ("can't fork, aborting.\n");
1464 } 1422 }
1465 case 0: 1423 case 0:
1466 init_env (); 1424 init_env ();
1467 1425
1468 if (!pty.make_controlling_tty ()) 1426 if (!pty->make_controlling_tty ())
1469 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1427 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1470 else 1428 else
1471 { 1429 {
1472 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1430 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1473 dup2 (pty.tty, STDIN_FILENO); 1431 dup2 (pty->tty, STDIN_FILENO);
1474 dup2 (pty.tty, STDOUT_FILENO); 1432 dup2 (pty->tty, STDOUT_FILENO);
1475 dup2 (pty.tty, STDERR_FILENO); 1433 dup2 (pty->tty, STDERR_FILENO);
1476 1434
1477 // close all our file handles that we do no longer need 1435 // close all our file handles that we do no longer need
1478 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1436 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1479 { 1437 {
1480 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1438 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1481 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1439 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1482 } 1440 }
1483 1441
1484 run_child (argv); 1442 run_child (argv);
1485 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1443 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1486 } 1444 }
1487 1445
1488 _exit (EXIT_FAILURE); 1446 _exit (EXIT_FAILURE);
1489 1447
1490 default: 1448 default:
1491 { 1449 if (!OPTION (Opt_utmpInhibit))
1492#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1450 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1493 int fdstdin;
1494 1451
1495 fdstdin = dup (STDIN_FILENO); 1452 pty->close_tty ();
1496 dup2 (pty.tty, STDIN_FILENO);
1497#endif
1498 1453
1499#ifdef UTMP_SUPPORT 1454 child_ev.start (cmd_pid);
1500 privileged_utmp (SAVE);
1501#endif
1502 1455
1503#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1456 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
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; 1457 break;
1512 } 1458 }
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} 1459}
1522 1460
1523/* ------------------------------------------------------------------------- * 1461/* ------------------------------------------------------------------------- *
1524 * CHILD PROCESS OPERATIONS * 1462 * CHILD PROCESS OPERATIONS *
1525 * ------------------------------------------------------------------------- */ 1463 * ------------------------------------------------------------------------- */
… …
1569 // unblock signals (signals are blocked by iom.C 1507 // unblock signals (signals are blocked by iom.C
1570 sigset_t ss; 1508 sigset_t ss;
1571 sigemptyset (&ss); 1509 sigemptyset (&ss);
1572 sigprocmask (SIG_SETMASK, &ss, 0); 1510 sigprocmask (SIG_SETMASK, &ss, 0);
1573 1511
1574#ifndef __QNX__
1575 /* command interpreter path */ 1512 /* command interpreter path */
1576 if (argv != NULL) 1513 if (argv != NULL)
1577 { 1514 {
1578# ifdef DEBUG_CMD 1515# ifdef DEBUG_CMD
1579 int i; 1516 int i;
… …
1605 1542
1606 execlp (shell, argv0, NULL); 1543 execlp (shell, argv0, NULL);
1607 /* no error message: STDERR is closed! */ 1544 /* no error message: STDERR is closed! */
1608 } 1545 }
1609 1546
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; 1547 return -1;
1667} 1548}
1668 1549
1669/*----------------------- end-of-file (C source) -----------------------*/ 1550/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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