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.155 by root, Wed Jan 25 02:53:13 2006 UTC vs.
Revision 1.200 by ayin, Fri Aug 3 23:15:34 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>
… …
43const char *const def_colorName[] = 43const char *const def_colorName[] =
44 { 44 {
45 COLOR_FOREGROUND, 45 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
47 /* low-intensity colors */ 47 /* low-intensity colors */
48 "Black", /* 0: black (#000000) */ 48 "rgb:00/00/00", // 0: black (Black)
49 "Red3", /* 1: red (#CD0000) */ 49 "rgb:cd/00/00", // 1: red (Red3)
50 "Green3", /* 2: green (#00CD00) */ 50 "rgb:00/cd/00", // 2: green (Green3)
51 "Yellow3", /* 3: yellow (#CDCD00) */ 51 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "Blue3", /* 4: blue (#0000CD) */ 52 "rgb:00/00/cd", // 4: blue (Blue3)
53 "Magenta3", /* 5: magenta (#CD00CD) */ 53 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "Cyan3", /* 6: cyan (#00CDCD) */ 54 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 55# ifdef XTERM_COLORS
56 "Grey90", /* 7: white (#E5E5E5) */ 56 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 57# else
58 "AntiqueWhite", /* 7: white (#FAEBD7) */ 58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 59# endif
60 /* high-intensity colors */ 60 /* high-intensity colors */
61# ifdef XTERM_COLORS 61# ifdef XTERM_COLORS
62 "Grey30", /* 8: bright black (#4D4D4D) */ 62 "rgb:4d/4d/4d", // 8: bright black (Grey30)
63# else 63# else
64 "Grey25", /* 8: bright black (#404040) */ 64 "rgb:40/40/40", // 8: bright black (Grey25)
65# endif 65# endif
66 "Red", /* 1/9: bright red (#FF0000) */ 66 "rgb:ff/00/00", // 1/9: bright red (Reed)
67 "Green", /* 2/10: bright green (#00FF00) */ 67 "rgb:00/ff/00", // 2/10: bright green (Green)
68 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 68 "rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
69 "Blue", /* 4/12: bright blue (#0000FF) */ 69 "rgb:00/00/ff", // 4/12: bright blue (Blue)
70 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 70 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
71 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 71 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
72 "White", /* 7/15: bright white (#FFFFFF) */ 72 "rgb:ff/ff/ff", // 7/15: bright white (White)
73 73
74 // 88 xterm colours 74 // 88 xterm colours
75 "rgb:00/00/00", 75 "rgb:00/00/00",
76 "rgb:00/00/8b", 76 "rgb:00/00/8b",
77 "rgb:00/00/cd", 77 "rgb:00/00/cd",
… …
170#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 171#if TINTING
172 NULL, 172 NULL,
173#endif 173#endif
174#if OFF_FOCUS_FADING 174#if OFF_FOCUS_FADING
175 "black", 175 "rgb:00/00/00",
176#endif 176#endif
177 }; 177 };
178 178
179bool 179bool
180rxvt_term::init_vars () 180rxvt_term::init_vars ()
… …
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 216
215 last_bot = last_state = -1; 217 last_bot = last_state = -1;
218
219 set_option (Opt_scrollBar);
220 set_option (Opt_scrollTtyOutput);
221 set_option (Opt_jumpScroll);
222 set_option (Opt_skipScroll);
223 set_option (Opt_secondaryScreen);
224 set_option (Opt_secondaryScroll);
225 set_option (Opt_pastableTabs);
226 set_option (Opt_intensityStyles);
227 set_option (Opt_iso14755_52);
216 228
217 return true; 229 return true;
218} 230}
219 231
220void 232void
… …
258 int i, r_argc; 270 int i, r_argc;
259 char *val; 271 char *val;
260 const char **cmd_argv, **r_argv; 272 const char **cmd_argv, **r_argv;
261 273
262 /* 274 /*
263 * Look for -exec option. Find => split and make cmd_argv[] of command args 275 * Look for -e option. Find => split and make cmd_argv[] of command args
264 */ 276 */
265 for (r_argc = 0; r_argc < argc; r_argc++) 277 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 278 if (!strcmp (argv[r_argc], "-e"))
267 break; 279 break;
268 280
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 281 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270 282
271 for (i = 0; i < r_argc; i++) 283 for (i = 0; i < r_argc; i++)
… …
297 get_options (r_argc, r_argv); 309 get_options (r_argc, r_argv);
298 310
299 if (!(display = displays.get (rs[Rs_display_name]))) 311 if (!(display = displays.get (rs[Rs_display_name])))
300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 312 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
301 313
314 // using a local pointer decreases code size a lot
315 xa = display->xa;
316
317 set (display);
302 extract_resources (); 318 extract_resources ();
303 319
320#if XFT
321 if (rs[Rs_depth])
322 select_visual (strtol (rs[Rs_depth], 0, 0));
323#endif
324
325#ifdef HAVE_AFTERIMAGE
326 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
327#endif
304 free (r_argv); 328 free (r_argv);
329
330 for (int i = NUM_RESOURCES; i--; )
331 if (rs [i] == resval_undef)
332 rs [i] = 0;
305 333
306#if ENABLE_PERL 334#if ENABLE_PERL
307 if (!rs[Rs_perl_ext_1]) 335 if (!rs[Rs_perl_ext_1])
308 rs[Rs_perl_ext_1] = "default"; 336 rs[Rs_perl_ext_1] = "default";
309 337
… …
408 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 436 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
409#endif 437#endif
410 438
411#ifdef XTERM_REVERSE_VIDEO 439#ifdef XTERM_REVERSE_VIDEO
412 /* this is how xterm implements reverseVideo */ 440 /* this is how xterm implements reverseVideo */
413 if (OPTION (Opt_reverseVideo)) 441 if (option (Opt_reverseVideo))
414 { 442 {
415 if (!rs[Rs_color + Color_fg]) 443 if (!rs[Rs_color + Color_fg])
416 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 444 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
445
417 if (!rs[Rs_color + Color_bg]) 446 if (!rs[Rs_color + Color_bg])
418 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 447 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
419 } 448 }
420#endif 449#endif
421 450
… …
423 if (!rs[Rs_color + i]) 452 if (!rs[Rs_color + i])
424 rs[Rs_color + i] = def_colorName[i]; 453 rs[Rs_color + i] = def_colorName[i];
425 454
426#ifndef XTERM_REVERSE_VIDEO 455#ifndef XTERM_REVERSE_VIDEO
427 /* this is how we implement reverseVideo */ 456 /* this is how we implement reverseVideo */
428 if (OPTION (Opt_reverseVideo)) 457 if (option (Opt_reverseVideo))
429 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 458 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
430#endif 459#endif
431 460
432 /* convenient aliases for setting fg/bg to colors */ 461 /* convenient aliases for setting fg/bg to colors */
433 color_aliases (Color_fg); 462 color_aliases (Color_fg);
… …
473 val = rxvt_network_display (rs[Rs_display_name]); 502 val = rxvt_network_display (rs[Rs_display_name]);
474 rs[Rs_display_name] = (const char *)val; 503 rs[Rs_display_name] = (const char *)val;
475 504
476 if (val == NULL) 505 if (val == NULL)
477#endif /* DISPLAY_IS_IP */ 506#endif /* DISPLAY_IS_IP */
478 val = XDisplayString (display->display); 507 val = XDisplayString (dpy);
479 508
480 if (rs[Rs_display_name] == NULL) 509 if (rs[Rs_display_name] == NULL)
481 rs[Rs_display_name] = val; /* use broken `:0' value */ 510 rs[Rs_display_name] = val; /* use broken `:0' value */
482 511
483 i = strlen (val); 512 i = strlen (val);
… …
503 532
504#ifdef RXVT_TERMINFO 533#ifdef RXVT_TERMINFO
505 putenv ("TERMINFO=" RXVT_TERMINFO); 534 putenv ("TERMINFO=" RXVT_TERMINFO);
506#endif 535#endif
507 536
508 if (display->depth <= 2) 537 if (depth <= 2)
509 putenv ("COLORTERM=" COLORTERMENV "-mono"); 538 putenv ("COLORTERM=" COLORTERMENV "-mono");
510 else 539 else
511 putenv ("COLORTERM=" COLORTERMENVFULL); 540 putenv ("COLORTERM=" COLORTERMENVFULL);
512 541
513 if (rs[Rs_term_name] != NULL) 542 if (rs[Rs_term_name] != NULL)
… …
607 * Initialize the command connection. 636 * Initialize the command connection.
608 * This should be called after the X server connection is established. 637 * This should be called after the X server connection is established.
609 */ 638 */
610 639
611#ifdef META8_OPTION 640#ifdef META8_OPTION
612 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 641 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
613#endif 642#endif
614 643
615 get_ourmods (); 644 get_ourmods ();
616 645
617 if (!OPTION (Opt_scrollTtyOutput)) 646 if (!option (Opt_scrollTtyOutput))
618 priv_modes |= PrivMode_TtyOutputInh; 647 priv_modes |= PrivMode_TtyOutputInh;
619 if (OPTION (Opt_scrollTtyKeypress)) 648 if (option (Opt_scrollTtyKeypress))
620 priv_modes |= PrivMode_Keypress; 649 priv_modes |= PrivMode_Keypress;
621 if (!OPTION (Opt_jumpScroll)) 650 if (!option (Opt_jumpScroll))
622 priv_modes |= PrivMode_smoothScroll; 651 priv_modes |= PrivMode_smoothScroll;
623 652
624#ifndef NO_BACKSPACE_KEY 653#ifndef NO_BACKSPACE_KEY
625 if (strcmp (key_backspace, "DEC") == 0) 654 if (strcmp (key_backspace, "DEC") == 0)
626 priv_modes |= PrivMode_HaveBackSpace; 655 priv_modes |= PrivMode_HaveBackSpace;
… …
644 673
645#ifdef OFF_FOCUS_FADING 674#ifdef OFF_FOCUS_FADING
646 pix_colors = pix_colors_focused; 675 pix_colors = pix_colors_focused;
647#endif 676#endif
648 677
649 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 678 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
650 { 679 {
680 const char *name = rs[Rs_color + i];
681
682 if (!name)
683 continue;
684
651 rxvt_color xcol; 685 rxvt_color xcol;
652 686
653 if (!rs[Rs_color + i]) 687 if (!set_color (xcol, name))
654 continue;
655
656 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
657 { 688 {
658#ifndef XTERM_REVERSE_VIDEO 689#ifndef XTERM_REVERSE_VIDEO
659 if (i < 2 && OPTION (Opt_reverseVideo)) 690 if (i < 2 && option (Opt_reverseVideo))
660 rs[Rs_color + i] = def_colorName[!i]; 691 name = def_colorName [1 - i];
661 else 692 else
662#endif 693#endif
663 rs[Rs_color + i] = def_colorName[i]; 694 name = def_colorName [i];
664 695
665 if (!rs[Rs_color + i]) 696 if (!name)
666 continue; 697 continue;
667 698
668 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 699 if (!set_color (xcol, name))
669 { 700 {
670 switch (i) 701 switch (i)
671 { 702 {
672 case Color_fg: 703 case Color_fg:
673 case Color_bg: 704 case Color_bg:
674 /* fatal: need bg/fg color */
675 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 705 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
676 /* NOTREACHED */ 706 name = "";
677 break; 707 break;
678#ifndef NO_CURSORCOLOR 708#ifndef NO_CURSORCOLOR
679 case Color_cursor2: 709 case Color_cursor2:
680 xcol = pix_colors[Color_fg]; 710#endif
681 break;
682#endif /* ! NO_CURSORCOLOR */
683 case Color_pointer_fg: 711 case Color_pointer_fg:
684 xcol = pix_colors[Color_fg]; 712 name = rs[Rs_color + Color_fg];
713 xcol.set (this, name);
685 break; 714 break;
686 default: 715 default:
687 xcol = pix_colors[Color_bg]; /* None */ 716 name = rs[Rs_color + Color_bg];
717 xcol.set (this, name);
688 break; 718 break;
689 } 719 }
690 } 720 }
691 } 721 }
692 722
693 pix_colors[i] = xcol; 723 pix_colors[i] = xcol;
694 SET_PIXCOLOR (i); 724 rs[Rs_color + i] = name;
695 }
696
697#ifdef OFF_FOCUS_FADING
698 if (rs[Rs_fade])
699 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
700 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
701#endif
702
703 if (display->depth <= 2)
704 { 725 }
726
727 if (depth <= 2)
728 {
705 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 729 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
706 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 730 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
707 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 731 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
708 } 732 }
709 733
710 /* 734 /*
711 * get scrollBar shadow colors 735 * get scrollBar shadow colors
712 * 736 *
713 * The calculations of topShadow/bottomShadow values are adapted 737 * The calculations of topShadow/bottomShadow values are adapted
714 * from the fvwm window manager. 738 * from the fvwm window manager.
715 */ 739 */
716#ifdef KEEP_SCROLLCOLOR 740#ifdef KEEP_SCROLLCOLOR
717
718 if (display->depth <= 2) 741 if (depth <= 2)
719 { 742 {
720 /* Monochrome */ 743 /* Monochrome */
721 pix_colors[Color_scroll] = pix_colors[Color_fg]; 744 alias_color (Color_scroll, Color_fg);
722 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 745 alias_color (Color_topShadow, Color_bg);
723 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 746 alias_color (Color_bottomShadow, Color_bg);
724 } 747 }
725 else 748 else
726 { 749 {
727 rxvt_color xcol[2]; 750 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
728 /* xcol[0] == white
729 * xcol[1] == top shadow
730 * xcol[2] == bot shadow */
731 751
732 xcol[1] = pix_colors[Color_scroll]; 752 rgba cscroll;
733 xcol[0].set (display, 65535, 65535, 65535); 753 pix_colors [Color_scroll].get (cscroll);
734
735 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
736
737 xcol[0].get (display, pr0, pg0, pb0);
738 xcol[1].get (display, pr1, pg1, pb1);
739
740 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
741 754
742 /* topShadowColor */ 755 /* topShadowColor */
743 if (!xcol[1].set (display, 756 if (!pix_colors[Color_topShadow].set (this,
744 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 757 rgba (
745 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 758 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
746 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 759 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
747 xcol[1] = pix_colors[Color_White]; 760 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
748 761 cscroll.a)
749 pix_colors[Color_topShadow] = xcol[1]; 762 ))
763 alias_color (Color_topShadow, Color_White);
750 } 764 }
751#endif /* KEEP_SCROLLCOLOR */ 765#endif /* KEEP_SCROLLCOLOR */
766
767#ifdef OFF_FOCUS_FADING
768 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
769 update_fade_color (i);
770#endif
752} 771}
753 772
754/*----------------------------------------------------------------------*/ 773/*----------------------------------------------------------------------*/
755/* color aliases, fg/bg bright-bold */ 774/* color aliases, fg/bg bright-bold */
756void 775void
… …
795 814
796 if (rsmod 815 if (rsmod
797 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 816 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
798 requestedmeta = rsmod[3] - '0'; 817 requestedmeta = rsmod[3] - '0';
799 818
800 map = XGetModifierMapping (display->display); 819 map = XGetModifierMapping (dpy);
801 kc = map->modifiermap; 820 kc = map->modifiermap;
802 821
803 for (i = 1; i < 6; i++) 822 for (i = 1; i < 6; i++)
804 { 823 {
805 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 824 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
807 for (j = map->max_keypermod; j--; k++) 826 for (j = map->max_keypermod; j--; k++)
808 { 827 {
809 if (kc[k] == 0) 828 if (kc[k] == 0)
810 break; 829 break;
811 830
812 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 831 switch (XKeycodeToKeysym (dpy, kc[k], 0))
813 { 832 {
814 case XK_Num_Lock: 833 case XK_Num_Lock:
815 ModNumLockMask = modmasks[i - 1]; 834 ModNumLockMask = modmasks[i - 1];
816 continue; 835 continue;
817 836
… …
867rxvt_term::create_windows (int argc, const char *const *argv) 886rxvt_term::create_windows (int argc, const char *const *argv)
868{ 887{
869 XClassHint classHint; 888 XClassHint classHint;
870 XWMHints wmHint; 889 XWMHints wmHint;
871#if ENABLE_FRILLS 890#if ENABLE_FRILLS
872 MWMHints mwmhints; 891 MWMHints mwmhints = { };
873#endif 892#endif
874 XGCValues gcvalue; 893 XGCValues gcvalue;
875 XSetWindowAttributes attributes; 894 XSetWindowAttributes attributes;
876 Window top, parent; 895 Window top, parent;
877 dDisp;
878 896
879 xa = display->xa; 897 dLocal (Display *, dpy);
880 898
881 /* grab colors before netscape does */ 899 /* grab colors before netscape does */
882 Get_Colours (); 900 Get_Colours ();
883 901
884 if (!set_fonts ()) 902 if (!set_fonts ())
885 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 903 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
886 904
887 parent = display->root; 905 parent = display->root;
888 906
889 attributes.override_redirect = !!OPTION (Opt_override_redirect); 907 attributes.override_redirect = !!option (Opt_override_redirect);
890 908
891#if ENABLE_FRILLS 909#if ENABLE_FRILLS
892 if (OPTION (Opt_borderLess)) 910 if (option (Opt_borderLess))
893 { 911 {
894 if (XInternAtom (disp, "_MOTIF_WM_INFO", True) == None) 912 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
895 { 913 {
896 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 914 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
897 attributes.override_redirect = TRUE; 915 attributes.override_redirect = true;
898 mwmhints.flags = 0; 916 mwmhints.flags = 0;
899 } 917 }
900 else 918 else
901 { 919 {
902 mwmhints.flags = MWM_HINTS_DECORATIONS; 920 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
912 { 930 {
913 XWindowAttributes wattr; 931 XWindowAttributes wattr;
914 932
915 parent = strtol (rs[Rs_embed], 0, 0); 933 parent = strtol (rs[Rs_embed], 0, 0);
916 934
917 if (!XGetWindowAttributes (disp, parent, &wattr)) 935 if (!XGetWindowAttributes (dpy, parent, &wattr))
918 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 936 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
919 937
920 window_calc (wattr.width, wattr.height); 938 window_calc (wattr.width, wattr.height);
921 } 939 }
922#endif 940#endif
923 941
924 window_calc (0, 0); 942 window_calc (0, 0);
925 943
926 /* sub-window placement & size in rxvt_resize_subwindows () */ 944 /* sub-window placement & size in rxvt_resize_subwindows () */
927 attributes.background_pixel = pix_colors_focused[Color_border]; 945 attributes.background_pixel = pix_colors_focused [Color_border];
928 attributes.border_pixel = pix_colors_focused[Color_border]; 946 attributes.border_pixel = pix_colors_focused [Color_border];
929 attributes.colormap = display->cmap; 947 attributes.colormap = cmap;
930 948
931 top = XCreateWindow (disp, parent, 949 top = XCreateWindow (dpy, parent,
932 szHint.x, szHint.y, 950 szHint.x, szHint.y,
933 szHint.width, szHint.height, 951 szHint.width, szHint.height,
934 ext_bwidth, 952 ext_bwidth,
935 display->depth, InputOutput, 953 depth, InputOutput, visual,
936 display->visual,
937 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 954 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
938 &attributes); 955 &attributes);
939 956
940 this->parent[0] = top; 957 this->parent[0] = top;
941 958
… …
948 classHint.res_name = (char *)rs[Rs_name]; 965 classHint.res_name = (char *)rs[Rs_name];
949 classHint.res_class = (char *)RESCLASS; 966 classHint.res_class = (char *)RESCLASS;
950 967
951 wmHint.flags = InputHint | StateHint | WindowGroupHint; 968 wmHint.flags = InputHint | StateHint | WindowGroupHint;
952 wmHint.input = True; 969 wmHint.input = True;
953 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 970 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
954 wmHint.window_group = top; 971 wmHint.window_group = top;
955 972
956 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 973 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
957 &szHint, &wmHint, &classHint); 974 &szHint, &wmHint, &classHint);
958 975
959#if ENABLE_FRILLS 976#if ENABLE_FRILLS
960 if (mwmhints.flags) 977 if (mwmhints.flags)
961 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 978 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
962 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 979 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
963#endif 980#endif
964 981
965 Atom protocols[] = { 982 Atom protocols[] = {
966 xa[XA_WM_DELETE_WINDOW], 983 xa[XA_WM_DELETE_WINDOW],
967#if ENABLE_EWMH 984#if ENABLE_EWMH
968 xa[XA_NET_WM_PING], 985 xa[XA_NET_WM_PING],
969#endif 986#endif
970 }; 987 };
971 988
972 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 989 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
973 990
974#if ENABLE_FRILLS 991#if ENABLE_FRILLS
975 if (rs[Rs_transient_for]) 992 if (rs[Rs_transient_for])
976 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 993 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
977#endif 994#endif
978 995
979#if ENABLE_EWMH 996#if ENABLE_EWMH
980 long pid = getpid (); 997 long pid = getpid ();
981 998
982 XChangeProperty (disp, top, 999 XChangeProperty (dpy, top,
983 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1000 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
984 PropModeReplace, (unsigned char *)&pid, 1); 1001 PropModeReplace, (unsigned char *)&pid, 1);
985 1002
986 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1003 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
987#endif 1004#endif
988 1005
989 XSelectInput (disp, top, 1006 XSelectInput (dpy, top,
990 KeyPressMask 1007 KeyPressMask
991#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1008#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
992 | KeyReleaseMask 1009 | KeyReleaseMask
993#endif 1010#endif
994 | FocusChangeMask | VisibilityChangeMask 1011 | FocusChangeMask | VisibilityChangeMask
995 | ExposureMask | StructureNotifyMask); 1012 | ExposureMask | StructureNotifyMask);
996 1013
997 termwin_ev.start (display, top); 1014 termwin_ev.start (display, top);
998 1015
999 /* vt cursor: Black-on-White is standard, but this is more popular */ 1016 /* vt cursor: Black-on-White is standard, but this is more popular */
1000 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1017 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1001 1018
1002#ifdef HAVE_SCROLLBARS 1019#ifdef HAVE_SCROLLBARS
1003 /* cursor scrollBar: Black-on-White */ 1020 /* cursor scrollBar: Black-on-White */
1004 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1021 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1005#endif 1022#endif
1006 1023
1007 /* the vt window */ 1024 /* the vt window */
1008 vt = XCreateSimpleWindow (disp, top, 1025 vt = XCreateSimpleWindow (dpy, top,
1009 window_vt_x, window_vt_y, 1026 window_vt_x, window_vt_y,
1010 width, height, 1027 width, height,
1011 0, 1028 0,
1012 pix_colors_focused[Color_fg], 1029 pix_colors_focused[Color_fg],
1013 pix_colors_focused[Color_bg]); 1030 pix_colors_focused[Color_bg]);
1014 1031
1015 attributes.bit_gravity = NorthWestGravity; 1032 attributes.bit_gravity = NorthWestGravity;
1016 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1033 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1017 1034
1018 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1035 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1019 1036
1020 if (OPTION (Opt_pointerBlank)) 1037 if (option (Opt_pointerBlank))
1021 vt_emask |= PointerMotionMask; 1038 vt_emask |= PointerMotionMask;
1022 else 1039 else
1023 vt_emask |= Button1MotionMask | Button3MotionMask; 1040 vt_emask |= Button1MotionMask | Button3MotionMask;
1024 1041
1025 vt_select_input (); 1042 vt_select_input ();
1026 1043
1027 vt_ev.start (display, vt); 1044 vt_ev.start (display, vt);
1028 1045
1029#ifdef XPM_BACKGROUND 1046#ifdef XPM_BACKGROUND
1030 if (rs[Rs_backgroundPixmap] != NULL 1047 if (rs[Rs_backgroundPixmap] != NULL)
1031 && !OPTION (Opt_transparent))
1032 { 1048 {
1033 const char *p = rs[Rs_backgroundPixmap]; 1049 const char *p = rs[Rs_backgroundPixmap];
1034 1050
1035 if ((p = strchr (p, ';')) != NULL) 1051 if ((p = strchr (p, ';')) != NULL)
1036 { 1052 {
1037 p++; 1053 p++;
1038 scale_pixmap (p); 1054 bgPixmap.handle_geometry (p);
1039 } 1055 }
1040 1056
1041 set_bgPixmap (rs[Rs_backgroundPixmap]); 1057 set_bgPixmap (rs[Rs_backgroundPixmap]);
1042 scr_touch (true); 1058 scr_touch (true);
1043 } 1059 }
1044#endif 1060#endif
1045 1061
1046 /* graphics context for the vt window */ 1062 /* graphics context for the vt window */
1047 gcvalue.foreground = pix_colors[Color_fg]; 1063 gcvalue.foreground = pix_colors[Color_fg];
1048 gcvalue.background = pix_colors[Color_bg]; 1064 gcvalue.background = pix_colors[Color_bg];
1049 gcvalue.graphics_exposures = 1; 1065 gcvalue.graphics_exposures = 0;
1050 1066
1051 gc = XCreateGC (disp, vt, 1067 gc = XCreateGC (dpy, vt,
1052 GCForeground | GCBackground | GCGraphicsExposures, 1068 GCForeground | GCBackground | GCGraphicsExposures,
1053 &gcvalue); 1069 &gcvalue);
1054 1070
1055 drawable = new rxvt_drawable (display, vt); 1071 drawable = new rxvt_drawable (this, vt);
1056 1072
1057#ifdef RXVT_SCROLLBAR 1073#ifdef RXVT_SCROLLBAR
1058 gcvalue.foreground = pix_colors[Color_topShadow]; 1074 gcvalue.foreground = pix_colors[Color_topShadow];
1059 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1075 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1060 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1076 gcvalue.foreground = pix_colors[Color_bottomShadow];
1061 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1077 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1062 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1078 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1063 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1079 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1064#endif 1080#endif
1065 1081
1066#ifdef OFF_FOCUS_FADING 1082#ifdef OFF_FOCUS_FADING
1067 // initially we are in unfocused state 1083 // initially we are in unfocused state
1068 if (rs[Rs_fade]) 1084 if (rs[Rs_fade])
… …
1077 * GET TTY CURRENT STATE * 1093 * GET TTY CURRENT STATE *
1078 * ------------------------------------------------------------------------- */ 1094 * ------------------------------------------------------------------------- */
1079void 1095void
1080rxvt_get_ttymode (ttymode_t *tio, int erase) 1096rxvt_get_ttymode (ttymode_t *tio, int erase)
1081{ 1097{
1082#ifdef HAVE_TERMIOS_H
1083 /* 1098 /*
1084 * standard System V termios interface 1099 * standard System V termios interface
1085 */ 1100 */
1086 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1101 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1087 { 1102 {
… …
1154 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1169 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1155# if defined (ECHOCTL) && defined (ECHOKE) 1170# if defined (ECHOCTL) && defined (ECHOKE)
1156 | ECHOCTL | ECHOKE 1171 | ECHOCTL | ECHOKE
1157# endif 1172# endif
1158 | ECHOE | ECHOK); 1173 | ECHOE | ECHOK);
1159# else /* HAVE_TERMIOS_H */
1160
1161 /*
1162 * sgtty interface
1163 */
1164
1165 /* get parameters -- gtty */
1166 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1167 {
1168 tio->sg.sg_erase = CERASE; /* ^H */
1169 tio->sg.sg_kill = CKILL; /* ^U */
1170 }
1171
1172 if (erase != -1)
1173 tio->sg.sg_erase = (char)erase;
1174
1175 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1176
1177 /* get special characters */
1178 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1179 {
1180 tio->tc.t_intrc = CINTR; /* ^C */
1181 tio->tc.t_quitc = CQUIT; /* ^\ */
1182 tio->tc.t_startc = CSTART; /* ^Q */
1183 tio->tc.t_stopc = CSTOP; /* ^S */
1184 tio->tc.t_eofc = CEOF; /* ^D */
1185 tio->tc.t_brkc = -1;
1186 }
1187
1188 /* get local special chars */
1189 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1190 {
1191 tio->lc.t_suspc = CSUSP; /* ^Z */
1192 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1193 tio->lc.t_rprntc = CRPRNT; /* ^R */
1194 tio->lc.t_flushc = CFLUSH; /* ^O */
1195 tio->lc.t_werasc = CWERASE; /* ^W */
1196 tio->lc.t_lnextc = CLNEXT; /* ^V */
1197 }
1198 /* get line discipline */
1199 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1200# ifdef NTTYDISC
1201 tio->line = NTTYDISC;
1202# endif /* NTTYDISC */
1203
1204 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1205#endif /* HAVE_TERMIOS_H */
1206 1174
1207 /* 1175 /*
1208 * Debugging 1176 * Debugging
1209 */ 1177 */
1210#ifdef DEBUG_TTYMODE 1178#ifdef DEBUG_TTYMODE
… …
1311 else 1279 else
1312#endif 1280#endif
1313 if (!pty->get ()) 1281 if (!pty->get ())
1314 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1282 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1315 1283
1316 pty->set_utf8_mode (enc_utf8);
1317
1318 /* set initial window size */
1319 tt_winch ();
1320
1321 int er; 1284 int er;
1322 1285
1323#ifndef NO_BACKSPACE_KEY 1286#ifndef NO_BACKSPACE_KEY
1324 if (key_backspace[0] && !key_backspace[1]) 1287 if (key_backspace[0] && !key_backspace[1])
1325 er = key_backspace[0]; 1288 er = key_backspace[0];
… …
1328 else 1291 else
1329#endif 1292#endif
1330 er = -1; 1293 er = -1;
1331 1294
1332 rxvt_get_ttymode (&tio, er); 1295 rxvt_get_ttymode (&tio, er);
1296 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1297 pty->set_utf8_mode (enc_utf8);
1298
1299 /* set initial window size */
1300 tt_winch ();
1333 1301
1334#if ENABLE_FRILLS 1302#if ENABLE_FRILLS
1335 if (rs[Rs_pty_fd]) 1303 if (rs[Rs_pty_fd])
1336 return; 1304 return;
1337#endif 1305#endif
… …
1368 } 1336 }
1369 1337
1370 _exit (EXIT_FAILURE); 1338 _exit (EXIT_FAILURE);
1371 1339
1372 default: 1340 default:
1373 if (!OPTION (Opt_utmpInhibit)) 1341 if (!option (Opt_utmpInhibit))
1374 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1342 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1375 1343
1376 pty->close_tty (); 1344 pty->close_tty ();
1377 1345
1378 child_ev.start (cmd_pid); 1346 child_ev.start (cmd_pid);
1379 1347
… …
1392int 1360int
1393rxvt_term::run_child (const char *const *argv) 1361rxvt_term::run_child (const char *const *argv)
1394{ 1362{
1395 char *login; 1363 char *login;
1396 1364
1397 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1398
1399 if (OPTION (Opt_console)) 1365 if (option (Opt_console))
1400 { /* be virtual console, fail silently */ 1366 { /* be virtual console, fail silently */
1401#ifdef TIOCCONS 1367#ifdef TIOCCONS
1402 unsigned int on = 1; 1368 unsigned int on = 1;
1403 1369
1404 ioctl (STDIN_FILENO, TIOCCONS, &on); 1370 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1453 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1419 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1454 shell = "/bin/sh"; 1420 shell = "/bin/sh";
1455 1421
1456 argv0 = (const char *)rxvt_r_basename (shell); 1422 argv0 = (const char *)rxvt_r_basename (shell);
1457 1423
1458 if (OPTION (Opt_loginShell)) 1424 if (option (Opt_loginShell))
1459 { 1425 {
1460 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1426 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1461 1427
1462 login[0] = '-'; 1428 login[0] = '-';
1463 strcpy (&login[1], argv0); 1429 strcpy (&login[1], argv0);

Diff Legend

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