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.180 by ayin, Fri Feb 16 21:46:05 2007 UTC vs.
Revision 1.204 by sasha, Thu Aug 9 22:08:21 2007 UTC

… …
46 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
47 /* low-intensity colors */ 47 /* low-intensity colors */
48 "rgb:00/00/00", // 0: black (Black) 48 "rgb:00/00/00", // 0: black (Black)
49 "rgb:cd/00/00", // 1: red (Red3) 49 "rgb:cd/00/00", // 1: red (Red3)
50 "rgb:00/cd/00", // 2: green (Green3) 50 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: ywlloe (Yellow3) 51 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "rgb:00/00/cd", // 4: blue (Blue3) 52 "rgb:00/00/cd", // 4: blue (Blue3)
53 "rgb:cd/00/cd", // 5: magenta (Magenta3) 53 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "rgb:00/cd/cd", // 6: cyan (Cyan3) 54 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 55# ifdef XTERM_COLORS
56 "rgb:e5/e5/e5", // 7: white (Grey90) 56 "rgb:e5/e5/e5", // 7: white (Grey90)
… …
166#endif 166#endif
167#ifdef KEEP_SCROLLCOLOR 167#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 168 COLOR_SCROLLBAR,
169 COLOR_SCROLLTROUGH, 169 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 171#if ENABLE_TRANSPARENCY
172 NULL, 172 NULL,
173#endif 173#endif
174#if OFF_FOCUS_FADING 174#if OFF_FOCUS_FADING
175 "rgb:00/00/00", 175 "rgb:00/00/00",
176#endif 176#endif
… …
183 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
184#ifdef OFF_FOCUS_FADING 184#ifdef OFF_FOCUS_FADING
185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
186#endif 186#endif
187 187
188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
189 pixmap = None;
190#endif
191 188
192 MEvent.time = CurrentTime; 189 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 190 MEvent.button = AnyButton;
194 options = DEFAULT_OPTIONS;
195 want_refresh = 1; 191 want_refresh = 1;
196 priv_modes = SavedModes = PrivMode_Default; 192 priv_modes = SavedModes = PrivMode_Default;
197 ncol = 80; 193 ncol = 80;
198 nrow = 24; 194 nrow = 24;
199 int_bwidth = INTERNALBORDERWIDTH; 195 int_bwidth = INTERNALBORDERWIDTH;
200 ext_bwidth = EXTERNALBORDERWIDTH; 196 ext_bwidth = EXTERNALBORDERWIDTH;
201 lineSpace = LINESPACE; 197 lineSpace = LINESPACE;
202 saveLines = SAVELINES; 198 saveLines = SAVELINES;
203 numpix_colors = TOTAL_COLORS; 199 numpix_colors = TOTAL_COLORS;
204 200
205 refresh_limit = 1;
206 refresh_type = SLOW_REFRESH; 201 refresh_type = SLOW_REFRESH;
207 202
208 oldcursor.row = oldcursor.col = -1; 203 oldcursor.row = oldcursor.col = -1;
204#ifdef HAVE_BG_PIXMAP
205#ifdef HAVE_AFTERIMAGE
206 bgPixmap.original_asim = NULL;
207#endif
208 /* bgPixmap.w = bgPixmap.h = 0; */
209#ifdef XPM_BACKGROUND 209#ifdef XPM_BACKGROUND
210 /* bgPixmap.w = bgPixmap.h = 0; */
211 bgPixmap.x = bgPixmap.y = 0; 210 bgPixmap.h_scale = bgPixmap.v_scale = 0;
211 bgPixmap.h_align = bgPixmap.v_align = 0;
212#endif
213 bgPixmap.flags = 0;
212 bgPixmap.pixmap = None; 214 bgPixmap.pixmap = None;
213#endif 215#endif
214
215 last_bot = last_state = -1; 216 last_bot = last_state = -1;
217
218 set_option (Opt_scrollBar);
219 set_option (Opt_scrollTtyOutput);
220 set_option (Opt_jumpScroll);
221 set_option (Opt_skipScroll);
222 set_option (Opt_secondaryScreen);
223 set_option (Opt_secondaryScroll);
224 set_option (Opt_pastableTabs);
225 set_option (Opt_intensityStyles);
226 set_option (Opt_iso14755_52);
216 227
217 return true; 228 return true;
218} 229}
219 230
220void 231void
… …
308#if XFT 319#if XFT
309 if (rs[Rs_depth]) 320 if (rs[Rs_depth])
310 select_visual (strtol (rs[Rs_depth], 0, 0)); 321 select_visual (strtol (rs[Rs_depth], 0, 0));
311#endif 322#endif
312 323
324#ifdef HAVE_AFTERIMAGE
325 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
326#endif
313 free (r_argv); 327 free (r_argv);
328
329 bgPixmap.set_target (this);
314 330
315 for (int i = NUM_RESOURCES; i--; ) 331 for (int i = NUM_RESOURCES; i--; )
316 if (rs [i] == resval_undef) 332 if (rs [i] == resval_undef)
317 rs [i] = 0; 333 rs [i] = 0;
318 334
… …
421 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 437 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
422#endif 438#endif
423 439
424#ifdef XTERM_REVERSE_VIDEO 440#ifdef XTERM_REVERSE_VIDEO
425 /* this is how xterm implements reverseVideo */ 441 /* this is how xterm implements reverseVideo */
426 if (OPTION (Opt_reverseVideo)) 442 if (option (Opt_reverseVideo))
427 { 443 {
428 if (!rs[Rs_color + Color_fg]) 444 if (!rs[Rs_color + Color_fg])
429 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 445 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
430 446
431 if (!rs[Rs_color + Color_bg]) 447 if (!rs[Rs_color + Color_bg])
… …
437 if (!rs[Rs_color + i]) 453 if (!rs[Rs_color + i])
438 rs[Rs_color + i] = def_colorName[i]; 454 rs[Rs_color + i] = def_colorName[i];
439 455
440#ifndef XTERM_REVERSE_VIDEO 456#ifndef XTERM_REVERSE_VIDEO
441 /* this is how we implement reverseVideo */ 457 /* this is how we implement reverseVideo */
442 if (OPTION (Opt_reverseVideo)) 458 if (option (Opt_reverseVideo))
443 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 459 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
444#endif 460#endif
445 461
446 /* convenient aliases for setting fg/bg to colors */ 462 /* convenient aliases for setting fg/bg to colors */
447 color_aliases (Color_fg); 463 color_aliases (Color_fg);
… …
621 * Initialize the command connection. 637 * Initialize the command connection.
622 * This should be called after the X server connection is established. 638 * This should be called after the X server connection is established.
623 */ 639 */
624 640
625#ifdef META8_OPTION 641#ifdef META8_OPTION
626 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 642 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
627#endif 643#endif
628 644
629 get_ourmods (); 645 get_ourmods ();
630 646
631 if (!OPTION (Opt_scrollTtyOutput)) 647 if (!option (Opt_scrollTtyOutput))
632 priv_modes |= PrivMode_TtyOutputInh; 648 priv_modes |= PrivMode_TtyOutputInh;
633 if (OPTION (Opt_scrollTtyKeypress)) 649 if (option (Opt_scrollTtyKeypress))
634 priv_modes |= PrivMode_Keypress; 650 priv_modes |= PrivMode_Keypress;
635 if (!OPTION (Opt_jumpScroll)) 651 if (!option (Opt_jumpScroll))
636 priv_modes |= PrivMode_smoothScroll; 652 priv_modes |= PrivMode_smoothScroll;
637 653
638#ifndef NO_BACKSPACE_KEY 654#ifndef NO_BACKSPACE_KEY
639 if (strcmp (key_backspace, "DEC") == 0) 655 if (strcmp (key_backspace, "DEC") == 0)
640 priv_modes |= PrivMode_HaveBackSpace; 656 priv_modes |= PrivMode_HaveBackSpace;
… …
670 rxvt_color xcol; 686 rxvt_color xcol;
671 687
672 if (!set_color (xcol, name)) 688 if (!set_color (xcol, name))
673 { 689 {
674#ifndef XTERM_REVERSE_VIDEO 690#ifndef XTERM_REVERSE_VIDEO
675 if (i < 2 && OPTION (Opt_reverseVideo)) 691 if (i < 2 && option (Opt_reverseVideo))
676 name = def_colorName [1 - i]; 692 name = def_colorName [1 - i];
677 else 693 else
678#endif 694#endif
679 name = def_colorName [i]; 695 name = def_colorName [i];
680 696
… …
871rxvt_term::create_windows (int argc, const char *const *argv) 887rxvt_term::create_windows (int argc, const char *const *argv)
872{ 888{
873 XClassHint classHint; 889 XClassHint classHint;
874 XWMHints wmHint; 890 XWMHints wmHint;
875#if ENABLE_FRILLS 891#if ENABLE_FRILLS
876 MWMHints mwmhints; 892 MWMHints mwmhints = { };
877#endif 893#endif
878 XGCValues gcvalue; 894 XGCValues gcvalue;
879 XSetWindowAttributes attributes; 895 XSetWindowAttributes attributes;
880 Window top, parent; 896 Window top, parent;
881 897
… …
887 if (!set_fonts ()) 903 if (!set_fonts ())
888 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 904 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
889 905
890 parent = display->root; 906 parent = display->root;
891 907
892 attributes.override_redirect = !!OPTION (Opt_override_redirect); 908 attributes.override_redirect = !!option (Opt_override_redirect);
893 909
894#if ENABLE_FRILLS 910#if ENABLE_FRILLS
895 if (OPTION (Opt_borderLess)) 911 if (option (Opt_borderLess))
896 { 912 {
897 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 913 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
898 { 914 {
899 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 915 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
900 attributes.override_redirect = true; 916 attributes.override_redirect = true;
… …
950 classHint.res_name = (char *)rs[Rs_name]; 966 classHint.res_name = (char *)rs[Rs_name];
951 classHint.res_class = (char *)RESCLASS; 967 classHint.res_class = (char *)RESCLASS;
952 968
953 wmHint.flags = InputHint | StateHint | WindowGroupHint; 969 wmHint.flags = InputHint | StateHint | WindowGroupHint;
954 wmHint.input = True; 970 wmHint.input = True;
955 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 971 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
956 wmHint.window_group = top; 972 wmHint.window_group = top;
957 973
958 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 974 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
959 &szHint, &wmHint, &classHint); 975 &szHint, &wmHint, &classHint);
960 976
… …
1017 attributes.bit_gravity = NorthWestGravity; 1033 attributes.bit_gravity = NorthWestGravity;
1018 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); 1034 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1019 1035
1020 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1036 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1021 1037
1022 if (OPTION (Opt_pointerBlank)) 1038 if (option (Opt_pointerBlank))
1023 vt_emask |= PointerMotionMask; 1039 vt_emask |= PointerMotionMask;
1024 else 1040 else
1025 vt_emask |= Button1MotionMask | Button3MotionMask; 1041 vt_emask |= Button1MotionMask | Button3MotionMask;
1026 1042
1027 vt_select_input (); 1043 vt_select_input ();
1028 1044
1029 vt_ev.start (display, vt); 1045 vt_ev.start (display, vt);
1030 1046
1031#ifdef XPM_BACKGROUND 1047#ifdef XPM_BACKGROUND
1032 if (rs[Rs_backgroundPixmap] != NULL 1048 if (rs[Rs_backgroundPixmap] != NULL)
1033 && !OPTION (Opt_transparent))
1034 { 1049 {
1035 const char *p = rs[Rs_backgroundPixmap]; 1050 const char *p = rs[Rs_backgroundPixmap];
1036 1051
1037 if ((p = strchr (p, ';')) != NULL) 1052 if ((p = strchr (p, ';')) != NULL)
1038 { 1053 {
1039 p++; 1054 p++;
1040 scale_pixmap (p); 1055 bgPixmap.handle_geometry (p);
1041 } 1056 }
1057 else
1058 bgPixmap.set_defaultGeometry ();
1042 1059
1043 set_bgPixmap (rs[Rs_backgroundPixmap]); 1060 set_bgPixmap (rs[Rs_backgroundPixmap]);
1044 scr_touch (true); 1061 scr_touch (true);
1045 } 1062 }
1046#endif 1063#endif
… …
1322 } 1339 }
1323 1340
1324 _exit (EXIT_FAILURE); 1341 _exit (EXIT_FAILURE);
1325 1342
1326 default: 1343 default:
1327 if (!OPTION (Opt_utmpInhibit)) 1344 if (!option (Opt_utmpInhibit))
1328 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1345 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1329 1346
1330 pty->close_tty (); 1347 pty->close_tty ();
1331 1348
1332 child_ev.start (cmd_pid); 1349 child_ev.start (cmd_pid);
1333 1350
… …
1346int 1363int
1347rxvt_term::run_child (const char *const *argv) 1364rxvt_term::run_child (const char *const *argv)
1348{ 1365{
1349 char *login; 1366 char *login;
1350 1367
1351 if (OPTION (Opt_console)) 1368 if (option (Opt_console))
1352 { /* be virtual console, fail silently */ 1369 { /* be virtual console, fail silently */
1353#ifdef TIOCCONS 1370#ifdef TIOCCONS
1354 unsigned int on = 1; 1371 unsigned int on = 1;
1355 1372
1356 ioctl (STDIN_FILENO, TIOCCONS, &on); 1373 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1405 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1422 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1406 shell = "/bin/sh"; 1423 shell = "/bin/sh";
1407 1424
1408 argv0 = (const char *)rxvt_r_basename (shell); 1425 argv0 = (const char *)rxvt_r_basename (shell);
1409 1426
1410 if (OPTION (Opt_loginShell)) 1427 if (option (Opt_loginShell))
1411 { 1428 {
1412 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1429 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1413 1430
1414 login[0] = '-'; 1431 login[0] = '-';
1415 strcpy (&login[1], argv0); 1432 strcpy (&login[1], argv0);

Diff Legend

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