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.174 by root, Wed Jul 5 22:46:14 2006 UTC vs.
Revision 1.187 by root, Mon Jun 18 12:53:26 2007 UTC

… …
46 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
47 /* low-intensity colors */ 47 /* low-intensity colors */
48 "rgb:00/00/00", // 0: black (Black) 48 "rgb:00/00/00", // 0: black (Black)
49 "rgb:cd/00/00", // 1: red (Red3) 49 "rgb:cd/00/00", // 1: red (Red3)
50 "rgb:00/cd/00", // 2: green (Green3) 50 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: ywlloe (Yellow3) 51 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "rgb:00/00/cd", // 4: blue (Blue3) 52 "rgb:00/00/cd", // 4: blue (Blue3)
53 "rgb:cd/00/cd", // 5: magenta (Magenta3) 53 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "rgb:00/cd/cd", // 6: cyan (Cyan3) 54 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 55# ifdef XTERM_COLORS
56 "rgb:e5/e5/e5", // 7: white (Grey90) 56 "rgb:e5/e5/e5", // 7: white (Grey90)
… …
189 pixmap = None; 189 pixmap = None;
190#endif 190#endif
191 191
192 MEvent.time = CurrentTime; 192 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 193 MEvent.button = AnyButton;
194 options = DEFAULT_OPTIONS;
195 want_refresh = 1; 194 want_refresh = 1;
196 priv_modes = SavedModes = PrivMode_Default; 195 priv_modes = SavedModes = PrivMode_Default;
197 ncol = 80; 196 ncol = 80;
198 nrow = 24; 197 nrow = 24;
199 int_bwidth = INTERNALBORDERWIDTH; 198 int_bwidth = INTERNALBORDERWIDTH;
200 ext_bwidth = EXTERNALBORDERWIDTH; 199 ext_bwidth = EXTERNALBORDERWIDTH;
201 lineSpace = LINESPACE; 200 lineSpace = LINESPACE;
202 saveLines = SAVELINES; 201 saveLines = SAVELINES;
203 numpix_colors = TOTAL_COLORS; 202 numpix_colors = TOTAL_COLORS;
204 203
205 refresh_limit = 1;
206 refresh_type = SLOW_REFRESH; 204 refresh_type = SLOW_REFRESH;
207 205
208 oldcursor.row = oldcursor.col = -1; 206 oldcursor.row = oldcursor.col = -1;
209#ifdef XPM_BACKGROUND 207#ifdef XPM_BACKGROUND
210 /* bgPixmap.w = bgPixmap.h = 0; */ 208 /* bgPixmap.w = bgPixmap.h = 0; */
211 bgPixmap.x = bgPixmap.y = 50; 209 bgPixmap.x = bgPixmap.y = 0;
212 bgPixmap.pixmap = None; 210 bgPixmap.pixmap = None;
213#endif 211#endif
214 212
215 last_bot = last_state = -1; 213 last_bot = last_state = -1;
214
215 set_option (Opt_scrollBar);
216 set_option (Opt_scrollTtyOutput);
217 set_option (Opt_jumpScroll);
218 set_option (Opt_secondaryScreen);
219 set_option (Opt_secondaryScroll);
220 set_option (Opt_pastableTabs);
221 set_option (Opt_intensityStyles);
222 set_option (Opt_iso14755_52);
216 223
217 return true; 224 return true;
218} 225}
219 226
220void 227void
… …
421 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 428 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
422#endif 429#endif
423 430
424#ifdef XTERM_REVERSE_VIDEO 431#ifdef XTERM_REVERSE_VIDEO
425 /* this is how xterm implements reverseVideo */ 432 /* this is how xterm implements reverseVideo */
426 if (OPTION (Opt_reverseVideo)) 433 if (option (Opt_reverseVideo))
427 { 434 {
428 if (!rs[Rs_color + Color_fg]) 435 if (!rs[Rs_color + Color_fg])
429 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 436 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
430 437
431 if (!rs[Rs_color + Color_bg]) 438 if (!rs[Rs_color + Color_bg])
… …
437 if (!rs[Rs_color + i]) 444 if (!rs[Rs_color + i])
438 rs[Rs_color + i] = def_colorName[i]; 445 rs[Rs_color + i] = def_colorName[i];
439 446
440#ifndef XTERM_REVERSE_VIDEO 447#ifndef XTERM_REVERSE_VIDEO
441 /* this is how we implement reverseVideo */ 448 /* this is how we implement reverseVideo */
442 if (OPTION (Opt_reverseVideo)) 449 if (option (Opt_reverseVideo))
443 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 450 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
444#endif 451#endif
445 452
446 /* convenient aliases for setting fg/bg to colors */ 453 /* convenient aliases for setting fg/bg to colors */
447 color_aliases (Color_fg); 454 color_aliases (Color_fg);
… …
621 * Initialize the command connection. 628 * Initialize the command connection.
622 * This should be called after the X server connection is established. 629 * This should be called after the X server connection is established.
623 */ 630 */
624 631
625#ifdef META8_OPTION 632#ifdef META8_OPTION
626 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 633 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
627#endif 634#endif
628 635
629 get_ourmods (); 636 get_ourmods ();
630 637
631 if (!OPTION (Opt_scrollTtyOutput)) 638 if (!option (Opt_scrollTtyOutput))
632 priv_modes |= PrivMode_TtyOutputInh; 639 priv_modes |= PrivMode_TtyOutputInh;
633 if (OPTION (Opt_scrollTtyKeypress)) 640 if (option (Opt_scrollTtyKeypress))
634 priv_modes |= PrivMode_Keypress; 641 priv_modes |= PrivMode_Keypress;
635 if (!OPTION (Opt_jumpScroll)) 642 if (!option (Opt_jumpScroll))
636 priv_modes |= PrivMode_smoothScroll; 643 priv_modes |= PrivMode_smoothScroll;
637 644
638#ifndef NO_BACKSPACE_KEY 645#ifndef NO_BACKSPACE_KEY
639 if (strcmp (key_backspace, "DEC") == 0) 646 if (strcmp (key_backspace, "DEC") == 0)
640 priv_modes |= PrivMode_HaveBackSpace; 647 priv_modes |= PrivMode_HaveBackSpace;
… …
670 rxvt_color xcol; 677 rxvt_color xcol;
671 678
672 if (!set_color (xcol, name)) 679 if (!set_color (xcol, name))
673 { 680 {
674#ifndef XTERM_REVERSE_VIDEO 681#ifndef XTERM_REVERSE_VIDEO
675 if (i < 2 && OPTION (Opt_reverseVideo)) 682 if (i < 2 && option (Opt_reverseVideo))
676 name = def_colorName [1 - i]; 683 name = def_colorName [1 - i];
677 else 684 else
678#endif 685#endif
679 name = def_colorName [i]; 686 name = def_colorName [i];
680 687
… …
887 if (!set_fonts ()) 894 if (!set_fonts ())
888 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 895 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
889 896
890 parent = display->root; 897 parent = display->root;
891 898
892 attributes.override_redirect = !!OPTION (Opt_override_redirect); 899 attributes.override_redirect = !!option (Opt_override_redirect);
893 900
894#if ENABLE_FRILLS 901#if ENABLE_FRILLS
895 if (OPTION (Opt_borderLess)) 902 if (option (Opt_borderLess))
896 { 903 {
897 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 904 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
898 { 905 {
899 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 906 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
900 attributes.override_redirect = true; 907 attributes.override_redirect = true;
… …
950 classHint.res_name = (char *)rs[Rs_name]; 957 classHint.res_name = (char *)rs[Rs_name];
951 classHint.res_class = (char *)RESCLASS; 958 classHint.res_class = (char *)RESCLASS;
952 959
953 wmHint.flags = InputHint | StateHint | WindowGroupHint; 960 wmHint.flags = InputHint | StateHint | WindowGroupHint;
954 wmHint.input = True; 961 wmHint.input = True;
955 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 962 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
956 wmHint.window_group = top; 963 wmHint.window_group = top;
957 964
958 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 965 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
959 &szHint, &wmHint, &classHint); 966 &szHint, &wmHint, &classHint);
960 967
… …
1017 attributes.bit_gravity = NorthWestGravity; 1024 attributes.bit_gravity = NorthWestGravity;
1018 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); 1025 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1019 1026
1020 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1027 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1021 1028
1022 if (OPTION (Opt_pointerBlank)) 1029 if (option (Opt_pointerBlank))
1023 vt_emask |= PointerMotionMask; 1030 vt_emask |= PointerMotionMask;
1024 else 1031 else
1025 vt_emask |= Button1MotionMask | Button3MotionMask; 1032 vt_emask |= Button1MotionMask | Button3MotionMask;
1026 1033
1027 vt_select_input (); 1034 vt_select_input ();
1028 1035
1029 vt_ev.start (display, vt); 1036 vt_ev.start (display, vt);
1030 1037
1031#ifdef XPM_BACKGROUND 1038#ifdef XPM_BACKGROUND
1032 if (rs[Rs_backgroundPixmap] != NULL 1039 if (rs[Rs_backgroundPixmap] != NULL
1040#ifndef HAVE_AFTERIMAGE
1033 && !OPTION (Opt_transparent)) 1041 && !option (Opt_transparent)
1042#endif
1043 )
1034 { 1044 {
1035 const char *p = rs[Rs_backgroundPixmap]; 1045 const char *p = rs[Rs_backgroundPixmap];
1036 1046
1037 if ((p = strchr (p, ';')) != NULL) 1047 if ((p = strchr (p, ';')) != NULL)
1038 { 1048 {
… …
1079 * GET TTY CURRENT STATE * 1089 * GET TTY CURRENT STATE *
1080 * ------------------------------------------------------------------------- */ 1090 * ------------------------------------------------------------------------- */
1081void 1091void
1082rxvt_get_ttymode (ttymode_t *tio, int erase) 1092rxvt_get_ttymode (ttymode_t *tio, int erase)
1083{ 1093{
1084#ifdef HAVE_TERMIOS_H
1085 /* 1094 /*
1086 * standard System V termios interface 1095 * standard System V termios interface
1087 */ 1096 */
1088 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1097 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1089 { 1098 {
… …
1156 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1165 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1157# if defined (ECHOCTL) && defined (ECHOKE) 1166# if defined (ECHOCTL) && defined (ECHOKE)
1158 | ECHOCTL | ECHOKE 1167 | ECHOCTL | ECHOKE
1159# endif 1168# endif
1160 | ECHOE | ECHOK); 1169 | ECHOE | ECHOK);
1161# else /* HAVE_TERMIOS_H */
1162
1163 /*
1164 * sgtty interface
1165 */
1166
1167 /* get parameters -- gtty */
1168 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1169 {
1170 tio->sg.sg_erase = CERASE; /* ^H */
1171 tio->sg.sg_kill = CKILL; /* ^U */
1172 }
1173
1174 if (erase != -1)
1175 tio->sg.sg_erase = (char)erase;
1176
1177 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1178
1179 /* get special characters */
1180 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1181 {
1182 tio->tc.t_intrc = CINTR; /* ^C */
1183 tio->tc.t_quitc = CQUIT; /* ^\ */
1184 tio->tc.t_startc = CSTART; /* ^Q */
1185 tio->tc.t_stopc = CSTOP; /* ^S */
1186 tio->tc.t_eofc = CEOF; /* ^D */
1187 tio->tc.t_brkc = -1;
1188 }
1189
1190 /* get local special chars */
1191 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1192 {
1193 tio->lc.t_suspc = CSUSP; /* ^Z */
1194 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1195 tio->lc.t_rprntc = CRPRNT; /* ^R */
1196 tio->lc.t_flushc = CFLUSH; /* ^O */
1197 tio->lc.t_werasc = CWERASE; /* ^W */
1198 tio->lc.t_lnextc = CLNEXT; /* ^V */
1199 }
1200 /* get line discipline */
1201 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1202# ifdef NTTYDISC
1203 tio->line = NTTYDISC;
1204# endif /* NTTYDISC */
1205
1206 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1207#endif /* HAVE_TERMIOS_H */
1208 1170
1209 /* 1171 /*
1210 * Debugging 1172 * Debugging
1211 */ 1173 */
1212#ifdef DEBUG_TTYMODE 1174#ifdef DEBUG_TTYMODE
… …
1313 else 1275 else
1314#endif 1276#endif
1315 if (!pty->get ()) 1277 if (!pty->get ())
1316 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1278 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1317 1279
1318 pty->set_utf8_mode (enc_utf8);
1319
1320 /* set initial window size */
1321 tt_winch ();
1322
1323 int er; 1280 int er;
1324 1281
1325#ifndef NO_BACKSPACE_KEY 1282#ifndef NO_BACKSPACE_KEY
1326 if (key_backspace[0] && !key_backspace[1]) 1283 if (key_backspace[0] && !key_backspace[1])
1327 er = key_backspace[0]; 1284 er = key_backspace[0];
… …
1330 else 1287 else
1331#endif 1288#endif
1332 er = -1; 1289 er = -1;
1333 1290
1334 rxvt_get_ttymode (&tio, er); 1291 rxvt_get_ttymode (&tio, er);
1292 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1293 pty->set_utf8_mode (enc_utf8);
1294
1295 /* set initial window size */
1296 tt_winch ();
1335 1297
1336#if ENABLE_FRILLS 1298#if ENABLE_FRILLS
1337 if (rs[Rs_pty_fd]) 1299 if (rs[Rs_pty_fd])
1338 return; 1300 return;
1339#endif 1301#endif
… …
1370 } 1332 }
1371 1333
1372 _exit (EXIT_FAILURE); 1334 _exit (EXIT_FAILURE);
1373 1335
1374 default: 1336 default:
1375 if (!OPTION (Opt_utmpInhibit)) 1337 if (!option (Opt_utmpInhibit))
1376 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1338 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1377 1339
1378 pty->close_tty (); 1340 pty->close_tty ();
1379 1341
1380 child_ev.start (cmd_pid); 1342 child_ev.start (cmd_pid);
1381 1343
… …
1394int 1356int
1395rxvt_term::run_child (const char *const *argv) 1357rxvt_term::run_child (const char *const *argv)
1396{ 1358{
1397 char *login; 1359 char *login;
1398 1360
1399 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1400
1401 if (OPTION (Opt_console)) 1361 if (option (Opt_console))
1402 { /* be virtual console, fail silently */ 1362 { /* be virtual console, fail silently */
1403#ifdef TIOCCONS 1363#ifdef TIOCCONS
1404 unsigned int on = 1; 1364 unsigned int on = 1;
1405 1365
1406 ioctl (STDIN_FILENO, TIOCCONS, &on); 1366 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1455 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1415 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1456 shell = "/bin/sh"; 1416 shell = "/bin/sh";
1457 1417
1458 argv0 = (const char *)rxvt_r_basename (shell); 1418 argv0 = (const char *)rxvt_r_basename (shell);
1459 1419
1460 if (OPTION (Opt_loginShell)) 1420 if (option (Opt_loginShell))
1461 { 1421 {
1462 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1422 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1463 1423
1464 login[0] = '-'; 1424 login[0] = '-';
1465 strcpy (&login[1], argv0); 1425 strcpy (&login[1], argv0);

Diff Legend

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