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.122 by root, Sun Dec 18 00:59:42 2005 UTC vs.
Revision 1.128 by root, Sat Dec 31 17:16:17 2005 UTC

… …
33 33
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
39#include <limits>
38 40
39#include <csignal> 41#include <csignal>
40 42
41const char *const def_colorName[] = 43const char *const def_colorName[] =
42 { 44 {
… …
369 if (!rs[Rs_iconName]) 371 if (!rs[Rs_iconName])
370 rs[Rs_iconName] = rs[Rs_name]; 372 rs[Rs_iconName] = rs[Rs_name];
371 } 373 }
372 374
373 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 375 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
374 saveLines = BOUND_POSITIVE_INT16 (i); 376 saveLines = min (i, MAX_SAVELINES);
375 377
376#if ENABLE_FRILLS 378#if ENABLE_FRILLS
377 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 379 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
378 int_bwidth = min (i, 100); /* arbitrary limit */ 380 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
381
379 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 382 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
380 ext_bwidth = min (i, 100); /* arbitrary limit */ 383 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
384
381 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 385 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
382 lineSpace = min (i, 100); /* arbitrary limit */ 386 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
383#endif 387#endif
384 388
385#ifdef POINTER_BLANK 389#ifdef POINTER_BLANK
386 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 390 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
387 pointerBlankDelay = i; 391 pointerBlankDelay = i;
… …
389 pointerBlankDelay = 2; 393 pointerBlankDelay = 2;
390#endif 394#endif
391 395
392 /* no point having a scrollbar without having any scrollback! */ 396 /* no point having a scrollbar without having any scrollback! */
393 if (!saveLines) 397 if (!saveLines)
394 options &= ~Opt_scrollBar; 398 CLR_OPTION (Opt_scrollBar);
395 399
396#ifdef PRINTPIPE 400#ifdef PRINTPIPE
397 if (!rs[Rs_print_pipe]) 401 if (!rs[Rs_print_pipe])
398 rs[Rs_print_pipe] = PRINTPIPE; 402 rs[Rs_print_pipe] = PRINTPIPE;
399#endif 403#endif
… …
442 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 446 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
443#endif 447#endif
444 448
445#ifdef XTERM_REVERSE_VIDEO 449#ifdef XTERM_REVERSE_VIDEO
446 /* this is how xterm implements reverseVideo */ 450 /* this is how xterm implements reverseVideo */
447 if (options & Opt_reverseVideo) 451 if (OPTION (Opt_reverseVideo))
448 { 452 {
449 if (!rs[Rs_color + Color_fg]) 453 if (!rs[Rs_color + Color_fg])
450 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 454 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
451 if (!rs[Rs_color + Color_bg]) 455 if (!rs[Rs_color + Color_bg])
452 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 456 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
457 if (!rs[Rs_color + i]) 461 if (!rs[Rs_color + i])
458 rs[Rs_color + i] = def_colorName[i]; 462 rs[Rs_color + i] = def_colorName[i];
459 463
460#ifndef XTERM_REVERSE_VIDEO 464#ifndef XTERM_REVERSE_VIDEO
461 /* this is how we implement reverseVideo */ 465 /* this is how we implement reverseVideo */
462 if (options & Opt_reverseVideo) 466 if (OPTION (Opt_reverseVideo))
463 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 467 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
464#endif 468#endif
465 469
466 /* convenient aliases for setting fg/bg to colors */ 470 /* convenient aliases for setting fg/bg to colors */
467 color_aliases (Color_fg); 471 color_aliases (Color_fg);
468 color_aliases (Color_bg); 472 color_aliases (Color_bg);
… …
521 525
522 /* avoiding the math library: 526 /* avoiding the math library:
523 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */ 527 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
524 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++) 528 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
525 ; 529 ;
526 MAX_IT (i, 1); 530 max_it (i, 1);
527 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); 531 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
528 532
529 sprintf (env_windowid, "WINDOWID=%u", 533 sprintf (env_windowid, "WINDOWID=%u",
530 (unsigned int)parent[0]); 534 (unsigned int)parent[0]);
531 535
… …
644 * Initialize the command connection. 648 * Initialize the command connection.
645 * This should be called after the X server connection is established. 649 * This should be called after the X server connection is established.
646 */ 650 */
647 651
648#ifdef META8_OPTION 652#ifdef META8_OPTION
649 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 653 meta_char = OPTION ((Opt_meta8) ? 0x80 : C0_ESC);
650#endif 654#endif
651 655
652 get_ourmods (); 656 get_ourmods ();
653 657
654 if (!(options & Opt_scrollTtyOutput)) 658 if (!OPTION (Opt_scrollTtyOutput))
655 priv_modes |= PrivMode_TtyOutputInh; 659 priv_modes |= PrivMode_TtyOutputInh;
656 if (options & Opt_scrollTtyKeypress) 660 if (OPTION (Opt_scrollTtyKeypress))
657 priv_modes |= PrivMode_Keypress; 661 priv_modes |= PrivMode_Keypress;
658 if (!(options & Opt_jumpScroll)) 662 if (!OPTION (Opt_jumpScroll))
659 priv_modes |= PrivMode_smoothScroll; 663 priv_modes |= PrivMode_smoothScroll;
660 664
661#ifndef NO_BACKSPACE_KEY 665#ifndef NO_BACKSPACE_KEY
662 if (strcmp (key_backspace, "DEC") == 0) 666 if (strcmp (key_backspace, "DEC") == 0)
663 priv_modes |= PrivMode_HaveBackSpace; 667 priv_modes |= PrivMode_HaveBackSpace;
… …
675 priv_modes |= PrivMode_menuBar; 679 priv_modes |= PrivMode_menuBar;
676 SavedModes |= PrivMode_menuBar; 680 SavedModes |= PrivMode_menuBar;
677 } 681 }
678 682
679#ifdef CURSOR_BLINK 683#ifdef CURSOR_BLINK
680 if (options & Opt_cursorBlink) 684 if (OPTION (Opt_cursorBlink))
681 (void)gettimeofday (&lastcursorchange, NULL); 685 (void)gettimeofday (&lastcursorchange, NULL);
682#endif 686#endif
683 687
684 run_command (argv); 688 run_command (argv);
685} 689}
… …
702 continue; 706 continue;
703 707
704 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 708 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
705 { 709 {
706#ifndef XTERM_REVERSE_VIDEO 710#ifndef XTERM_REVERSE_VIDEO
707 if (i < 2 && (options & Opt_reverseVideo)) 711 if (i < 2 && OPTION (Opt_reverseVideo))
708 rs[Rs_color + i] = def_colorName[!i]; 712 rs[Rs_color + i] = def_colorName[!i];
709 else 713 else
710#endif 714#endif
711 rs[Rs_color + i] = def_colorName[i]; 715 rs[Rs_color + i] = def_colorName[i];
712 716
… …
935#endif 939#endif
936 940
937 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 941 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
938 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 942 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
939 943
940 if (options & Opt_transparent) 944 if (OPTION (Opt_transparent))
941 { 945 {
942 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 946 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
943 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 947 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
944 } 948 }
945 949
946#if ENABLE_FRILLS 950#if ENABLE_FRILLS
947 if (options & Opt_borderLess) 951 if (OPTION (Opt_borderLess))
948 { 952 {
949 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 953 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
950 954
951 if (prop == None) 955 if (prop == None)
952 { 956 {
… …
1022 classHint.res_name = (char *)rs[Rs_name]; 1026 classHint.res_name = (char *)rs[Rs_name];
1023 classHint.res_class = (char *)RESCLASS; 1027 classHint.res_class = (char *)RESCLASS;
1024 1028
1025 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1029 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1026 wmHint.input = True; 1030 wmHint.input = True;
1027 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1031 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1028 wmHint.window_group = top; 1032 wmHint.window_group = top;
1029 1033
1030 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1034 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1031 &szHint, &wmHint, &classHint); 1035 &szHint, &wmHint, &classHint);
1032 1036
… …
1090 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1094 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1091 1095
1092 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1096 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1093 1097
1094#ifdef POINTER_BLANK 1098#ifdef POINTER_BLANK
1095 if (options & Opt_pointerBlank) 1099 if (OPTION (Opt_pointerBlank))
1096 vt_emask |= PointerMotionMask; 1100 vt_emask |= PointerMotionMask;
1097 else 1101 else
1098#endif 1102#endif
1099 vt_emask |= Button1MotionMask | Button3MotionMask; 1103 vt_emask |= Button1MotionMask | Button3MotionMask;
1100 1104
… …
1127 } 1131 }
1128#endif 1132#endif
1129 1133
1130#ifdef XPM_BACKGROUND 1134#ifdef XPM_BACKGROUND
1131 if (rs[Rs_backgroundPixmap] != NULL 1135 if (rs[Rs_backgroundPixmap] != NULL
1132 && ! (options & Opt_transparent)) 1136 && ! OPTION (Opt_transparent))
1133 { 1137 {
1134 const char *p = rs[Rs_backgroundPixmap]; 1138 const char *p = rs[Rs_backgroundPixmap];
1135 1139
1136 if ((p = strchr (p, ';')) != NULL) 1140 if ((p = strchr (p, ';')) != NULL)
1137 { 1141 {
… …
1193 /* 1197 /*
1194 * standard System V termios interface 1198 * standard System V termios interface
1195 */ 1199 */
1196 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1200 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1197 { 1201 {
1198 /* return error - use system defaults */ 1202 // return error - use system defaults,
1203 // where possible, and zero elsewhere
1204 memset (tio, 0, sizeof (ttymode_t));
1205
1199 tio->c_cc[VINTR] = CINTR; 1206 tio->c_cc[VINTR] = CINTR;
1200 tio->c_cc[VQUIT] = CQUIT; 1207 tio->c_cc[VQUIT] = CQUIT;
1201 tio->c_cc[VERASE] = CERASE; 1208 tio->c_cc[VERASE] = CERASE;
1209#ifdef VERASE2
1210 tio->c_cc[VERASE2] = CERASE2;
1211#endif
1202 tio->c_cc[VKILL] = CKILL; 1212 tio->c_cc[VKILL] = CKILL;
1203 tio->c_cc[VSTART] = CSTART; 1213 tio->c_cc[VSTART] = CSTART;
1204 tio->c_cc[VSTOP] = CSTOP; 1214 tio->c_cc[VSTOP] = CSTOP;
1205 tio->c_cc[VSUSP] = CSUSP; 1215 tio->c_cc[VSUSP] = CSUSP;
1206# ifdef VDSUSP 1216# ifdef VDSUSP
… …
1400{ 1410{
1401#if ENABLE_FRILLS 1411#if ENABLE_FRILLS
1402 if (rs[Rs_pty_fd]) 1412 if (rs[Rs_pty_fd])
1403 { 1413 {
1404 pty.pty = atoi (rs[Rs_pty_fd]); 1414 pty.pty = atoi (rs[Rs_pty_fd]);
1415
1416 if (getfd_hook)
1417 pty.pty = (*getfd_hook) (pty.pty);
1418
1405 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");
1406 } 1421 }
1407 else 1422 else
1408#endif 1423#endif
1409 if (!pty.get ()) 1424 if (!pty.get ())
1410 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1425 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
… …
1511{ 1526{
1512 char *login; 1527 char *login;
1513 1528
1514 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1529 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1515 1530
1516 if (options & Opt_console) 1531 if (OPTION (Opt_console))
1517 { /* be virtual console, fail silently */ 1532 { /* be virtual console, fail silently */
1518#ifdef TIOCCONS 1533#ifdef TIOCCONS
1519 unsigned int on = 1; 1534 unsigned int on = 1;
1520 1535
1521 ioctl (STDIN_FILENO, TIOCCONS, &on); 1536 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1571 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1586 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1572 shell = "/bin/sh"; 1587 shell = "/bin/sh";
1573 1588
1574 argv0 = (const char *)rxvt_r_basename (shell); 1589 argv0 = (const char *)rxvt_r_basename (shell);
1575 1590
1576 if (options & Opt_loginShell) 1591 if (OPTION (Opt_loginShell))
1577 { 1592 {
1578 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1593 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1579 1594
1580 login[0] = '-'; 1595 login[0] = '-';
1581 strcpy (&login[1], argv0); 1596 strcpy (&login[1], argv0);
… …
1616 if ((command = getenv ("SHELL")) == NULL || *command == '\0') 1631 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1617 command = "/bin/sh"; 1632 command = "/bin/sh";
1618 1633
1619 arg_a[0] = my_basename (command); 1634 arg_a[0] = my_basename (command);
1620 1635
1621 if (options & Opt_loginShell) 1636 if (OPTION (Opt_loginShell))
1622 { 1637 {
1623 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char)); 1638 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1624 1639
1625 login[0] = '-'; 1640 login[0] = '-';
1626 strcpy (&login[1], arg_a[0]); 1641 strcpy (&login[1], arg_a[0]);

Diff Legend

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