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.128 by root, Sat Dec 31 17:16:17 2005 UTC vs.
Revision 1.134 by root, Fri Jan 6 05:37:59 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) */
… …
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 = OPTION ((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 (!OPTION (Opt_scrollTtyOutput)) 656 if (!OPTION (Opt_scrollTtyOutput))
… …
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 (OPTION (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/*----------------------------------------------------------------------*/
… …
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 }
… …
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
1099 if (OPTION (Opt_pointerBlank)) 1094 if (OPTION (Opt_pointerBlank)
1095#ifdef ENABLE_PERL
1096 || 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
… …
1411#if ENABLE_FRILLS 1409#if ENABLE_FRILLS
1412 if (rs[Rs_pty_fd]) 1410 if (rs[Rs_pty_fd])
1413 { 1411 {
1414 pty.pty = atoi (rs[Rs_pty_fd]); 1412 pty.pty = atoi (rs[Rs_pty_fd]);
1415 1413
1414 if (pty.pty >= 0)
1415 {
1416 if (getfd_hook) 1416 if (getfd_hook)
1417 pty.pty = (*getfd_hook) (pty.pty); 1417 pty.pty = (*getfd_hook) (pty.pty);
1418 1418
1419 if (pty.pty < 0 || 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"); 1420 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1421 }
1421 } 1422 }
1422 else 1423 else
1423#endif 1424#endif
1424 if (!pty.get ()) 1425 if (!pty.get ())
1425 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1426 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");

Diff Legend

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