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.111 by root, Thu Feb 17 20:52:48 2005 UTC vs.
Revision 1.124 by root, Wed Dec 21 14:19:19 2005 UTC

… …
169 COLOR_SCROLLTROUGH, 169 COLOR_SCROLLTROUGH,
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
175 "black",
176#endif
174 }; 177 };
175 178
176const char *const xa_names[] = 179const char *const xa_names[] =
177 { 180 {
178 "TEXT", 181 "TEXT",
… …
181 "MULTIPLE", 184 "MULTIPLE",
182 "TARGETS", 185 "TARGETS",
183 "TIMESTAMP", 186 "TIMESTAMP",
184 "VT_SELECTION", 187 "VT_SELECTION",
185 "INCR", 188 "INCR",
189 "WM_PROTOCOLS",
186 "WM_DELETE_WINDOW", 190 "WM_DELETE_WINDOW",
187 "CLIPBOARD", 191 "CLIPBOARD",
188#if ENABLE_FRILLS 192#if ENABLE_FRILLS
193 "_MOTIF_WM_HINTS",
194#endif
195#if ENABLE_EWMH
189 "_NET_WM_PID", 196 "_NET_WM_PID",
190 "_MOTIF_WM_HINTS",
191 "_NET_WM_NAME", 197 "_NET_WM_NAME",
192 "_NET_WM_ICON_NAME", 198 "_NET_WM_ICON_NAME",
199 "_NET_WM_PING",
193#endif 200#endif
194#if USE_XIM 201#if USE_XIM
195 "WM_LOCALE_NAME", 202 "WM_LOCALE_NAME",
196#endif 203#endif
197#ifdef TRANSPARENT 204#ifdef TRANSPARENT
… …
200#endif 207#endif
201#ifdef OFFIX_DND 208#ifdef OFFIX_DND
202 "DndProtocol", 209 "DndProtocol",
203 "DndSelection", 210 "DndSelection",
204#endif 211#endif
212#if ENABLE_XEMBED
213 "_XEMBED",
214 "_XEMBED_INFO",
215#endif
205 }; 216 };
206 217
207bool 218bool
208rxvt_term::init_vars () 219rxvt_term::init_vars ()
209{ 220{
210 sw_term.start (SIGTERM);
211 sw_int.start (SIGINT);
212
213 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 221 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
214#ifdef OFF_FOCUS_FADING 222#ifdef OFF_FOCUS_FADING
215 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
216#endif 224#endif
217 pix_colors = pix_colors_focused; 225 pix_colors = pix_colors_focused;
218 226
219 if (pix_colors == NULL) 227 if (pix_colors == NULL)
220 return false; 228 return false;
221 229
222#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 230#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
223 TermWin.pixmap = None; 231 pixmap = None;
224#endif 232#endif
225 233
226 MEvent.time = CurrentTime; 234 MEvent.time = CurrentTime;
227 MEvent.button = AnyButton; 235 MEvent.button = AnyButton;
228 options = DEFAULT_OPTIONS; 236 options = DEFAULT_OPTIONS;
229 want_refresh = 1; 237 want_refresh = 1;
230 priv_modes = SavedModes = PrivMode_Default; 238 priv_modes = SavedModes = PrivMode_Default;
231 TermWin.focus = 0; 239 focus = 0;
232 TermWin.ncol = 80; 240 ncol = 80;
233 TermWin.nrow = 24; 241 nrow = 24;
234 TermWin.int_bwidth = INTERNALBORDERWIDTH; 242 int_bwidth = INTERNALBORDERWIDTH;
235 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 243 ext_bwidth = EXTERNALBORDERWIDTH;
236 TermWin.lineSpace = LINESPACE; 244 lineSpace = LINESPACE;
237 TermWin.saveLines = SAVELINES; 245 saveLines = SAVELINES;
238 numpix_colors = TOTAL_COLORS; 246 numpix_colors = TOTAL_COLORS;
239 247
240 refresh_limit = 1; 248 refresh_limit = 1;
241 refresh_type = SLOW_REFRESH; 249 refresh_type = SLOW_REFRESH;
242 prev_nrow = prev_ncol = 0; 250 prev_nrow = prev_ncol = 0;
… …
336 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 344 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
337 rs[Rs_display_name] = ":0"; 345 rs[Rs_display_name] = ":0";
338 346
339 get_options (r_argc, r_argv); 347 get_options (r_argc, r_argv);
340 348
341#ifdef LOCAL_X_IS_UNIX
342 if (rs[Rs_display_name][0] == ':')
343 {
344 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
345 strcpy (val, "unix");
346 strcat (val, rs[Rs_display_name]);
347 display = displays.get (val);
348 free (val);
349 }
350#endif
351
352 if (!display
353 && ! (display = displays.get (rs[Rs_display_name]))) 349 if (!(display = displays.get (rs[Rs_display_name])))
354 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 350 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
355 351
356 extract_resources (); 352 extract_resources ();
357 free (r_argv); 353 free (r_argv);
358 354
… …
373 if (!rs[Rs_iconName]) 369 if (!rs[Rs_iconName])
374 rs[Rs_iconName] = rs[Rs_name]; 370 rs[Rs_iconName] = rs[Rs_name];
375 } 371 }
376 372
377 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 373 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
378 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 374 saveLines = min (i, MAX_POSITIVE_INT16);
379 375
380#if ENABLE_FRILLS 376#if ENABLE_FRILLS
381 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 377 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
382 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 378 int_bwidth = min (i, MAX_POSITIVE_INT16);
379
383 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 380 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
384 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 381 ext_bwidth = min (i, MAX_POSITIVE_INT16);
382
385 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 383 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
386 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 384 lineSpace = min (i, MAX_POSITIVE_INT16);
387#endif 385#endif
388 386
389#ifdef POINTER_BLANK 387#ifdef POINTER_BLANK
390 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 388 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
391 pointerBlankDelay = i; 389 pointerBlankDelay = i;
392 else 390 else
393 pointerBlankDelay = 2; 391 pointerBlankDelay = 2;
394#endif 392#endif
395 393
396 /* no point having a scrollbar without having any scrollback! */ 394 /* no point having a scrollbar without having any scrollback! */
397 if (!TermWin.saveLines) 395 if (!saveLines)
398 options &= ~Opt_scrollBar; 396 options &= ~Opt_scrollBar;
399 397
400#ifdef PRINTPIPE 398#ifdef PRINTPIPE
401 if (!rs[Rs_print_pipe]) 399 if (!rs[Rs_print_pipe])
402 rs[Rs_print_pipe] = PRINTPIPE; 400 rs[Rs_print_pipe] = PRINTPIPE;
… …
462 rs[Rs_color + i] = def_colorName[i]; 460 rs[Rs_color + i] = def_colorName[i];
463 461
464#ifndef XTERM_REVERSE_VIDEO 462#ifndef XTERM_REVERSE_VIDEO
465 /* this is how we implement reverseVideo */ 463 /* this is how we implement reverseVideo */
466 if (options & Opt_reverseVideo) 464 if (options & Opt_reverseVideo)
467 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 465 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
468#endif 466#endif
469 467
470 /* convenient aliases for setting fg/bg to colors */ 468 /* convenient aliases for setting fg/bg to colors */
471 color_aliases (Color_fg); 469 color_aliases (Color_fg);
472 color_aliases (Color_bg); 470 color_aliases (Color_bg);
… …
522 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 520 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
523 521
524 sprintf (env_display, "DISPLAY=%s", val); 522 sprintf (env_display, "DISPLAY=%s", val);
525 523
526 /* avoiding the math library: 524 /* avoiding the math library:
527 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */ 525 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
528 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++) 526 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
529 ; 527 ;
530 MAX_IT (i, 1); 528 max_it (i, 1);
531 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); 529 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
532 530
533 sprintf (env_windowid, "WINDOWID=%u", 531 sprintf (env_windowid, "WINDOWID=%u",
534 (unsigned int)TermWin.parent[0]); 532 (unsigned int)parent[0]);
535 533
536 /* add entries to the environment: 534 /* add entries to the environment:
537 * @ DISPLAY: in case we started with -display 535 * @ DISPLAY: in case we started with -display
538 * @ WINDOWID: X window id number of the window 536 * @ WINDOWID: X window id number of the window
539 * @ COLORTERM: terminal sub-name and also indicates its color 537 * @ COLORTERM: terminal sub-name and also indicates its color
… …
741 } 739 }
742 } 740 }
743 } 741 }
744 742
745 pix_colors[i] = xcol; 743 pix_colors[i] = xcol;
744 SET_PIXCOLOR (i);
745 }
746
746#ifdef OFF_FOCUS_FADING 747#ifdef OFF_FOCUS_FADING
747 if (rs[Rs_fade]) 748 if (rs[Rs_fade])
749 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
748 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade])); 750 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
749#endif 751#endif
750 SET_PIXCOLOR (i);
751 }
752 752
753 if (display->depth <= 2) 753 if (display->depth <= 2)
754 { 754 {
755 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 755 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
756 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 756 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
… …
764 * from the fvwm window manager. 764 * from the fvwm window manager.
765 */ 765 */
766#ifdef KEEP_SCROLLCOLOR 766#ifdef KEEP_SCROLLCOLOR
767 767
768 if (display->depth <= 2) 768 if (display->depth <= 2)
769 {
769 { /* Monochrome */ 770 /* Monochrome */
770 pix_colors[Color_scroll] = pix_colors[Color_fg]; 771 pix_colors[Color_scroll] = pix_colors[Color_fg];
771 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 772 pix_colors[Color_topShadow] = pix_colors[Color_bg];
772 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 773 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
773 } 774 }
774 else 775 else
… …
925#endif 926#endif
926 XGCValues gcvalue; 927 XGCValues gcvalue;
927 long vt_emask; 928 long vt_emask;
928 XSetWindowAttributes attributes; 929 XSetWindowAttributes attributes;
929 XWindowAttributes gattr; 930 XWindowAttributes gattr;
930 Window top; 931 Window top, parent;
931 dDisp; 932 dDisp;
932 933
933#ifdef USING_W11LIB 934#ifdef USING_W11LIB
934 /* enable W11 callbacks */ 935 /* enable W11 callbacks */
935 W11AddEventHandler (disp, rxvt_W11_process_x_event); 936 W11AddEventHandler (disp, rxvt_W11_process_x_event);
… …
962 mwmhints.flags = MWM_HINTS_DECORATIONS; 963 mwmhints.flags = MWM_HINTS_DECORATIONS;
963 mwmhints.decorations = 0; 964 mwmhints.decorations = 0;
964 } 965 }
965 } 966 }
966 else 967 else
967 {
968 mwmhints.flags = 0; 968 mwmhints.flags = 0;
969 }
970#endif 969#endif
971 970
972 /* grab colors before netscape does */ 971 /* grab colors before netscape does */
973 Get_Colours (); 972 Get_Colours ();
974 973
975 if (!set_fonts ()) 974 if (!set_fonts ())
976 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 975 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
977 976
978#if ENABLE_FRILLS 977 parent = DefaultRootWindow (disp);
978
979#if ENABLE_XEMBED
979 if (rs[Rs_embed]) 980 if (rs[Rs_embed])
980 { 981 {
981 XWindowAttributes wattr; 982 XWindowAttributes wattr;
982 983
983 top = strtol (rs[Rs_embed], 0, 0); 984 parent = strtol (rs[Rs_embed], 0, 0);
984 985
985 if (!XGetWindowAttributes (disp, top, &wattr)) 986 if (!XGetWindowAttributes (disp, parent, &wattr))
986 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 987 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
987 988
988 window_calc (wattr.width, wattr.height); 989 window_calc (wattr.width, wattr.height);
990 }
991#endif
989 992
990#if 0 993 window_calc (0, 0);
991 if (wattr.map_state == IsViewable) 994
992 { 995 /* sub-window placement & size in rxvt_resize_subwindows () */
993 TermWin.mapped = 1; 996#ifdef PREFER_24BIT
994 refresh_type = FAST_REFRESH; 997 attributes.background_pixel = pix_colors_focused[Color_border];
995 XClearWindow (disp, top); 998 attributes.border_pixel = pix_colors_focused[Color_border];
996 // TODO: make XMapNotify-event-code a function and call it 999 attributes.colormap = display->cmap;
997 // TODO: how can I detetc visibility without unmpa/map? 1000 top = XCreateWindow (disp, parent,
998 // TODO: focusin etc. 1001 szHint.x, szHint.y,
999 } 1002 szHint.width, szHint.height,
1003 ext_bwidth,
1004 display->depth, InputOutput,
1005 display->visual,
1006 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1000#else 1007#else
1001 // it'S easiets just to unmap/map to get all state correctly set-up 1008 top = XCreateSimpleWindow (disp, parent,
1002 XUnmapWindow (disp, top);
1003#endif
1004 }
1005 else
1006#endif
1007 {
1008 window_calc (0, 0);
1009
1010 /* sub-window placement & size in rxvt_resize_subwindows () */
1011#ifdef PREFER_24BIT
1012 attributes.background_pixel = pix_colors_focused[Color_border];
1013 attributes.border_pixel = pix_colors_focused[Color_border];
1014 attributes.colormap = display->cmap;
1015 top = XCreateWindow (disp, DefaultRootWindow (disp),
1016 szHint.x, szHint.y, 1009 szHint.x, szHint.y,
1017 szHint.width, szHint.height, 1010 szHint.width, szHint.height,
1018 TermWin.ext_bwidth, 1011 ext_bwidth,
1019 display->depth, InputOutput,
1020 display->visual,
1021 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1022#else
1023 top = XCreateSimpleWindow (disp, DefaultRootWindow (disp),
1024 szHint.x, szHint.y,
1025 szHint.width, szHint.height,
1026 TermWin.ext_bwidth,
1027 pix_colors_focused[Color_border], 1012 pix_colors_focused[Color_border],
1028 pix_colors_focused[Color_border]); 1013 pix_colors_focused[Color_border]);
1029#endif 1014#endif
1030 }
1031 1015
1032 TermWin.parent[0] = top; 1016 this->parent[0] = top;
1033 1017
1034 old_width = szHint.width; 1018 old_width = szHint.width;
1035 old_height = szHint.height; 1019 old_height = szHint.height;
1036 1020
1037 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1021 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
… …
1043 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1027 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1044 wmHint.input = True; 1028 wmHint.input = True;
1045 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1029 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
1046 wmHint.window_group = top; 1030 wmHint.window_group = top;
1047 1031
1048 XSetWMProperties (disp, top, NULL, NULL, 1032 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1049 (char **)argv, argc, &szHint, &wmHint, &classHint); 1033 &szHint, &wmHint, &classHint);
1050 1034
1051 /* Enable delete window protocol */ 1035 Atom protocols[] = {
1052 XSetWMProtocols (disp, top, &xa[XA_WMDELETEWINDOW], 1); 1036 xa[XA_WM_DELETE_WINDOW],
1037#if ENABLE_EWMH
1038 xa[XA_NET_WM_PING],
1039#endif
1040 };
1053 1041
1054#if ENABLE_FRILLS 1042 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1043
1044#if ENABLE_EWMH
1055 long pid = getpid (); 1045 long pid = getpid ();
1056 1046
1057 XChangeProperty (disp, top, 1047 XChangeProperty (disp, top,
1058 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1048 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1059 PropModeReplace, (unsigned char *)&pid, 1); 1049 PropModeReplace, (unsigned char *)&pid, 1);
1050
1051 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1060#endif 1052#endif
1061 1053
1062 XSelectInput (disp, top, 1054 XSelectInput (disp, top,
1063 KeyPressMask 1055 KeyPressMask
1064#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1056#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1065 | KeyReleaseMask 1057 | KeyReleaseMask
1066#endif 1058#endif
1067 | FocusChangeMask | VisibilityChangeMask 1059 | FocusChangeMask | VisibilityChangeMask
1068 | ExposureMask
1069 | StructureNotifyMask); 1060 | ExposureMask | StructureNotifyMask);
1061
1070 termwin_ev.start (display, top); 1062 termwin_ev.start (display, top);
1071 1063
1072#if ENABLE_FRILLS 1064#if ENABLE_FRILLS
1073 if (mwmhints.flags) 1065 if (mwmhints.flags)
1074 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1066 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1082 /* cursor (menuBar/scrollBar): Black-on-White */ 1074 /* cursor (menuBar/scrollBar): Black-on-White */
1083 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1075 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1084#endif 1076#endif
1085 1077
1086 /* the vt window */ 1078 /* the vt window */
1087 TermWin.vt = XCreateSimpleWindow (disp, top, 1079 vt = XCreateSimpleWindow (disp, top,
1088 window_vt_x, 1080 window_vt_x,
1089 window_vt_y, 1081 window_vt_y,
1090 TermWin_TotalWidth (), 1082 TermWin_TotalWidth (),
1091 TermWin_TotalHeight (), 1083 TermWin_TotalHeight (),
1092 0, 1084 0,
1093 pix_colors_focused[Color_fg], 1085 pix_colors_focused[Color_fg],
1094 pix_colors_focused[Color_bg]); 1086 pix_colors_focused[Color_bg]);
1095#ifdef DEBUG_X 1087#ifdef DEBUG_X
1096 XStoreName (disp, TermWin.vt, "vt window"); 1088 XStoreName (disp, vt, "vt window");
1097#endif 1089#endif
1098 1090
1099 attributes.bit_gravity = NorthWestGravity; 1091 attributes.bit_gravity = NorthWestGravity;
1100 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes); 1092 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1101 1093
1102 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1094 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1103
1104 pointer_unblank ();
1105 1095
1106#ifdef POINTER_BLANK 1096#ifdef POINTER_BLANK
1107 if (options & Opt_pointerBlank) 1097 if (options & Opt_pointerBlank)
1108 vt_emask |= PointerMotionMask; 1098 vt_emask |= PointerMotionMask;
1109 else 1099 else
1110#endif 1100#endif
1111 vt_emask |= Button1MotionMask | Button3MotionMask; 1101 vt_emask |= Button1MotionMask | Button3MotionMask;
1112 1102
1113 XSelectInput (disp, TermWin.vt, vt_emask); 1103 XSelectInput (disp, vt, vt_emask);
1114 vt_ev.start (display, TermWin.vt); 1104 vt_ev.start (display, vt);
1115 1105
1116#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1106#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1117 if (menuBar_height ()) 1107 if (menuBar_height ())
1118 { 1108 {
1119 menuBar.win = XCreateSimpleWindow (disp, top, 1109 menuBar.win = XCreateSimpleWindow (disp, top,
… …
1158 1148
1159 /* graphics context for the vt window */ 1149 /* graphics context for the vt window */
1160 gcvalue.foreground = pix_colors[Color_fg]; 1150 gcvalue.foreground = pix_colors[Color_fg];
1161 gcvalue.background = pix_colors[Color_bg]; 1151 gcvalue.background = pix_colors[Color_bg];
1162 gcvalue.graphics_exposures = 1; 1152 gcvalue.graphics_exposures = 1;
1163 TermWin.gc = XCreateGC (disp, TermWin.vt, 1153 gc = XCreateGC (disp, vt,
1164 GCForeground | GCBackground | GCGraphicsExposures, 1154 GCForeground | GCBackground | GCGraphicsExposures,
1165 &gcvalue); 1155 &gcvalue);
1166 1156
1167 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1157 drawable = new rxvt_drawable (display, vt);
1168 1158
1169#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1159#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1170 gcvalue.foreground = pix_colors[Color_topShadow]; 1160 gcvalue.foreground = pix_colors[Color_topShadow];
1171 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1161 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1172 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1162 gcvalue.foreground = pix_colors[Color_bottomShadow];
1173 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1163 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1174 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1164 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1175 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1165 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1176#endif 1166#endif
1177 1167
1178#ifdef OFF_FOCUS_FADING 1168#ifdef OFF_FOCUS_FADING
1179 // initially we are in unfocused state 1169 // initially we are in unfocused state
1180 if (rs[Rs_fade]) 1170 if (rs[Rs_fade])
1181 pix_colors = pix_colors_unfocused; 1171 pix_colors = pix_colors_unfocused;
1182#endif 1172#endif
1183 1173
1174 pointer_unblank ();
1184 scr_recolour (); 1175 scr_recolour ();
1176
1177#if ENABLE_XEMBED
1178 if (rs[Rs_embed])
1179 {
1180 long info[2] = { 0, XEMBED_MAPPED };
1181
1182 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1183 32, PropModeReplace, (unsigned char *)&info, 2);
1184 }
1185#endif
1185} 1186}
1186 1187
1187/* ------------------------------------------------------------------------- * 1188/* ------------------------------------------------------------------------- *
1188 * GET TTY CURRENT STATE * 1189 * GET TTY CURRENT STATE *
1189 * ------------------------------------------------------------------------- */ 1190 * ------------------------------------------------------------------------- */
… …
1203 tio->c_cc[VKILL] = CKILL; 1204 tio->c_cc[VKILL] = CKILL;
1204 tio->c_cc[VSTART] = CSTART; 1205 tio->c_cc[VSTART] = CSTART;
1205 tio->c_cc[VSTOP] = CSTOP; 1206 tio->c_cc[VSTOP] = CSTOP;
1206 tio->c_cc[VSUSP] = CSUSP; 1207 tio->c_cc[VSUSP] = CSUSP;
1207# ifdef VDSUSP 1208# ifdef VDSUSP
1208
1209 tio->c_cc[VDSUSP] = CDSUSP; 1209 tio->c_cc[VDSUSP] = CDSUSP;
1210# endif 1210# endif
1211# ifdef VREPRINT 1211# ifdef VREPRINT
1212
1213 tio->c_cc[VREPRINT] = CRPRNT; 1212 tio->c_cc[VREPRINT] = CRPRNT;
1214# endif 1213# endif
1215# ifdef VDISCRD 1214# ifdef VDISCRD
1216
1217 tio->c_cc[VDISCRD] = CFLUSH; 1215 tio->c_cc[VDISCRD] = CFLUSH;
1218# endif 1216# endif
1219# ifdef VWERSE 1217# ifdef VWERSE
1220
1221 tio->c_cc[VWERSE] = CWERASE; 1218 tio->c_cc[VWERSE] = CWERASE;
1222# endif 1219# endif
1223# ifdef VLNEXT 1220# ifdef VLNEXT
1224
1225 tio->c_cc[VLNEXT] = CLNEXT; 1221 tio->c_cc[VLNEXT] = CLNEXT;
1226# endif 1222# endif
1227
1228 } 1223 }
1224
1229 tio->c_cc[VEOF] = CEOF; 1225 tio->c_cc[VEOF] = CEOF;
1230 tio->c_cc[VEOL] = VDISABLE; 1226 tio->c_cc[VEOL] = VDISABLE;
1231# ifdef VEOL2 1227# ifdef VEOL2
1232
1233 tio->c_cc[VEOL2] = VDISABLE; 1228 tio->c_cc[VEOL2] = VDISABLE;
1234# endif 1229# endif
1235# ifdef VSWTC 1230# ifdef VSWTC
1236
1237 tio->c_cc[VSWTC] = VDISABLE; 1231 tio->c_cc[VSWTC] = VDISABLE;
1238# endif 1232# endif
1239# ifdef VSWTCH 1233# ifdef VSWTCH
1240
1241 tio->c_cc[VSWTCH] = VDISABLE; 1234 tio->c_cc[VSWTCH] = VDISABLE;
1242# endif 1235# endif
1243# if VMIN != VEOF 1236# if VMIN != VEOF
1244
1245 tio->c_cc[VMIN] = 1; 1237 tio->c_cc[VMIN] = 1;
1246# endif 1238# endif
1247# if VTIME != VEOL 1239# if VTIME != VEOL
1248
1249 tio->c_cc[VTIME] = 0; 1240 tio->c_cc[VTIME] = 0;
1250# endif 1241# endif
1251 1242
1252 if (erase != -1) 1243 if (erase != -1)
1253 tio->c_cc[VERASE] = (char)erase; 1244 tio->c_cc[VERASE] = (char)erase;
… …
1281 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1272 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1282 { 1273 {
1283 tio->sg.sg_erase = CERASE; /* ^H */ 1274 tio->sg.sg_erase = CERASE; /* ^H */
1284 tio->sg.sg_kill = CKILL; /* ^U */ 1275 tio->sg.sg_kill = CKILL; /* ^U */
1285 } 1276 }
1277
1286 if (erase != -1) 1278 if (erase != -1)
1287 tio->sg.sg_erase = (char)erase; 1279 tio->sg.sg_erase = (char)erase;
1288 1280
1289 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1281 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1290 1282
… …
1296 tio->tc.t_startc = CSTART; /* ^Q */ 1288 tio->tc.t_startc = CSTART; /* ^Q */
1297 tio->tc.t_stopc = CSTOP; /* ^S */ 1289 tio->tc.t_stopc = CSTOP; /* ^S */
1298 tio->tc.t_eofc = CEOF; /* ^D */ 1290 tio->tc.t_eofc = CEOF; /* ^D */
1299 tio->tc.t_brkc = -1; 1291 tio->tc.t_brkc = -1;
1300 } 1292 }
1293
1301 /* get local special chars */ 1294 /* get local special chars */
1302 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1295 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1303 { 1296 {
1304 tio->lc.t_suspc = CSUSP; /* ^Z */ 1297 tio->lc.t_suspc = CSUSP; /* ^Z */
1305 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1298 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1309 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1302 tio->lc.t_lnextc = CLNEXT; /* ^V */
1310 } 1303 }
1311 /* get line discipline */ 1304 /* get line discipline */
1312 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1305 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1313# ifdef NTTYDISC 1306# ifdef NTTYDISC
1314
1315 tio->line = NTTYDISC; 1307 tio->line = NTTYDISC;
1316# endif /* NTTYDISC */ 1308# endif /* NTTYDISC */
1317 1309
1318 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1310 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1319#endif /* HAVE_TERMIOS_H */ 1311#endif /* HAVE_TERMIOS_H */
… …
1342 FOO (IGNCR, "IGNCR"); 1334 FOO (IGNCR, "IGNCR");
1343 FOO (ICRNL, "ICRNL"); 1335 FOO (ICRNL, "ICRNL");
1344 FOO (IXON, "IXON"); 1336 FOO (IXON, "IXON");
1345 FOO (IXOFF, "IXOFF"); 1337 FOO (IXOFF, "IXOFF");
1346# ifdef IUCLC 1338# ifdef IUCLC
1347
1348 FOO (IUCLC, "IUCLC"); 1339 FOO (IUCLC, "IUCLC");
1349# endif 1340# endif
1350# ifdef IXANY 1341# ifdef IXANY
1351
1352 FOO (IXANY, "IXANY"); 1342 FOO (IXANY, "IXANY");
1353# endif 1343# endif
1354# ifdef IMAXBEL 1344# ifdef IMAXBEL
1355
1356 FOO (IMAXBEL, "IMAXBEL"); 1345 FOO (IMAXBEL, "IMAXBEL");
1357# endif 1346# endif
1358 1347
1359 fprintf (stderr, "\n"); 1348 fprintf (stderr, "\n");
1360 1349
… …
1367 FOO (VERASE, "VERASE"); 1356 FOO (VERASE, "VERASE");
1368 FOO (VKILL, "VKILL"); 1357 FOO (VKILL, "VKILL");
1369 FOO (VEOF, "VEOF"); 1358 FOO (VEOF, "VEOF");
1370 FOO (VEOL, "VEOL"); 1359 FOO (VEOL, "VEOL");
1371# ifdef VEOL2 1360# ifdef VEOL2
1372
1373 FOO (VEOL2, "VEOL2"); 1361 FOO (VEOL2, "VEOL2");
1374# endif 1362# endif
1375# ifdef VSWTC 1363# ifdef VSWTC
1376
1377 FOO (VSWTC, "VSWTC"); 1364 FOO (VSWTC, "VSWTC");
1378# endif 1365# endif
1379# ifdef VSWTCH 1366# ifdef VSWTCH
1380
1381 FOO (VSWTCH, "VSWTCH"); 1367 FOO (VSWTCH, "VSWTCH");
1382# endif 1368# endif
1383
1384 FOO (VSTART, "VSTART"); 1369 FOO (VSTART, "VSTART");
1385 FOO (VSTOP, "VSTOP"); 1370 FOO (VSTOP, "VSTOP");
1386 FOO (VSUSP, "VSUSP"); 1371 FOO (VSUSP, "VSUSP");
1387# ifdef VDSUSP 1372# ifdef VDSUSP
1388
1389 FOO (VDSUSP, "VDSUSP"); 1373 FOO (VDSUSP, "VDSUSP");
1390# endif 1374# endif
1391# ifdef VREPRINT 1375# ifdef VREPRINT
1392
1393 FOO (VREPRINT, "VREPRINT"); 1376 FOO (VREPRINT, "VREPRINT");
1394# endif 1377# endif
1395# ifdef VDISCRD 1378# ifdef VDISCRD
1396
1397 FOO (VDISCRD, "VDISCRD"); 1379 FOO (VDISCRD, "VDISCRD");
1398# endif 1380# endif
1399# ifdef VWERSE 1381# ifdef VWERSE
1400
1401 FOO (VWERSE, "VWERSE"); 1382 FOO (VWERSE, "VWERSE");
1402# endif 1383# endif
1403# ifdef VLNEXT 1384# ifdef VLNEXT
1404
1405 FOO (VLNEXT, "VLNEXT"); 1385 FOO (VLNEXT, "VLNEXT");
1406# endif 1386# endif
1407 1387
1408 fprintf (stderr, "\n"); 1388 fprintf (stderr, "\n");
1409# undef FOO 1389# undef FOO
… …
1451 1431
1452#if ENABLE_FRILLS 1432#if ENABLE_FRILLS
1453 if (rs[Rs_pty_fd]) 1433 if (rs[Rs_pty_fd])
1454 return; 1434 return;
1455#endif 1435#endif
1456
1457 sw_chld.start (SIGCHLD);
1458 1436
1459#ifndef __QNX__ 1437#ifndef __QNX__
1460 /* spin off the command interpreter */ 1438 /* spin off the command interpreter */
1461 switch (cmd_pid = fork ()) 1439 switch (cmd_pid = fork ())
1462 { 1440 {

Diff Legend

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