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.121 by root, Wed Nov 30 21:05:39 2005 UTC vs.
Revision 1.127 by root, Fri Dec 23 14:46:34 2005 UTC

… …
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 "rxvtutil.h"
37#include "init.h" 37#include "init.h"
38
39#include <limits>
38 40
39#include <csignal> 41#include <csignal>
40 42
41const char *const def_colorName[] = 43const char *const def_colorName[] =
42 { 44 {
… …
226 228
227 if (pix_colors == NULL) 229 if (pix_colors == NULL)
228 return false; 230 return false;
229 231
230#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 232#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
231 TermWin.pixmap = None; 233 pixmap = None;
232#endif 234#endif
233 235
234 MEvent.time = CurrentTime; 236 MEvent.time = CurrentTime;
235 MEvent.button = AnyButton; 237 MEvent.button = AnyButton;
236 options = DEFAULT_OPTIONS; 238 options = DEFAULT_OPTIONS;
237 want_refresh = 1; 239 want_refresh = 1;
238 priv_modes = SavedModes = PrivMode_Default; 240 priv_modes = SavedModes = PrivMode_Default;
239 TermWin.focus = 0; 241 focus = 0;
240 TermWin.ncol = 80; 242 ncol = 80;
241 TermWin.nrow = 24; 243 nrow = 24;
242 TermWin.int_bwidth = INTERNALBORDERWIDTH; 244 int_bwidth = INTERNALBORDERWIDTH;
243 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 245 ext_bwidth = EXTERNALBORDERWIDTH;
244 TermWin.lineSpace = LINESPACE; 246 lineSpace = LINESPACE;
245 TermWin.saveLines = SAVELINES; 247 saveLines = SAVELINES;
246 numpix_colors = TOTAL_COLORS; 248 numpix_colors = TOTAL_COLORS;
247 249
248 refresh_limit = 1; 250 refresh_limit = 1;
249 refresh_type = SLOW_REFRESH; 251 refresh_type = SLOW_REFRESH;
250 prev_nrow = prev_ncol = 0; 252 prev_nrow = prev_ncol = 0;
… …
369 if (!rs[Rs_iconName]) 371 if (!rs[Rs_iconName])
370 rs[Rs_iconName] = rs[Rs_name]; 372 rs[Rs_iconName] = rs[Rs_name];
371 } 373 }
372 374
373 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 375 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
374 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 376 saveLines = min (i, MAX_SAVELINES);
375 377
376#if ENABLE_FRILLS 378#if ENABLE_FRILLS
377 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 379 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
378 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 380 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
381
379 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 382 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
380 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 383 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
384
381 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 385 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
382 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 386 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
383#endif 387#endif
384 388
385#ifdef POINTER_BLANK 389#ifdef POINTER_BLANK
386 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 390 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
387 pointerBlankDelay = i; 391 pointerBlankDelay = i;
388 else 392 else
389 pointerBlankDelay = 2; 393 pointerBlankDelay = 2;
390#endif 394#endif
391 395
392 /* no point having a scrollbar without having any scrollback! */ 396 /* no point having a scrollbar without having any scrollback! */
393 if (!TermWin.saveLines) 397 if (!saveLines)
394 options &= ~Opt_scrollBar; 398 options &= ~Opt_scrollBar;
395 399
396#ifdef PRINTPIPE 400#ifdef PRINTPIPE
397 if (!rs[Rs_print_pipe]) 401 if (!rs[Rs_print_pipe])
398 rs[Rs_print_pipe] = PRINTPIPE; 402 rs[Rs_print_pipe] = PRINTPIPE;
… …
458 rs[Rs_color + i] = def_colorName[i]; 462 rs[Rs_color + i] = def_colorName[i];
459 463
460#ifndef XTERM_REVERSE_VIDEO 464#ifndef XTERM_REVERSE_VIDEO
461 /* this is how we implement reverseVideo */ 465 /* this is how we implement reverseVideo */
462 if (options & Opt_reverseVideo) 466 if (options & Opt_reverseVideo)
463 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 467 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
464#endif 468#endif
465 469
466 /* convenient aliases for setting fg/bg to colors */ 470 /* convenient aliases for setting fg/bg to colors */
467 color_aliases (Color_fg); 471 color_aliases (Color_fg);
468 color_aliases (Color_bg); 472 color_aliases (Color_bg);
… …
518 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 522 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
519 523
520 sprintf (env_display, "DISPLAY=%s", val); 524 sprintf (env_display, "DISPLAY=%s", val);
521 525
522 /* avoiding the math library: 526 /* avoiding the math library:
523 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */ 527 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
524 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++) 528 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
525 ; 529 ;
526 MAX_IT (i, 1); 530 max_it (i, 1);
527 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); 531 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
528 532
529 sprintf (env_windowid, "WINDOWID=%u", 533 sprintf (env_windowid, "WINDOWID=%u",
530 (unsigned int)TermWin.parent[0]); 534 (unsigned int)parent[0]);
531 535
532 /* add entries to the environment: 536 /* add entries to the environment:
533 * @ DISPLAY: in case we started with -display 537 * @ DISPLAY: in case we started with -display
534 * @ WINDOWID: X window id number of the window 538 * @ WINDOWID: X window id number of the window
535 * @ COLORTERM: terminal sub-name and also indicates its color 539 * @ COLORTERM: terminal sub-name and also indicates its color
… …
984 if (!XGetWindowAttributes (disp, parent, &wattr)) 988 if (!XGetWindowAttributes (disp, parent, &wattr))
985 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 989 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
986 990
987 window_calc (wattr.width, wattr.height); 991 window_calc (wattr.width, wattr.height);
988 } 992 }
989
990#endif 993#endif
994
991 window_calc (0, 0); 995 window_calc (0, 0);
992 996
993 /* sub-window placement & size in rxvt_resize_subwindows () */ 997 /* sub-window placement & size in rxvt_resize_subwindows () */
994#ifdef PREFER_24BIT 998#ifdef PREFER_24BIT
995 attributes.background_pixel = pix_colors_focused[Color_border]; 999 attributes.background_pixel = pix_colors_focused[Color_border];
996 attributes.border_pixel = pix_colors_focused[Color_border]; 1000 attributes.border_pixel = pix_colors_focused[Color_border];
997 attributes.colormap = display->cmap; 1001 attributes.colormap = display->cmap;
998 top = XCreateWindow (disp, parent, 1002 top = XCreateWindow (disp, parent,
999 szHint.x, szHint.y, 1003 szHint.x, szHint.y,
1000 szHint.width, szHint.height, 1004 szHint.width, szHint.height,
1001 TermWin.ext_bwidth, 1005 ext_bwidth,
1002 display->depth, InputOutput, 1006 display->depth, InputOutput,
1003 display->visual, 1007 display->visual,
1004 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1008 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1005#else 1009#else
1006 top = XCreateSimpleWindow (disp, parent, 1010 top = XCreateSimpleWindow (disp, parent,
1007 szHint.x, szHint.y, 1011 szHint.x, szHint.y,
1008 szHint.width, szHint.height, 1012 szHint.width, szHint.height,
1009 TermWin.ext_bwidth, 1013 ext_bwidth,
1010 pix_colors_focused[Color_border], 1014 pix_colors_focused[Color_border],
1011 pix_colors_focused[Color_border]); 1015 pix_colors_focused[Color_border]);
1012#endif 1016#endif
1013 1017
1014 TermWin.parent[0] = top; 1018 this->parent[0] = top;
1015 1019
1016 old_width = szHint.width; 1020 old_width = szHint.width;
1017 old_height = szHint.height; 1021 old_height = szHint.height;
1018 1022
1019 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1023 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
… …
1072 /* cursor (menuBar/scrollBar): Black-on-White */ 1076 /* cursor (menuBar/scrollBar): Black-on-White */
1073 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1077 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1074#endif 1078#endif
1075 1079
1076 /* the vt window */ 1080 /* the vt window */
1077 TermWin.vt = XCreateSimpleWindow (disp, top, 1081 vt = XCreateSimpleWindow (disp, top,
1078 window_vt_x, 1082 window_vt_x,
1079 window_vt_y, 1083 window_vt_y,
1080 TermWin_TotalWidth (), 1084 TermWin_TotalWidth (),
1081 TermWin_TotalHeight (), 1085 TermWin_TotalHeight (),
1082 0, 1086 0,
1083 pix_colors_focused[Color_fg], 1087 pix_colors_focused[Color_fg],
1084 pix_colors_focused[Color_bg]); 1088 pix_colors_focused[Color_bg]);
1085#ifdef DEBUG_X 1089#ifdef DEBUG_X
1086 XStoreName (disp, TermWin.vt, "vt window"); 1090 XStoreName (disp, vt, "vt window");
1087#endif 1091#endif
1088 1092
1089 attributes.bit_gravity = NorthWestGravity; 1093 attributes.bit_gravity = NorthWestGravity;
1090 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes); 1094 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1091 1095
1092 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1096 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1093 1097
1094#ifdef POINTER_BLANK 1098#ifdef POINTER_BLANK
1095 if (options & Opt_pointerBlank) 1099 if (options & Opt_pointerBlank)
1096 vt_emask |= PointerMotionMask; 1100 vt_emask |= PointerMotionMask;
1097 else 1101 else
1098#endif 1102#endif
1099 vt_emask |= Button1MotionMask | Button3MotionMask; 1103 vt_emask |= Button1MotionMask | Button3MotionMask;
1100 1104
1101 XSelectInput (disp, TermWin.vt, vt_emask); 1105 XSelectInput (disp, vt, vt_emask);
1102 vt_ev.start (display, TermWin.vt); 1106 vt_ev.start (display, vt);
1103 1107
1104#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1108#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1105 if (menuBar_height ()) 1109 if (menuBar_height ())
1106 { 1110 {
1107 menuBar.win = XCreateSimpleWindow (disp, top, 1111 menuBar.win = XCreateSimpleWindow (disp, top,
… …
1146 1150
1147 /* graphics context for the vt window */ 1151 /* graphics context for the vt window */
1148 gcvalue.foreground = pix_colors[Color_fg]; 1152 gcvalue.foreground = pix_colors[Color_fg];
1149 gcvalue.background = pix_colors[Color_bg]; 1153 gcvalue.background = pix_colors[Color_bg];
1150 gcvalue.graphics_exposures = 1; 1154 gcvalue.graphics_exposures = 1;
1151 TermWin.gc = XCreateGC (disp, TermWin.vt, 1155 gc = XCreateGC (disp, vt,
1152 GCForeground | GCBackground | GCGraphicsExposures, 1156 GCForeground | GCBackground | GCGraphicsExposures,
1153 &gcvalue); 1157 &gcvalue);
1154 1158
1155 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1159 drawable = new rxvt_drawable (display, vt);
1156 1160
1157#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1161#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1158 gcvalue.foreground = pix_colors[Color_topShadow]; 1162 gcvalue.foreground = pix_colors[Color_topShadow];
1159 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1163 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1160 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1164 gcvalue.foreground = pix_colors[Color_bottomShadow];
1161 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1165 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1162 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1166 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1163 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1167 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1164#endif 1168#endif
1165 1169
1166#ifdef OFF_FOCUS_FADING 1170#ifdef OFF_FOCUS_FADING
1167 // initially we are in unfocused state 1171 // initially we are in unfocused state
1168 if (rs[Rs_fade]) 1172 if (rs[Rs_fade])
… …
1193 /* 1197 /*
1194 * standard System V termios interface 1198 * standard System V termios interface
1195 */ 1199 */
1196 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1200 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1197 { 1201 {
1198 /* return error - use system defaults */ 1202 // return error - use system defaults,
1203 // where possible, and zero elsewhere
1204 memset (tio, 0, sizeof (ttymode_t));
1205
1199 tio->c_cc[VINTR] = CINTR; 1206 tio->c_cc[VINTR] = CINTR;
1200 tio->c_cc[VQUIT] = CQUIT; 1207 tio->c_cc[VQUIT] = CQUIT;
1201 tio->c_cc[VERASE] = CERASE; 1208 tio->c_cc[VERASE] = CERASE;
1209#ifdef VERASE2
1210 tio->c_cc[VERASE2] = CERASE2;
1211#endif
1202 tio->c_cc[VKILL] = CKILL; 1212 tio->c_cc[VKILL] = CKILL;
1203 tio->c_cc[VSTART] = CSTART; 1213 tio->c_cc[VSTART] = CSTART;
1204 tio->c_cc[VSTOP] = CSTOP; 1214 tio->c_cc[VSTOP] = CSTOP;
1205 tio->c_cc[VSUSP] = CSUSP; 1215 tio->c_cc[VSUSP] = CSUSP;
1206# ifdef VDSUSP 1216# ifdef VDSUSP
… …
1400{ 1410{
1401#if ENABLE_FRILLS 1411#if ENABLE_FRILLS
1402 if (rs[Rs_pty_fd]) 1412 if (rs[Rs_pty_fd])
1403 { 1413 {
1404 pty.pty = atoi (rs[Rs_pty_fd]); 1414 pty.pty = atoi (rs[Rs_pty_fd]);
1415
1416 if (getfd_hook)
1417 pty.pty = (*getfd_hook) (pty.pty);
1418
1405 fcntl (pty.pty, F_SETFL, O_NONBLOCK); 1419 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK))
1420 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1406 } 1421 }
1407 else 1422 else
1408#endif 1423#endif
1409 if (!pty.get ()) 1424 if (!pty.get ())
1410 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1425 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");

Diff Legend

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