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.120 by root, Mon Nov 28 18:37:42 2005 UTC vs.
Revision 1.124 by root, Wed Dec 21 14:19:19 2005 UTC

… …
216 }; 216 };
217 217
218bool 218bool
219rxvt_term::init_vars () 219rxvt_term::init_vars ()
220{ 220{
221 sw_term.start (SIGTERM);
222 sw_int.start (SIGINT);
223
224 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 221 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
225#ifdef OFF_FOCUS_FADING 222#ifdef OFF_FOCUS_FADING
226 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
227#endif 224#endif
228 pix_colors = pix_colors_focused; 225 pix_colors = pix_colors_focused;
229 226
230 if (pix_colors == NULL) 227 if (pix_colors == NULL)
231 return false; 228 return false;
232 229
233#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 230#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
234 TermWin.pixmap = None; 231 pixmap = None;
235#endif 232#endif
236 233
237 MEvent.time = CurrentTime; 234 MEvent.time = CurrentTime;
238 MEvent.button = AnyButton; 235 MEvent.button = AnyButton;
239 options = DEFAULT_OPTIONS; 236 options = DEFAULT_OPTIONS;
240 want_refresh = 1; 237 want_refresh = 1;
241 priv_modes = SavedModes = PrivMode_Default; 238 priv_modes = SavedModes = PrivMode_Default;
242 TermWin.focus = 0; 239 focus = 0;
243 TermWin.ncol = 80; 240 ncol = 80;
244 TermWin.nrow = 24; 241 nrow = 24;
245 TermWin.int_bwidth = INTERNALBORDERWIDTH; 242 int_bwidth = INTERNALBORDERWIDTH;
246 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 243 ext_bwidth = EXTERNALBORDERWIDTH;
247 TermWin.lineSpace = LINESPACE; 244 lineSpace = LINESPACE;
248 TermWin.saveLines = SAVELINES; 245 saveLines = SAVELINES;
249 numpix_colors = TOTAL_COLORS; 246 numpix_colors = TOTAL_COLORS;
250 247
251 refresh_limit = 1; 248 refresh_limit = 1;
252 refresh_type = SLOW_REFRESH; 249 refresh_type = SLOW_REFRESH;
253 prev_nrow = prev_ncol = 0; 250 prev_nrow = prev_ncol = 0;
… …
372 if (!rs[Rs_iconName]) 369 if (!rs[Rs_iconName])
373 rs[Rs_iconName] = rs[Rs_name]; 370 rs[Rs_iconName] = rs[Rs_name];
374 } 371 }
375 372
376 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 373 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
377 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 374 saveLines = min (i, MAX_POSITIVE_INT16);
378 375
379#if ENABLE_FRILLS 376#if ENABLE_FRILLS
380 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)
381 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 378 int_bwidth = min (i, MAX_POSITIVE_INT16);
379
382 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)
383 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 381 ext_bwidth = min (i, MAX_POSITIVE_INT16);
382
384 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 383 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
385 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 384 lineSpace = min (i, MAX_POSITIVE_INT16);
386#endif 385#endif
387 386
388#ifdef POINTER_BLANK 387#ifdef POINTER_BLANK
389 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 388 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
390 pointerBlankDelay = i; 389 pointerBlankDelay = i;
391 else 390 else
392 pointerBlankDelay = 2; 391 pointerBlankDelay = 2;
393#endif 392#endif
394 393
395 /* no point having a scrollbar without having any scrollback! */ 394 /* no point having a scrollbar without having any scrollback! */
396 if (!TermWin.saveLines) 395 if (!saveLines)
397 options &= ~Opt_scrollBar; 396 options &= ~Opt_scrollBar;
398 397
399#ifdef PRINTPIPE 398#ifdef PRINTPIPE
400 if (!rs[Rs_print_pipe]) 399 if (!rs[Rs_print_pipe])
401 rs[Rs_print_pipe] = PRINTPIPE; 400 rs[Rs_print_pipe] = PRINTPIPE;
… …
461 rs[Rs_color + i] = def_colorName[i]; 460 rs[Rs_color + i] = def_colorName[i];
462 461
463#ifndef XTERM_REVERSE_VIDEO 462#ifndef XTERM_REVERSE_VIDEO
464 /* this is how we implement reverseVideo */ 463 /* this is how we implement reverseVideo */
465 if (options & Opt_reverseVideo) 464 if (options & Opt_reverseVideo)
466 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]);
467#endif 466#endif
468 467
469 /* convenient aliases for setting fg/bg to colors */ 468 /* convenient aliases for setting fg/bg to colors */
470 color_aliases (Color_fg); 469 color_aliases (Color_fg);
471 color_aliases (Color_bg); 470 color_aliases (Color_bg);
… …
521 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 520 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
522 521
523 sprintf (env_display, "DISPLAY=%s", val); 522 sprintf (env_display, "DISPLAY=%s", val);
524 523
525 /* avoiding the math library: 524 /* avoiding the math library:
526 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */ 525 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
527 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++)
528 ; 527 ;
529 MAX_IT (i, 1); 528 max_it (i, 1);
530 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); 529 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
531 530
532 sprintf (env_windowid, "WINDOWID=%u", 531 sprintf (env_windowid, "WINDOWID=%u",
533 (unsigned int)TermWin.parent[0]); 532 (unsigned int)parent[0]);
534 533
535 /* add entries to the environment: 534 /* add entries to the environment:
536 * @ DISPLAY: in case we started with -display 535 * @ DISPLAY: in case we started with -display
537 * @ WINDOWID: X window id number of the window 536 * @ WINDOWID: X window id number of the window
538 * @ COLORTERM: terminal sub-name and also indicates its color 537 * @ COLORTERM: terminal sub-name and also indicates its color
… …
987 if (!XGetWindowAttributes (disp, parent, &wattr)) 986 if (!XGetWindowAttributes (disp, parent, &wattr))
988 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 987 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
989 988
990 window_calc (wattr.width, wattr.height); 989 window_calc (wattr.width, wattr.height);
991 } 990 }
992
993#endif 991#endif
992
994 window_calc (0, 0); 993 window_calc (0, 0);
995 994
996 /* sub-window placement & size in rxvt_resize_subwindows () */ 995 /* sub-window placement & size in rxvt_resize_subwindows () */
997#ifdef PREFER_24BIT 996#ifdef PREFER_24BIT
998 attributes.background_pixel = pix_colors_focused[Color_border]; 997 attributes.background_pixel = pix_colors_focused[Color_border];
999 attributes.border_pixel = pix_colors_focused[Color_border]; 998 attributes.border_pixel = pix_colors_focused[Color_border];
1000 attributes.colormap = display->cmap; 999 attributes.colormap = display->cmap;
1001 top = XCreateWindow (disp, parent, 1000 top = XCreateWindow (disp, parent,
1002 szHint.x, szHint.y, 1001 szHint.x, szHint.y,
1003 szHint.width, szHint.height, 1002 szHint.width, szHint.height,
1004 TermWin.ext_bwidth, 1003 ext_bwidth,
1005 display->depth, InputOutput, 1004 display->depth, InputOutput,
1006 display->visual, 1005 display->visual,
1007 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1006 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1008#else 1007#else
1009 top = XCreateSimpleWindow (disp, parent, 1008 top = XCreateSimpleWindow (disp, parent,
1010 szHint.x, szHint.y, 1009 szHint.x, szHint.y,
1011 szHint.width, szHint.height, 1010 szHint.width, szHint.height,
1012 TermWin.ext_bwidth, 1011 ext_bwidth,
1013 pix_colors_focused[Color_border], 1012 pix_colors_focused[Color_border],
1014 pix_colors_focused[Color_border]); 1013 pix_colors_focused[Color_border]);
1015#endif 1014#endif
1016 1015
1017 TermWin.parent[0] = top; 1016 this->parent[0] = top;
1018 1017
1019 old_width = szHint.width; 1018 old_width = szHint.width;
1020 old_height = szHint.height; 1019 old_height = szHint.height;
1021 1020
1022 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1021 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
… …
1075 /* cursor (menuBar/scrollBar): Black-on-White */ 1074 /* cursor (menuBar/scrollBar): Black-on-White */
1076 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1075 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1077#endif 1076#endif
1078 1077
1079 /* the vt window */ 1078 /* the vt window */
1080 TermWin.vt = XCreateSimpleWindow (disp, top, 1079 vt = XCreateSimpleWindow (disp, top,
1081 window_vt_x, 1080 window_vt_x,
1082 window_vt_y, 1081 window_vt_y,
1083 TermWin_TotalWidth (), 1082 TermWin_TotalWidth (),
1084 TermWin_TotalHeight (), 1083 TermWin_TotalHeight (),
1085 0, 1084 0,
1086 pix_colors_focused[Color_fg], 1085 pix_colors_focused[Color_fg],
1087 pix_colors_focused[Color_bg]); 1086 pix_colors_focused[Color_bg]);
1088#ifdef DEBUG_X 1087#ifdef DEBUG_X
1089 XStoreName (disp, TermWin.vt, "vt window"); 1088 XStoreName (disp, vt, "vt window");
1090#endif 1089#endif
1091 1090
1092 attributes.bit_gravity = NorthWestGravity; 1091 attributes.bit_gravity = NorthWestGravity;
1093 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes); 1092 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1094 1093
1095 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1094 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1096 1095
1097#ifdef POINTER_BLANK 1096#ifdef POINTER_BLANK
1098 if (options & Opt_pointerBlank) 1097 if (options & Opt_pointerBlank)
1099 vt_emask |= PointerMotionMask; 1098 vt_emask |= PointerMotionMask;
1100 else 1099 else
1101#endif 1100#endif
1102 vt_emask |= Button1MotionMask | Button3MotionMask; 1101 vt_emask |= Button1MotionMask | Button3MotionMask;
1103 1102
1104 XSelectInput (disp, TermWin.vt, vt_emask); 1103 XSelectInput (disp, vt, vt_emask);
1105 vt_ev.start (display, TermWin.vt); 1104 vt_ev.start (display, vt);
1106 1105
1107#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1106#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1108 if (menuBar_height ()) 1107 if (menuBar_height ())
1109 { 1108 {
1110 menuBar.win = XCreateSimpleWindow (disp, top, 1109 menuBar.win = XCreateSimpleWindow (disp, top,
… …
1149 1148
1150 /* graphics context for the vt window */ 1149 /* graphics context for the vt window */
1151 gcvalue.foreground = pix_colors[Color_fg]; 1150 gcvalue.foreground = pix_colors[Color_fg];
1152 gcvalue.background = pix_colors[Color_bg]; 1151 gcvalue.background = pix_colors[Color_bg];
1153 gcvalue.graphics_exposures = 1; 1152 gcvalue.graphics_exposures = 1;
1154 TermWin.gc = XCreateGC (disp, TermWin.vt, 1153 gc = XCreateGC (disp, vt,
1155 GCForeground | GCBackground | GCGraphicsExposures, 1154 GCForeground | GCBackground | GCGraphicsExposures,
1156 &gcvalue); 1155 &gcvalue);
1157 1156
1158 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1157 drawable = new rxvt_drawable (display, vt);
1159 1158
1160#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1159#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1161 gcvalue.foreground = pix_colors[Color_topShadow]; 1160 gcvalue.foreground = pix_colors[Color_topShadow];
1162 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1161 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1163 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1162 gcvalue.foreground = pix_colors[Color_bottomShadow];
1164 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1163 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1165 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1164 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1166 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1165 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1167#endif 1166#endif
1168 1167
1169#ifdef OFF_FOCUS_FADING 1168#ifdef OFF_FOCUS_FADING
1170 // initially we are in unfocused state 1169 // initially we are in unfocused state
1171 if (rs[Rs_fade]) 1170 if (rs[Rs_fade])
… …
1432 1431
1433#if ENABLE_FRILLS 1432#if ENABLE_FRILLS
1434 if (rs[Rs_pty_fd]) 1433 if (rs[Rs_pty_fd])
1435 return; 1434 return;
1436#endif 1435#endif
1437
1438 sw_chld.start (SIGCHLD);
1439 1436
1440#ifndef __QNX__ 1437#ifndef __QNX__
1441 /* spin off the command interpreter */ 1438 /* spin off the command interpreter */
1442 switch (cmd_pid = fork ()) 1439 switch (cmd_pid = fork ())
1443 { 1440 {

Diff Legend

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