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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines