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.124 by root, Wed Dec 21 14:19:19 2005 UTC vs.
Revision 1.132 by root, Fri Jan 6 02:11:15 2006 UTC

… …
34#include "../config.h" /* NECESSARY */ 34#include "../config.h" /* NECESSARY */
35#include "rxvt.h" /* NECESSARY */ 35#include "rxvt.h" /* NECESSARY */
36#include "rxvtutil.h" 36#include "rxvtutil.h"
37#include "init.h" 37#include "init.h"
38 38
39#include <limits>
40
39#include <csignal> 41#include <csignal>
40 42
41const char *const def_colorName[] = 43const char *const def_colorName[] =
42 { 44 {
43 COLOR_FOREGROUND, 45 COLOR_FOREGROUND,
44 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
45 /* low-intensity colors */ 47 /* low-intensity colors */
46 "Black", /* 0: black (#000000) */ 48 "Black", /* 0: black (#000000) */
47#ifndef NO_BRIGHTCOLOR
48 "Red3", /* 1: red (#CD0000) */ 49 "Red3", /* 1: red (#CD0000) */
49 "Green3", /* 2: green (#00CD00) */ 50 "Green3", /* 2: green (#00CD00) */
50 "Yellow3", /* 3: yellow (#CDCD00) */ 51 "Yellow3", /* 3: yellow (#CDCD00) */
51 "Blue3", /* 4: blue (#0000CD) */ 52 "Blue3", /* 4: blue (#0000CD) */
52 "Magenta3", /* 5: magenta (#CD00CD) */ 53 "Magenta3", /* 5: magenta (#CD00CD) */
… …
60# ifdef XTERM_COLORS 61# ifdef XTERM_COLORS
61 "Grey30", /* 8: bright black (#4D4D4D) */ 62 "Grey30", /* 8: bright black (#4D4D4D) */
62# else 63# else
63 "Grey25", /* 8: bright black (#404040) */ 64 "Grey25", /* 8: bright black (#404040) */
64# endif 65# endif
65#endif /* NO_BRIGHTCOLOR */
66 "Red", /* 1/9: bright red (#FF0000) */ 66 "Red", /* 1/9: bright red (#FF0000) */
67 "Green", /* 2/10: bright green (#00FF00) */ 67 "Green", /* 2/10: bright green (#00FF00) */
68 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 68 "Yellow", /* 3/11: bright yellow (#FFFF00) */
69 "Blue", /* 4/12: bright blue (#0000FF) */ 69 "Blue", /* 4/12: bright blue (#0000FF) */
70 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 70 "Magenta", /* 5/13: bright magenta (#FF00FF) */
… …
369 if (!rs[Rs_iconName]) 369 if (!rs[Rs_iconName])
370 rs[Rs_iconName] = rs[Rs_name]; 370 rs[Rs_iconName] = rs[Rs_name];
371 } 371 }
372 372
373 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 373 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
374 saveLines = min (i, MAX_POSITIVE_INT16); 374 saveLines = min (i, MAX_SAVELINES);
375 375
376#if ENABLE_FRILLS 376#if ENABLE_FRILLS
377 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)
378 int_bwidth = min (i, MAX_POSITIVE_INT16); 378 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
379 379
380 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 380 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
381 ext_bwidth = min (i, MAX_POSITIVE_INT16); 381 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
382 382
383 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 383 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
384 lineSpace = min (i, MAX_POSITIVE_INT16); 384 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
385#endif 385#endif
386 386
387#ifdef POINTER_BLANK 387#ifdef POINTER_BLANK
388 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 388 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
389 pointerBlankDelay = i; 389 pointerBlankDelay = i;
… …
391 pointerBlankDelay = 2; 391 pointerBlankDelay = 2;
392#endif 392#endif
393 393
394 /* no point having a scrollbar without having any scrollback! */ 394 /* no point having a scrollbar without having any scrollback! */
395 if (!saveLines) 395 if (!saveLines)
396 options &= ~Opt_scrollBar; 396 CLR_OPTION (Opt_scrollBar);
397 397
398#ifdef PRINTPIPE 398#ifdef PRINTPIPE
399 if (!rs[Rs_print_pipe]) 399 if (!rs[Rs_print_pipe])
400 rs[Rs_print_pipe] = PRINTPIPE; 400 rs[Rs_print_pipe] = PRINTPIPE;
401#endif 401#endif
… …
444 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]);
445#endif 445#endif
446 446
447#ifdef XTERM_REVERSE_VIDEO 447#ifdef XTERM_REVERSE_VIDEO
448 /* this is how xterm implements reverseVideo */ 448 /* this is how xterm implements reverseVideo */
449 if (options & Opt_reverseVideo) 449 if (OPTION (Opt_reverseVideo))
450 { 450 {
451 if (!rs[Rs_color + Color_fg]) 451 if (!rs[Rs_color + Color_fg])
452 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 452 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
453 if (!rs[Rs_color + Color_bg]) 453 if (!rs[Rs_color + Color_bg])
454 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 454 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
459 if (!rs[Rs_color + i]) 459 if (!rs[Rs_color + i])
460 rs[Rs_color + i] = def_colorName[i]; 460 rs[Rs_color + i] = def_colorName[i];
461 461
462#ifndef XTERM_REVERSE_VIDEO 462#ifndef XTERM_REVERSE_VIDEO
463 /* this is how we implement reverseVideo */ 463 /* this is how we implement reverseVideo */
464 if (options & Opt_reverseVideo) 464 if (OPTION (Opt_reverseVideo))
465 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 465 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
466#endif 466#endif
467 467
468 /* convenient aliases for setting fg/bg to colors */ 468 /* convenient aliases for setting fg/bg to colors */
469 color_aliases (Color_fg); 469 color_aliases (Color_fg);
… …
646 * Initialize the command connection. 646 * Initialize the command connection.
647 * This should be called after the X server connection is established. 647 * This should be called after the X server connection is established.
648 */ 648 */
649 649
650#ifdef META8_OPTION 650#ifdef META8_OPTION
651 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 651 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
652#endif 652#endif
653 653
654 get_ourmods (); 654 get_ourmods ();
655 655
656 if (!(options & Opt_scrollTtyOutput)) 656 if (!OPTION (Opt_scrollTtyOutput))
657 priv_modes |= PrivMode_TtyOutputInh; 657 priv_modes |= PrivMode_TtyOutputInh;
658 if (options & Opt_scrollTtyKeypress) 658 if (OPTION (Opt_scrollTtyKeypress))
659 priv_modes |= PrivMode_Keypress; 659 priv_modes |= PrivMode_Keypress;
660 if (!(options & Opt_jumpScroll)) 660 if (!OPTION (Opt_jumpScroll))
661 priv_modes |= PrivMode_smoothScroll; 661 priv_modes |= PrivMode_smoothScroll;
662 662
663#ifndef NO_BACKSPACE_KEY 663#ifndef NO_BACKSPACE_KEY
664 if (strcmp (key_backspace, "DEC") == 0) 664 if (strcmp (key_backspace, "DEC") == 0)
665 priv_modes |= PrivMode_HaveBackSpace; 665 priv_modes |= PrivMode_HaveBackSpace;
… …
675 if (menubar_visible ()) 675 if (menubar_visible ())
676 { 676 {
677 priv_modes |= PrivMode_menuBar; 677 priv_modes |= PrivMode_menuBar;
678 SavedModes |= PrivMode_menuBar; 678 SavedModes |= PrivMode_menuBar;
679 } 679 }
680
681#ifdef CURSOR_BLINK
682 if (options & Opt_cursorBlink)
683 (void)gettimeofday (&lastcursorchange, NULL);
684#endif
685 680
686 run_command (argv); 681 run_command (argv);
687} 682}
688 683
689/*----------------------------------------------------------------------*/ 684/*----------------------------------------------------------------------*/
… …
704 continue; 699 continue;
705 700
706 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 701 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
707 { 702 {
708#ifndef XTERM_REVERSE_VIDEO 703#ifndef XTERM_REVERSE_VIDEO
709 if (i < 2 && (options & Opt_reverseVideo)) 704 if (i < 2 && OPTION (Opt_reverseVideo))
710 rs[Rs_color + i] = def_colorName[!i]; 705 rs[Rs_color + i] = def_colorName[!i];
711 else 706 else
712#endif 707#endif
713 rs[Rs_color + i] = def_colorName[i]; 708 rs[Rs_color + i] = def_colorName[i];
714 709
… …
811 int i = atoi (rs[Rs_color + idx]); 806 int i = atoi (rs[Rs_color + idx]);
812 807
813 if (i >= 8 && i <= 15) 808 if (i >= 8 && i <= 15)
814 { /* bright colors */ 809 { /* bright colors */
815 i -= 8; 810 i -= 8;
816#ifndef NO_BRIGHTCOLOR
817 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 811 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
818 return; 812 return;
819#endif
820 } 813 }
821 814
822 if (i >= 0 && i <= 7) /* normal colors */ 815 if (i >= 0 && i <= 7) /* normal colors */
823 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 816 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
824 } 817 }
… …
937#endif 930#endif
938 931
939 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 932 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
940 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 933 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
941 934
942 if (options & Opt_transparent) 935 if (OPTION (Opt_transparent))
943 { 936 {
944 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 937 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
945 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 938 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
946 } 939 }
947 940
948#if ENABLE_FRILLS 941#if ENABLE_FRILLS
949 if (options & Opt_borderLess) 942 if (OPTION (Opt_borderLess))
950 { 943 {
951 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 944 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
952 945
953 if (prop == None) 946 if (prop == None)
954 { 947 {
… …
1024 classHint.res_name = (char *)rs[Rs_name]; 1017 classHint.res_name = (char *)rs[Rs_name];
1025 classHint.res_class = (char *)RESCLASS; 1018 classHint.res_class = (char *)RESCLASS;
1026 1019
1027 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1020 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1028 wmHint.input = True; 1021 wmHint.input = True;
1029 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1022 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1030 wmHint.window_group = top; 1023 wmHint.window_group = top;
1031 1024
1032 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1025 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1033 &szHint, &wmHint, &classHint); 1026 &szHint, &wmHint, &classHint);
1034 1027
… …
1077 1070
1078 /* the vt window */ 1071 /* the vt window */
1079 vt = XCreateSimpleWindow (disp, top, 1072 vt = XCreateSimpleWindow (disp, top,
1080 window_vt_x, 1073 window_vt_x,
1081 window_vt_y, 1074 window_vt_y,
1082 TermWin_TotalWidth (), 1075 width,
1083 TermWin_TotalHeight (), 1076 height,
1084 0, 1077 0,
1085 pix_colors_focused[Color_fg], 1078 pix_colors_focused[Color_fg],
1086 pix_colors_focused[Color_bg]); 1079 pix_colors_focused[Color_bg]);
1087#ifdef DEBUG_X 1080#ifdef DEBUG_X
1088 XStoreName (disp, vt, "vt window"); 1081 XStoreName (disp, vt, "vt window");
… …
1092 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1085 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1093 1086
1094 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1087 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1095 1088
1096#ifdef POINTER_BLANK 1089#ifdef POINTER_BLANK
1097 if (options & Opt_pointerBlank) 1090 if (OPTION (Opt_pointerBlank))
1098 vt_emask |= PointerMotionMask; 1091 vt_emask |= PointerMotionMask;
1099 else 1092 else
1100#endif 1093#endif
1101 vt_emask |= Button1MotionMask | Button3MotionMask; 1094 vt_emask |= Button1MotionMask | Button3MotionMask;
1102 1095
… …
1106#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1099#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1107 if (menuBar_height ()) 1100 if (menuBar_height ())
1108 { 1101 {
1109 menuBar.win = XCreateSimpleWindow (disp, top, 1102 menuBar.win = XCreateSimpleWindow (disp, top,
1110 window_vt_x, 0, 1103 window_vt_x, 0,
1111 TermWin_TotalWidth (), 1104 width,
1112 menuBar_TotalHeight (), 1105 menuBar_TotalHeight (),
1113 0, 1106 0,
1114 pix_colors_focused[Color_fg], 1107 pix_colors_focused[Color_fg],
1115 pix_colors_focused[Color_scroll]); 1108 pix_colors_focused[Color_scroll]);
1116 1109
… …
1129 } 1122 }
1130#endif 1123#endif
1131 1124
1132#ifdef XPM_BACKGROUND 1125#ifdef XPM_BACKGROUND
1133 if (rs[Rs_backgroundPixmap] != NULL 1126 if (rs[Rs_backgroundPixmap] != NULL
1134 && ! (options & Opt_transparent)) 1127 && ! OPTION (Opt_transparent))
1135 { 1128 {
1136 const char *p = rs[Rs_backgroundPixmap]; 1129 const char *p = rs[Rs_backgroundPixmap];
1137 1130
1138 if ((p = strchr (p, ';')) != NULL) 1131 if ((p = strchr (p, ';')) != NULL)
1139 { 1132 {
… …
1195 /* 1188 /*
1196 * standard System V termios interface 1189 * standard System V termios interface
1197 */ 1190 */
1198 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1191 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1199 { 1192 {
1200 /* return error - use system defaults */ 1193 // return error - use system defaults,
1194 // where possible, and zero elsewhere
1195 memset (tio, 0, sizeof (ttymode_t));
1196
1201 tio->c_cc[VINTR] = CINTR; 1197 tio->c_cc[VINTR] = CINTR;
1202 tio->c_cc[VQUIT] = CQUIT; 1198 tio->c_cc[VQUIT] = CQUIT;
1203 tio->c_cc[VERASE] = CERASE; 1199 tio->c_cc[VERASE] = CERASE;
1200#ifdef VERASE2
1201 tio->c_cc[VERASE2] = CERASE2;
1202#endif
1204 tio->c_cc[VKILL] = CKILL; 1203 tio->c_cc[VKILL] = CKILL;
1205 tio->c_cc[VSTART] = CSTART; 1204 tio->c_cc[VSTART] = CSTART;
1206 tio->c_cc[VSTOP] = CSTOP; 1205 tio->c_cc[VSTOP] = CSTOP;
1207 tio->c_cc[VSUSP] = CSUSP; 1206 tio->c_cc[VSUSP] = CSUSP;
1208# ifdef VDSUSP 1207# ifdef VDSUSP
… …
1402{ 1401{
1403#if ENABLE_FRILLS 1402#if ENABLE_FRILLS
1404 if (rs[Rs_pty_fd]) 1403 if (rs[Rs_pty_fd])
1405 { 1404 {
1406 pty.pty = atoi (rs[Rs_pty_fd]); 1405 pty.pty = atoi (rs[Rs_pty_fd]);
1406
1407 if (pty.pty >= 0)
1408 {
1409 if (getfd_hook)
1410 pty.pty = (*getfd_hook) (pty.pty);
1411
1407 fcntl (pty.pty, F_SETFL, O_NONBLOCK); 1412 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK))
1413 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1414 }
1408 } 1415 }
1409 else 1416 else
1410#endif 1417#endif
1411 if (!pty.get ()) 1418 if (!pty.get ())
1412 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1419 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
… …
1513{ 1520{
1514 char *login; 1521 char *login;
1515 1522
1516 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1523 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1517 1524
1518 if (options & Opt_console) 1525 if (OPTION (Opt_console))
1519 { /* be virtual console, fail silently */ 1526 { /* be virtual console, fail silently */
1520#ifdef TIOCCONS 1527#ifdef TIOCCONS
1521 unsigned int on = 1; 1528 unsigned int on = 1;
1522 1529
1523 ioctl (STDIN_FILENO, TIOCCONS, &on); 1530 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1573 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1580 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1574 shell = "/bin/sh"; 1581 shell = "/bin/sh";
1575 1582
1576 argv0 = (const char *)rxvt_r_basename (shell); 1583 argv0 = (const char *)rxvt_r_basename (shell);
1577 1584
1578 if (options & Opt_loginShell) 1585 if (OPTION (Opt_loginShell))
1579 { 1586 {
1580 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1587 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1581 1588
1582 login[0] = '-'; 1589 login[0] = '-';
1583 strcpy (&login[1], argv0); 1590 strcpy (&login[1], argv0);
… …
1618 if ((command = getenv ("SHELL")) == NULL || *command == '\0') 1625 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1619 command = "/bin/sh"; 1626 command = "/bin/sh";
1620 1627
1621 arg_a[0] = my_basename (command); 1628 arg_a[0] = my_basename (command);
1622 1629
1623 if (options & Opt_loginShell) 1630 if (OPTION (Opt_loginShell))
1624 { 1631 {
1625 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char)); 1632 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1626 1633
1627 login[0] = '-'; 1634 login[0] = '-';
1628 strcpy (&login[1], arg_a[0]); 1635 strcpy (&login[1], arg_a[0]);

Diff Legend

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