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.27 by pcg, Fri Feb 13 13:28:17 2004 UTC vs.
Revision 1.68 by root, Tue Aug 10 20:39:19 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
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>
7 * - original version 7 * - original version
… …
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11 * - extensive modifications 11 * - extensive modifications
12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com> 12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13 * - QNX support 13 * - QNX support
14 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
14 * 15 *
15 * This program is free software; you can redistribute it and/or modify 16 * This program is free software; you can redistribute it and/or modify
16 * it under the terms of the GNU General Public License as published by 17 * it under the terms of the GNU General Public License as published by
17 * the Free Software Foundation; either version 2 of the License, or 18 * the Free Software Foundation; either version 2 of the License, or
18 * (at your option) any later version. 19 * (at your option) any later version.
… …
312#endif 313#endif
313#ifndef NO_CURSORCOLOR 314#ifndef NO_CURSORCOLOR
314 COLOR_CURSOR_BACKGROUND, 315 COLOR_CURSOR_BACKGROUND,
315 COLOR_CURSOR_FOREGROUND, 316 COLOR_CURSOR_FOREGROUND,
316#endif /* ! NO_CURSORCOLOR */ 317#endif /* ! NO_CURSORCOLOR */
317 NULL, /* Color_pointer */ 318 NULL, /* Color_pointer_fg */
319 NULL, /* Color_pointer_bg */
318 NULL, /* Color_border */ 320 NULL, /* Color_border */
319#ifndef NO_BOLD_UNDERLINE_REVERSE 321#ifndef NO_BOLD_UNDERLINE_REVERSE
320 NULL, /* Color_BD */ 322 NULL, /* Color_BD */
321 NULL, /* Color_UL */ 323 NULL, /* Color_UL */
322 NULL, /* Color_RV */ 324 NULL, /* Color_RV */
… …
326#endif 328#endif
327#ifdef KEEP_SCROLLCOLOR 329#ifdef KEEP_SCROLLCOLOR
328 COLOR_SCROLLBAR, 330 COLOR_SCROLLBAR,
329 COLOR_SCROLLTROUGH, 331 COLOR_SCROLLTROUGH,
330#endif /* KEEP_SCROLLCOLOR */ 332#endif /* KEEP_SCROLLCOLOR */
331 333#if TINTING
334 NULL,
335#endif
332 }; 336 };
333 337
334const char *const xa_names[NUM_XA] = 338const char *const xa_names[NUM_XA] =
335 { 339 {
336 "TEXT", 340 "TEXT",
… …
353 }; 357 };
354 358
355bool 359bool
356rxvt_term::init_vars () 360rxvt_term::init_vars ()
357{ 361{
358 PixColors = new rxvt_color [TOTAL_COLORS]; 362 PixColorsFocused = new rxvt_color [TOTAL_COLORS];
363#ifdef OFF_FOCUS_FADING
364 PixColorsUnFocused = new rxvt_color [TOTAL_COLORS];
365#endif
366 PixColors = PixColorsFocused;
367
359 if (PixColors == NULL) 368 if (PixColors == NULL)
360 return false; 369 return false;
361 370
362#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 371#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
363 TermWin.pixmap = None; 372 TermWin.pixmap = None;
… …
383 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 392 TermWin.ext_bwidth = EXTERNALBORDERWIDTH;
384 TermWin.lineSpace = LINESPACE; 393 TermWin.lineSpace = LINESPACE;
385 TermWin.saveLines = SAVELINES; 394 TermWin.saveLines = SAVELINES;
386 numPixColors = TOTAL_COLORS; 395 numPixColors = TOTAL_COLORS;
387 396
388#ifndef NO_NEW_SELECTION
389 selection_style = NEW_SELECT;
390#else
391 selection_style = OLD_SELECT;
392#endif
393
394#ifndef NO_BRIGHTCOLOR 397#ifndef NO_BRIGHTCOLOR
395 colorfgbg = DEFAULT_RSTYLE; 398 colorfgbg = DEFAULT_RSTYLE;
396#endif
397
398#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
399 ks_bigfont = XK_greater;
400 ks_smallfont = XK_less;
401#endif
402
403#ifdef GREEK_SUPPORT
404 ks_greekmodeswith = GREEK_KEYBOARD_MODESWITCH;
405#endif 399#endif
406 400
407 refresh_limit = 1; 401 refresh_limit = 1;
408 refresh_type = SLOW_REFRESH; 402 refresh_type = SLOW_REFRESH;
409 prev_nrow = prev_ncol = 0; 403 prev_nrow = prev_ncol = 0;
410#ifdef MULTICHAR_SET
411# ifdef MULTICHAR_ENCODING
412 encoding_method = MULTICHAR_ENCODING;
413# endif
414 multichar_decode = rxvt_euc2jis;
415#endif
416 404
417 oldcursor.row = oldcursor.col = -1; 405 oldcursor.row = oldcursor.col = -1;
418#ifdef XPM_BACKGROUND 406#ifdef XPM_BACKGROUND
419 /* bgPixmap.w = bgPixmap.h = 0; */ 407 /* bgPixmap.w = bgPixmap.h = 0; */
420 bgPixmap.x = bgPixmap.y = 50; 408 bgPixmap.x = bgPixmap.y = 50;
… …
514 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 502 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
515 503
516 cmd_argv[i] = NULL; 504 cmd_argv[i] = NULL;
517 } 505 }
518 506
519 /* clear all resources */
520 for (i = 0; i < NUM_RESOURCES;)
521 rs[i++] = NULL;
522
523 rs[Rs_name] = rxvt_r_basename (argv[0]); 507 rs[Rs_name] = rxvt_r_basename (argv[0]);
524 508
525 /* 509 /*
526 * Open display, get options/resources and create the window 510 * Open display, get options/resources and create the window
527 */ 511 */
… …
542 } 526 }
543#endif 527#endif
544 528
545 if (!display 529 if (!display
546 && ! (display = displays.get (rs[Rs_display_name]))) 530 && ! (display = displays.get (rs[Rs_display_name])))
547 {
548 rxvt_print_error ("can't open display %s", rs[Rs_display_name]); 531 rxvt_fatal ("can't open display %s", rs[Rs_display_name]);
549 exit (EXIT_FAILURE);
550 }
551 532
552 extract_resources (display->display, rs[Rs_name]); 533 extract_resources (display->display, rs[Rs_name]);
553 534
554 /* 535 /*
555 * set any defaults not already set 536 * set any defaults not already set
… …
600 rs[Rs_print_pipe] = PRINTPIPE; 581 rs[Rs_print_pipe] = PRINTPIPE;
601#endif 582#endif
602 583
603 if (!rs[Rs_cutchars]) 584 if (!rs[Rs_cutchars])
604 rs[Rs_cutchars] = CUTCHARS; 585 rs[Rs_cutchars] = CUTCHARS;
605
606#ifdef ACS_ASCII
607 if (!rs[Rs_acs_chars])
608 rs[Rs_acs_chars] = ACS_CHARS;
609 if ((i = STRLEN (rs[Rs_acs_chars])) < 0x20)
610 {
611 val = rxvt_realloc ((void *)rs[Rs_acs_chars], 0x20);
612 for (; i < 0x20; )
613 val[i] = ' ';
614 rs[Rs_acs_chars] = val;
615 }
616#endif
617 586
618#ifndef NO_BACKSPACE_KEY 587#ifndef NO_BACKSPACE_KEY
619 if (!rs[Rs_backspace_key]) 588 if (!rs[Rs_backspace_key])
620# ifdef DEFAULT_BACKSPACE 589# ifdef DEFAULT_BACKSPACE
621 key_backspace = DEFAULT_BACKSPACE; 590 key_backspace = DEFAULT_BACKSPACE;
… …
650 { 619 {
651 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]); 620 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
652 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]); 621 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
653 } 622 }
654 623
655 if (rs[Rs_selectstyle])
656 {
657 if (STRNCASECMP (rs[Rs_selectstyle], "oldword", 7) == 0)
658 selection_style = OLD_WORD_SELECT;
659#ifndef NO_OLD_SELECTION
660
661 else if (STRNCASECMP (rs[Rs_selectstyle], "old", 3) == 0)
662 selection_style = OLD_SELECT;
663#endif
664
665 }
666
667#ifdef HAVE_SCROLLBARS 624#ifdef HAVE_SCROLLBARS
668 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], 625 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle],
669 rs[Rs_scrollBar_thickness]); 626 rs[Rs_scrollBar_thickness]);
670#endif 627#endif
671
672 TermWin.fontset = new rxvt_fontset (this);
673 TermWin.fontset->populate (rs[Rs_font]);
674 TermWin.fwidth = TermWin.fontset->base_font ()->width;
675 TermWin.fheight = TermWin.fontset->base_font ()->height;
676 TermWin.fbase = TermWin.fontset->base_font ()->ascent;
677 628
678#ifdef XTERM_REVERSE_VIDEO 629#ifdef XTERM_REVERSE_VIDEO
679 /* this is how xterm implements reverseVideo */ 630 /* this is how xterm implements reverseVideo */
680 if (Options & Opt_reverseVideo) 631 if (Options & Opt_reverseVideo)
681 { 632 {
… …
701 color_aliases (Color_bg); 652 color_aliases (Color_bg);
702#ifndef NO_CURSORCOLOR 653#ifndef NO_CURSORCOLOR
703 color_aliases (Color_cursor); 654 color_aliases (Color_cursor);
704 color_aliases (Color_cursor2); 655 color_aliases (Color_cursor2);
705#endif /* NO_CURSORCOLOR */ 656#endif /* NO_CURSORCOLOR */
706 color_aliases (Color_pointer); 657 color_aliases (Color_pointer_fg);
658 color_aliases (Color_pointer_bg);
707 color_aliases (Color_border); 659 color_aliases (Color_border);
708#ifndef NO_BOLD_UNDERLINE_REVERSE 660#ifndef NO_BOLD_UNDERLINE_REVERSE
709 color_aliases (Color_BD); 661 color_aliases (Color_BD);
710 color_aliases (Color_UL); 662 color_aliases (Color_UL);
711 color_aliases (Color_RV); 663 color_aliases (Color_RV);
… …
805void 757void
806rxvt_term::set_locale (const char *locale) 758rxvt_term::set_locale (const char *locale)
807{ 759{
808#if HAVE_XSETLOCALE || HAVE_SETLOCALE 760#if HAVE_XSETLOCALE || HAVE_SETLOCALE
809 free (this->locale); 761 free (this->locale);
810 this->locale = rxvt_strdup (setlocale (LC_CTYPE, "")); 762 this->locale = setlocale (LC_CTYPE, locale);
763
764 if (!this->locale)
765 {
766 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale);
767 setlocale (LC_CTYPE, "");
768 this->locale = "";
769 }
770
771 this->locale = rxvt_strdup (this->locale);
772 SET_LOCALE (this->locale);
773 mbstate.reset ();
811#endif 774#endif
775#if 0
812#if HAVE_NL_LANGINFO 776#if HAVE_NL_LANGINFO
813 free (codeset); 777 free (codeset);
814 codeset = strdup (nl_langinfo (CODESET)); 778 codeset = strdup (nl_langinfo (CODESET));
815 enc_utf8 = !STRCASECMP (codeset, "UTF-8") 779 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
816 || !STRCASECMP (codeset, "UTF8"); 780 || !STRCASECMP (codeset, "UTF8");
817#else 781#else
818 enc_utf8 = 1; 782 enc_utf8 = 1;
819#endif 783#endif
784#endif
820} 785}
821 786
822void 787void
823rxvt_term::init_xlocale () 788rxvt_term::init_xlocale ()
824{ 789{
825#ifdef USE_XIM 790#ifdef USE_XIM
826 if (!locale) 791 if (!locale)
827 rxvt_print_error ("Setting locale failed."); 792 rxvt_warn ("setting locale failed, working without locale support.\n");
828 else 793 else
829 { 794 {
830 Atom wmlocale; 795 Atom wmlocale;
831 796
832 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False); 797 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
… …
834 XA_STRING, 8, PropModeReplace, 799 XA_STRING, 8, PropModeReplace,
835 (unsigned char *)locale, STRLEN (locale)); 800 (unsigned char *)locale, STRLEN (locale));
836 801
837 if (!XSupportsLocale ()) 802 if (!XSupportsLocale ())
838 { 803 {
839 rxvt_print_error ("The locale is not supported by Xlib"); 804 rxvt_warn ("the locale is not supported by Xlib, working withotu locale support.\n");
840 return; 805 return;
841 } 806 }
842 807
843 im_ev.start (display); 808 im_ev.start (display);
844 809
… …
874 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); 839 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC);
875#endif 840#endif
876 841
877 get_ourmods (); 842 get_ourmods ();
878 843
879 if (! (Options & Opt_scrollTtyOutput)) 844 if (!(Options & Opt_scrollTtyOutput))
880 PrivateModes |= PrivMode_TtyOutputInh; 845 PrivateModes |= PrivMode_TtyOutputInh;
881 if (Options & Opt_scrollTtyKeypress) 846 if (Options & Opt_scrollTtyKeypress)
882 PrivateModes |= PrivMode_Keypress; 847 PrivateModes |= PrivMode_Keypress;
883 if (! (Options & Opt_jumpScroll)) 848 if (!(Options & Opt_jumpScroll))
884 PrivateModes |= PrivMode_smoothScroll; 849 PrivateModes |= PrivMode_smoothScroll;
885 850
886#ifndef NO_BACKSPACE_KEY 851#ifndef NO_BACKSPACE_KEY
887 if (STRCMP (key_backspace, "DEC") == 0) 852 if (STRCMP (key_backspace, "DEC") == 0)
888 PrivateModes |= PrivMode_HaveBackSpace; 853 PrivateModes |= PrivMode_HaveBackSpace;
… …
898 { 863 {
899 PrivateModes |= PrivMode_menuBar; 864 PrivateModes |= PrivMode_menuBar;
900 SavedModes |= PrivMode_menuBar; 865 SavedModes |= PrivMode_menuBar;
901 } 866 }
902 867
903#ifdef GREEK_SUPPORT
904 greek_init ();
905#endif
906
907#ifdef CURSOR_BLINK 868#ifdef CURSOR_BLINK
908 if (Options & Opt_cursorBlink) 869 if (Options & Opt_cursorBlink)
909 (void)gettimeofday (&lastcursorchange, NULL); 870 (void)gettimeofday (&lastcursorchange, NULL);
910#endif 871#endif
911 872
912 if ((cmd_fd = run_command (argv)) < 0) 873 if ((cmd_fd = run_command (argv)) < 0)
913 { 874 rxvt_fatal ("failure while running command, aborting");
914 rxvt_print_error ("aborting");
915 exit (EXIT_FAILURE);
916 }
917} 875}
918 876
919/*----------------------------------------------------------------------*/ 877/*----------------------------------------------------------------------*/
920void 878void
921rxvt_term::Get_Colours () 879rxvt_term::Get_Colours ()
922{ 880{
923 int i; 881 int i;
924 882
883#ifdef OFF_FOCUS_FADING
884 PixColors = PixColorsFocused;
885#endif
886
925 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++) 887 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
926 { 888 {
927 rxvt_color xcol; 889 rxvt_color xcol;
928 890
929 if (!rs[Rs_color + i]) 891 if (!rs[Rs_color + i])
930 continue; 892 continue;
… …
946 switch (i) 908 switch (i)
947 { 909 {
948 case Color_fg: 910 case Color_fg:
949 case Color_bg: 911 case Color_bg:
950 /* fatal: need bg/fg color */ 912 /* fatal: need bg/fg color */
951 rxvt_print_error ("aborting"); 913 rxvt_fatal ("unable to get foreground/background colour, aborting");
952 exit (EXIT_FAILURE);
953 /* NOTREACHED */ 914 /* NOTREACHED */
954 break; 915 break;
955#ifndef NO_CURSORCOLOR 916#ifndef NO_CURSORCOLOR
956 case Color_cursor2: 917 case Color_cursor2:
957 xcol = PixColors[Color_fg]; 918 xcol = PixColors[Color_fg];
958 break; 919 break;
959#endif /* ! NO_CURSORCOLOR */ 920#endif /* ! NO_CURSORCOLOR */
960 case Color_pointer: 921 case Color_pointer_fg:
961 xcol = PixColors[Color_fg]; 922 xcol = PixColors[Color_fg];
962 break; 923 break;
963 default: 924 default:
964 xcol = PixColors[Color_bg]; /* None */ 925 xcol = PixColors[Color_bg]; /* None */
965 break; 926 break;
966 } 927 }
967 } 928 }
968 } 929 }
969 930
970 PixColors[i] = xcol; 931 PixColors[i] = xcol;
932#ifdef OFF_FOCUS_FADING
933 if (rs[Rs_fade])
934 PixColorsUnFocused[i] = xcol.fade (display, atoi (rs[Rs_fade]));
935#endif
971 SET_PIXCOLOR (i); 936 SET_PIXCOLOR (i);
972 } 937 }
973 938
974 if (XDEPTH <= 2 || !rs[Rs_color + Color_pointer]) 939 if (display->depth <= 2)
975 PixColors[Color_pointer] = PixColors[Color_fg]; 940 {
976 if (XDEPTH <= 2 || !rs[Rs_color + Color_border]) 941 if (!rs[Rs_color + Color_pointer_fg]) PixColors[Color_pointer_fg] = PixColors[Color_fg];
977 PixColors[Color_border] = PixColors[Color_fg]; 942 if (!rs[Rs_color + Color_pointer_bg]) PixColors[Color_pointer_bg] = PixColors[Color_bg];
943 if (!rs[Rs_color + Color_border] ) PixColors[Color_border] = PixColors[Color_fg];
944 }
978 945
979 /* 946 /*
980 * get scrollBar/menuBar shadow colors 947 * get scrollBar/menuBar shadow colors
981 * 948 *
982 * The calculations of topShadow/bottomShadow values are adapted 949 * The calculations of topShadow/bottomShadow values are adapted
983 * from the fvwm window manager. 950 * from the fvwm window manager.
984 */ 951 */
985#ifdef KEEP_SCROLLCOLOR 952#ifdef KEEP_SCROLLCOLOR
986 953
987 if (XDEPTH <= 2) 954 if (display->depth <= 2)
988 { /* Monochrome */ 955 { /* Monochrome */
989 PixColors[Color_scroll] = PixColors[Color_fg]; 956 PixColors[Color_scroll] = PixColors[Color_fg];
990 PixColors[Color_topShadow] = PixColors[Color_bg]; 957 PixColors[Color_topShadow] = PixColors[Color_bg];
991 PixColors[Color_bottomShadow] = PixColors[Color_bg]; 958 PixColors[Color_bottomShadow] = PixColors[Color_bg];
992 } 959 }
993 else 960 else
994 { 961 {
995 rxvt_color xcol[3]; 962 rxvt_color xcol[2];
996 /* xcol[0] == white 963 /* xcol[0] == white
997 * xcol[1] == top shadow 964 * xcol[1] == top shadow
998 * xcol[2] == bot shadow */ 965 * xcol[2] == bot shadow */
999 966
1000 xcol[1] = PixColors[Color_scroll]; 967 xcol[1] = PixColors[Color_scroll];
1001# ifdef PREFER_24BIT
1002 xcol[0].set (display, 65535, 65535, 65535); 968 xcol[0].set (display, 65535, 65535, 65535);
1003 /* XFreeColors (display->display, XCMAP, & (xcol[0].pixel), 1, ~0); */
1004# else
1005 xcol[0].set (display, WhitePixel (display->display, display->screen));
1006# endif
1007 969
1008 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 970 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
1009 971
1010 xcol[0].get (display, pr0, pg0, pb0); 972 xcol[0].get (display, pr0, pg0, pb0);
1011 xcol[1].get (display, pr1, pg1, pb1); 973 xcol[1].get (display, pr1, pg1, pb1);
1012 974
1013 /* bottomShadowColor */
1014 if (!xcol[2].set (display, pr1 / 2, pg1 / 2, pb1 / 2))
1015 xcol[2] = PixColors[Color_Black];
1016
1017 PixColors[Color_bottomShadow] = xcol[2]; 975 PixColors[Color_bottomShadow] = xcol[1].fade (display, 50);
1018 976
1019 /* topShadowColor */ 977 /* topShadowColor */
1020 if (!xcol[1].set (display, 978 if (!xcol[1].set (display,
1021 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 979 min (pr0, max (pr0 / 5, pr1) * 7 / 5),
1022 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 980 min (pg0, max (pg0 / 5, pg1) * 7 / 5),
… …
1126/*----------------------------------------------------------------------*/ 1084/*----------------------------------------------------------------------*/
1127/* rxvt_Create_Windows () - Open and map the window */ 1085/* rxvt_Create_Windows () - Open and map the window */
1128void 1086void
1129rxvt_term::create_windows (int argc, const char *const *argv) 1087rxvt_term::create_windows (int argc, const char *const *argv)
1130{ 1088{
1131 XClassHint classHint; 1089 XClassHint classHint;
1132 XWMHints wmHint; 1090 XWMHints wmHint;
1091#ifndef NO_FRILLS
1092 Atom prop = None;
1093 MWMHints mwmhints;
1094#endif
1133 XGCValues gcvalue; 1095 XGCValues gcvalue;
1134 long vt_emask; 1096 long vt_emask;
1135 1097 XSetWindowAttributes attributes;
1136 XWindowAttributes gattr; 1098 XWindowAttributes gattr;
1137 1099
1138 if (Options & Opt_transparent) 1100 if (Options & Opt_transparent)
1139 { 1101 {
1140 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 1102 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);
1141 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 1103 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
1142 } 1104 }
1143 1105
1106#ifndef NO_FRILLS
1107 if (Options & Opt_borderLess)
1108 {
1109 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True);
1110 if (prop == None)
1111 {
1112 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
1113#ifdef PREFER_24BIT
1114 attributes.override_redirect = TRUE;
1115#endif
1116 mwmhints.flags = 0;
1117 }
1118 else
1119 {
1120 mwmhints.flags = MWM_HINTS_DECORATIONS;
1121 mwmhints.decorations = 0;
1122 }
1123 }
1124 else
1125 {
1126 mwmhints.flags = 0;
1127 }
1128#endif
1129
1144 /* grab colors before netscape does */ 1130 /* grab colors before netscape does */
1145 Get_Colours (); 1131 Get_Colours ();
1146 1132
1147 change_font (1, NULL); 1133 if (!change_font (rs[Rs_font]))
1134 {
1135 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1136 destroy ();
1137 return;
1138 }
1139
1148 window_calc (0, 0); 1140 window_calc (0, 0);
1149 old_width = szHint.width; 1141 old_width = szHint.width;
1150 old_height = szHint.height; 1142 old_height = szHint.height;
1151 1143
1152 /* parent window - reverse video so we can see placement errors
1153 * sub-window placement & size in rxvt_resize_subwindows () 1144 /* sub-window placement & size in rxvt_resize_subwindows () */
1154 */
1155 1145
1156#ifdef PREFER_24BIT 1146#ifdef PREFER_24BIT
1157 XSetWindowAttributes attributes;
1158
1159 attributes.background_pixel = PixColors[Color_fg]; 1147 attributes.background_pixel = PixColors[Color_bg];
1160 attributes.border_pixel = PixColors[Color_border]; 1148 attributes.border_pixel = PixColors[Color_border];
1161 attributes.colormap = display->cmap; 1149 attributes.colormap = display->cmap;
1162 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 1150 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
1163 szHint.x, szHint.y, 1151 szHint.x, szHint.y,
1164 szHint.width, szHint.height, 1152 szHint.width, szHint.height,
1165 TermWin.ext_bwidth, 1153 TermWin.ext_bwidth,
1166 display->depth, InputOutput, 1154 display->depth, InputOutput,
1167 display->visual, 1155 display->visual,
1168 CWBackPixel | CWBorderPixel | CWColormap, &attributes); 1156 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1169#else 1157#else
1170 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 1158 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
1171 szHint.x, szHint.y, 1159 szHint.x, szHint.y,
1172 szHint.width, 1160 szHint.width, szHint.height,
1173 szHint.height,
1174 TermWin.ext_bwidth, 1161 TermWin.ext_bwidth,
1175 PixColors[Color_border], 1162 PixColors[Color_border],
1176 PixColors[Color_fg]); 1163 PixColors[Color_bg]);
1177#endif 1164#endif
1178 1165
1179 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1166 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1180 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1167 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1181 1168
1182 classHint.res_name = (char *)rs[Rs_name]; 1169 classHint.res_name = (char *)rs[Rs_name];
1183 classHint.res_class = (char *)APL_CLASS; 1170 classHint.res_class = (char *)RESCLASS;
1184 1171
1185 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 1172 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1186 wmHint.input = True; 1173 wmHint.input = True;
1187 wmHint.initial_state = (Options & Opt_iconic ? IconicState 1174 wmHint.initial_state = Options & Opt_iconic ? IconicState : NormalState;
1188 : NormalState);
1189 wmHint.window_group = TermWin.parent[0]; 1175 wmHint.window_group = TermWin.parent[0];
1190 1176
1191 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1177 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,
1192 (char **)argv, argc, &szHint, &wmHint, &classHint); 1178 (char **)argv, argc, &szHint, &wmHint, &classHint);
1179
1180#ifndef NO_FRILLS
1181 long pid = getpid ();
1182 XChangeProperty (display->display, TermWin.parent[0],
1183 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32,
1184 PropModeReplace, (unsigned char *)&pid, 1);
1185#endif
1193 1186
1194 XSelectInput (display->display, TermWin.parent[0], 1187 XSelectInput (display->display, TermWin.parent[0],
1195 KeyPressMask 1188 KeyPressMask
1196#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1189#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1197 | KeyReleaseMask 1190 | KeyReleaseMask
1198#endif 1191#endif
1199 | FocusChangeMask | VisibilityChangeMask 1192 | FocusChangeMask | VisibilityChangeMask
1193 | ExposureMask
1200 | StructureNotifyMask); 1194 | StructureNotifyMask);
1201 termwin_ev.start (display, TermWin.parent[0]); 1195 termwin_ev.start (display, TermWin.parent[0]);
1196
1197#ifndef NO_FRILLS
1198 if (mwmhints.flags)
1199 {
1200 prop = XInternAtom(display->display, "_MOTIF_WM_HINTS", False);
1201 XChangeProperty(display->display, TermWin.parent[0], prop, prop, 32, PropModeReplace, (unsigned char *) &mwmhints, PROP_MWM_HINTS_ELEMENTS);
1202 }
1203#endif
1202 1204
1203 /* vt cursor: Black-on-White is standard, but this is more popular */ 1205 /* vt cursor: Black-on-White is standard, but this is more popular */
1204 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1206 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm);
1205 1207
1206#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1208#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
… …
1221 } 1223 }
1222#endif 1224#endif
1223 1225
1224 /* the vt window */ 1226 /* the vt window */
1225 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1227 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],
1226 window_vt_x, window_vt_y, 1228 window_vt_x,
1229 window_vt_y,
1227 TermWin_TotalWidth (), 1230 TermWin_TotalWidth (),
1228 TermWin_TotalHeight (), 1231 TermWin_TotalHeight (),
1229 0, 1232 0,
1230 PixColors[Color_fg], 1233 PixColors[Color_fg],
1231 PixColors[Color_bg]); 1234 PixColors[Color_bg]);
1232
1233#ifdef DEBUG_X 1235#ifdef DEBUG_X
1234 XStoreName (display->display, TermWin.vt, "vt window"); 1236 XStoreName (display->display, TermWin.vt, "vt window");
1235#endif 1237#endif
1236 1238
1239 attributes.bit_gravity = NorthWestGravity;
1240 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes);
1241
1237 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask 1242 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1238 | PropertyChangeMask); 1243
1244 pointer_unblank ();
1239 1245
1240#ifdef POINTER_BLANK 1246#ifdef POINTER_BLANK
1241 pointer_unblank ();
1242
1243 if ((Options & Opt_pointerBlank)) 1247 if (Options & Opt_pointerBlank)
1244 vt_emask |= PointerMotionMask; 1248 vt_emask |= PointerMotionMask;
1245 else 1249 else
1246#endif 1250#endif
1247 vt_emask |= (Button1MotionMask | Button3MotionMask); 1251 vt_emask |= Button1MotionMask | Button3MotionMask;
1248 1252
1249 XSelectInput (display->display, TermWin.vt, vt_emask); 1253 XSelectInput (display->display, TermWin.vt, vt_emask);
1250 vt_ev.start (display, TermWin.vt); 1254 vt_ev.start (display, TermWin.vt);
1251 1255
1252#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1256#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1253 if (menuBar_height ()) 1257 if (menuBar_height ())
1254 { 1258 {
1255 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1259 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1256 window_vt_x, 0, 1260 window_vt_x, 0,
1257 TermWin_TotalWidth (), 1261 TermWin_TotalWidth (),
1258 menuBar_TotalHeight (), 1262 menuBar_TotalHeight (),
1259 0, 1263 0,
1260 PixColors[Color_fg], 1264 PixColors[Color_fg],
1261 PixColors[Color_scroll]); 1265 PixColors[Color_scroll]);
1266
1262#ifdef DEBUG_X 1267#ifdef DEBUG_X
1263 XStoreName (display->display, menuBar.win, "menubar"); 1268 XStoreName (display->display, menuBar.win, "menubar");
1264#endif 1269#endif
1265 1270
1271 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1272
1266 XDefineCursor (display->display, menuBar.win, pointer_leftptr); 1273 XDefineCursor (display->display, menuBar.win,
1274 XCreateFontCursor (display->display, XC_left_ptr));
1267 1275
1268 XSelectInput (display->display, menuBar.win, 1276 XSelectInput (display->display, menuBar.win,
1269 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1277 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1270 | Button1MotionMask)); 1278 | Button1MotionMask));
1271 menubar_ev.start (display, menuBar.win); 1279 menubar_ev.start (display, menuBar.win);
… …
1274 1282
1275#ifdef XPM_BACKGROUND 1283#ifdef XPM_BACKGROUND
1276 if (rs[Rs_backgroundPixmap] != NULL 1284 if (rs[Rs_backgroundPixmap] != NULL
1277 && ! (Options & Opt_transparent)) 1285 && ! (Options & Opt_transparent))
1278 { 1286 {
1279 const char *p = rs[Rs_backgroundPixmap]; 1287 const char *p = rs[Rs_backgroundPixmap];
1280 1288
1281 if ((p = STRCHR (p, ';')) != NULL) 1289 if ((p = STRCHR (p, ';')) != NULL)
1282 { 1290 {
1283 p++; 1291 p++;
1284 scale_pixmap (p); 1292 scale_pixmap (p);
… …
1291 /* graphics context for the vt window */ 1299 /* graphics context for the vt window */
1292 gcvalue.foreground = PixColors[Color_fg]; 1300 gcvalue.foreground = PixColors[Color_fg];
1293 gcvalue.background = PixColors[Color_bg]; 1301 gcvalue.background = PixColors[Color_bg];
1294 gcvalue.graphics_exposures = 1; 1302 gcvalue.graphics_exposures = 1;
1295 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1303 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1296 GCForeground | GCBackground 1304 GCForeground | GCBackground | GCGraphicsExposures,
1297 | GCGraphicsExposures, &gcvalue); 1305 &gcvalue);
1306
1307 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1298 1308
1299#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1309#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1300 gcvalue.foreground = PixColors[Color_topShadow]; 1310 gcvalue.foreground = PixColors[Color_topShadow];
1301 topShadowGC = XCreateGC (display->display, TermWin.vt, 1311 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1302 GCForeground, &gcvalue);
1303 gcvalue.foreground = PixColors[Color_bottomShadow]; 1312 gcvalue.foreground = PixColors[Color_bottomShadow];
1304 botShadowGC = XCreateGC (display->display, TermWin.vt, 1313 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1305 GCForeground, &gcvalue); 1314 gcvalue.foreground = PixColors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1306 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg
1307 : Color_scroll)];
1308 scrollbarGC = XCreateGC (display->display, TermWin.vt, 1315 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1309 GCForeground, &gcvalue); 1316#endif
1317
1318#ifdef OFF_FOCUS_FADING
1319 // initially we are in unfocused state
1320 if (rs[Rs_fade])
1321 PixColors = PixColorsUnFocused;
1310#endif 1322#endif
1311} 1323}
1312 1324
1313/*----------------------------------------------------------------------*/ 1325/*----------------------------------------------------------------------*/
1314/* 1326/*
… …
1321{ 1333{
1322 int cfd, er; 1334 int cfd, er;
1323 1335
1324 /* get master (pty) */ 1336 /* get master (pty) */
1325 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0) 1337 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0)
1326 {
1327 rxvt_print_error ("can't open pseudo-tty"); 1338 rxvt_fatal ("can't open pseudo-tty");
1328 return -1;
1329 }
1330 1339
1331 fcntl (cfd, F_SETFL, O_NONBLOCK); 1340 fcntl (cfd, F_SETFL, O_NONBLOCK);
1332 1341
1333 /* get slave (tty) */ 1342 /* get slave (tty) */
1334 if (tty_fd < 0) 1343 if (tty_fd < 0)
… …
1338#endif 1347#endif
1339 1348
1340 if ((tty_fd = rxvt_get_tty (ttydev)) < 0) 1349 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1341 { 1350 {
1342 close (cfd); 1351 close (cfd);
1343 rxvt_print_error ("can't open slave tty %s", ttydev); 1352 rxvt_fatal ("can't open slave tty %s", ttydev);
1344 return -1;
1345 } 1353 }
1346 } 1354 }
1355
1347#ifndef NO_BACKSPACE_KEY 1356#ifndef NO_BACKSPACE_KEY
1348 if (key_backspace[0] && !key_backspace[1]) 1357 if (key_backspace[0] && !key_backspace[1])
1349 er = key_backspace[0]; 1358 er = key_backspace[0];
1350 else if (STRCMP (key_backspace, "DEC") == 0) 1359 else if (STRCMP (key_backspace, "DEC") == 0)
1351 er = '\177'; /* the initial state anyway */ 1360 er = '\177'; /* the initial state anyway */
1352 else 1361 else
1353#endif 1362#endif
1354
1355 er = -1; 1363 er = -1;
1356 1364
1357 rxvt_get_ttymode (& (tio), er); 1365 rxvt_get_ttymode (&tio, er);
1358 1366
1359#ifndef __QNX__ 1367#ifndef __QNX__
1360 /* spin off the command interpreter */ 1368 /* spin off the command interpreter */
1361 switch (cmd_pid = fork ()) 1369 switch (cmd_pid = fork ())
1362 { 1370 {
1363 case -1: 1371 case -1:
1364 rxvt_print_error ("can't fork"); 1372 rxvt_fatal ("can't fork");
1365 return -1;
1366 case 0: 1373 case 0:
1367 close (cfd); /* only keep tty_fd and STDERR open */ 1374 close (cfd); /* only keep tty_fd and STDERR open */
1368 1375
1369 init_env (); 1376 init_env ();
1370 1377
1371 if (rxvt_control_tty (tty_fd, ttydev) < 0) 1378 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1372 rxvt_print_error ("could not obtain control of tty"); 1379 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1373 else 1380 else
1374 { 1381 {
1375 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1382 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1376 dup2 (tty_fd, STDIN_FILENO); 1383 dup2 (tty_fd, STDIN_FILENO);
1377 dup2 (tty_fd, STDOUT_FILENO); 1384 dup2 (tty_fd, STDOUT_FILENO);
… …
1379 1386
1380 if (tty_fd > 2) 1387 if (tty_fd > 2)
1381 close (tty_fd); 1388 close (tty_fd);
1382 1389
1383 run_child (argv); 1390 run_child (argv);
1391 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1384 } 1392 }
1393
1385 exit (EXIT_FAILURE); 1394 _exit (EXIT_FAILURE);
1386 /* NOTREACHED */ 1395
1387 default: 1396 default:
1388 { 1397 {
1389#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1398#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1390 int fdstdin; 1399 int fdstdin;
1391 1400
… …
1400#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1409#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1401 1410
1402 dup2 (fdstdin, STDIN_FILENO); 1411 dup2 (fdstdin, STDIN_FILENO);
1403 close (fdstdin); 1412 close (fdstdin);
1404#endif 1413#endif
1405
1406 } 1414 }
1415
1407 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */ 1416 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1408 break; 1417 break;
1409 } 1418 }
1410#else /* __QNX__ uses qnxspawn () */ 1419#else /* __QNX__ uses qnxspawn () */
1411 fchmod (tty_fd, 0622); 1420 fchmod (tty_fd, 0622);
… …
1442#elif defined (SRIOCSREDIR) 1451#elif defined (SRIOCSREDIR)
1443 int fd; 1452 int fd;
1444 1453
1445 fd = open (CONSOLE, O_WRONLY, 0); 1454 fd = open (CONSOLE, O_WRONLY, 0);
1446 if (fd >= 0) 1455 if (fd >= 0)
1447 {
1448 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1456 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1449 close (fd); 1457 close (fd);
1450 }
1451#endif /* SRIOCSREDIR */ 1458#endif /* SRIOCSREDIR */
1452 1459
1453 } 1460 }
1454 1461
1455 /* reset signals and spin off the command interpreter */ 1462 /* reset signals and spin off the command interpreter */

Diff Legend

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