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.177 by root, Sat Jan 20 00:45:30 2007 UTC vs.
Revision 1.208 by ayin, Mon Sep 3 08:48:00 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 = 50; 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);
314 328
315 for (int i = NUM_RESOURCES; i--; ) 329 for (int i = NUM_RESOURCES; i--; )
316 if (rs [i] == resval_undef) 330 if (rs [i] == resval_undef)
317 rs [i] = 0; 331 rs [i] = 0;
… …
421 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]);
422#endif 436#endif
423 437
424#ifdef XTERM_REVERSE_VIDEO 438#ifdef XTERM_REVERSE_VIDEO
425 /* this is how xterm implements reverseVideo */ 439 /* this is how xterm implements reverseVideo */
426 if (OPTION (Opt_reverseVideo)) 440 if (option (Opt_reverseVideo))
427 { 441 {
428 if (!rs[Rs_color + Color_fg]) 442 if (!rs[Rs_color + Color_fg])
429 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 443 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
430 444
431 if (!rs[Rs_color + Color_bg]) 445 if (!rs[Rs_color + Color_bg])
… …
437 if (!rs[Rs_color + i]) 451 if (!rs[Rs_color + i])
438 rs[Rs_color + i] = def_colorName[i]; 452 rs[Rs_color + i] = def_colorName[i];
439 453
440#ifndef XTERM_REVERSE_VIDEO 454#ifndef XTERM_REVERSE_VIDEO
441 /* this is how we implement reverseVideo */ 455 /* this is how we implement reverseVideo */
442 if (OPTION (Opt_reverseVideo)) 456 if (option (Opt_reverseVideo))
443 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 457 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
444#endif 458#endif
445 459
446 /* convenient aliases for setting fg/bg to colors */ 460 /* convenient aliases for setting fg/bg to colors */
447 color_aliases (Color_fg); 461 color_aliases (Color_fg);
… …
468/*----------------------------------------------------------------------*/ 482/*----------------------------------------------------------------------*/
469void 483void
470rxvt_term::init_env () 484rxvt_term::init_env ()
471{ 485{
472 int i; 486 int i;
473 unsigned int u;
474 char *val; 487 char *val;
475 488
476#ifdef DISPLAY_IS_IP 489#ifdef DISPLAY_IS_IP
477 /* Fixup display_name for export over pty to any interested terminal 490 /* Fixup display_name for export over pty to any interested terminal
478 * 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
… …
493 506
494 if (rs[Rs_display_name] == NULL) 507 if (rs[Rs_display_name] == NULL)
495 rs[Rs_display_name] = val; /* use broken `:0' value */ 508 rs[Rs_display_name] = val; /* use broken `:0' value */
496 509
497 i = strlen (val); 510 i = strlen (val);
498 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 511 env_display = (char *)rxvt_malloc (i + 9);
499 512
500 sprintf (env_display, "DISPLAY=%s", val); 513 sprintf (env_display, "DISPLAY=%s", val);
501 514
502 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 515 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
503 516
… …
524 else 537 else
525 putenv ("COLORTERM=" COLORTERMENVFULL); 538 putenv ("COLORTERM=" COLORTERMENVFULL);
526 539
527 if (rs[Rs_term_name] != NULL) 540 if (rs[Rs_term_name] != NULL)
528 { 541 {
529 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 542 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
530 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 543 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
531 putenv (env_term); 544 putenv (env_term);
532 } 545 }
533 else 546 else
534 putenv ("TERM=" TERMENV); 547 putenv ("TERM=" TERMENV);
… …
621 * Initialize the command connection. 634 * Initialize the command connection.
622 * This should be called after the X server connection is established. 635 * This should be called after the X server connection is established.
623 */ 636 */
624 637
625#ifdef META8_OPTION 638#ifdef META8_OPTION
626 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 639 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
627#endif 640#endif
628 641
629 get_ourmods (); 642 get_ourmods ();
630 643
631 if (!OPTION (Opt_scrollTtyOutput)) 644 if (!option (Opt_scrollTtyOutput))
632 priv_modes |= PrivMode_TtyOutputInh; 645 priv_modes |= PrivMode_TtyOutputInh;
633 if (OPTION (Opt_scrollTtyKeypress)) 646 if (option (Opt_scrollTtyKeypress))
634 priv_modes |= PrivMode_Keypress; 647 priv_modes |= PrivMode_Keypress;
635 if (!OPTION (Opt_jumpScroll)) 648 if (!option (Opt_jumpScroll))
636 priv_modes |= PrivMode_smoothScroll; 649 priv_modes |= PrivMode_smoothScroll;
637 650
638#ifndef NO_BACKSPACE_KEY 651#ifndef NO_BACKSPACE_KEY
639 if (strcmp (key_backspace, "DEC") == 0) 652 if (strcmp (key_backspace, "DEC") == 0)
640 priv_modes |= PrivMode_HaveBackSpace; 653 priv_modes |= PrivMode_HaveBackSpace;
… …
670 rxvt_color xcol; 683 rxvt_color xcol;
671 684
672 if (!set_color (xcol, name)) 685 if (!set_color (xcol, name))
673 { 686 {
674#ifndef XTERM_REVERSE_VIDEO 687#ifndef XTERM_REVERSE_VIDEO
675 if (i < 2 && OPTION (Opt_reverseVideo)) 688 if (i < 2 && option (Opt_reverseVideo))
676 name = def_colorName [1 - i]; 689 name = def_colorName [1 - i];
677 else 690 else
678#endif 691#endif
679 name = def_colorName [i]; 692 name = def_colorName [i];
680 693
… …
871rxvt_term::create_windows (int argc, const char *const *argv) 884rxvt_term::create_windows (int argc, const char *const *argv)
872{ 885{
873 XClassHint classHint; 886 XClassHint classHint;
874 XWMHints wmHint; 887 XWMHints wmHint;
875#if ENABLE_FRILLS 888#if ENABLE_FRILLS
876 MWMHints mwmhints; 889 MWMHints mwmhints = { };
877#endif 890#endif
878 XGCValues gcvalue; 891 XGCValues gcvalue;
879 XSetWindowAttributes attributes; 892 XSetWindowAttributes attributes;
880 Window top, parent; 893 Window top, parent;
881 894
… …
887 if (!set_fonts ()) 900 if (!set_fonts ())
888 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");
889 902
890 parent = display->root; 903 parent = display->root;
891 904
892 attributes.override_redirect = !!OPTION (Opt_override_redirect); 905 attributes.override_redirect = !!option (Opt_override_redirect);
893 906
894#if ENABLE_FRILLS 907#if ENABLE_FRILLS
895 if (OPTION (Opt_borderLess)) 908 if (option (Opt_borderLess))
896 { 909 {
897 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 910 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
898 { 911 {
899 /* 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");
900 attributes.override_redirect = true; 913 attributes.override_redirect = true;
901 mwmhints.flags = 0;
902 } 914 }
903 else 915 else
904 { 916 {
905 mwmhints.flags = MWM_HINTS_DECORATIONS; 917 mwmhints.flags = MWM_HINTS_DECORATIONS;
906 mwmhints.decorations = 0;
907 } 918 }
908 } 919 }
909 else
910 mwmhints.flags = 0;
911#endif 920#endif
912 921
913#if ENABLE_XEMBED 922#if ENABLE_XEMBED
914 if (rs[Rs_embed]) 923 if (rs[Rs_embed])
915 { 924 {
… …
950 classHint.res_name = (char *)rs[Rs_name]; 959 classHint.res_name = (char *)rs[Rs_name];
951 classHint.res_class = (char *)RESCLASS; 960 classHint.res_class = (char *)RESCLASS;
952 961
953 wmHint.flags = InputHint | StateHint | WindowGroupHint; 962 wmHint.flags = InputHint | StateHint | WindowGroupHint;
954 wmHint.input = True; 963 wmHint.input = True;
955 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 964 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
956 wmHint.window_group = top; 965 wmHint.window_group = top;
957 966
958 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 967 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
959 &szHint, &wmHint, &classHint); 968 &szHint, &wmHint, &classHint);
960 969
… …
1017 attributes.bit_gravity = NorthWestGravity; 1026 attributes.bit_gravity = NorthWestGravity;
1018 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); 1027 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1019 1028
1020 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1029 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1021 1030
1022 if (OPTION (Opt_pointerBlank)) 1031 if (option (Opt_pointerBlank))
1023 vt_emask |= PointerMotionMask; 1032 vt_emask |= PointerMotionMask;
1024 else 1033 else
1025 vt_emask |= Button1MotionMask | Button3MotionMask; 1034 vt_emask |= Button1MotionMask | Button3MotionMask;
1026 1035
1027 vt_select_input (); 1036 vt_select_input ();
1028 1037
1029 vt_ev.start (display, vt); 1038 vt_ev.start (display, vt);
1030
1031#ifdef XPM_BACKGROUND
1032 if (rs[Rs_backgroundPixmap] != NULL
1033 && !OPTION (Opt_transparent))
1034 {
1035 const char *p = rs[Rs_backgroundPixmap];
1036
1037 if ((p = strchr (p, ';')) != NULL)
1038 {
1039 p++;
1040 scale_pixmap (p);
1041 }
1042
1043 set_bgPixmap (rs[Rs_backgroundPixmap]);
1044 scr_touch (true);
1045 }
1046#endif
1047 1039
1048 /* graphics context for the vt window */ 1040 /* graphics context for the vt window */
1049 gcvalue.foreground = pix_colors[Color_fg]; 1041 gcvalue.foreground = pix_colors[Color_fg];
1050 gcvalue.background = pix_colors[Color_bg]; 1042 gcvalue.background = pix_colors[Color_bg];
1051 gcvalue.graphics_exposures = 0; 1043 gcvalue.graphics_exposures = 0;
… …
1277 else 1269 else
1278#endif 1270#endif
1279 er = -1; 1271 er = -1;
1280 1272
1281 rxvt_get_ttymode (&tio, er); 1273 rxvt_get_ttymode (&tio, er);
1274 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1282 pty->set_utf8_mode (enc_utf8); 1275 pty->set_utf8_mode (enc_utf8);
1283 SET_TTYMODE (pty->tty, &tio); /* init terminal attributes */
1284 1276
1285 /* set initial window size */ 1277 /* set initial window size */
1286 tt_winch (); 1278 tt_winch ();
1287 1279
1288#if ENABLE_FRILLS 1280#if ENABLE_FRILLS
… …
1322 } 1314 }
1323 1315
1324 _exit (EXIT_FAILURE); 1316 _exit (EXIT_FAILURE);
1325 1317
1326 default: 1318 default:
1327 if (!OPTION (Opt_utmpInhibit)) 1319 if (!option (Opt_utmpInhibit))
1328 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1320 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1329 1321
1330 pty->close_tty (); 1322 pty->close_tty ();
1331 1323
1332 child_ev.start (cmd_pid); 1324 child_ev.start (cmd_pid);
1333 1325
… …
1346int 1338int
1347rxvt_term::run_child (const char *const *argv) 1339rxvt_term::run_child (const char *const *argv)
1348{ 1340{
1349 char *login; 1341 char *login;
1350 1342
1351 if (OPTION (Opt_console)) 1343 if (option (Opt_console))
1352 { /* be virtual console, fail silently */ 1344 { /* be virtual console, fail silently */
1353#ifdef TIOCCONS 1345#ifdef TIOCCONS
1354 unsigned int on = 1; 1346 unsigned int on = 1;
1355 1347
1356 ioctl (STDIN_FILENO, TIOCCONS, &on); 1348 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1405 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1397 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1406 shell = "/bin/sh"; 1398 shell = "/bin/sh";
1407 1399
1408 argv0 = (const char *)rxvt_r_basename (shell); 1400 argv0 = (const char *)rxvt_r_basename (shell);
1409 1401
1410 if (OPTION (Opt_loginShell)) 1402 if (option (Opt_loginShell))
1411 { 1403 {
1412 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1404 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1413 1405
1414 login[0] = '-'; 1406 login[0] = '-';
1415 strcpy (&login[1], argv0); 1407 strcpy (&login[1], argv0);
1416 argv0 = login; 1408 argv0 = login;
1417 } 1409 }

Diff Legend

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