… | |
… | |
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 | } |
… | |
… | |
1079 | |
1070 | |
1080 | /* the vt window */ |
1071 | /* the vt window */ |
1081 | vt = XCreateSimpleWindow (disp, top, |
1072 | vt = XCreateSimpleWindow (disp, top, |
1082 | window_vt_x, |
1073 | window_vt_x, |
1083 | window_vt_y, |
1074 | window_vt_y, |
1084 | TermWin_TotalWidth (), |
1075 | width, |
1085 | TermWin_TotalHeight (), |
1076 | height, |
1086 | 0, |
1077 | 0, |
1087 | pix_colors_focused[Color_fg], |
1078 | pix_colors_focused[Color_fg], |
1088 | pix_colors_focused[Color_bg]); |
1079 | pix_colors_focused[Color_bg]); |
1089 | #ifdef DEBUG_X |
1080 | #ifdef DEBUG_X |
1090 | XStoreName (disp, vt, "vt window"); |
1081 | XStoreName (disp, vt, "vt window"); |
… | |
… | |
1108 | #if defined(MENUBAR) && (MENUBAR_MAX > 1) |
1099 | #if defined(MENUBAR) && (MENUBAR_MAX > 1) |
1109 | if (menuBar_height ()) |
1100 | if (menuBar_height ()) |
1110 | { |
1101 | { |
1111 | menuBar.win = XCreateSimpleWindow (disp, top, |
1102 | menuBar.win = XCreateSimpleWindow (disp, top, |
1112 | window_vt_x, 0, |
1103 | window_vt_x, 0, |
1113 | TermWin_TotalWidth (), |
1104 | width, |
1114 | menuBar_TotalHeight (), |
1105 | menuBar_TotalHeight (), |
1115 | 0, |
1106 | 0, |
1116 | pix_colors_focused[Color_fg], |
1107 | pix_colors_focused[Color_fg], |
1117 | pix_colors_focused[Color_scroll]); |
1108 | pix_colors_focused[Color_scroll]); |
1118 | |
1109 | |