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.165 by root, Tue Jan 31 19:11:43 2006 UTC vs.
Revision 1.209 by ayin, Sat Sep 8 20:54:50 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: init.C 2 * File: init.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
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
… …
258 int i, r_argc; 269 int i, r_argc;
259 char *val; 270 char *val;
260 const char **cmd_argv, **r_argv; 271 const char **cmd_argv, **r_argv;
261 272
262 /* 273 /*
263 * Look for -exec option. Find => split and make cmd_argv[] of command args 274 * Look for -e option. Find => split and make cmd_argv[] of command args
264 */ 275 */
265 for (r_argc = 0; r_argc < argc; r_argc++) 276 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 277 if (!strcmp (argv[r_argc], "-e"))
267 break; 278 break;
268 279
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 280 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270 281
271 for (i = 0; i < r_argc; i++) 282 for (i = 0; i < r_argc; i++)
… …
297 get_options (r_argc, r_argv); 308 get_options (r_argc, r_argv);
298 309
299 if (!(display = displays.get (rs[Rs_display_name]))) 310 if (!(display = displays.get (rs[Rs_display_name])))
300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 311 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
301 312
313 // using a local pointer decreases code size a lot
302 xa = display->xa; 314 xa = display->xa;
315
316 set (display);
317 extract_resources ();
303 318
304#if XFT 319#if XFT
305 if (rs[Rs_depth]) 320 if (rs[Rs_depth])
306 set (display, strtol (rs[Rs_depth], 0, 0)); 321 select_visual (strtol (rs[Rs_depth], 0, 0));
307 else
308#endif 322#endif
309 set (display);
310 323
311 extract_resources (); 324#ifdef HAVE_AFTERIMAGE
312 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 for (int i = NUM_RESOURCES; i--; )
330 if (rs [i] == resval_undef)
331 rs [i] = 0;
314 332
315#if ENABLE_PERL 333#if ENABLE_PERL
316 if (!rs[Rs_perl_ext_1]) 334 if (!rs[Rs_perl_ext_1])
317 rs[Rs_perl_ext_1] = "default"; 335 rs[Rs_perl_ext_1] = "default";
318 336
… …
384 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 402 key_backspace = "DEC"; /* can toggle between \010 or \177 */
385# endif 403# endif
386 else 404 else
387 { 405 {
388 val = strdup (rs[Rs_backspace_key]); 406 val = strdup (rs[Rs_backspace_key]);
389 rxvt_Str_trim (val);
390 rxvt_Str_escaped (val);
391 key_backspace = val; 407 key_backspace = val;
392 } 408 }
393#endif 409#endif
394 410
395#ifndef NO_DELETE_KEY 411#ifndef NO_DELETE_KEY
… …
400 key_delete = "\033[3~"; 416 key_delete = "\033[3~";
401# endif 417# endif
402 else 418 else
403 { 419 {
404 val = strdup (rs[Rs_delete_key]); 420 val = strdup (rs[Rs_delete_key]);
405 rxvt_Str_trim (val);
406 rxvt_Str_escaped (val);
407 key_delete = val; 421 key_delete = val;
408 } 422 }
409#endif 423#endif
410 if (rs[Rs_answerbackstring])
411 {
412 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
413 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
414 }
415 424
416#ifdef HAVE_SCROLLBARS 425#ifdef HAVE_SCROLLBARS
417 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 426 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
418#endif 427#endif
419 428
420#ifdef XTERM_REVERSE_VIDEO 429#ifdef XTERM_REVERSE_VIDEO
421 /* this is how xterm implements reverseVideo */ 430 /* this is how xterm implements reverseVideo */
422 if (OPTION (Opt_reverseVideo)) 431 if (option (Opt_reverseVideo))
423 { 432 {
424 if (!rs[Rs_color + Color_fg]) 433 if (!rs[Rs_color + Color_fg])
425 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 434 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
426 435
427 if (!rs[Rs_color + Color_bg]) 436 if (!rs[Rs_color + Color_bg])
… …
433 if (!rs[Rs_color + i]) 442 if (!rs[Rs_color + i])
434 rs[Rs_color + i] = def_colorName[i]; 443 rs[Rs_color + i] = def_colorName[i];
435 444
436#ifndef XTERM_REVERSE_VIDEO 445#ifndef XTERM_REVERSE_VIDEO
437 /* this is how we implement reverseVideo */ 446 /* this is how we implement reverseVideo */
438 if (OPTION (Opt_reverseVideo)) 447 if (option (Opt_reverseVideo))
439 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 448 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
440#endif 449#endif
441 450
442 /* convenient aliases for setting fg/bg to colors */ 451 /* convenient aliases for setting fg/bg to colors */
443 color_aliases (Color_fg); 452 color_aliases (Color_fg);
… …
464/*----------------------------------------------------------------------*/ 473/*----------------------------------------------------------------------*/
465void 474void
466rxvt_term::init_env () 475rxvt_term::init_env ()
467{ 476{
468 int i; 477 int i;
469 unsigned int u;
470 char *val; 478 char *val;
471 479
472#ifdef DISPLAY_IS_IP 480#ifdef DISPLAY_IS_IP
473 /* Fixup display_name for export over pty to any interested terminal 481 /* Fixup display_name for export over pty to any interested terminal
474 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 482 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
483 val = rxvt_network_display (rs[Rs_display_name]); 491 val = rxvt_network_display (rs[Rs_display_name]);
484 rs[Rs_display_name] = (const char *)val; 492 rs[Rs_display_name] = (const char *)val;
485 493
486 if (val == NULL) 494 if (val == NULL)
487#endif /* DISPLAY_IS_IP */ 495#endif /* DISPLAY_IS_IP */
488 val = XDisplayString (xdisp); 496 val = XDisplayString (dpy);
489 497
490 if (rs[Rs_display_name] == NULL) 498 if (rs[Rs_display_name] == NULL)
491 rs[Rs_display_name] = val; /* use broken `:0' value */ 499 rs[Rs_display_name] = val; /* use broken `:0' value */
492 500
493 i = strlen (val); 501 i = strlen (val);
494 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 502 env_display = (char *)rxvt_malloc (i + 9);
495 503
496 sprintf (env_display, "DISPLAY=%s", val); 504 sprintf (env_display, "DISPLAY=%s", val);
497 505
498 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 506 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
499 507
… …
520 else 528 else
521 putenv ("COLORTERM=" COLORTERMENVFULL); 529 putenv ("COLORTERM=" COLORTERMENVFULL);
522 530
523 if (rs[Rs_term_name] != NULL) 531 if (rs[Rs_term_name] != NULL)
524 { 532 {
525 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 533 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
526 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 534 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
527 putenv (env_term); 535 putenv (env_term);
528 } 536 }
529 else 537 else
530 putenv ("TERM=" TERMENV); 538 putenv ("TERM=" TERMENV);
… …
617 * Initialize the command connection. 625 * Initialize the command connection.
618 * This should be called after the X server connection is established. 626 * This should be called after the X server connection is established.
619 */ 627 */
620 628
621#ifdef META8_OPTION 629#ifdef META8_OPTION
622 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 630 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
623#endif 631#endif
624 632
625 get_ourmods (); 633 get_ourmods ();
626 634
627 if (!OPTION (Opt_scrollTtyOutput)) 635 if (!option (Opt_scrollTtyOutput))
628 priv_modes |= PrivMode_TtyOutputInh; 636 priv_modes |= PrivMode_TtyOutputInh;
629 if (OPTION (Opt_scrollTtyKeypress)) 637 if (option (Opt_scrollTtyKeypress))
630 priv_modes |= PrivMode_Keypress; 638 priv_modes |= PrivMode_Keypress;
631 if (!OPTION (Opt_jumpScroll)) 639 if (!option (Opt_jumpScroll))
632 priv_modes |= PrivMode_smoothScroll; 640 priv_modes |= PrivMode_smoothScroll;
633 641
634#ifndef NO_BACKSPACE_KEY 642#ifndef NO_BACKSPACE_KEY
635 if (strcmp (key_backspace, "DEC") == 0) 643 if (strcmp (key_backspace, "DEC") == 0)
636 priv_modes |= PrivMode_HaveBackSpace; 644 priv_modes |= PrivMode_HaveBackSpace;
… …
666 rxvt_color xcol; 674 rxvt_color xcol;
667 675
668 if (!set_color (xcol, name)) 676 if (!set_color (xcol, name))
669 { 677 {
670#ifndef XTERM_REVERSE_VIDEO 678#ifndef XTERM_REVERSE_VIDEO
671 if (i < 2 && OPTION (Opt_reverseVideo)) 679 if (i < 2 && option (Opt_reverseVideo))
672 name = def_colorName [1 - i]; 680 name = def_colorName [1 - i];
673 else 681 else
674#endif 682#endif
675 name = def_colorName [i]; 683 name = def_colorName [i];
676 684
… …
689#ifndef NO_CURSORCOLOR 697#ifndef NO_CURSORCOLOR
690 case Color_cursor2: 698 case Color_cursor2:
691#endif 699#endif
692 case Color_pointer_fg: 700 case Color_pointer_fg:
693 name = rs[Rs_color + Color_fg]; 701 name = rs[Rs_color + Color_fg];
694 xcol = pix_colors[Color_fg]; 702 xcol.set (this, name);
695 break; 703 break;
696 default: 704 default:
697 name = rs[Rs_color + Color_bg]; 705 name = rs[Rs_color + Color_bg];
698 xcol = pix_colors[Color_bg]; 706 xcol.set (this, name);
699 break; 707 break;
700 } 708 }
701 } 709 }
702 } 710 }
703 711
704 pix_colors[i] = xcol; 712 pix_colors[i] = xcol;
705 rs[Rs_color + i] = name; 713 rs[Rs_color + i] = name;
706 } 714 }
707 715
708#ifdef OFF_FOCUS_FADING
709 if (rs[Rs_fade])
710 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
711 {
712 rgba c;
713 pix_colors[Color_fade].get (this, c);
714 pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
715 }
716#endif
717
718 if (depth <= 2) 716 if (depth <= 2)
719 { 717 {
720 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 718 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
721 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 719 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
722 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 720 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
723 } 721 }
724 722
725 /* 723 /*
726 * get scrollBar shadow colors 724 * get scrollBar shadow colors
727 * 725 *
728 * The calculations of topShadow/bottomShadow values are adapted 726 * The calculations of topShadow/bottomShadow values are adapted
729 * from the fvwm window manager. 727 * from the fvwm window manager.
730 */ 728 */
731#ifdef KEEP_SCROLLCOLOR 729#ifdef KEEP_SCROLLCOLOR
732
733 if (depth <= 2) 730 if (depth <= 2)
734 { 731 {
735 /* Monochrome */ 732 /* Monochrome */
736 pix_colors[Color_scroll] = pix_colors[Color_fg]; 733 alias_color (Color_scroll, Color_fg);
737 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 734 alias_color (Color_topShadow, Color_bg);
738 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 735 alias_color (Color_bottomShadow, Color_bg);
739 } 736 }
740 else 737 else
741 { 738 {
742 rxvt_color xcol[2]; 739 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
743 /* xcol[0] == white
744 * xcol[1] == top shadow
745 * xcol[2] == bot shadow */
746 740
747 xcol[1] = pix_colors[Color_scroll];
748 xcol[0].set (this, rgba (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC));
749
750 rgba c0, c1; 741 rgba cscroll;
751 742 pix_colors [Color_scroll].get (cscroll);
752 xcol[0].get (this, c0);
753 xcol[1].get (this, c1);
754
755 xcol[1].fade (this, 50, pix_colors[Color_bottomShadow]);
756 743
757 /* topShadowColor */ 744 /* topShadowColor */
758 if (!xcol[1].set (this, 745 if (!pix_colors[Color_topShadow].set (this,
759 rgba ( 746 rgba (
760 min (c0.r, max (c1.r / 5, c1.r) * 7 / 5), 747 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
761 min (c0.g, max (c1.g / 5, c1.g) * 7 / 5), 748 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
762 min (c0.b, max (c1.b / 5, c1.b) * 7 / 5), 749 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
763 c1.a) // pa1 vs. pa0: arbitrary 750 cscroll.a)
764 )); 751 ))
765 xcol[1] = pix_colors[Color_White]; 752 alias_color (Color_topShadow, Color_White);
766
767 pix_colors[Color_topShadow] = xcol[1];
768 } 753 }
769#endif /* KEEP_SCROLLCOLOR */ 754#endif /* KEEP_SCROLLCOLOR */
755
756#ifdef OFF_FOCUS_FADING
757 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
758 update_fade_color (i);
759#endif
770} 760}
771 761
772/*----------------------------------------------------------------------*/ 762/*----------------------------------------------------------------------*/
773/* color aliases, fg/bg bright-bold */ 763/* color aliases, fg/bg bright-bold */
774void 764void
… …
813 803
814 if (rsmod 804 if (rsmod
815 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 805 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
816 requestedmeta = rsmod[3] - '0'; 806 requestedmeta = rsmod[3] - '0';
817 807
818 map = XGetModifierMapping (xdisp); 808 map = XGetModifierMapping (dpy);
819 kc = map->modifiermap; 809 kc = map->modifiermap;
820 810
821 for (i = 1; i < 6; i++) 811 for (i = 1; i < 6; i++)
822 { 812 {
823 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 813 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
825 for (j = map->max_keypermod; j--; k++) 815 for (j = map->max_keypermod; j--; k++)
826 { 816 {
827 if (kc[k] == 0) 817 if (kc[k] == 0)
828 break; 818 break;
829 819
830 switch (XKeycodeToKeysym (xdisp, kc[k], 0)) 820 switch (XKeycodeToKeysym (dpy, kc[k], 0))
831 { 821 {
832 case XK_Num_Lock: 822 case XK_Num_Lock:
833 ModNumLockMask = modmasks[i - 1]; 823 ModNumLockMask = modmasks[i - 1];
834 continue; 824 continue;
835 825
… …
885rxvt_term::create_windows (int argc, const char *const *argv) 875rxvt_term::create_windows (int argc, const char *const *argv)
886{ 876{
887 XClassHint classHint; 877 XClassHint classHint;
888 XWMHints wmHint; 878 XWMHints wmHint;
889#if ENABLE_FRILLS 879#if ENABLE_FRILLS
890 MWMHints mwmhints; 880 MWMHints mwmhints = { };
891#endif 881#endif
892 XGCValues gcvalue; 882 XGCValues gcvalue;
893 XSetWindowAttributes attributes; 883 XSetWindowAttributes attributes;
894 Window top, parent; 884 Window top, parent;
895 885
896 dLocal (Display *, xdisp); 886 dLocal (Display *, dpy);
897 887
898 /* grab colors before netscape does */ 888 /* grab colors before netscape does */
899 Get_Colours (); 889 Get_Colours ();
900 890
901 if (!set_fonts ()) 891 if (!set_fonts ())
902 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 892 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
903 893
904 parent = display->root; 894 parent = display->root;
905 895
906 attributes.override_redirect = !!OPTION (Opt_override_redirect); 896 attributes.override_redirect = !!option (Opt_override_redirect);
907 897
908#if ENABLE_FRILLS 898#if ENABLE_FRILLS
909 if (OPTION (Opt_borderLess)) 899 if (option (Opt_borderLess))
910 { 900 {
911 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None) 901 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
912 { 902 {
913 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 903 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
914 attributes.override_redirect = true; 904 attributes.override_redirect = true;
915 mwmhints.flags = 0;
916 } 905 }
917 else 906 else
918 { 907 {
919 mwmhints.flags = MWM_HINTS_DECORATIONS; 908 mwmhints.flags = MWM_HINTS_DECORATIONS;
920 mwmhints.decorations = 0;
921 } 909 }
922 } 910 }
923 else
924 mwmhints.flags = 0;
925#endif 911#endif
926 912
927#if ENABLE_XEMBED 913#if ENABLE_XEMBED
928 if (rs[Rs_embed]) 914 if (rs[Rs_embed])
929 { 915 {
930 XWindowAttributes wattr; 916 XWindowAttributes wattr;
931 917
932 parent = strtol (rs[Rs_embed], 0, 0); 918 parent = strtol (rs[Rs_embed], 0, 0);
933 919
934 if (!XGetWindowAttributes (xdisp, parent, &wattr)) 920 if (!XGetWindowAttributes (dpy, parent, &wattr))
935 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 921 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
936 922
937 window_calc (wattr.width, wattr.height); 923 window_calc (wattr.width, wattr.height);
938 } 924 }
939#endif 925#endif
… …
943 /* sub-window placement & size in rxvt_resize_subwindows () */ 929 /* sub-window placement & size in rxvt_resize_subwindows () */
944 attributes.background_pixel = pix_colors_focused [Color_border]; 930 attributes.background_pixel = pix_colors_focused [Color_border];
945 attributes.border_pixel = pix_colors_focused [Color_border]; 931 attributes.border_pixel = pix_colors_focused [Color_border];
946 attributes.colormap = cmap; 932 attributes.colormap = cmap;
947 933
948 top = XCreateWindow (xdisp, parent, 934 top = XCreateWindow (dpy, parent,
949 szHint.x, szHint.y, 935 szHint.x, szHint.y,
950 szHint.width, szHint.height, 936 szHint.width, szHint.height,
951 ext_bwidth, 937 ext_bwidth,
952 depth, InputOutput, visual, 938 depth, InputOutput, visual,
953 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 939 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
… …
964 classHint.res_name = (char *)rs[Rs_name]; 950 classHint.res_name = (char *)rs[Rs_name];
965 classHint.res_class = (char *)RESCLASS; 951 classHint.res_class = (char *)RESCLASS;
966 952
967 wmHint.flags = InputHint | StateHint | WindowGroupHint; 953 wmHint.flags = InputHint | StateHint | WindowGroupHint;
968 wmHint.input = True; 954 wmHint.input = True;
969 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 955 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
970 wmHint.window_group = top; 956 wmHint.window_group = top;
971 957
972 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc, 958 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
973 &szHint, &wmHint, &classHint); 959 &szHint, &wmHint, &classHint);
974 960
975#if ENABLE_FRILLS 961#if ENABLE_FRILLS
976 if (mwmhints.flags) 962 if (mwmhints.flags)
977 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 963 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
978 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 964 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
979#endif 965#endif
980 966
981 Atom protocols[] = { 967 Atom protocols[] = {
982 xa[XA_WM_DELETE_WINDOW], 968 xa[XA_WM_DELETE_WINDOW],
983#if ENABLE_EWMH 969#if ENABLE_EWMH
984 xa[XA_NET_WM_PING], 970 xa[XA_NET_WM_PING],
985#endif 971#endif
986 }; 972 };
987 973
988 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 974 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
989 975
990#if ENABLE_FRILLS 976#if ENABLE_FRILLS
991 if (rs[Rs_transient_for]) 977 if (rs[Rs_transient_for])
992 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 978 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
993#endif 979#endif
994 980
995#if ENABLE_EWMH 981#if ENABLE_EWMH
996 long pid = getpid (); 982 long pid = getpid ();
997 983
998 XChangeProperty (xdisp, top, 984 XChangeProperty (dpy, top,
999 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 985 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1000 PropModeReplace, (unsigned char *)&pid, 1); 986 PropModeReplace, (unsigned char *)&pid, 1);
1001 987
1002 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 988 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1003#endif 989#endif
1004 990
1005 XSelectInput (xdisp, top, 991 XSelectInput (dpy, top,
1006 KeyPressMask 992 KeyPressMask
1007#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 993#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1008 | KeyReleaseMask 994 | KeyReleaseMask
1009#endif 995#endif
1010 | FocusChangeMask | VisibilityChangeMask 996 | FocusChangeMask | VisibilityChangeMask
1011 | ExposureMask | StructureNotifyMask); 997 | ExposureMask | StructureNotifyMask);
1012 998
1013 termwin_ev.start (display, top); 999 termwin_ev.start (display, top);
1014 1000
1015 /* vt cursor: Black-on-White is standard, but this is more popular */ 1001 /* vt cursor: Black-on-White is standard, but this is more popular */
1016 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm); 1002 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1017 1003
1018#ifdef HAVE_SCROLLBARS 1004#ifdef HAVE_SCROLLBARS
1019 /* cursor scrollBar: Black-on-White */ 1005 /* cursor scrollBar: Black-on-White */
1020 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr); 1006 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1021#endif 1007#endif
1022 1008
1023 /* the vt window */ 1009 /* the vt window */
1024 vt = XCreateSimpleWindow (xdisp, top, 1010 vt = XCreateSimpleWindow (dpy, top,
1025 window_vt_x, window_vt_y, 1011 window_vt_x, window_vt_y,
1026 width, height, 1012 width, height,
1027 0, 1013 0,
1028 pix_colors_focused[Color_fg], 1014 pix_colors_focused[Color_fg],
1029 pix_colors_focused[Color_bg]); 1015 pix_colors_focused[Color_bg]);
1030 1016
1031 attributes.bit_gravity = NorthWestGravity; 1017 attributes.bit_gravity = NorthWestGravity;
1032 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes); 1018 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1033 1019
1034 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1020 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1035 1021
1036 if (OPTION (Opt_pointerBlank)) 1022 if (option (Opt_pointerBlank))
1037 vt_emask |= PointerMotionMask; 1023 vt_emask |= PointerMotionMask;
1038 else 1024 else
1039 vt_emask |= Button1MotionMask | Button3MotionMask; 1025 vt_emask |= Button1MotionMask | Button3MotionMask;
1040 1026
1041 vt_select_input (); 1027 vt_select_input ();
1042 1028
1043 vt_ev.start (display, vt); 1029 vt_ev.start (display, vt);
1044 1030
1045#ifdef XPM_BACKGROUND
1046 if (rs[Rs_backgroundPixmap] != NULL
1047 && !OPTION (Opt_transparent))
1048 {
1049 const char *p = rs[Rs_backgroundPixmap];
1050
1051 if ((p = strchr (p, ';')) != NULL)
1052 {
1053 p++;
1054 scale_pixmap (p);
1055 }
1056
1057 set_bgPixmap (rs[Rs_backgroundPixmap]);
1058 scr_touch (true);
1059 }
1060#endif
1061
1062 /* graphics context for the vt window */ 1031 /* graphics context for the vt window */
1063 gcvalue.foreground = pix_colors[Color_fg]; 1032 gcvalue.foreground = pix_colors[Color_fg];
1064 gcvalue.background = pix_colors[Color_bg]; 1033 gcvalue.background = pix_colors[Color_bg];
1065 gcvalue.graphics_exposures = 1; 1034 gcvalue.graphics_exposures = 0;
1066 1035
1067 gc = XCreateGC (xdisp, vt, 1036 gc = XCreateGC (dpy, vt,
1068 GCForeground | GCBackground | GCGraphicsExposures, 1037 GCForeground | GCBackground | GCGraphicsExposures,
1069 &gcvalue); 1038 &gcvalue);
1070 1039
1071 drawable = new rxvt_drawable (this, vt); 1040 drawable = new rxvt_drawable (this, vt);
1072 1041
1073#ifdef RXVT_SCROLLBAR 1042#ifdef RXVT_SCROLLBAR
1074 gcvalue.foreground = pix_colors[Color_topShadow]; 1043 gcvalue.foreground = pix_colors[Color_topShadow];
1075 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1044 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1076 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1045 gcvalue.foreground = pix_colors[Color_bottomShadow];
1077 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1046 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1078 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)]; 1047 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1079 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1048 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1080#endif 1049#endif
1081 1050
1082#ifdef OFF_FOCUS_FADING 1051#ifdef OFF_FOCUS_FADING
1083 // initially we are in unfocused state 1052 // initially we are in unfocused state
1084 if (rs[Rs_fade]) 1053 if (rs[Rs_fade])
… …
1093 * GET TTY CURRENT STATE * 1062 * GET TTY CURRENT STATE *
1094 * ------------------------------------------------------------------------- */ 1063 * ------------------------------------------------------------------------- */
1095void 1064void
1096rxvt_get_ttymode (ttymode_t *tio, int erase) 1065rxvt_get_ttymode (ttymode_t *tio, int erase)
1097{ 1066{
1098#ifdef HAVE_TERMIOS_H
1099 /* 1067 /*
1100 * standard System V termios interface 1068 * standard System V termios interface
1101 */ 1069 */
1102 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1070 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1103 { 1071 {
… …
1170 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1138 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1171# if defined (ECHOCTL) && defined (ECHOKE) 1139# if defined (ECHOCTL) && defined (ECHOKE)
1172 | ECHOCTL | ECHOKE 1140 | ECHOCTL | ECHOKE
1173# endif 1141# endif
1174 | ECHOE | ECHOK); 1142 | ECHOE | ECHOK);
1175# else /* HAVE_TERMIOS_H */
1176
1177 /*
1178 * sgtty interface
1179 */
1180
1181 /* get parameters -- gtty */
1182 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1183 {
1184 tio->sg.sg_erase = CERASE; /* ^H */
1185 tio->sg.sg_kill = CKILL; /* ^U */
1186 }
1187
1188 if (erase != -1)
1189 tio->sg.sg_erase = (char)erase;
1190
1191 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1192
1193 /* get special characters */
1194 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1195 {
1196 tio->tc.t_intrc = CINTR; /* ^C */
1197 tio->tc.t_quitc = CQUIT; /* ^\ */
1198 tio->tc.t_startc = CSTART; /* ^Q */
1199 tio->tc.t_stopc = CSTOP; /* ^S */
1200 tio->tc.t_eofc = CEOF; /* ^D */
1201 tio->tc.t_brkc = -1;
1202 }
1203
1204 /* get local special chars */
1205 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1206 {
1207 tio->lc.t_suspc = CSUSP; /* ^Z */
1208 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1209 tio->lc.t_rprntc = CRPRNT; /* ^R */
1210 tio->lc.t_flushc = CFLUSH; /* ^O */
1211 tio->lc.t_werasc = CWERASE; /* ^W */
1212 tio->lc.t_lnextc = CLNEXT; /* ^V */
1213 }
1214 /* get line discipline */
1215 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1216# ifdef NTTYDISC
1217 tio->line = NTTYDISC;
1218# endif /* NTTYDISC */
1219
1220 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1221#endif /* HAVE_TERMIOS_H */
1222 1143
1223 /* 1144 /*
1224 * Debugging 1145 * Debugging
1225 */ 1146 */
1226#ifdef DEBUG_TTYMODE 1147#ifdef DEBUG_TTYMODE
… …
1327 else 1248 else
1328#endif 1249#endif
1329 if (!pty->get ()) 1250 if (!pty->get ())
1330 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1251 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1331 1252
1332 pty->set_utf8_mode (enc_utf8);
1333
1334 /* set initial window size */
1335 tt_winch ();
1336
1337 int er; 1253 int er;
1338 1254
1339#ifndef NO_BACKSPACE_KEY 1255#ifndef NO_BACKSPACE_KEY
1340 if (key_backspace[0] && !key_backspace[1]) 1256 if (key_backspace[0] && !key_backspace[1])
1341 er = key_backspace[0]; 1257 er = key_backspace[0];
… …
1344 else 1260 else
1345#endif 1261#endif
1346 er = -1; 1262 er = -1;
1347 1263
1348 rxvt_get_ttymode (&tio, er); 1264 rxvt_get_ttymode (&tio, er);
1265 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1266 pty->set_utf8_mode (enc_utf8);
1267
1268 /* set initial window size */
1269 tt_winch ();
1349 1270
1350#if ENABLE_FRILLS 1271#if ENABLE_FRILLS
1351 if (rs[Rs_pty_fd]) 1272 if (rs[Rs_pty_fd])
1352 return; 1273 return;
1353#endif 1274#endif
… …
1384 } 1305 }
1385 1306
1386 _exit (EXIT_FAILURE); 1307 _exit (EXIT_FAILURE);
1387 1308
1388 default: 1309 default:
1389 if (!OPTION (Opt_utmpInhibit)) 1310 if (!option (Opt_utmpInhibit))
1390 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1311 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1391 1312
1392 pty->close_tty (); 1313 pty->close_tty ();
1393 1314
1394 child_ev.start (cmd_pid); 1315 child_ev.start (cmd_pid);
1395 1316
… …
1408int 1329int
1409rxvt_term::run_child (const char *const *argv) 1330rxvt_term::run_child (const char *const *argv)
1410{ 1331{
1411 char *login; 1332 char *login;
1412 1333
1413 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1414
1415 if (OPTION (Opt_console)) 1334 if (option (Opt_console))
1416 { /* be virtual console, fail silently */ 1335 { /* be virtual console, fail silently */
1417#ifdef TIOCCONS 1336#ifdef TIOCCONS
1418 unsigned int on = 1; 1337 unsigned int on = 1;
1419 1338
1420 ioctl (STDIN_FILENO, TIOCCONS, &on); 1339 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1469 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1388 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1470 shell = "/bin/sh"; 1389 shell = "/bin/sh";
1471 1390
1472 argv0 = (const char *)rxvt_r_basename (shell); 1391 argv0 = (const char *)rxvt_r_basename (shell);
1473 1392
1474 if (OPTION (Opt_loginShell)) 1393 if (option (Opt_loginShell))
1475 { 1394 {
1476 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1395 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1477 1396
1478 login[0] = '-'; 1397 login[0] = '-';
1479 strcpy (&login[1], argv0); 1398 strcpy (&login[1], argv0);
1480 argv0 = login; 1399 argv0 = login;
1481 } 1400 }

Diff Legend

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