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.135 by root, Sat Jan 7 19:29:17 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 ()
… …
339 rs[Rs_name] = rxvt_r_basename (argv[0]); 332 rs[Rs_name] = rxvt_r_basename (argv[0]);
340 333
341 /* 334 /*
342 * Open display, get options/resources and create the window 335 * Open display, get options/resources and create the window
343 */ 336 */
337
344 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 338 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
345 rs[Rs_display_name] = ":0"; 339 rs[Rs_display_name] = ":0";
346 340
347 get_options (r_argc, r_argv); 341 get_options (r_argc, r_argv);
348 342
349 if (!(display = displays.get (rs[Rs_display_name]))) 343 if (!(display = displays.get (rs[Rs_display_name])))
350 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 344 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
351 345
352 extract_resources (); 346 extract_resources ();
347
353 free (r_argv); 348 free (r_argv);
354 349
355 /* 350 /*
356 * set any defaults not already set 351 * set any defaults not already set
357 */ 352 */
… …
391 pointerBlankDelay = 2; 386 pointerBlankDelay = 2;
392#endif 387#endif
393 388
394 /* no point having a scrollbar without having any scrollback! */ 389 /* no point having a scrollbar without having any scrollback! */
395 if (!saveLines) 390 if (!saveLines)
396 CLR_OPTION (Opt_scrollBar); 391 set_option (Opt_scrollBar, 0);
397 392
398#ifdef PRINTPIPE 393#ifdef PRINTPIPE
399 if (!rs[Rs_print_pipe]) 394 if (!rs[Rs_print_pipe])
400 rs[Rs_print_pipe] = PRINTPIPE; 395 rs[Rs_print_pipe] = PRINTPIPE;
401#endif 396#endif
… …
576 * This should support all European type languages. 571 * This should support all European type languages.
577 */ 572 */
578void 573void
579rxvt_term::set_locale (const char *locale) 574rxvt_term::set_locale (const char *locale)
580{ 575{
576 set_environ (envv);
577
581#if HAVE_XSETLOCALE || HAVE_SETLOCALE 578#if HAVE_XSETLOCALE || HAVE_SETLOCALE
582 free (this->locale); 579 free (this->locale);
583 this->locale = setlocale (LC_CTYPE, locale); 580 this->locale = setlocale (LC_CTYPE, locale);
584 581
585 if (!this->locale) 582 if (!this->locale)
586 { 583 {
587 if (*locale) 584 if (*locale)
588 { 585 {
589 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 586 rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
590 setlocale (LC_CTYPE, ""); 587 setlocale (LC_CTYPE, "C");
591 } 588 }
592 else 589 else
593 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 590 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
594 591
595 this->locale = ""; 592 this->locale = "C";
596 } 593 }
597 594
598 595
599 this->locale = rxvt_strdup (this->locale); 596 this->locale = rxvt_strdup (this->locale);
600 SET_LOCALE (this->locale); 597 SET_LOCALE (this->locale);
… …
615} 612}
616 613
617void 614void
618rxvt_term::init_xlocale () 615rxvt_term::init_xlocale ()
619{ 616{
617 set_environ (envv);
618
620#ifdef USE_XIM 619#ifdef USE_XIM
621 if (!locale) 620 if (!locale)
622 rxvt_warn ("setting locale failed, working without locale support.\n"); 621 rxvt_warn ("setting locale failed, working without locale support.\n");
623 else 622 else
624 { 623 {
… …
664 if (strcmp (key_backspace, "DEC") == 0) 663 if (strcmp (key_backspace, "DEC") == 0)
665 priv_modes |= PrivMode_HaveBackSpace; 664 priv_modes |= PrivMode_HaveBackSpace;
666#endif 665#endif
667 666
668 /* add value for scrollBar */ 667 /* add value for scrollBar */
669 if (scrollbar_visible ()) 668 if (scrollBar.state)
670 { 669 {
671 priv_modes |= PrivMode_scrollBar; 670 priv_modes |= PrivMode_scrollBar;
672 SavedModes |= PrivMode_scrollBar; 671 SavedModes |= PrivMode_scrollBar;
673 }
674
675 if (menubar_visible ())
676 {
677 priv_modes |= PrivMode_menuBar;
678 SavedModes |= PrivMode_menuBar;
679 } 672 }
680 673
681 run_command (argv); 674 run_command (argv);
682} 675}
683 676
… …
751 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];
752 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];
753 } 746 }
754 747
755 /* 748 /*
756 * get scrollBar/menuBar shadow colors 749 * get scrollBar shadow colors
757 * 750 *
758 * The calculations of topShadow/bottomShadow values are adapted 751 * The calculations of topShadow/bottomShadow values are adapted
759 * from the fvwm window manager. 752 * from the fvwm window manager.
760 */ 753 */
761#ifdef KEEP_SCROLLCOLOR 754#ifdef KEEP_SCROLLCOLOR
… …
916#if ENABLE_FRILLS 909#if ENABLE_FRILLS
917 Atom prop = None; 910 Atom prop = None;
918 MWMHints mwmhints; 911 MWMHints mwmhints;
919#endif 912#endif
920 XGCValues gcvalue; 913 XGCValues gcvalue;
921 long vt_emask;
922 XSetWindowAttributes attributes; 914 XSetWindowAttributes attributes;
923 XWindowAttributes gattr; 915 XWindowAttributes gattr;
924 Window top, parent; 916 Window top, parent;
925 dDisp; 917 dDisp;
926 918
… …
1066#endif 1058#endif
1067 1059
1068 /* 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 */
1069 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1061 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1070 1062
1071#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1063#ifdef HAVE_SCROLLBARS
1072 /* cursor (menuBar/scrollBar): Black-on-White */ 1064 /* cursor scrollBar: Black-on-White */
1073 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1065 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1074#endif 1066#endif
1075 1067
1076 /* the vt window */ 1068 /* the vt window */
1077 vt = XCreateSimpleWindow (disp, top, 1069 vt = XCreateSimpleWindow (disp, top,
… …
1089 attributes.bit_gravity = NorthWestGravity; 1081 attributes.bit_gravity = NorthWestGravity;
1090 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1082 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1091 1083
1092 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1084 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1093 1085
1094 if (OPTION (Opt_pointerBlank) 1086 if (OPTION (Opt_pointerBlank))
1095#ifdef ENABLE_PERL
1096 || perl.self
1097#endif
1098 )
1099 vt_emask |= PointerMotionMask; 1087 vt_emask |= PointerMotionMask;
1100 else 1088 else
1101 vt_emask |= Button1MotionMask | Button3MotionMask; 1089 vt_emask |= Button1MotionMask | Button3MotionMask;
1102 1090
1103 XSelectInput (disp, vt, vt_emask); 1091 vt_select_input ();
1092
1104 vt_ev.start (display, vt); 1093 vt_ev.start (display, vt);
1105
1106#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1107 if (menuBar_height ())
1108 {
1109 menuBar.win = XCreateSimpleWindow (disp, top,
1110 window_vt_x, 0,
1111 width,
1112 menuBar_TotalHeight (),
1113 0,
1114 pix_colors_focused[Color_fg],
1115 pix_colors_focused[Color_scroll]);
1116
1117#ifdef DEBUG_X
1118 XStoreName (disp, menuBar.win, "menubar");
1119#endif
1120
1121 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1122
1123 XDefineCursor (disp, menuBar.win,
1124 XCreateFontCursor (disp, XC_left_ptr));
1125
1126 XSelectInput (disp, menuBar.win,
1127 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1128 menubar_ev.start (display, menuBar.win);
1129 }
1130#endif
1131 1094
1132#ifdef XPM_BACKGROUND 1095#ifdef XPM_BACKGROUND
1133 if (rs[Rs_backgroundPixmap] != NULL 1096 if (rs[Rs_backgroundPixmap] != NULL
1134 && ! OPTION (Opt_transparent)) 1097 && ! OPTION (Opt_transparent))
1135 { 1098 {
… …
1154 GCForeground | GCBackground | GCGraphicsExposures, 1117 GCForeground | GCBackground | GCGraphicsExposures,
1155 &gcvalue); 1118 &gcvalue);
1156 1119
1157 drawable = new rxvt_drawable (display, vt); 1120 drawable = new rxvt_drawable (display, vt);
1158 1121
1159#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1122#ifdef RXVT_SCROLLBAR
1160 gcvalue.foreground = pix_colors[Color_topShadow]; 1123 gcvalue.foreground = pix_colors[Color_topShadow];
1161 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1124 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1162 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1125 gcvalue.foreground = pix_colors[Color_bottomShadow];
1163 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1126 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1164 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1127 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
… …
1407rxvt_term::run_command (const char *const *argv) 1370rxvt_term::run_command (const char *const *argv)
1408{ 1371{
1409#if ENABLE_FRILLS 1372#if ENABLE_FRILLS
1410 if (rs[Rs_pty_fd]) 1373 if (rs[Rs_pty_fd])
1411 { 1374 {
1412 pty.pty = atoi (rs[Rs_pty_fd]); 1375 pty->pty = atoi (rs[Rs_pty_fd]);
1413 1376
1414 if (pty.pty >= 0) 1377 if (pty->pty >= 0)
1415 { 1378 {
1416 if (getfd_hook) 1379 if (getfd_hook)
1417 pty.pty = (*getfd_hook) (pty.pty); 1380 pty->pty = (*getfd_hook) (pty->pty);
1418 1381
1419 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK)) 1382 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1420 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1383 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1421 } 1384 }
1422 } 1385 }
1423 else 1386 else
1424#endif 1387#endif
1425 if (!pty.get ()) 1388 if (!pty->get ())
1426 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1389 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1427 1390
1428 pty.set_utf8_mode (enc_utf8); 1391 pty->set_utf8_mode (enc_utf8);
1429 1392
1430 /* set initial window size */ 1393 /* set initial window size */
1431 tt_winch (); 1394 tt_winch ();
1432 1395
1433 int er; 1396 int er;
… …
1446#if ENABLE_FRILLS 1409#if ENABLE_FRILLS
1447 if (rs[Rs_pty_fd]) 1410 if (rs[Rs_pty_fd])
1448 return; 1411 return;
1449#endif 1412#endif
1450 1413
1451#ifndef __QNX__
1452 /* spin off the command interpreter */ 1414 /* spin off the command interpreter */
1453 switch (cmd_pid = fork ()) 1415 switch (cmd_pid = fork ())
1454 { 1416 {
1455 case -1: 1417 case -1:
1456 { 1418 {
… …
1458 rxvt_fatal ("can't fork, aborting.\n"); 1420 rxvt_fatal ("can't fork, aborting.\n");
1459 } 1421 }
1460 case 0: 1422 case 0:
1461 init_env (); 1423 init_env ();
1462 1424
1463 if (!pty.make_controlling_tty ()) 1425 if (!pty->make_controlling_tty ())
1464 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1426 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1465 else 1427 else
1466 { 1428 {
1467 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1429 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1468 dup2 (pty.tty, STDIN_FILENO); 1430 dup2 (pty->tty, STDIN_FILENO);
1469 dup2 (pty.tty, STDOUT_FILENO); 1431 dup2 (pty->tty, STDOUT_FILENO);
1470 dup2 (pty.tty, STDERR_FILENO); 1432 dup2 (pty->tty, STDERR_FILENO);
1471 1433
1472 // close all our file handles that we do no longer need 1434 // close all our file handles that we do no longer need
1473 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1435 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1474 { 1436 {
1475 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1437 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1476 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1438 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1477 } 1439 }
1478 1440
1479 run_child (argv); 1441 run_child (argv);
1480 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1442 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1481 } 1443 }
1482 1444
1483 _exit (EXIT_FAILURE); 1445 _exit (EXIT_FAILURE);
1484 1446
1485 default: 1447 default:
1486 {
1487#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1488 int fdstdin;
1489
1490 fdstdin = dup (STDIN_FILENO);
1491 dup2 (pty.tty, STDIN_FILENO);
1492#endif
1493
1494#ifdef UTMP_SUPPORT 1448#if UTMP_SUPPORT
1495 privileged_utmp (SAVE); 1449 if (!OPTION (Opt_utmpInhibit))
1450 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1496#endif 1451#endif
1497 1452
1498#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1453 pty->close_tty ();
1499
1500 dup2 (fdstdin, STDIN_FILENO);
1501 close (fdstdin);
1502#endif
1503 }
1504
1505 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1506 break; 1454 break;
1507 } 1455 }
1508#else /* __QNX__ uses qnxspawn () */
1509 fchmod (pty.tty, 0622);
1510 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1511 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1512
1513 if (run_child (argv) == -1)
1514 exit (EXIT_FAILURE);
1515#endif
1516} 1456}
1517 1457
1518/* ------------------------------------------------------------------------- * 1458/* ------------------------------------------------------------------------- *
1519 * CHILD PROCESS OPERATIONS * 1459 * CHILD PROCESS OPERATIONS *
1520 * ------------------------------------------------------------------------- */ 1460 * ------------------------------------------------------------------------- */
… …
1564 // unblock signals (signals are blocked by iom.C 1504 // unblock signals (signals are blocked by iom.C
1565 sigset_t ss; 1505 sigset_t ss;
1566 sigemptyset (&ss); 1506 sigemptyset (&ss);
1567 sigprocmask (SIG_SETMASK, &ss, 0); 1507 sigprocmask (SIG_SETMASK, &ss, 0);
1568 1508
1569#ifndef __QNX__
1570 /* command interpreter path */ 1509 /* command interpreter path */
1571 if (argv != NULL) 1510 if (argv != NULL)
1572 { 1511 {
1573# ifdef DEBUG_CMD 1512# ifdef DEBUG_CMD
1574 int i; 1513 int i;
… …
1580 execvp (argv[0], (char *const *)argv); 1519 execvp (argv[0], (char *const *)argv);
1581 /* no error message: STDERR is closed! */ 1520 /* no error message: STDERR is closed! */
1582 } 1521 }
1583 else 1522 else
1584 { 1523 {
1585 const char *argv0, *shell; 1524 const char *argv0, *shell;
1586 1525
1587 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1526 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1588 shell = "/bin/sh"; 1527 shell = "/bin/sh";
1589 1528
1590 argv0 = (const char *)rxvt_r_basename (shell); 1529 argv0 = (const char *)rxvt_r_basename (shell);
… …
1595 1534
1596 login[0] = '-'; 1535 login[0] = '-';
1597 strcpy (&login[1], argv0); 1536 strcpy (&login[1], argv0);
1598 argv0 = login; 1537 argv0 = login;
1599 } 1538 }
1539
1600 execlp (shell, argv0, NULL); 1540 execlp (shell, argv0, NULL);
1601 /* no error message: STDERR is closed! */ 1541 /* no error message: STDERR is closed! */
1602 } 1542 }
1603 1543
1604#else /* __QNX__ uses qnxspawn () */
1605
1606 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1607 char *command = NULL, fullcommand[_MAX_PATH];
1608 char **arg_v, *arg_a[2] = { NULL, NULL };
1609
1610 if (argv != NULL)
1611 {
1612 if (access (argv[0], X_OK) == -1)
1613 {
1614 if (strchr (argv[0], '/') == NULL)
1615 {
1616 searchenv (argv[0], "PATH", fullcommand);
1617
1618 if (fullcommand[0] != '\0')
1619 command = fullcommand;
1620 }
1621
1622 if (access (command, X_OK) == -1)
1623 return -1;
1624 }
1625 else
1626 command = argv[0];
1627
1628 arg_v = argv;
1629 }
1630 else
1631 {
1632 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1633 command = "/bin/sh";
1634
1635 arg_a[0] = my_basename (command);
1636
1637 if (OPTION (Opt_loginShell))
1638 {
1639 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1640
1641 login[0] = '-';
1642 strcpy (&login[1], arg_a[0]);
1643 arg_a[0] = login;
1644 }
1645
1646 arg_v = arg_a;
1647 }
1648
1649 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1650 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1651 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1652 command, arg_v, environ, iov_a, 0);
1653 if (login)
1654 free (login);
1655
1656 pty.close_tty ();
1657 return pty.pty;
1658#endif
1659
1660 return -1; 1544 return -1;
1661} 1545}
1662 1546
1663/*----------------------- end-of-file (C source) -----------------------*/ 1547/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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