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.181 by ayin, Tue May 1 21:10:04 2007 UTC vs.
Revision 1.207 by ayin, Mon Aug 27 18:30:59 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 want_refresh = 1; 191 want_refresh = 1;
195 priv_modes = SavedModes = PrivMode_Default; 192 priv_modes = SavedModes = PrivMode_Default;
… …
199 ext_bwidth = EXTERNALBORDERWIDTH; 196 ext_bwidth = EXTERNALBORDERWIDTH;
200 lineSpace = LINESPACE; 197 lineSpace = LINESPACE;
201 saveLines = SAVELINES; 198 saveLines = SAVELINES;
202 numpix_colors = TOTAL_COLORS; 199 numpix_colors = TOTAL_COLORS;
203 200
204 refresh_limit = 1;
205 refresh_type = SLOW_REFRESH; 201 refresh_type = SLOW_REFRESH;
206 202
207 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; */
208#ifdef XPM_BACKGROUND 209#ifdef XPM_BACKGROUND
209 /* bgPixmap.w = bgPixmap.h = 0; */
210 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;
211 bgPixmap.pixmap = None; 214 bgPixmap.pixmap = None;
212#endif 215#endif
213
214 last_bot = last_state = -1; 216 last_bot = last_state = -1;
215 217
216 set_option (Opt_scrollBar, 1); 218 set_option (Opt_scrollBar);
217 set_option (Opt_scrollTtyOutput, 1); 219 set_option (Opt_scrollTtyOutput);
218 set_option (Opt_jumpScroll, 1); 220 set_option (Opt_jumpScroll);
221 set_option (Opt_skipScroll);
219 set_option (Opt_secondaryScreen, 1); 222 set_option (Opt_secondaryScreen);
220 set_option (Opt_secondaryScroll, 1); 223 set_option (Opt_secondaryScroll);
221 set_option (Opt_pastableTabs, 1); 224 set_option (Opt_pastableTabs);
222 set_option (Opt_intensityStyles, 1); 225 set_option (Opt_intensityStyles);
226 set_option (Opt_iso14755_52);
223 227
224 return true; 228 return true;
225} 229}
226 230
227void 231void
… …
315#if XFT 319#if XFT
316 if (rs[Rs_depth]) 320 if (rs[Rs_depth])
317 select_visual (strtol (rs[Rs_depth], 0, 0)); 321 select_visual (strtol (rs[Rs_depth], 0, 0));
318#endif 322#endif
319 323
324#ifdef HAVE_AFTERIMAGE
325 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
326#endif
320 free (r_argv); 327 free (r_argv);
321 328
322 for (int i = NUM_RESOURCES; i--; ) 329 for (int i = NUM_RESOURCES; i--; )
323 if (rs [i] == resval_undef) 330 if (rs [i] == resval_undef)
324 rs [i] = 0; 331 rs [i] = 0;
… …
428 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 435 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
429#endif 436#endif
430 437
431#ifdef XTERM_REVERSE_VIDEO 438#ifdef XTERM_REVERSE_VIDEO
432 /* this is how xterm implements reverseVideo */ 439 /* this is how xterm implements reverseVideo */
433 if (OPTION (Opt_reverseVideo)) 440 if (option (Opt_reverseVideo))
434 { 441 {
435 if (!rs[Rs_color + Color_fg]) 442 if (!rs[Rs_color + Color_fg])
436 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 443 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
437 444
438 if (!rs[Rs_color + Color_bg]) 445 if (!rs[Rs_color + Color_bg])
… …
444 if (!rs[Rs_color + i]) 451 if (!rs[Rs_color + i])
445 rs[Rs_color + i] = def_colorName[i]; 452 rs[Rs_color + i] = def_colorName[i];
446 453
447#ifndef XTERM_REVERSE_VIDEO 454#ifndef XTERM_REVERSE_VIDEO
448 /* this is how we implement reverseVideo */ 455 /* this is how we implement reverseVideo */
449 if (OPTION (Opt_reverseVideo)) 456 if (option (Opt_reverseVideo))
450 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 457 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
451#endif 458#endif
452 459
453 /* convenient aliases for setting fg/bg to colors */ 460 /* convenient aliases for setting fg/bg to colors */
454 color_aliases (Color_fg); 461 color_aliases (Color_fg);
… …
475/*----------------------------------------------------------------------*/ 482/*----------------------------------------------------------------------*/
476void 483void
477rxvt_term::init_env () 484rxvt_term::init_env ()
478{ 485{
479 int i; 486 int i;
480 unsigned int u;
481 char *val; 487 char *val;
482 488
483#ifdef DISPLAY_IS_IP 489#ifdef DISPLAY_IS_IP
484 /* Fixup display_name for export over pty to any interested terminal 490 /* Fixup display_name for export over pty to any interested terminal
485 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 491 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
628 * Initialize the command connection. 634 * Initialize the command connection.
629 * This should be called after the X server connection is established. 635 * This should be called after the X server connection is established.
630 */ 636 */
631 637
632#ifdef META8_OPTION 638#ifdef META8_OPTION
633 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 639 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
634#endif 640#endif
635 641
636 get_ourmods (); 642 get_ourmods ();
637 643
638 if (!OPTION (Opt_scrollTtyOutput)) 644 if (!option (Opt_scrollTtyOutput))
639 priv_modes |= PrivMode_TtyOutputInh; 645 priv_modes |= PrivMode_TtyOutputInh;
640 if (OPTION (Opt_scrollTtyKeypress)) 646 if (option (Opt_scrollTtyKeypress))
641 priv_modes |= PrivMode_Keypress; 647 priv_modes |= PrivMode_Keypress;
642 if (!OPTION (Opt_jumpScroll)) 648 if (!option (Opt_jumpScroll))
643 priv_modes |= PrivMode_smoothScroll; 649 priv_modes |= PrivMode_smoothScroll;
644 650
645#ifndef NO_BACKSPACE_KEY 651#ifndef NO_BACKSPACE_KEY
646 if (strcmp (key_backspace, "DEC") == 0) 652 if (strcmp (key_backspace, "DEC") == 0)
647 priv_modes |= PrivMode_HaveBackSpace; 653 priv_modes |= PrivMode_HaveBackSpace;
… …
677 rxvt_color xcol; 683 rxvt_color xcol;
678 684
679 if (!set_color (xcol, name)) 685 if (!set_color (xcol, name))
680 { 686 {
681#ifndef XTERM_REVERSE_VIDEO 687#ifndef XTERM_REVERSE_VIDEO
682 if (i < 2 && OPTION (Opt_reverseVideo)) 688 if (i < 2 && option (Opt_reverseVideo))
683 name = def_colorName [1 - i]; 689 name = def_colorName [1 - i];
684 else 690 else
685#endif 691#endif
686 name = def_colorName [i]; 692 name = def_colorName [i];
687 693
… …
878rxvt_term::create_windows (int argc, const char *const *argv) 884rxvt_term::create_windows (int argc, const char *const *argv)
879{ 885{
880 XClassHint classHint; 886 XClassHint classHint;
881 XWMHints wmHint; 887 XWMHints wmHint;
882#if ENABLE_FRILLS 888#if ENABLE_FRILLS
883 MWMHints mwmhints; 889 MWMHints mwmhints = { };
884#endif 890#endif
885 XGCValues gcvalue; 891 XGCValues gcvalue;
886 XSetWindowAttributes attributes; 892 XSetWindowAttributes attributes;
887 Window top, parent; 893 Window top, parent;
888 894
… …
894 if (!set_fonts ()) 900 if (!set_fonts ())
895 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 901 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
896 902
897 parent = display->root; 903 parent = display->root;
898 904
899 attributes.override_redirect = !!OPTION (Opt_override_redirect); 905 attributes.override_redirect = !!option (Opt_override_redirect);
900 906
901#if ENABLE_FRILLS 907#if ENABLE_FRILLS
902 if (OPTION (Opt_borderLess)) 908 if (option (Opt_borderLess))
903 { 909 {
904 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 910 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
905 { 911 {
906 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 912 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
907 attributes.override_redirect = true; 913 attributes.override_redirect = true;
908 mwmhints.flags = 0;
909 } 914 }
910 else 915 else
911 { 916 {
912 mwmhints.flags = MWM_HINTS_DECORATIONS; 917 mwmhints.flags = MWM_HINTS_DECORATIONS;
913 mwmhints.decorations = 0;
914 } 918 }
915 } 919 }
916 else
917 mwmhints.flags = 0;
918#endif 920#endif
919 921
920#if ENABLE_XEMBED 922#if ENABLE_XEMBED
921 if (rs[Rs_embed]) 923 if (rs[Rs_embed])
922 { 924 {
… …
957 classHint.res_name = (char *)rs[Rs_name]; 959 classHint.res_name = (char *)rs[Rs_name];
958 classHint.res_class = (char *)RESCLASS; 960 classHint.res_class = (char *)RESCLASS;
959 961
960 wmHint.flags = InputHint | StateHint | WindowGroupHint; 962 wmHint.flags = InputHint | StateHint | WindowGroupHint;
961 wmHint.input = True; 963 wmHint.input = True;
962 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 964 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
963 wmHint.window_group = top; 965 wmHint.window_group = top;
964 966
965 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 967 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
966 &szHint, &wmHint, &classHint); 968 &szHint, &wmHint, &classHint);
967 969
… …
1024 attributes.bit_gravity = NorthWestGravity; 1026 attributes.bit_gravity = NorthWestGravity;
1025 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); 1027 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1026 1028
1027 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1029 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1028 1030
1029 if (OPTION (Opt_pointerBlank)) 1031 if (option (Opt_pointerBlank))
1030 vt_emask |= PointerMotionMask; 1032 vt_emask |= PointerMotionMask;
1031 else 1033 else
1032 vt_emask |= Button1MotionMask | Button3MotionMask; 1034 vt_emask |= Button1MotionMask | Button3MotionMask;
1033 1035
1034 vt_select_input (); 1036 vt_select_input ();
1035 1037
1036 vt_ev.start (display, vt); 1038 vt_ev.start (display, vt);
1037
1038#ifdef XPM_BACKGROUND
1039 if (rs[Rs_backgroundPixmap] != NULL
1040 && !OPTION (Opt_transparent))
1041 {
1042 const char *p = rs[Rs_backgroundPixmap];
1043
1044 if ((p = strchr (p, ';')) != NULL)
1045 {
1046 p++;
1047 scale_pixmap (p);
1048 }
1049
1050 set_bgPixmap (rs[Rs_backgroundPixmap]);
1051 scr_touch (true);
1052 }
1053#endif
1054 1039
1055 /* graphics context for the vt window */ 1040 /* graphics context for the vt window */
1056 gcvalue.foreground = pix_colors[Color_fg]; 1041 gcvalue.foreground = pix_colors[Color_fg];
1057 gcvalue.background = pix_colors[Color_bg]; 1042 gcvalue.background = pix_colors[Color_bg];
1058 gcvalue.graphics_exposures = 0; 1043 gcvalue.graphics_exposures = 0;
… …
1329 } 1314 }
1330 1315
1331 _exit (EXIT_FAILURE); 1316 _exit (EXIT_FAILURE);
1332 1317
1333 default: 1318 default:
1334 if (!OPTION (Opt_utmpInhibit)) 1319 if (!option (Opt_utmpInhibit))
1335 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1320 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1336 1321
1337 pty->close_tty (); 1322 pty->close_tty ();
1338 1323
1339 child_ev.start (cmd_pid); 1324 child_ev.start (cmd_pid);
1340 1325
… …
1353int 1338int
1354rxvt_term::run_child (const char *const *argv) 1339rxvt_term::run_child (const char *const *argv)
1355{ 1340{
1356 char *login; 1341 char *login;
1357 1342
1358 if (OPTION (Opt_console)) 1343 if (option (Opt_console))
1359 { /* be virtual console, fail silently */ 1344 { /* be virtual console, fail silently */
1360#ifdef TIOCCONS 1345#ifdef TIOCCONS
1361 unsigned int on = 1; 1346 unsigned int on = 1;
1362 1347
1363 ioctl (STDIN_FILENO, TIOCCONS, &on); 1348 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1412 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1397 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1413 shell = "/bin/sh"; 1398 shell = "/bin/sh";
1414 1399
1415 argv0 = (const char *)rxvt_r_basename (shell); 1400 argv0 = (const char *)rxvt_r_basename (shell);
1416 1401
1417 if (OPTION (Opt_loginShell)) 1402 if (option (Opt_loginShell))
1418 { 1403 {
1419 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1404 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1420 1405
1421 login[0] = '-'; 1406 login[0] = '-';
1422 strcpy (&login[1], argv0); 1407 strcpy (&login[1], argv0);

Diff Legend

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