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.125 by root, Wed Dec 21 19:50:16 2005 UTC vs.
Revision 1.135 by root, Sat Jan 7 19:29:17 2006 UTC

… …
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11 * - extensive modifications 11 * - extensive modifications
12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com> 12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13 * - QNX support 13 * - QNX support
14 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 14 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
15 * 15 *
16 * This program is free software; you can redistribute it and/or modify 16 * This program is free software; you can redistribute it and/or modify
17 * it under the terms of the GNU General Public License as published by 17 * it under the terms of the GNU General Public License as published by
18 * the Free Software Foundation; either version 2 of the License, or 18 * the Free Software Foundation; either version 2 of the License, or
19 * (at your option) any later version. 19 * (at your option) any later version.
… …
44 { 44 {
45 COLOR_FOREGROUND, 45 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
47 /* low-intensity colors */ 47 /* low-intensity colors */
48 "Black", /* 0: black (#000000) */ 48 "Black", /* 0: black (#000000) */
49#ifndef NO_BRIGHTCOLOR
50 "Red3", /* 1: red (#CD0000) */ 49 "Red3", /* 1: red (#CD0000) */
51 "Green3", /* 2: green (#00CD00) */ 50 "Green3", /* 2: green (#00CD00) */
52 "Yellow3", /* 3: yellow (#CDCD00) */ 51 "Yellow3", /* 3: yellow (#CDCD00) */
53 "Blue3", /* 4: blue (#0000CD) */ 52 "Blue3", /* 4: blue (#0000CD) */
54 "Magenta3", /* 5: magenta (#CD00CD) */ 53 "Magenta3", /* 5: magenta (#CD00CD) */
… …
62# ifdef XTERM_COLORS 61# ifdef XTERM_COLORS
63 "Grey30", /* 8: bright black (#4D4D4D) */ 62 "Grey30", /* 8: bright black (#4D4D4D) */
64# else 63# else
65 "Grey25", /* 8: bright black (#404040) */ 64 "Grey25", /* 8: bright black (#404040) */
66# endif 65# endif
67#endif /* NO_BRIGHTCOLOR */
68 "Red", /* 1/9: bright red (#FF0000) */ 66 "Red", /* 1/9: bright red (#FF0000) */
69 "Green", /* 2/10: bright green (#00FF00) */ 67 "Green", /* 2/10: bright green (#00FF00) */
70 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 68 "Yellow", /* 3/11: bright yellow (#FFFF00) */
71 "Blue", /* 4/12: bright blue (#0000FF) */ 69 "Blue", /* 4/12: bright blue (#0000FF) */
72 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 70 "Magenta", /* 5/13: bright magenta (#FF00FF) */
… …
371 if (!rs[Rs_iconName]) 369 if (!rs[Rs_iconName])
372 rs[Rs_iconName] = rs[Rs_name]; 370 rs[Rs_iconName] = rs[Rs_name];
373 } 371 }
374 372
375 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 373 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
376 saveLines = min (i, std::numeric_limits<int16_t>::max ()); 374 saveLines = min (i, MAX_SAVELINES);
377 375
378#if ENABLE_FRILLS 376#if ENABLE_FRILLS
379 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 377 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
380 int_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 378 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
381 379
… …
393 pointerBlankDelay = 2; 391 pointerBlankDelay = 2;
394#endif 392#endif
395 393
396 /* no point having a scrollbar without having any scrollback! */ 394 /* no point having a scrollbar without having any scrollback! */
397 if (!saveLines) 395 if (!saveLines)
398 options &= ~Opt_scrollBar; 396 CLR_OPTION (Opt_scrollBar);
399 397
400#ifdef PRINTPIPE 398#ifdef PRINTPIPE
401 if (!rs[Rs_print_pipe]) 399 if (!rs[Rs_print_pipe])
402 rs[Rs_print_pipe] = PRINTPIPE; 400 rs[Rs_print_pipe] = PRINTPIPE;
403#endif 401#endif
… …
446 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 444 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
447#endif 445#endif
448 446
449#ifdef XTERM_REVERSE_VIDEO 447#ifdef XTERM_REVERSE_VIDEO
450 /* this is how xterm implements reverseVideo */ 448 /* this is how xterm implements reverseVideo */
451 if (options & Opt_reverseVideo) 449 if (OPTION (Opt_reverseVideo))
452 { 450 {
453 if (!rs[Rs_color + Color_fg]) 451 if (!rs[Rs_color + Color_fg])
454 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 452 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
455 if (!rs[Rs_color + Color_bg]) 453 if (!rs[Rs_color + Color_bg])
456 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 454 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
461 if (!rs[Rs_color + i]) 459 if (!rs[Rs_color + i])
462 rs[Rs_color + i] = def_colorName[i]; 460 rs[Rs_color + i] = def_colorName[i];
463 461
464#ifndef XTERM_REVERSE_VIDEO 462#ifndef XTERM_REVERSE_VIDEO
465 /* this is how we implement reverseVideo */ 463 /* this is how we implement reverseVideo */
466 if (options & Opt_reverseVideo) 464 if (OPTION (Opt_reverseVideo))
467 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 465 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
468#endif 466#endif
469 467
470 /* convenient aliases for setting fg/bg to colors */ 468 /* convenient aliases for setting fg/bg to colors */
471 color_aliases (Color_fg); 469 color_aliases (Color_fg);
… …
648 * Initialize the command connection. 646 * Initialize the command connection.
649 * This should be called after the X server connection is established. 647 * This should be called after the X server connection is established.
650 */ 648 */
651 649
652#ifdef META8_OPTION 650#ifdef META8_OPTION
653 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 651 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
654#endif 652#endif
655 653
656 get_ourmods (); 654 get_ourmods ();
657 655
658 if (!(options & Opt_scrollTtyOutput)) 656 if (!OPTION (Opt_scrollTtyOutput))
659 priv_modes |= PrivMode_TtyOutputInh; 657 priv_modes |= PrivMode_TtyOutputInh;
660 if (options & Opt_scrollTtyKeypress) 658 if (OPTION (Opt_scrollTtyKeypress))
661 priv_modes |= PrivMode_Keypress; 659 priv_modes |= PrivMode_Keypress;
662 if (!(options & Opt_jumpScroll)) 660 if (!OPTION (Opt_jumpScroll))
663 priv_modes |= PrivMode_smoothScroll; 661 priv_modes |= PrivMode_smoothScroll;
664 662
665#ifndef NO_BACKSPACE_KEY 663#ifndef NO_BACKSPACE_KEY
666 if (strcmp (key_backspace, "DEC") == 0) 664 if (strcmp (key_backspace, "DEC") == 0)
667 priv_modes |= PrivMode_HaveBackSpace; 665 priv_modes |= PrivMode_HaveBackSpace;
… …
677 if (menubar_visible ()) 675 if (menubar_visible ())
678 { 676 {
679 priv_modes |= PrivMode_menuBar; 677 priv_modes |= PrivMode_menuBar;
680 SavedModes |= PrivMode_menuBar; 678 SavedModes |= PrivMode_menuBar;
681 } 679 }
682
683#ifdef CURSOR_BLINK
684 if (options & Opt_cursorBlink)
685 (void)gettimeofday (&lastcursorchange, NULL);
686#endif
687 680
688 run_command (argv); 681 run_command (argv);
689} 682}
690 683
691/*----------------------------------------------------------------------*/ 684/*----------------------------------------------------------------------*/
… …
706 continue; 699 continue;
707 700
708 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 701 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
709 { 702 {
710#ifndef XTERM_REVERSE_VIDEO 703#ifndef XTERM_REVERSE_VIDEO
711 if (i < 2 && (options & Opt_reverseVideo)) 704 if (i < 2 && OPTION (Opt_reverseVideo))
712 rs[Rs_color + i] = def_colorName[!i]; 705 rs[Rs_color + i] = def_colorName[!i];
713 else 706 else
714#endif 707#endif
715 rs[Rs_color + i] = def_colorName[i]; 708 rs[Rs_color + i] = def_colorName[i];
716 709
… …
813 int i = atoi (rs[Rs_color + idx]); 806 int i = atoi (rs[Rs_color + idx]);
814 807
815 if (i >= 8 && i <= 15) 808 if (i >= 8 && i <= 15)
816 { /* bright colors */ 809 { /* bright colors */
817 i -= 8; 810 i -= 8;
818#ifndef NO_BRIGHTCOLOR
819 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 811 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
820 return; 812 return;
821#endif
822 } 813 }
823 814
824 if (i >= 0 && i <= 7) /* normal colors */ 815 if (i >= 0 && i <= 7) /* normal colors */
825 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 816 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
826 } 817 }
… …
939#endif 930#endif
940 931
941 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 932 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
942 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 933 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
943 934
944 if (options & Opt_transparent) 935 if (OPTION (Opt_transparent))
945 { 936 {
946 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 937 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
947 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 938 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
948 } 939 }
949 940
950#if ENABLE_FRILLS 941#if ENABLE_FRILLS
951 if (options & Opt_borderLess) 942 if (OPTION (Opt_borderLess))
952 { 943 {
953 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 944 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
954 945
955 if (prop == None) 946 if (prop == None)
956 { 947 {
… …
1026 classHint.res_name = (char *)rs[Rs_name]; 1017 classHint.res_name = (char *)rs[Rs_name];
1027 classHint.res_class = (char *)RESCLASS; 1018 classHint.res_class = (char *)RESCLASS;
1028 1019
1029 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1020 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1030 wmHint.input = True; 1021 wmHint.input = True;
1031 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1022 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1032 wmHint.window_group = top; 1023 wmHint.window_group = top;
1033 1024
1034 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1025 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1035 &szHint, &wmHint, &classHint); 1026 &szHint, &wmHint, &classHint);
1036 1027
… …
1041#endif 1032#endif
1042 }; 1033 };
1043 1034
1044 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1035 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1045 1036
1037#if ENABLE_FRILLS
1038 if (rs[Rs_transient_for])
1039 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1040#endif
1041
1046#if ENABLE_EWMH 1042#if ENABLE_EWMH
1047 long pid = getpid (); 1043 long pid = getpid ();
1048 1044
1049 XChangeProperty (disp, top, 1045 XChangeProperty (disp, top,
1050 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1046 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
… …
1079 1075
1080 /* the vt window */ 1076 /* the vt window */
1081 vt = XCreateSimpleWindow (disp, top, 1077 vt = XCreateSimpleWindow (disp, top,
1082 window_vt_x, 1078 window_vt_x,
1083 window_vt_y, 1079 window_vt_y,
1084 TermWin_TotalWidth (), 1080 width,
1085 TermWin_TotalHeight (), 1081 height,
1086 0, 1082 0,
1087 pix_colors_focused[Color_fg], 1083 pix_colors_focused[Color_fg],
1088 pix_colors_focused[Color_bg]); 1084 pix_colors_focused[Color_bg]);
1089#ifdef DEBUG_X 1085#ifdef DEBUG_X
1090 XStoreName (disp, vt, "vt window"); 1086 XStoreName (disp, vt, "vt window");
… …
1093 attributes.bit_gravity = NorthWestGravity; 1089 attributes.bit_gravity = NorthWestGravity;
1094 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1090 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1095 1091
1096 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1092 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1097 1093
1098#ifdef POINTER_BLANK 1094 if (OPTION (Opt_pointerBlank)
1099 if (options & Opt_pointerBlank) 1095#ifdef ENABLE_PERL
1096 || perl.self
1097#endif
1098 )
1100 vt_emask |= PointerMotionMask; 1099 vt_emask |= PointerMotionMask;
1101 else 1100 else
1102#endif
1103 vt_emask |= Button1MotionMask | Button3MotionMask; 1101 vt_emask |= Button1MotionMask | Button3MotionMask;
1104 1102
1105 XSelectInput (disp, vt, vt_emask); 1103 XSelectInput (disp, vt, vt_emask);
1106 vt_ev.start (display, vt); 1104 vt_ev.start (display, vt);
1107 1105
1108#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1106#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1109 if (menuBar_height ()) 1107 if (menuBar_height ())
1110 { 1108 {
1111 menuBar.win = XCreateSimpleWindow (disp, top, 1109 menuBar.win = XCreateSimpleWindow (disp, top,
1112 window_vt_x, 0, 1110 window_vt_x, 0,
1113 TermWin_TotalWidth (), 1111 width,
1114 menuBar_TotalHeight (), 1112 menuBar_TotalHeight (),
1115 0, 1113 0,
1116 pix_colors_focused[Color_fg], 1114 pix_colors_focused[Color_fg],
1117 pix_colors_focused[Color_scroll]); 1115 pix_colors_focused[Color_scroll]);
1118 1116
… …
1131 } 1129 }
1132#endif 1130#endif
1133 1131
1134#ifdef XPM_BACKGROUND 1132#ifdef XPM_BACKGROUND
1135 if (rs[Rs_backgroundPixmap] != NULL 1133 if (rs[Rs_backgroundPixmap] != NULL
1136 && ! (options & Opt_transparent)) 1134 && ! OPTION (Opt_transparent))
1137 { 1135 {
1138 const char *p = rs[Rs_backgroundPixmap]; 1136 const char *p = rs[Rs_backgroundPixmap];
1139 1137
1140 if ((p = strchr (p, ';')) != NULL) 1138 if ((p = strchr (p, ';')) != NULL)
1141 { 1139 {
… …
1197 /* 1195 /*
1198 * standard System V termios interface 1196 * standard System V termios interface
1199 */ 1197 */
1200 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1198 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1201 { 1199 {
1202 /* return error - use system defaults */ 1200 // return error - use system defaults,
1201 // where possible, and zero elsewhere
1202 memset (tio, 0, sizeof (ttymode_t));
1203
1203 tio->c_cc[VINTR] = CINTR; 1204 tio->c_cc[VINTR] = CINTR;
1204 tio->c_cc[VQUIT] = CQUIT; 1205 tio->c_cc[VQUIT] = CQUIT;
1205 tio->c_cc[VERASE] = CERASE; 1206 tio->c_cc[VERASE] = CERASE;
1207#ifdef VERASE2
1208 tio->c_cc[VERASE2] = CERASE2;
1209#endif
1206 tio->c_cc[VKILL] = CKILL; 1210 tio->c_cc[VKILL] = CKILL;
1207 tio->c_cc[VSTART] = CSTART; 1211 tio->c_cc[VSTART] = CSTART;
1208 tio->c_cc[VSTOP] = CSTOP; 1212 tio->c_cc[VSTOP] = CSTOP;
1209 tio->c_cc[VSUSP] = CSUSP; 1213 tio->c_cc[VSUSP] = CSUSP;
1210# ifdef VDSUSP 1214# ifdef VDSUSP
… …
1404{ 1408{
1405#if ENABLE_FRILLS 1409#if ENABLE_FRILLS
1406 if (rs[Rs_pty_fd]) 1410 if (rs[Rs_pty_fd])
1407 { 1411 {
1408 pty.pty = atoi (rs[Rs_pty_fd]); 1412 pty.pty = atoi (rs[Rs_pty_fd]);
1413
1414 if (pty.pty >= 0)
1415 {
1416 if (getfd_hook)
1417 pty.pty = (*getfd_hook) (pty.pty);
1418
1409 fcntl (pty.pty, F_SETFL, O_NONBLOCK); 1419 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK))
1420 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1421 }
1410 } 1422 }
1411 else 1423 else
1412#endif 1424#endif
1413 if (!pty.get ()) 1425 if (!pty.get ())
1414 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1426 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
… …
1515{ 1527{
1516 char *login; 1528 char *login;
1517 1529
1518 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1530 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1519 1531
1520 if (options & Opt_console) 1532 if (OPTION (Opt_console))
1521 { /* be virtual console, fail silently */ 1533 { /* be virtual console, fail silently */
1522#ifdef TIOCCONS 1534#ifdef TIOCCONS
1523 unsigned int on = 1; 1535 unsigned int on = 1;
1524 1536
1525 ioctl (STDIN_FILENO, TIOCCONS, &on); 1537 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1575 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1587 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1576 shell = "/bin/sh"; 1588 shell = "/bin/sh";
1577 1589
1578 argv0 = (const char *)rxvt_r_basename (shell); 1590 argv0 = (const char *)rxvt_r_basename (shell);
1579 1591
1580 if (options & Opt_loginShell) 1592 if (OPTION (Opt_loginShell))
1581 { 1593 {
1582 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1594 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1583 1595
1584 login[0] = '-'; 1596 login[0] = '-';
1585 strcpy (&login[1], argv0); 1597 strcpy (&login[1], argv0);
… …
1620 if ((command = getenv ("SHELL")) == NULL || *command == '\0') 1632 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1621 command = "/bin/sh"; 1633 command = "/bin/sh";
1622 1634
1623 arg_a[0] = my_basename (command); 1635 arg_a[0] = my_basename (command);
1624 1636
1625 if (options & Opt_loginShell) 1637 if (OPTION (Opt_loginShell))
1626 { 1638 {
1627 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char)); 1639 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1628 1640
1629 login[0] = '-'; 1641 login[0] = '-';
1630 strcpy (&login[1], arg_a[0]); 1642 strcpy (&login[1], arg_a[0]);

Diff Legend

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