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.90 by root, Wed Aug 25 03:47:20 2004 UTC vs.
Revision 1.108 by root, Fri Feb 4 11:41:23 2005 UTC

… …
31 * Initialisation routines. 31 * Initialisation routines.
32 */ 32 */
33 33
34#include "../config.h" /* NECESSARY */ 34#include "../config.h" /* NECESSARY */
35#include "rxvt.h" /* NECESSARY */ 35#include "rxvt.h" /* NECESSARY */
36#include "rxvtutil.h"
36#include "init.h" 37#include "init.h"
37 38
38#include <signal.h> 39#include <csignal>
39 40
40const char *const def_colorName[] = 41const char *const def_colorName[] =
41 { 42 {
42 COLOR_FOREGROUND, 43 COLOR_FOREGROUND,
43 COLOR_BACKGROUND, 44 COLOR_BACKGROUND,
… …
155 NULL, /* Color_BD */ 156 NULL, /* Color_BD */
156 NULL, /* Color_IT */ 157 NULL, /* Color_IT */
157 NULL, /* Color_UL */ 158 NULL, /* Color_UL */
158 NULL, /* Color_RV */ 159 NULL, /* Color_RV */
159#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 160#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161#if ENABLE_FRILLS
162 NULL, // Color_underline
163#endif
160#ifdef OPTION_HC 164#ifdef OPTION_HC
161 NULL, 165 NULL,
162#endif 166#endif
163#ifdef KEEP_SCROLLCOLOR 167#ifdef KEEP_SCROLLCOLOR
164 COLOR_SCROLLBAR, 168 COLOR_SCROLLBAR,
… …
167#if TINTING 171#if TINTING
168 NULL, 172 NULL,
169#endif 173#endif
170 }; 174 };
171 175
172const char *const xa_names[NUM_XA] = 176const char *const xa_names[] =
173 { 177 {
174 "TEXT", 178 "TEXT",
175 "COMPOUND_TEXT", 179 "COMPOUND_TEXT",
176 "UTF8_STRING", 180 "UTF8_STRING",
177 "MULTIPLE", 181 "MULTIPLE",
178 "TARGETS", 182 "TARGETS",
179 "TIMESTAMP", 183 "TIMESTAMP",
180 "VT_SELECTION", 184 "VT_SELECTION",
181 "INCR", 185 "INCR",
182 "WM_DELETE_WINDOW", 186 "WM_DELETE_WINDOW",
187 "CLIPBOARD",
188#if ENABLE_FRILLS
189 "_NET_WM_PID",
190 "_MOTIF_WM_HINTS",
191 "_NET_WM_NAME",
192 "_NET_WM_ICON_NAME",
193#endif
194#if USE_XIM
195 "WM_LOCALE_NAME",
196#endif
183#ifdef TRANSPARENT 197#ifdef TRANSPARENT
184 "_XROOTPMAP_ID", 198 "_XROOTPMAP_ID",
199 "ESETROOT_PMAP_ID",
185#endif 200#endif
186#ifdef OFFIX_DND 201#ifdef OFFIX_DND
187 "DndProtocol", 202 "DndProtocol",
188 "DndSelection", 203 "DndSelection",
189#endif 204#endif
190 "CLIPBOARD"
191 }; 205 };
192 206
193bool 207bool
194rxvt_term::init_vars () 208rxvt_term::init_vars ()
195{ 209{
210 sw_term.start (SIGTERM);
211 sw_int.start (SIGINT);
212
196 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 213 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
197#ifdef OFF_FOCUS_FADING 214#ifdef OFF_FOCUS_FADING
198 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 215 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
199#endif 216#endif
200 pix_colors = pix_colors_focused; 217 pix_colors = pix_colors_focused;
… …
236 last_bot = last_state = -1; 253 last_bot = last_state = -1;
237 254
238#ifdef MENUBAR 255#ifdef MENUBAR
239 menu_readonly = 1; 256 menu_readonly = 1;
240# if ! (MENUBAR_MAX > 1) 257# if ! (MENUBAR_MAX > 1)
241 CurrentBar = & (BarList); 258 CurrentBar = &BarList;
242# endif /* (MENUBAR_MAX > 1) */ 259# endif /* (MENUBAR_MAX > 1) */
243#endif 260#endif
244 261
245 return true; 262 return true;
246} 263}
… …
320 */ 337 */
321 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 338 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
322 rs[Rs_display_name] = ":0"; 339 rs[Rs_display_name] = ":0";
323 340
324 get_options (r_argc, r_argv); 341 get_options (r_argc, r_argv);
325 free (r_argv);
326 342
327#ifdef LOCAL_X_IS_UNIX 343#ifdef LOCAL_X_IS_UNIX
328 if (rs[Rs_display_name][0] == ':') 344 if (rs[Rs_display_name][0] == ':')
329 { 345 {
330 val = rxvt_malloc (5 + strlen (rs[Rs_display_name])); 346 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
… …
337 353
338 if (!display 354 if (!display
339 && ! (display = displays.get (rs[Rs_display_name]))) 355 && ! (display = displays.get (rs[Rs_display_name])))
340 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 356 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
341 357
342 extract_resources (display->display, rs[Rs_name]); 358 extract_resources ();
359 free (r_argv);
343 360
344 /* 361 /*
345 * set any defaults not already set 362 * set any defaults not already set
346 */ 363 */
347 if (cmd_argv && cmd_argv[0]) 364 if (cmd_argv && cmd_argv[0])
… …
365#if ENABLE_FRILLS 382#if ENABLE_FRILLS
366 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 383 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
367 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 384 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */
368 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 385 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
369 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 386 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */
370#endif
371
372#ifndef NO_LINESPACE
373 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 387 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
374 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 388 TermWin.lineSpace = min (i, 100); /* arbitrary limit */
375#endif 389#endif
376 390
377#ifdef POINTER_BLANK 391#ifdef POINTER_BLANK
… …
588 602
589 this->locale = rxvt_strdup (this->locale); 603 this->locale = rxvt_strdup (this->locale);
590 SET_LOCALE (this->locale); 604 SET_LOCALE (this->locale);
591 mbstate.reset (); 605 mbstate.reset ();
592#endif 606#endif
593#if 0 607
594#if HAVE_NL_LANGINFO 608#if HAVE_NL_LANGINFO
609 char *codeset = strdup (nl_langinfo (CODESET));
610 // /^UTF.?8/i
611 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
612 && (codeset[1] == 'T' || codeset[1] == 't')
613 && (codeset[2] == 'F' || codeset[2] == 'f')
614 && (codeset[3] == '8' || codeset[4] == '8');
595 free (codeset); 615 free (codeset);
596 codeset = strdup (nl_langinfo (CODESET));
597 enc_utf8 = !strcasecmp (codeset, "UTF-8")
598 || !strcasecmp (codeset, "UTF8");
599#else 616#else
600 enc_utf8 = 1; 617 enc_utf8 = 0;
601#endif
602#endif 618#endif
603} 619}
604 620
605void 621void
606rxvt_term::init_xlocale () 622rxvt_term::init_xlocale ()
… …
608#ifdef USE_XIM 624#ifdef USE_XIM
609 if (!locale) 625 if (!locale)
610 rxvt_warn ("setting locale failed, working without locale support.\n"); 626 rxvt_warn ("setting locale failed, working without locale support.\n");
611 else 627 else
612 { 628 {
613 Atom wmlocale; 629 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
614
615 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
616 XChangeProperty (display->display, TermWin.parent[0], wmlocale,
617 XA_STRING, 8, PropModeReplace,
618 (unsigned char *)locale, strlen (locale));
619 630
620 if (!XSupportsLocale ()) 631 if (!XSupportsLocale ())
621 { 632 {
622 rxvt_warn ("the locale is not supported by Xlib, working withotu locale support.\n"); 633 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n");
623 return; 634 return;
624 } 635 }
625 636
626 im_ev.start (display); 637 im_ev.start (display);
627 638
… …
637{ 648{
638 /* 649 /*
639 * Initialize the command connection. 650 * Initialize the command connection.
640 * This should be called after the X server connection is established. 651 * This should be called after the X server connection is established.
641 */ 652 */
642 int i;
643
644 for (i = 0; i < NUM_XA; i++)
645 xa[i] = XInternAtom (display->display, xa_names[i], False);
646
647 /* Enable delete window protocol */
648 XSetWMProtocols (display->display, TermWin.parent[0],
649 & (xa[XA_WMDELETEWINDOW]), 1);
650
651#ifdef USING_W11LIB
652 /* enable W11 callbacks */
653 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
654#endif
655 653
656#ifdef META8_OPTION 654#ifdef META8_OPTION
657 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 655 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC);
658#endif 656#endif
659 657
… …
832 * Use resource ``modifier'' to override the Meta modifier 830 * Use resource ``modifier'' to override the Meta modifier
833 */ 831 */
834void 832void
835rxvt_term::get_ourmods () 833rxvt_term::get_ourmods ()
836{ 834{
837 int i, j, k; 835 int i, j, k;
838 int requestedmeta, realmeta, realalt; 836 int requestedmeta, realmeta, realalt;
839 const char *cm, *rsmod; 837 const char *cm, *rsmod;
840 XModifierKeymap *map; 838 XModifierKeymap *map;
841 KeyCode *kc; 839 KeyCode *kc;
842 const unsigned int modmasks[] = 840 const unsigned int modmasks[] =
843 { 841 {
844 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 842 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
845 }; 843 };
846 844
847 requestedmeta = realmeta = realalt = 0; 845 requestedmeta = realmeta = realalt = 0;
848 rsmod = rs[Rs_modifier]; 846 rsmod = rs[Rs_modifier];
847
849 if (rsmod 848 if (rsmod
850 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 849 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
851 requestedmeta = rsmod[3] - '0'; 850 requestedmeta = rsmod[3] - '0';
852 851
853 map = XGetModifierMapping (display->display); 852 map = XGetModifierMapping (display->display);
854 kc = map->modifiermap; 853 kc = map->modifiermap;
854
855 for (i = 1; i < 6; i++) 855 for (i = 1; i < 6; i++)
856 { 856 {
857 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 857 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
858
858 for (j = map->max_keypermod; j--; k++) 859 for (j = map->max_keypermod; j--; k++)
859 { 860 {
860 if (kc[k] == 0) 861 if (kc[k] == 0)
861 break; 862 break;
863
862 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 864 switch (XKeycodeToKeysym (display->display, kc[k], 0))
863 { 865 {
864 case XK_Num_Lock: 866 case XK_Num_Lock:
865 ModNumLockMask = modmasks[i - 1]; 867 ModNumLockMask = modmasks[i - 1];
866 /* FALLTHROUGH */ 868 continue;
867 default: 869
868 continue; /* for (;;) */ 870 case XK_ISO_Level3_Shift:
871 ModLevel3Mask = modmasks[i - 1];
872 continue;
873
869 case XK_Meta_L: 874 case XK_Meta_L:
870 case XK_Meta_R: 875 case XK_Meta_R:
871 cm = "meta"; 876 cm = "meta";
872 realmeta = i; 877 realmeta = i;
873 break; 878 break;
879
874 case XK_Alt_L: 880 case XK_Alt_L:
875 case XK_Alt_R: 881 case XK_Alt_R:
876 cm = "alt"; 882 cm = "alt";
877 realalt = i; 883 realalt = i;
878 break; 884 break;
885
879 case XK_Super_L: 886 case XK_Super_L:
880 case XK_Super_R: 887 case XK_Super_R:
881 cm = "super"; 888 cm = "super";
882 break; 889 break;
890
883 case XK_Hyper_L: 891 case XK_Hyper_L:
884 case XK_Hyper_R: 892 case XK_Hyper_R:
885 cm = "hyper"; 893 cm = "hyper";
886 break; 894 break;
895
896 default:
897 continue;
887 } 898 }
899
888 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0) 900 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
889 requestedmeta = i; 901 requestedmeta = i;
890 } 902 }
891 } 903 }
904
892 XFreeModifiermap (map); 905 XFreeModifiermap (map);
906
893 i = (requestedmeta ? requestedmeta 907 i = requestedmeta ? requestedmeta
894 : (realmeta ? realmeta 908 : realmeta ? realmeta
895 : (realalt ? realalt : 0))); 909 : realalt ? realalt
910 : 0;
911
896 if (i) 912 if (i)
897 ModMetaMask = modmasks[i - 1]; 913 ModMetaMask = modmasks[i - 1];
898} 914}
899 915
900/*----------------------------------------------------------------------*/ 916/*----------------------------------------------------------------------*/
… …
910#endif 926#endif
911 XGCValues gcvalue; 927 XGCValues gcvalue;
912 long vt_emask; 928 long vt_emask;
913 XSetWindowAttributes attributes; 929 XSetWindowAttributes attributes;
914 XWindowAttributes gattr; 930 XWindowAttributes gattr;
931 dDisp;
932
933#ifdef USING_W11LIB
934 /* enable W11 callbacks */
935 W11AddEventHandler (disp, rxvt_W11_process_x_event);
936#endif
937
938 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
939 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
915 940
916 if (options & Opt_transparent) 941 if (options & Opt_transparent)
917 { 942 {
918 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 943 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
919 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 944 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
920 } 945 }
921 946
922#if ENABLE_FRILLS 947#if ENABLE_FRILLS
923 if (options & Opt_borderLess) 948 if (options & Opt_borderLess)
924 { 949 {
925 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 950 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
951
926 if (prop == None) 952 if (prop == None)
927 { 953 {
928 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 954 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
929#ifdef PREFER_24BIT 955#ifdef PREFER_24BIT
930 attributes.override_redirect = TRUE; 956 attributes.override_redirect = TRUE;
… …
945 971
946 /* grab colors before netscape does */ 972 /* grab colors before netscape does */
947 Get_Colours (); 973 Get_Colours ();
948 974
949 if (!set_fonts ()) 975 if (!set_fonts ())
950 rxvt_fatal ("unable to load base fontset, please specify one using -fn, aborting.\n"); 976 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
951 977
952 window_calc (0, 0); 978 window_calc (0, 0);
953 old_width = szHint.width; 979 old_width = szHint.width;
954 old_height = szHint.height; 980 old_height = szHint.height;
955 981
… …
957 983
958#ifdef PREFER_24BIT 984#ifdef PREFER_24BIT
959 attributes.background_pixel = pix_colors_focused[Color_border]; 985 attributes.background_pixel = pix_colors_focused[Color_border];
960 attributes.border_pixel = pix_colors_focused[Color_border]; 986 attributes.border_pixel = pix_colors_focused[Color_border];
961 attributes.colormap = display->cmap; 987 attributes.colormap = display->cmap;
962 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 988 TermWin.parent[0] = XCreateWindow (disp, DefaultRootWindow (disp),
963 szHint.x, szHint.y, 989 szHint.x, szHint.y,
964 szHint.width, szHint.height, 990 szHint.width, szHint.height,
965 TermWin.ext_bwidth, 991 TermWin.ext_bwidth,
966 display->depth, InputOutput, 992 display->depth, InputOutput,
967 display->visual, 993 display->visual,
968 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 994 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
969#else 995#else
970 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 996 TermWin.parent[0] = XCreateSimpleWindow (disp, DefaultRootWindow (disp),
971 szHint.x, szHint.y, 997 szHint.x, szHint.y,
972 szHint.width, szHint.height, 998 szHint.width, szHint.height,
973 TermWin.ext_bwidth, 999 TermWin.ext_bwidth,
974 pix_colors_focused[Color_border], 1000 pix_colors_focused[Color_border],
975 pix_colors_focused[Color_border]); 1001 pix_colors_focused[Color_border]);
… …
984 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1010 wmHint.flags = InputHint | StateHint | WindowGroupHint;
985 wmHint.input = True; 1011 wmHint.input = True;
986 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1012 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
987 wmHint.window_group = TermWin.parent[0]; 1013 wmHint.window_group = TermWin.parent[0];
988 1014
989 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1015 XSetWMProperties (disp, TermWin.parent[0], NULL, NULL,
990 (char **)argv, argc, &szHint, &wmHint, &classHint); 1016 (char **)argv, argc, &szHint, &wmHint, &classHint);
1017
1018 /* Enable delete window protocol */
1019 XSetWMProtocols (disp, TermWin.parent[0],
1020 &xa[XA_WMDELETEWINDOW], 1);
991 1021
992#if ENABLE_FRILLS 1022#if ENABLE_FRILLS
993 long pid = getpid (); 1023 long pid = getpid ();
1024
994 XChangeProperty (display->display, TermWin.parent[0], 1025 XChangeProperty (disp, TermWin.parent[0],
995 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32, 1026 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
996 PropModeReplace, (unsigned char *)&pid, 1); 1027 PropModeReplace, (unsigned char *)&pid, 1);
997#endif 1028#endif
998 1029
999 XSelectInput (display->display, TermWin.parent[0], 1030 XSelectInput (disp, TermWin.parent[0],
1000 KeyPressMask 1031 KeyPressMask
1001#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1032#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1002 | KeyReleaseMask 1033 | KeyReleaseMask
1003#endif 1034#endif
1004 | FocusChangeMask | VisibilityChangeMask 1035 | FocusChangeMask | VisibilityChangeMask
… …
1006 | StructureNotifyMask); 1037 | StructureNotifyMask);
1007 termwin_ev.start (display, TermWin.parent[0]); 1038 termwin_ev.start (display, TermWin.parent[0]);
1008 1039
1009#if ENABLE_FRILLS 1040#if ENABLE_FRILLS
1010 if (mwmhints.flags) 1041 if (mwmhints.flags)
1011 { 1042 XChangeProperty (disp, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1012 prop = XInternAtom (display->display, "_MOTIF_WM_HINTS", False); 1043 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1013 XChangeProperty (display->display, TermWin.parent[0], prop, prop, 32, PropModeReplace, (unsigned char *) &mwmhints, PROP_MWM_HINTS_ELEMENTS);
1014 }
1015#endif 1044#endif
1016 1045
1017 /* vt cursor: Black-on-White is standard, but this is more popular */ 1046 /* vt cursor: Black-on-White is standard, but this is more popular */
1018 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1047 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1019 1048
1020#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1049#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1021 /* cursor (menuBar/scrollBar): Black-on-White */ 1050 /* cursor (menuBar/scrollBar): Black-on-White */
1022 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1051 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1023#endif
1024
1025#ifdef POINTER_BLANK
1026 {
1027 XColor blackcolour;
1028 blackcolour.red = 0;
1029 blackcolour.green = 0;
1030 blackcolour.blue = 0;
1031 Font f = XLoadFont (display->display, "fixed");
1032 blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1033 &blackcolour, &blackcolour);
1034 XUnloadFont (display->display, f);
1035 }
1036#endif 1052#endif
1037 1053
1038 /* the vt window */ 1054 /* the vt window */
1039 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1055 TermWin.vt = XCreateSimpleWindow (disp, TermWin.parent[0],
1040 window_vt_x, 1056 window_vt_x,
1041 window_vt_y, 1057 window_vt_y,
1042 TermWin_TotalWidth (), 1058 TermWin_TotalWidth (),
1043 TermWin_TotalHeight (), 1059 TermWin_TotalHeight (),
1044 0, 1060 0,
1045 pix_colors_focused[Color_fg], 1061 pix_colors_focused[Color_fg],
1046 pix_colors_focused[Color_bg]); 1062 pix_colors_focused[Color_bg]);
1047#ifdef DEBUG_X 1063#ifdef DEBUG_X
1048 XStoreName (display->display, TermWin.vt, "vt window"); 1064 XStoreName (disp, TermWin.vt, "vt window");
1049#endif 1065#endif
1050 1066
1051 attributes.bit_gravity = NorthWestGravity; 1067 attributes.bit_gravity = NorthWestGravity;
1052 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1068 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);
1053 1069
1054 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1070 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1055 1071
1056 pointer_unblank (); 1072 pointer_unblank ();
1057 1073
… …
1060 vt_emask |= PointerMotionMask; 1076 vt_emask |= PointerMotionMask;
1061 else 1077 else
1062#endif 1078#endif
1063 vt_emask |= Button1MotionMask | Button3MotionMask; 1079 vt_emask |= Button1MotionMask | Button3MotionMask;
1064 1080
1065 XSelectInput (display->display, TermWin.vt, vt_emask); 1081 XSelectInput (disp, TermWin.vt, vt_emask);
1066 vt_ev.start (display, TermWin.vt); 1082 vt_ev.start (display, TermWin.vt);
1067 1083
1068#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1084#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1069 if (menuBar_height ()) 1085 if (menuBar_height ())
1070 { 1086 {
1071 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1087 menuBar.win = XCreateSimpleWindow (disp, TermWin.parent[0],
1072 window_vt_x, 0, 1088 window_vt_x, 0,
1073 TermWin_TotalWidth (), 1089 TermWin_TotalWidth (),
1074 menuBar_TotalHeight (), 1090 menuBar_TotalHeight (),
1075 0, 1091 0,
1076 pix_colors_focused[Color_fg], 1092 pix_colors_focused[Color_fg],
1077 pix_colors_focused[Color_scroll]); 1093 pix_colors_focused[Color_scroll]);
1078 1094
1079#ifdef DEBUG_X 1095#ifdef DEBUG_X
1080 XStoreName (display->display, menuBar.win, "menubar"); 1096 XStoreName (disp, menuBar.win, "menubar");
1081#endif 1097#endif
1082 1098
1083 menuBar.drawable = new rxvt_drawable (display, menuBar.win); 1099 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1084 1100
1085 XDefineCursor (display->display, menuBar.win, 1101 XDefineCursor (disp, menuBar.win,
1086 XCreateFontCursor (display->display, XC_left_ptr)); 1102 XCreateFontCursor (disp, XC_left_ptr));
1087 1103
1088 XSelectInput (display->display, menuBar.win, 1104 XSelectInput (disp, menuBar.win,
1089 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1105 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1090 | Button1MotionMask));
1091 menubar_ev.start (display, menuBar.win); 1106 menubar_ev.start (display, menuBar.win);
1092 } 1107 }
1093#endif 1108#endif
1094 1109
1095#ifdef XPM_BACKGROUND 1110#ifdef XPM_BACKGROUND
… …
1111 1126
1112 /* graphics context for the vt window */ 1127 /* graphics context for the vt window */
1113 gcvalue.foreground = pix_colors[Color_fg]; 1128 gcvalue.foreground = pix_colors[Color_fg];
1114 gcvalue.background = pix_colors[Color_bg]; 1129 gcvalue.background = pix_colors[Color_bg];
1115 gcvalue.graphics_exposures = 1; 1130 gcvalue.graphics_exposures = 1;
1116 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1131 TermWin.gc = XCreateGC (disp, TermWin.vt,
1117 GCForeground | GCBackground | GCGraphicsExposures, 1132 GCForeground | GCBackground | GCGraphicsExposures,
1118 &gcvalue); 1133 &gcvalue);
1119 1134
1120 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1135 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1121 1136
1122#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1137#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1123 gcvalue.foreground = pix_colors[Color_topShadow]; 1138 gcvalue.foreground = pix_colors[Color_topShadow];
1124 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1139 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1125 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1140 gcvalue.foreground = pix_colors[Color_bottomShadow];
1126 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1141 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1127 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1142 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1128 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1143 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1129#endif 1144#endif
1130 1145
1131#ifdef OFF_FOCUS_FADING 1146#ifdef OFF_FOCUS_FADING
1132 // initially we are in unfocused state 1147 // initially we are in unfocused state
1133 if (rs[Rs_fade]) 1148 if (rs[Rs_fade])
… …
1371 * the slave. 1386 * the slave.
1372 */ 1387 */
1373void 1388void
1374rxvt_term::run_command (const char *const *argv) 1389rxvt_term::run_command (const char *const *argv)
1375{ 1390{
1376 int er;
1377
1378 if (!pty.get ()) 1391 if (!pty.get ())
1379 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1392 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1393
1394 pty.set_utf8_mode (enc_utf8);
1395
1396 /* set initial window size */
1397 tt_winch ();
1398
1399 int er;
1380 1400
1381#ifndef NO_BACKSPACE_KEY 1401#ifndef NO_BACKSPACE_KEY
1382 if (key_backspace[0] && !key_backspace[1]) 1402 if (key_backspace[0] && !key_backspace[1])
1383 er = key_backspace[0]; 1403 er = key_backspace[0];
1384 else if (strcmp (key_backspace, "DEC") == 0) 1404 else if (strcmp (key_backspace, "DEC") == 0)
… …
1387#endif 1407#endif
1388 er = -1; 1408 er = -1;
1389 1409
1390 rxvt_get_ttymode (&tio, er); 1410 rxvt_get_ttymode (&tio, er);
1391 1411
1392 /* set initial window size */ 1412 sw_chld.start (SIGCHLD);
1393 tt_winch ();
1394 1413
1395#ifndef __QNX__ 1414#ifndef __QNX__
1396 /* spin off the command interpreter */ 1415 /* spin off the command interpreter */
1397 switch (cmd_pid = fork ()) 1416 switch (cmd_pid = fork ())
1398 { 1417 {

Diff Legend

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