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.93 by root, Sun Oct 24 14:02:44 2004 UTC vs.
Revision 1.109 by root, Mon Feb 14 18:47:54 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{
196 sw_term.start (SIGTERM); 210 sw_term.start (SIGTERM);
211 sw_int.start (SIGINT);
197 212
198 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 213 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
199#ifdef OFF_FOCUS_FADING 214#ifdef OFF_FOCUS_FADING
200 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 215 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
201#endif 216#endif
… …
238 last_bot = last_state = -1; 253 last_bot = last_state = -1;
239 254
240#ifdef MENUBAR 255#ifdef MENUBAR
241 menu_readonly = 1; 256 menu_readonly = 1;
242# if ! (MENUBAR_MAX > 1) 257# if ! (MENUBAR_MAX > 1)
243 CurrentBar = & (BarList); 258 CurrentBar = &BarList;
244# endif /* (MENUBAR_MAX > 1) */ 259# endif /* (MENUBAR_MAX > 1) */
245#endif 260#endif
246 261
247 return true; 262 return true;
248} 263}
… …
322 */ 337 */
323 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 338 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
324 rs[Rs_display_name] = ":0"; 339 rs[Rs_display_name] = ":0";
325 340
326 get_options (r_argc, r_argv); 341 get_options (r_argc, r_argv);
327 free (r_argv);
328 342
329#ifdef LOCAL_X_IS_UNIX 343#ifdef LOCAL_X_IS_UNIX
330 if (rs[Rs_display_name][0] == ':') 344 if (rs[Rs_display_name][0] == ':')
331 { 345 {
332 val = rxvt_malloc (5 + strlen (rs[Rs_display_name])); 346 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
… …
339 353
340 if (!display 354 if (!display
341 && ! (display = displays.get (rs[Rs_display_name]))) 355 && ! (display = displays.get (rs[Rs_display_name])))
342 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]);
343 357
344 extract_resources (display->display, rs[Rs_name]); 358 extract_resources ();
359 free (r_argv);
345 360
346 /* 361 /*
347 * set any defaults not already set 362 * set any defaults not already set
348 */ 363 */
349 if (cmd_argv && cmd_argv[0]) 364 if (cmd_argv && cmd_argv[0])
… …
367#if ENABLE_FRILLS 382#if ENABLE_FRILLS
368 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)
369 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 384 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */
370 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)
371 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 386 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */
372#endif
373
374#ifndef NO_LINESPACE
375 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 387 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
376 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 388 TermWin.lineSpace = min (i, 100); /* arbitrary limit */
377#endif 389#endif
378 390
379#ifdef POINTER_BLANK 391#ifdef POINTER_BLANK
… …
590 602
591 this->locale = rxvt_strdup (this->locale); 603 this->locale = rxvt_strdup (this->locale);
592 SET_LOCALE (this->locale); 604 SET_LOCALE (this->locale);
593 mbstate.reset (); 605 mbstate.reset ();
594#endif 606#endif
595#if 0 607
596#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');
597 free (codeset); 615 free (codeset);
598 codeset = strdup (nl_langinfo (CODESET));
599 enc_utf8 = !strcasecmp (codeset, "UTF-8")
600 || !strcasecmp (codeset, "UTF8");
601#else 616#else
602 enc_utf8 = 1; 617 enc_utf8 = 0;
603#endif
604#endif 618#endif
605} 619}
606 620
607void 621void
608rxvt_term::init_xlocale () 622rxvt_term::init_xlocale ()
… …
610#ifdef USE_XIM 624#ifdef USE_XIM
611 if (!locale) 625 if (!locale)
612 rxvt_warn ("setting locale failed, working without locale support.\n"); 626 rxvt_warn ("setting locale failed, working without locale support.\n");
613 else 627 else
614 { 628 {
615 Atom wmlocale; 629 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
616
617 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
618 XChangeProperty (display->display, TermWin.parent[0], wmlocale,
619 XA_STRING, 8, PropModeReplace,
620 (unsigned char *)locale, strlen (locale));
621 630
622 if (!XSupportsLocale ()) 631 if (!XSupportsLocale ())
623 { 632 {
624 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 633 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n");
625 return; 634 return;
… …
639{ 648{
640 /* 649 /*
641 * Initialize the command connection. 650 * Initialize the command connection.
642 * This should be called after the X server connection is established. 651 * This should be called after the X server connection is established.
643 */ 652 */
644 int i;
645
646 for (i = 0; i < NUM_XA; i++)
647 xa[i] = XInternAtom (display->display, xa_names[i], False);
648
649 /* Enable delete window protocol */
650 XSetWMProtocols (display->display, TermWin.parent[0],
651 & (xa[XA_WMDELETEWINDOW]), 1);
652
653#ifdef USING_W11LIB
654 /* enable W11 callbacks */
655 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
656#endif
657 653
658#ifdef META8_OPTION 654#ifdef META8_OPTION
659 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 655 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC);
660#endif 656#endif
661 657
… …
834 * Use resource ``modifier'' to override the Meta modifier 830 * Use resource ``modifier'' to override the Meta modifier
835 */ 831 */
836void 832void
837rxvt_term::get_ourmods () 833rxvt_term::get_ourmods ()
838{ 834{
839 int i, j, k; 835 int i, j, k;
840 int requestedmeta, realmeta, realalt; 836 int requestedmeta, realmeta, realalt;
841 const char *cm, *rsmod; 837 const char *cm, *rsmod;
842 XModifierKeymap *map; 838 XModifierKeymap *map;
843 KeyCode *kc; 839 KeyCode *kc;
844 const unsigned int modmasks[] = 840 const unsigned int modmasks[] =
845 { 841 {
846 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 842 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
847 }; 843 };
848 844
849 requestedmeta = realmeta = realalt = 0; 845 requestedmeta = realmeta = realalt = 0;
850 rsmod = rs[Rs_modifier]; 846 rsmod = rs[Rs_modifier];
847
851 if (rsmod 848 if (rsmod
852 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 849 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
853 requestedmeta = rsmod[3] - '0'; 850 requestedmeta = rsmod[3] - '0';
854 851
855 map = XGetModifierMapping (display->display); 852 map = XGetModifierMapping (display->display);
856 kc = map->modifiermap; 853 kc = map->modifiermap;
854
857 for (i = 1; i < 6; i++) 855 for (i = 1; i < 6; i++)
858 { 856 {
859 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 857 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
858
860 for (j = map->max_keypermod; j--; k++) 859 for (j = map->max_keypermod; j--; k++)
861 { 860 {
862 if (kc[k] == 0) 861 if (kc[k] == 0)
863 break; 862 break;
863
864 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 864 switch (XKeycodeToKeysym (display->display, kc[k], 0))
865 { 865 {
866 case XK_Num_Lock: 866 case XK_Num_Lock:
867 ModNumLockMask = modmasks[i - 1]; 867 ModNumLockMask = modmasks[i - 1];
868 /* FALLTHROUGH */ 868 continue;
869 default: 869
870 continue; /* for (;;) */ 870 case XK_ISO_Level3_Shift:
871 ModLevel3Mask = modmasks[i - 1];
872 continue;
873
871 case XK_Meta_L: 874 case XK_Meta_L:
872 case XK_Meta_R: 875 case XK_Meta_R:
873 cm = "meta"; 876 cm = "meta";
874 realmeta = i; 877 realmeta = i;
875 break; 878 break;
879
876 case XK_Alt_L: 880 case XK_Alt_L:
877 case XK_Alt_R: 881 case XK_Alt_R:
878 cm = "alt"; 882 cm = "alt";
879 realalt = i; 883 realalt = i;
880 break; 884 break;
885
881 case XK_Super_L: 886 case XK_Super_L:
882 case XK_Super_R: 887 case XK_Super_R:
883 cm = "super"; 888 cm = "super";
884 break; 889 break;
890
885 case XK_Hyper_L: 891 case XK_Hyper_L:
886 case XK_Hyper_R: 892 case XK_Hyper_R:
887 cm = "hyper"; 893 cm = "hyper";
888 break; 894 break;
895
896 default:
897 continue;
889 } 898 }
899
890 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0) 900 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
891 requestedmeta = i; 901 requestedmeta = i;
892 } 902 }
893 } 903 }
904
894 XFreeModifiermap (map); 905 XFreeModifiermap (map);
906
895 i = (requestedmeta ? requestedmeta 907 i = requestedmeta ? requestedmeta
896 : (realmeta ? realmeta 908 : realmeta ? realmeta
897 : (realalt ? realalt : 0))); 909 : realalt ? realalt
910 : 0;
911
898 if (i) 912 if (i)
899 ModMetaMask = modmasks[i - 1]; 913 ModMetaMask = modmasks[i - 1];
900} 914}
901 915
902/*----------------------------------------------------------------------*/ 916/*----------------------------------------------------------------------*/
… …
912#endif 926#endif
913 XGCValues gcvalue; 927 XGCValues gcvalue;
914 long vt_emask; 928 long vt_emask;
915 XSetWindowAttributes attributes; 929 XSetWindowAttributes attributes;
916 XWindowAttributes gattr; 930 XWindowAttributes gattr;
931 Window top;
932 dDisp;
933
934#ifdef USING_W11LIB
935 /* enable W11 callbacks */
936 W11AddEventHandler (disp, rxvt_W11_process_x_event);
937#endif
938
939 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
940 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
917 941
918 if (options & Opt_transparent) 942 if (options & Opt_transparent)
919 { 943 {
920 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 944 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
921 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 945 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
922 } 946 }
923 947
924#if ENABLE_FRILLS 948#if ENABLE_FRILLS
925 if (options & Opt_borderLess) 949 if (options & Opt_borderLess)
926 { 950 {
927 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 951 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
928 952
929 if (prop == None) 953 if (prop == None)
930 { 954 {
931 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 955 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
932#ifdef PREFER_24BIT 956#ifdef PREFER_24BIT
… …
948 972
949 /* grab colors before netscape does */ 973 /* grab colors before netscape does */
950 Get_Colours (); 974 Get_Colours ();
951 975
952 if (!set_fonts ()) 976 if (!set_fonts ())
953 rxvt_fatal ("unable to load base fontset, please specify one using -fn, aborting.\n"); 977 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
954 978
979#if ENABLE_FRILLS
980 if (rs[Rs_embed])
981 {
982 top = strtol (rs[Rs_embed], 0, 0);
983
984 XWindowAttributes wattr;
985 XGetWindowAttributes (disp, top, &wattr);
986
987 window_calc (wattr.width, wattr.height);
988
989#if 0
990 if (wattr.map_state == IsViewable)
991 {
992 TermWin.mapped = 1;
993 refresh_type = FAST_REFRESH;
994 XClearWindow (disp, top);
995 // TODO: make XMapNotify-event-code a function and call it
996 // TODO: how can I detetc visibility without unmpa/map?
997 // TODO: focusin etc.
998 }
999#else
1000 // it'S easiets just to unmap/map to get all state correctly set-up
1001 XUnmapWindow (disp, top);
1002#endif
1003 }
1004 else
1005#endif
1006 {
955 window_calc (0, 0); 1007 window_calc (0, 0);
1008
1009 /* sub-window placement & size in rxvt_resize_subwindows () */
1010#ifdef PREFER_24BIT
1011 attributes.background_pixel = pix_colors_focused[Color_border];
1012 attributes.border_pixel = pix_colors_focused[Color_border];
1013 attributes.colormap = display->cmap;
1014 top = XCreateWindow (disp, DefaultRootWindow (disp),
1015 szHint.x, szHint.y,
1016 szHint.width, szHint.height,
1017 TermWin.ext_bwidth,
1018 display->depth, InputOutput,
1019 display->visual,
1020 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1021#else
1022 top = XCreateSimpleWindow (disp, DefaultRootWindow (disp),
1023 szHint.x, szHint.y,
1024 szHint.width, szHint.height,
1025 TermWin.ext_bwidth,
1026 pix_colors_focused[Color_border],
1027 pix_colors_focused[Color_border]);
1028#endif
1029 }
1030
1031 TermWin.parent[0] = top;
1032
956 old_width = szHint.width; 1033 old_width = szHint.width;
957 old_height = szHint.height; 1034 old_height = szHint.height;
958
959 /* sub-window placement & size in rxvt_resize_subwindows () */
960
961#ifdef PREFER_24BIT
962 attributes.background_pixel = pix_colors_focused[Color_border];
963 attributes.border_pixel = pix_colors_focused[Color_border];
964 attributes.colormap = display->cmap;
965 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
966 szHint.x, szHint.y,
967 szHint.width, szHint.height,
968 TermWin.ext_bwidth,
969 display->depth, InputOutput,
970 display->visual,
971 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
972#else
973 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
974 szHint.x, szHint.y,
975 szHint.width, szHint.height,
976 TermWin.ext_bwidth,
977 pix_colors_focused[Color_border],
978 pix_colors_focused[Color_border]);
979#endif
980 1035
981 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1036 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
982 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1037 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
983 1038
984 classHint.res_name = (char *)rs[Rs_name]; 1039 classHint.res_name = (char *)rs[Rs_name];
985 classHint.res_class = (char *)RESCLASS; 1040 classHint.res_class = (char *)RESCLASS;
986 1041
987 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1042 wmHint.flags = InputHint | StateHint | WindowGroupHint;
988 wmHint.input = True; 1043 wmHint.input = True;
989 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1044 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
990 wmHint.window_group = TermWin.parent[0]; 1045 wmHint.window_group = top;
991 1046
992 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1047 XSetWMProperties (disp, top, NULL, NULL,
993 (char **)argv, argc, &szHint, &wmHint, &classHint); 1048 (char **)argv, argc, &szHint, &wmHint, &classHint);
1049
1050 /* Enable delete window protocol */
1051 XSetWMProtocols (disp, top, &xa[XA_WMDELETEWINDOW], 1);
994 1052
995#if ENABLE_FRILLS 1053#if ENABLE_FRILLS
996 long pid = getpid (); 1054 long pid = getpid ();
997 1055
998 XChangeProperty (display->display, TermWin.parent[0], 1056 XChangeProperty (disp, top,
999 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32, 1057 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1000 PropModeReplace, (unsigned char *)&pid, 1); 1058 PropModeReplace, (unsigned char *)&pid, 1);
1001#endif 1059#endif
1002 1060
1003 XSelectInput (display->display, TermWin.parent[0], 1061 XSelectInput (disp, top,
1004 KeyPressMask 1062 KeyPressMask
1005#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1063#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1006 | KeyReleaseMask 1064 | KeyReleaseMask
1007#endif 1065#endif
1008 | FocusChangeMask | VisibilityChangeMask 1066 | FocusChangeMask | VisibilityChangeMask
1009 | ExposureMask 1067 | ExposureMask
1010 | StructureNotifyMask); 1068 | StructureNotifyMask);
1011 termwin_ev.start (display, TermWin.parent[0]); 1069 termwin_ev.start (display, top);
1012 1070
1013#if ENABLE_FRILLS 1071#if ENABLE_FRILLS
1014 if (mwmhints.flags) 1072 if (mwmhints.flags)
1015 { 1073 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1016 prop = XInternAtom (display->display, "_MOTIF_WM_HINTS", False);
1017 XChangeProperty (display->display, TermWin.parent[0], prop, prop, 32,
1018 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1074 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1019 }
1020#endif 1075#endif
1021 1076
1022 /* vt cursor: Black-on-White is standard, but this is more popular */ 1077 /* vt cursor: Black-on-White is standard, but this is more popular */
1023 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1078 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1024 1079
1025#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1080#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1026 /* cursor (menuBar/scrollBar): Black-on-White */ 1081 /* cursor (menuBar/scrollBar): Black-on-White */
1027 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1082 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1028#endif
1029
1030#ifdef POINTER_BLANK
1031 {
1032 XColor blackcolour;
1033 blackcolour.red = 0;
1034 blackcolour.green = 0;
1035 blackcolour.blue = 0;
1036 Font f = XLoadFont (display->display, "fixed");
1037 blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1038 &blackcolour, &blackcolour);
1039 XUnloadFont (display->display, f);
1040 }
1041#endif 1083#endif
1042 1084
1043 /* the vt window */ 1085 /* the vt window */
1044 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1086 TermWin.vt = XCreateSimpleWindow (disp, top,
1045 window_vt_x, 1087 window_vt_x,
1046 window_vt_y, 1088 window_vt_y,
1047 TermWin_TotalWidth (), 1089 TermWin_TotalWidth (),
1048 TermWin_TotalHeight (), 1090 TermWin_TotalHeight (),
1049 0, 1091 0,
1050 pix_colors_focused[Color_fg], 1092 pix_colors_focused[Color_fg],
1051 pix_colors_focused[Color_bg]); 1093 pix_colors_focused[Color_bg]);
1052#ifdef DEBUG_X 1094#ifdef DEBUG_X
1053 XStoreName (display->display, TermWin.vt, "vt window"); 1095 XStoreName (disp, TermWin.vt, "vt window");
1054#endif 1096#endif
1055 1097
1056 attributes.bit_gravity = NorthWestGravity; 1098 attributes.bit_gravity = NorthWestGravity;
1057 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1099 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);
1058 1100
1059 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1101 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1060 1102
1061 pointer_unblank (); 1103 pointer_unblank ();
1062 1104
… …
1065 vt_emask |= PointerMotionMask; 1107 vt_emask |= PointerMotionMask;
1066 else 1108 else
1067#endif 1109#endif
1068 vt_emask |= Button1MotionMask | Button3MotionMask; 1110 vt_emask |= Button1MotionMask | Button3MotionMask;
1069 1111
1070 XSelectInput (display->display, TermWin.vt, vt_emask); 1112 XSelectInput (disp, TermWin.vt, vt_emask);
1071 vt_ev.start (display, TermWin.vt); 1113 vt_ev.start (display, TermWin.vt);
1072 1114
1073#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1115#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1074 if (menuBar_height ()) 1116 if (menuBar_height ())
1075 { 1117 {
1076 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1118 menuBar.win = XCreateSimpleWindow (disp, top,
1077 window_vt_x, 0, 1119 window_vt_x, 0,
1078 TermWin_TotalWidth (), 1120 TermWin_TotalWidth (),
1079 menuBar_TotalHeight (), 1121 menuBar_TotalHeight (),
1080 0, 1122 0,
1081 pix_colors_focused[Color_fg], 1123 pix_colors_focused[Color_fg],
1082 pix_colors_focused[Color_scroll]); 1124 pix_colors_focused[Color_scroll]);
1083 1125
1084#ifdef DEBUG_X 1126#ifdef DEBUG_X
1085 XStoreName (display->display, menuBar.win, "menubar"); 1127 XStoreName (disp, menuBar.win, "menubar");
1086#endif 1128#endif
1087 1129
1088 menuBar.drawable = new rxvt_drawable (display, menuBar.win); 1130 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1089 1131
1090 XDefineCursor (display->display, menuBar.win, 1132 XDefineCursor (disp, menuBar.win,
1091 XCreateFontCursor (display->display, XC_left_ptr)); 1133 XCreateFontCursor (disp, XC_left_ptr));
1092 1134
1093 XSelectInput (display->display, menuBar.win, 1135 XSelectInput (disp, menuBar.win,
1094 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1136 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1095 | Button1MotionMask));
1096 menubar_ev.start (display, menuBar.win); 1137 menubar_ev.start (display, menuBar.win);
1097 } 1138 }
1098#endif 1139#endif
1099 1140
1100#ifdef XPM_BACKGROUND 1141#ifdef XPM_BACKGROUND
… …
1116 1157
1117 /* graphics context for the vt window */ 1158 /* graphics context for the vt window */
1118 gcvalue.foreground = pix_colors[Color_fg]; 1159 gcvalue.foreground = pix_colors[Color_fg];
1119 gcvalue.background = pix_colors[Color_bg]; 1160 gcvalue.background = pix_colors[Color_bg];
1120 gcvalue.graphics_exposures = 1; 1161 gcvalue.graphics_exposures = 1;
1121 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1162 TermWin.gc = XCreateGC (disp, TermWin.vt,
1122 GCForeground | GCBackground | GCGraphicsExposures, 1163 GCForeground | GCBackground | GCGraphicsExposures,
1123 &gcvalue); 1164 &gcvalue);
1124 1165
1125 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1166 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1126 1167
1127#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1168#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1128 gcvalue.foreground = pix_colors[Color_topShadow]; 1169 gcvalue.foreground = pix_colors[Color_topShadow];
1129 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1170 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1130 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1171 gcvalue.foreground = pix_colors[Color_bottomShadow];
1131 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1172 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1132 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1173 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1133 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1174 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1134#endif 1175#endif
1135 1176
1136#ifdef OFF_FOCUS_FADING 1177#ifdef OFF_FOCUS_FADING
1137 // initially we are in unfocused state 1178 // initially we are in unfocused state
1138 if (rs[Rs_fade]) 1179 if (rs[Rs_fade])
… …
1376 * the slave. 1417 * the slave.
1377 */ 1418 */
1378void 1419void
1379rxvt_term::run_command (const char *const *argv) 1420rxvt_term::run_command (const char *const *argv)
1380{ 1421{
1381 int er;
1382
1383 if (!pty.get ()) 1422 if (!pty.get ())
1384 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1423 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1424
1425 pty.set_utf8_mode (enc_utf8);
1426
1427 /* set initial window size */
1428 tt_winch ();
1429
1430 int er;
1385 1431
1386#ifndef NO_BACKSPACE_KEY 1432#ifndef NO_BACKSPACE_KEY
1387 if (key_backspace[0] && !key_backspace[1]) 1433 if (key_backspace[0] && !key_backspace[1])
1388 er = key_backspace[0]; 1434 er = key_backspace[0];
1389 else if (strcmp (key_backspace, "DEC") == 0) 1435 else if (strcmp (key_backspace, "DEC") == 0)
… …
1391 else 1437 else
1392#endif 1438#endif
1393 er = -1; 1439 er = -1;
1394 1440
1395 rxvt_get_ttymode (&tio, er); 1441 rxvt_get_ttymode (&tio, er);
1396
1397 /* set initial window size */
1398 tt_winch ();
1399 1442
1400 sw_chld.start (SIGCHLD); 1443 sw_chld.start (SIGCHLD);
1401 1444
1402#ifndef __QNX__ 1445#ifndef __QNX__
1403 /* spin off the command interpreter */ 1446 /* spin off the command interpreter */

Diff Legend

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