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.45 by pcg, Mon Mar 22 17:18:25 2004 UTC vs.
Revision 1.49 by pcg, Fri Apr 2 15:15:25 2004 UTC

… …
313#endif 313#endif
314#ifndef NO_CURSORCOLOR 314#ifndef NO_CURSORCOLOR
315 COLOR_CURSOR_BACKGROUND, 315 COLOR_CURSOR_BACKGROUND,
316 COLOR_CURSOR_FOREGROUND, 316 COLOR_CURSOR_FOREGROUND,
317#endif /* ! NO_CURSORCOLOR */ 317#endif /* ! NO_CURSORCOLOR */
318 NULL, /* Color_pointer */ 318 NULL, /* Color_pointer_fg */
319 NULL, /* Color_pointer_bg */
319 NULL, /* Color_border */ 320 NULL, /* Color_border */
320#ifndef NO_BOLD_UNDERLINE_REVERSE 321#ifndef NO_BOLD_UNDERLINE_REVERSE
321 NULL, /* Color_BD */ 322 NULL, /* Color_BD */
322 NULL, /* Color_UL */ 323 NULL, /* Color_UL */
323 NULL, /* Color_RV */ 324 NULL, /* Color_RV */
324#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 325#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
325#ifdef OPTION_HC 326#ifdef OPTION_HC
327 NULL,
328#endif
329#if TINTING
326 NULL, 330 NULL,
327#endif 331#endif
328#ifdef KEEP_SCROLLCOLOR 332#ifdef KEEP_SCROLLCOLOR
329 COLOR_SCROLLBAR, 333 COLOR_SCROLLBAR,
330 COLOR_SCROLLTROUGH, 334 COLOR_SCROLLTROUGH,
… …
644 color_aliases (Color_bg); 648 color_aliases (Color_bg);
645#ifndef NO_CURSORCOLOR 649#ifndef NO_CURSORCOLOR
646 color_aliases (Color_cursor); 650 color_aliases (Color_cursor);
647 color_aliases (Color_cursor2); 651 color_aliases (Color_cursor2);
648#endif /* NO_CURSORCOLOR */ 652#endif /* NO_CURSORCOLOR */
649 color_aliases (Color_pointer); 653 color_aliases (Color_pointer_fg);
654 color_aliases (Color_pointer_bg);
650 color_aliases (Color_border); 655 color_aliases (Color_border);
651#ifndef NO_BOLD_UNDERLINE_REVERSE 656#ifndef NO_BOLD_UNDERLINE_REVERSE
652 color_aliases (Color_BD); 657 color_aliases (Color_BD);
653 color_aliases (Color_UL); 658 color_aliases (Color_UL);
654 color_aliases (Color_RV); 659 color_aliases (Color_RV);
… …
894#ifndef NO_CURSORCOLOR 899#ifndef NO_CURSORCOLOR
895 case Color_cursor2: 900 case Color_cursor2:
896 xcol = PixColors[Color_fg]; 901 xcol = PixColors[Color_fg];
897 break; 902 break;
898#endif /* ! NO_CURSORCOLOR */ 903#endif /* ! NO_CURSORCOLOR */
899 case Color_pointer: 904 case Color_pointer_fg:
900 xcol = PixColors[Color_fg]; 905 xcol = PixColors[Color_fg];
901 break; 906 break;
902 default: 907 default:
903 xcol = PixColors[Color_bg]; /* None */ 908 xcol = PixColors[Color_bg]; /* None */
904 break; 909 break;
… …
908 913
909 PixColors[i] = xcol; 914 PixColors[i] = xcol;
910 SET_PIXCOLOR (i); 915 SET_PIXCOLOR (i);
911 } 916 }
912 917
913 if (XDEPTH <= 2 || !rs[Rs_color + Color_pointer]) 918 if (XDEPTH <= 2)
914 PixColors[Color_pointer] = PixColors[Color_fg]; 919 {
915 if (XDEPTH <= 2 || !rs[Rs_color + Color_border]) 920 if (!rs[Rs_color + Color_pointer_fg]) PixColors[Color_pointer_fg] = PixColors[Color_fg];
916 PixColors[Color_border] = PixColors[Color_fg]; 921 if (!rs[Rs_color + Color_pointer_bg]) PixColors[Color_pointer_bg] = PixColors[Color_bg];
922 if (!rs[Rs_color + Color_border] ) PixColors[Color_border] = PixColors[Color_fg];
923 }
917 924
918 /* 925 /*
919 * get scrollBar/menuBar shadow colors 926 * get scrollBar/menuBar shadow colors
920 * 927 *
921 * The calculations of topShadow/bottomShadow values are adapted 928 * The calculations of topShadow/bottomShadow values are adapted
… …
1119 TermWin.ext_bwidth, 1126 TermWin.ext_bwidth,
1120 PixColors[Color_border], 1127 PixColors[Color_border],
1121 PixColors[Color_fg]); 1128 PixColors[Color_fg]);
1122#endif 1129#endif
1123 1130
1124 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1131 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1125 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1132 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1126 1133
1127 classHint.res_name = (char *)rs[Rs_name]; 1134 classHint.res_name = (char *)rs[Rs_name];
1128 classHint.res_class = (char *)RESCLASS; 1135 classHint.res_class = (char *)RESCLASS;
1129 1136
1130 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 1137 wmHint.flags = (InputHint | StateHint | WindowGroupHint);
… …
1132 wmHint.initial_state = (Options & Opt_iconic ? IconicState 1139 wmHint.initial_state = (Options & Opt_iconic ? IconicState
1133 : NormalState); 1140 : NormalState);
1134 wmHint.window_group = TermWin.parent[0]; 1141 wmHint.window_group = TermWin.parent[0];
1135 1142
1136 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1143 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,
1137 (char **)argv, argc, &szHint, &wmHint, &classHint); 1144 (char **)argv, argc, &szHint, &wmHint, &classHint);
1145
1146#ifndef NO_FRILLS
1147 long pid = getpid ();
1148 XChangeProperty (display->display, TermWin.parent[0],
1149 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32,
1150 PropModeReplace, (unsigned char *)&pid, 1);
1151#endif
1138 1152
1139 XSelectInput (display->display, TermWin.parent[0], 1153 XSelectInput (display->display, TermWin.parent[0],
1140 KeyPressMask 1154 KeyPressMask
1141#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1155#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1142 | KeyReleaseMask 1156 | KeyReleaseMask

Diff Legend

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