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.180 by ayin, Fri Feb 16 21:46:05 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: ywlloe (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 ()
… …
206 refresh_type = SLOW_REFRESH; 206 refresh_type = SLOW_REFRESH;
207 207
208 oldcursor.row = oldcursor.col = -1; 208 oldcursor.row = oldcursor.col = -1;
209#ifdef XPM_BACKGROUND 209#ifdef XPM_BACKGROUND
210 /* bgPixmap.w = bgPixmap.h = 0; */ 210 /* bgPixmap.w = bgPixmap.h = 0; */
211 bgPixmap.x = bgPixmap.y = 50; 211 bgPixmap.x = bgPixmap.y = 0;
212 bgPixmap.pixmap = None; 212 bgPixmap.pixmap = None;
213#endif 213#endif
214 214
215 last_bot = last_state = -1; 215 last_bot = last_state = -1;
216 216
… …
258 int i, r_argc; 258 int i, r_argc;
259 char *val; 259 char *val;
260 const char **cmd_argv, **r_argv; 260 const char **cmd_argv, **r_argv;
261 261
262 /* 262 /*
263 * Look for -exec option. Find => split and make cmd_argv[] of command args 263 * Look for -e option. Find => split and make cmd_argv[] of command args
264 */ 264 */
265 for (r_argc = 0; r_argc < argc; r_argc++) 265 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 266 if (!strcmp (argv[r_argc], "-e"))
267 break; 267 break;
268 268
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270 270
271 for (i = 0; i < r_argc; i++) 271 for (i = 0; i < r_argc; i++)
… …
297 get_options (r_argc, r_argv); 297 get_options (r_argc, r_argv);
298 298
299 if (!(display = displays.get (rs[Rs_display_name]))) 299 if (!(display = displays.get (rs[Rs_display_name])))
300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
301 301
302 // using a local pointer decreases code size a lot
303 xa = display->xa;
304
305 set (display);
302 extract_resources (); 306 extract_resources ();
303 307
308#if XFT
309 if (rs[Rs_depth])
310 select_visual (strtol (rs[Rs_depth], 0, 0));
311#endif
312
304 free (r_argv); 313 free (r_argv);
314
315 for (int i = NUM_RESOURCES; i--; )
316 if (rs [i] == resval_undef)
317 rs [i] = 0;
305 318
306#if ENABLE_PERL 319#if ENABLE_PERL
307 if (!rs[Rs_perl_ext_1]) 320 if (!rs[Rs_perl_ext_1])
308 rs[Rs_perl_ext_1] = "default"; 321 rs[Rs_perl_ext_1] = "default";
309 322
… …
412 /* this is how xterm implements reverseVideo */ 425 /* this is how xterm implements reverseVideo */
413 if (OPTION (Opt_reverseVideo)) 426 if (OPTION (Opt_reverseVideo))
414 { 427 {
415 if (!rs[Rs_color + Color_fg]) 428 if (!rs[Rs_color + Color_fg])
416 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 429 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
430
417 if (!rs[Rs_color + Color_bg]) 431 if (!rs[Rs_color + Color_bg])
418 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 432 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
419 } 433 }
420#endif 434#endif
421 435
… …
473 val = rxvt_network_display (rs[Rs_display_name]); 487 val = rxvt_network_display (rs[Rs_display_name]);
474 rs[Rs_display_name] = (const char *)val; 488 rs[Rs_display_name] = (const char *)val;
475 489
476 if (val == NULL) 490 if (val == NULL)
477#endif /* DISPLAY_IS_IP */ 491#endif /* DISPLAY_IS_IP */
478 val = XDisplayString (display->display); 492 val = XDisplayString (dpy);
479 493
480 if (rs[Rs_display_name] == NULL) 494 if (rs[Rs_display_name] == NULL)
481 rs[Rs_display_name] = val; /* use broken `:0' value */ 495 rs[Rs_display_name] = val; /* use broken `:0' value */
482 496
483 i = strlen (val); 497 i = strlen (val);
… …
503 517
504#ifdef RXVT_TERMINFO 518#ifdef RXVT_TERMINFO
505 putenv ("TERMINFO=" RXVT_TERMINFO); 519 putenv ("TERMINFO=" RXVT_TERMINFO);
506#endif 520#endif
507 521
508 if (display->depth <= 2) 522 if (depth <= 2)
509 putenv ("COLORTERM=" COLORTERMENV "-mono"); 523 putenv ("COLORTERM=" COLORTERMENV "-mono");
510 else 524 else
511 putenv ("COLORTERM=" COLORTERMENVFULL); 525 putenv ("COLORTERM=" COLORTERMENVFULL);
512 526
513 if (rs[Rs_term_name] != NULL) 527 if (rs[Rs_term_name] != NULL)
… …
644 658
645#ifdef OFF_FOCUS_FADING 659#ifdef OFF_FOCUS_FADING
646 pix_colors = pix_colors_focused; 660 pix_colors = pix_colors_focused;
647#endif 661#endif
648 662
649 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 663 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
650 { 664 {
665 const char *name = rs[Rs_color + i];
666
667 if (!name)
668 continue;
669
651 rxvt_color xcol; 670 rxvt_color xcol;
652 671
653 if (!rs[Rs_color + i]) 672 if (!set_color (xcol, name))
654 continue;
655
656 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
657 { 673 {
658#ifndef XTERM_REVERSE_VIDEO 674#ifndef XTERM_REVERSE_VIDEO
659 if (i < 2 && OPTION (Opt_reverseVideo)) 675 if (i < 2 && OPTION (Opt_reverseVideo))
660 rs[Rs_color + i] = def_colorName[!i]; 676 name = def_colorName [1 - i];
661 else 677 else
662#endif 678#endif
663 rs[Rs_color + i] = def_colorName[i]; 679 name = def_colorName [i];
664 680
665 if (!rs[Rs_color + i]) 681 if (!name)
666 continue; 682 continue;
667 683
668 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 684 if (!set_color (xcol, name))
669 { 685 {
670 switch (i) 686 switch (i)
671 { 687 {
672 case Color_fg: 688 case Color_fg:
673 case Color_bg: 689 case Color_bg:
674 /* fatal: need bg/fg color */
675 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 690 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
676 /* NOTREACHED */ 691 name = "";
677 break; 692 break;
678#ifndef NO_CURSORCOLOR 693#ifndef NO_CURSORCOLOR
679 case Color_cursor2: 694 case Color_cursor2:
680 xcol = pix_colors[Color_fg]; 695#endif
681 break;
682#endif /* ! NO_CURSORCOLOR */
683 case Color_pointer_fg: 696 case Color_pointer_fg:
684 xcol = pix_colors[Color_fg]; 697 name = rs[Rs_color + Color_fg];
698 xcol.set (this, name);
685 break; 699 break;
686 default: 700 default:
687 xcol = pix_colors[Color_bg]; /* None */ 701 name = rs[Rs_color + Color_bg];
702 xcol.set (this, name);
688 break; 703 break;
689 } 704 }
690 } 705 }
691 } 706 }
692 707
693 pix_colors[i] = xcol; 708 pix_colors[i] = xcol;
694 SET_PIXCOLOR (i); 709 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 { 710 }
711
712 if (depth <= 2)
713 {
705 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 714 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]; 715 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]; 716 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
708 } 717 }
709 718
710 /* 719 /*
711 * get scrollBar shadow colors 720 * get scrollBar shadow colors
712 * 721 *
713 * The calculations of topShadow/bottomShadow values are adapted 722 * The calculations of topShadow/bottomShadow values are adapted
714 * from the fvwm window manager. 723 * from the fvwm window manager.
715 */ 724 */
716#ifdef KEEP_SCROLLCOLOR 725#ifdef KEEP_SCROLLCOLOR
717
718 if (display->depth <= 2) 726 if (depth <= 2)
719 { 727 {
720 /* Monochrome */ 728 /* Monochrome */
721 pix_colors[Color_scroll] = pix_colors[Color_fg]; 729 alias_color (Color_scroll, Color_fg);
722 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 730 alias_color (Color_topShadow, Color_bg);
723 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 731 alias_color (Color_bottomShadow, Color_bg);
724 } 732 }
725 else 733 else
726 { 734 {
727 rxvt_color xcol[2]; 735 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 736
732 xcol[1] = pix_colors[Color_scroll]; 737 rgba cscroll;
733 xcol[0].set (display, 65535, 65535, 65535); 738 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 739
742 /* topShadowColor */ 740 /* topShadowColor */
743 if (!xcol[1].set (display, 741 if (!pix_colors[Color_topShadow].set (this,
744 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 742 rgba (
745 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 743 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
746 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 744 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
747 xcol[1] = pix_colors[Color_White]; 745 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
748 746 cscroll.a)
749 pix_colors[Color_topShadow] = xcol[1]; 747 ))
748 alias_color (Color_topShadow, Color_White);
750 } 749 }
751#endif /* KEEP_SCROLLCOLOR */ 750#endif /* KEEP_SCROLLCOLOR */
751
752#ifdef OFF_FOCUS_FADING
753 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
754 update_fade_color (i);
755#endif
752} 756}
753 757
754/*----------------------------------------------------------------------*/ 758/*----------------------------------------------------------------------*/
755/* color aliases, fg/bg bright-bold */ 759/* color aliases, fg/bg bright-bold */
756void 760void
… …
795 799
796 if (rsmod 800 if (rsmod
797 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 801 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
798 requestedmeta = rsmod[3] - '0'; 802 requestedmeta = rsmod[3] - '0';
799 803
800 map = XGetModifierMapping (display->display); 804 map = XGetModifierMapping (dpy);
801 kc = map->modifiermap; 805 kc = map->modifiermap;
802 806
803 for (i = 1; i < 6; i++) 807 for (i = 1; i < 6; i++)
804 { 808 {
805 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 809 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
807 for (j = map->max_keypermod; j--; k++) 811 for (j = map->max_keypermod; j--; k++)
808 { 812 {
809 if (kc[k] == 0) 813 if (kc[k] == 0)
810 break; 814 break;
811 815
812 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 816 switch (XKeycodeToKeysym (dpy, kc[k], 0))
813 { 817 {
814 case XK_Num_Lock: 818 case XK_Num_Lock:
815 ModNumLockMask = modmasks[i - 1]; 819 ModNumLockMask = modmasks[i - 1];
816 continue; 820 continue;
817 821
… …
872 MWMHints mwmhints; 876 MWMHints mwmhints;
873#endif 877#endif
874 XGCValues gcvalue; 878 XGCValues gcvalue;
875 XSetWindowAttributes attributes; 879 XSetWindowAttributes attributes;
876 Window top, parent; 880 Window top, parent;
877 dDisp;
878 881
879 xa = display->xa; 882 dLocal (Display *, dpy);
880 883
881 /* grab colors before netscape does */ 884 /* grab colors before netscape does */
882 Get_Colours (); 885 Get_Colours ();
883 886
884 if (!set_fonts ()) 887 if (!set_fonts ())
… …
889 attributes.override_redirect = !!OPTION (Opt_override_redirect); 892 attributes.override_redirect = !!OPTION (Opt_override_redirect);
890 893
891#if ENABLE_FRILLS 894#if ENABLE_FRILLS
892 if (OPTION (Opt_borderLess)) 895 if (OPTION (Opt_borderLess))
893 { 896 {
894 if (XInternAtom (disp, "_MOTIF_WM_INFO", True) == None) 897 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
895 { 898 {
896 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 899 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
897 attributes.override_redirect = TRUE; 900 attributes.override_redirect = true;
898 mwmhints.flags = 0; 901 mwmhints.flags = 0;
899 } 902 }
900 else 903 else
901 { 904 {
902 mwmhints.flags = MWM_HINTS_DECORATIONS; 905 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
912 { 915 {
913 XWindowAttributes wattr; 916 XWindowAttributes wattr;
914 917
915 parent = strtol (rs[Rs_embed], 0, 0); 918 parent = strtol (rs[Rs_embed], 0, 0);
916 919
917 if (!XGetWindowAttributes (disp, parent, &wattr)) 920 if (!XGetWindowAttributes (dpy, parent, &wattr))
918 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 921 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
919 922
920 window_calc (wattr.width, wattr.height); 923 window_calc (wattr.width, wattr.height);
921 } 924 }
922#endif 925#endif
923 926
924 window_calc (0, 0); 927 window_calc (0, 0);
925 928
926 /* sub-window placement & size in rxvt_resize_subwindows () */ 929 /* sub-window placement & size in rxvt_resize_subwindows () */
927 attributes.background_pixel = pix_colors_focused[Color_border]; 930 attributes.background_pixel = pix_colors_focused [Color_border];
928 attributes.border_pixel = pix_colors_focused[Color_border]; 931 attributes.border_pixel = pix_colors_focused [Color_border];
929 attributes.colormap = display->cmap; 932 attributes.colormap = cmap;
930 933
931 top = XCreateWindow (disp, parent, 934 top = XCreateWindow (dpy, parent,
932 szHint.x, szHint.y, 935 szHint.x, szHint.y,
933 szHint.width, szHint.height, 936 szHint.width, szHint.height,
934 ext_bwidth, 937 ext_bwidth,
935 display->depth, InputOutput, 938 depth, InputOutput, visual,
936 display->visual,
937 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 939 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
938 &attributes); 940 &attributes);
939 941
940 this->parent[0] = top; 942 this->parent[0] = top;
941 943
… …
951 wmHint.flags = InputHint | StateHint | WindowGroupHint; 953 wmHint.flags = InputHint | StateHint | WindowGroupHint;
952 wmHint.input = True; 954 wmHint.input = True;
953 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 955 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
954 wmHint.window_group = top; 956 wmHint.window_group = top;
955 957
956 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 958 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
957 &szHint, &wmHint, &classHint); 959 &szHint, &wmHint, &classHint);
958 960
959#if ENABLE_FRILLS 961#if ENABLE_FRILLS
960 if (mwmhints.flags) 962 if (mwmhints.flags)
961 XChangeProperty (disp, 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,
962 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 964 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
963#endif 965#endif
964 966
965 Atom protocols[] = { 967 Atom protocols[] = {
966 xa[XA_WM_DELETE_WINDOW], 968 xa[XA_WM_DELETE_WINDOW],
967#if ENABLE_EWMH 969#if ENABLE_EWMH
968 xa[XA_NET_WM_PING], 970 xa[XA_NET_WM_PING],
969#endif 971#endif
970 }; 972 };
971 973
972 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 974 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
973 975
974#if ENABLE_FRILLS 976#if ENABLE_FRILLS
975 if (rs[Rs_transient_for]) 977 if (rs[Rs_transient_for])
976 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 978 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
977#endif 979#endif
978 980
979#if ENABLE_EWMH 981#if ENABLE_EWMH
980 long pid = getpid (); 982 long pid = getpid ();
981 983
982 XChangeProperty (disp, top, 984 XChangeProperty (dpy, top,
983 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 985 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
984 PropModeReplace, (unsigned char *)&pid, 1); 986 PropModeReplace, (unsigned char *)&pid, 1);
985 987
986 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 988 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
987#endif 989#endif
988 990
989 XSelectInput (disp, top, 991 XSelectInput (dpy, top,
990 KeyPressMask 992 KeyPressMask
991#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 993#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
992 | KeyReleaseMask 994 | KeyReleaseMask
993#endif 995#endif
994 | FocusChangeMask | VisibilityChangeMask 996 | FocusChangeMask | VisibilityChangeMask
995 | ExposureMask | StructureNotifyMask); 997 | ExposureMask | StructureNotifyMask);
996 998
997 termwin_ev.start (display, top); 999 termwin_ev.start (display, top);
998 1000
999 /* 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 */
1000 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1002 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1001 1003
1002#ifdef HAVE_SCROLLBARS 1004#ifdef HAVE_SCROLLBARS
1003 /* cursor scrollBar: Black-on-White */ 1005 /* cursor scrollBar: Black-on-White */
1004 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1006 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1005#endif 1007#endif
1006 1008
1007 /* the vt window */ 1009 /* the vt window */
1008 vt = XCreateSimpleWindow (disp, top, 1010 vt = XCreateSimpleWindow (dpy, top,
1009 window_vt_x, window_vt_y, 1011 window_vt_x, window_vt_y,
1010 width, height, 1012 width, height,
1011 0, 1013 0,
1012 pix_colors_focused[Color_fg], 1014 pix_colors_focused[Color_fg],
1013 pix_colors_focused[Color_bg]); 1015 pix_colors_focused[Color_bg]);
1014 1016
1015 attributes.bit_gravity = NorthWestGravity; 1017 attributes.bit_gravity = NorthWestGravity;
1016 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1018 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1017 1019
1018 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1020 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1019 1021
1020 if (OPTION (Opt_pointerBlank)) 1022 if (OPTION (Opt_pointerBlank))
1021 vt_emask |= PointerMotionMask; 1023 vt_emask |= PointerMotionMask;
… …
1044#endif 1046#endif
1045 1047
1046 /* graphics context for the vt window */ 1048 /* graphics context for the vt window */
1047 gcvalue.foreground = pix_colors[Color_fg]; 1049 gcvalue.foreground = pix_colors[Color_fg];
1048 gcvalue.background = pix_colors[Color_bg]; 1050 gcvalue.background = pix_colors[Color_bg];
1049 gcvalue.graphics_exposures = 1; 1051 gcvalue.graphics_exposures = 0;
1050 1052
1051 gc = XCreateGC (disp, vt, 1053 gc = XCreateGC (dpy, vt,
1052 GCForeground | GCBackground | GCGraphicsExposures, 1054 GCForeground | GCBackground | GCGraphicsExposures,
1053 &gcvalue); 1055 &gcvalue);
1054 1056
1055 drawable = new rxvt_drawable (display, vt); 1057 drawable = new rxvt_drawable (this, vt);
1056 1058
1057#ifdef RXVT_SCROLLBAR 1059#ifdef RXVT_SCROLLBAR
1058 gcvalue.foreground = pix_colors[Color_topShadow]; 1060 gcvalue.foreground = pix_colors[Color_topShadow];
1059 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1061 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1060 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1062 gcvalue.foreground = pix_colors[Color_bottomShadow];
1061 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1063 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1062 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1064 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1063 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1065 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1064#endif 1066#endif
1065 1067
1066#ifdef OFF_FOCUS_FADING 1068#ifdef OFF_FOCUS_FADING
1067 // initially we are in unfocused state 1069 // initially we are in unfocused state
1068 if (rs[Rs_fade]) 1070 if (rs[Rs_fade])
… …
1077 * GET TTY CURRENT STATE * 1079 * GET TTY CURRENT STATE *
1078 * ------------------------------------------------------------------------- */ 1080 * ------------------------------------------------------------------------- */
1079void 1081void
1080rxvt_get_ttymode (ttymode_t *tio, int erase) 1082rxvt_get_ttymode (ttymode_t *tio, int erase)
1081{ 1083{
1082#ifdef HAVE_TERMIOS_H
1083 /* 1084 /*
1084 * standard System V termios interface 1085 * standard System V termios interface
1085 */ 1086 */
1086 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1087 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1087 { 1088 {
… …
1154 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1155 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1155# if defined (ECHOCTL) && defined (ECHOKE) 1156# if defined (ECHOCTL) && defined (ECHOKE)
1156 | ECHOCTL | ECHOKE 1157 | ECHOCTL | ECHOKE
1157# endif 1158# endif
1158 | ECHOE | ECHOK); 1159 | 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 1160
1207 /* 1161 /*
1208 * Debugging 1162 * Debugging
1209 */ 1163 */
1210#ifdef DEBUG_TTYMODE 1164#ifdef DEBUG_TTYMODE
… …
1311 else 1265 else
1312#endif 1266#endif
1313 if (!pty->get ()) 1267 if (!pty->get ())
1314 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1268 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1315 1269
1316 pty->set_utf8_mode (enc_utf8);
1317
1318 /* set initial window size */
1319 tt_winch ();
1320
1321 int er; 1270 int er;
1322 1271
1323#ifndef NO_BACKSPACE_KEY 1272#ifndef NO_BACKSPACE_KEY
1324 if (key_backspace[0] && !key_backspace[1]) 1273 if (key_backspace[0] && !key_backspace[1])
1325 er = key_backspace[0]; 1274 er = key_backspace[0];
… …
1328 else 1277 else
1329#endif 1278#endif
1330 er = -1; 1279 er = -1;
1331 1280
1332 rxvt_get_ttymode (&tio, er); 1281 rxvt_get_ttymode (&tio, er);
1282 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1283 pty->set_utf8_mode (enc_utf8);
1284
1285 /* set initial window size */
1286 tt_winch ();
1333 1287
1334#if ENABLE_FRILLS 1288#if ENABLE_FRILLS
1335 if (rs[Rs_pty_fd]) 1289 if (rs[Rs_pty_fd])
1336 return; 1290 return;
1337#endif 1291#endif
… …
1391 */ 1345 */
1392int 1346int
1393rxvt_term::run_child (const char *const *argv) 1347rxvt_term::run_child (const char *const *argv)
1394{ 1348{
1395 char *login; 1349 char *login;
1396
1397 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1398 1350
1399 if (OPTION (Opt_console)) 1351 if (OPTION (Opt_console))
1400 { /* be virtual console, fail silently */ 1352 { /* be virtual console, fail silently */
1401#ifdef TIOCCONS 1353#ifdef TIOCCONS
1402 unsigned int on = 1; 1354 unsigned int on = 1;

Diff Legend

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