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.173 by root, Wed Jul 5 20:31:48 2006 UTC vs.
Revision 1.185 by ayin, Sat Jun 9 08:12:38 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;
… …
206 refresh_type = SLOW_REFRESH; 205 refresh_type = SLOW_REFRESH;
207 206
208 oldcursor.row = oldcursor.col = -1; 207 oldcursor.row = oldcursor.col = -1;
209#ifdef XPM_BACKGROUND 208#ifdef XPM_BACKGROUND
210 /* bgPixmap.w = bgPixmap.h = 0; */ 209 /* bgPixmap.w = bgPixmap.h = 0; */
211 bgPixmap.x = bgPixmap.y = 50; 210 bgPixmap.x = bgPixmap.y = 0;
212 bgPixmap.pixmap = None; 211 bgPixmap.pixmap = None;
213#endif 212#endif
214 213
215 last_bot = last_state = -1; 214 last_bot = last_state = -1;
215
216 set_option (Opt_scrollBar);
217 set_option (Opt_scrollTtyOutput);
218 set_option (Opt_jumpScroll);
219 set_option (Opt_secondaryScreen);
220 set_option (Opt_secondaryScroll);
221 set_option (Opt_pastableTabs);
222 set_option (Opt_intensityStyles);
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
… …
748 alias_color (Color_topShadow, Color_White); 755 alias_color (Color_topShadow, Color_White);
749 } 756 }
750#endif /* KEEP_SCROLLCOLOR */ 757#endif /* KEEP_SCROLLCOLOR */
751 758
752#ifdef OFF_FOCUS_FADING 759#ifdef OFF_FOCUS_FADING
753 if (rs[Rs_fade])
754 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 760 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
755 { 761 update_fade_color (i);
756 rgba c;
757 pix_colors [Color_fade].get (c);
758 pix_colors_focused [i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
759 }
760#endif 762#endif
761} 763}
762 764
763/*----------------------------------------------------------------------*/ 765/*----------------------------------------------------------------------*/
764/* color aliases, fg/bg bright-bold */ 766/* color aliases, fg/bg bright-bold */
… …
892 if (!set_fonts ()) 894 if (!set_fonts ())
893 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");
894 896
895 parent = display->root; 897 parent = display->root;
896 898
897 attributes.override_redirect = !!OPTION (Opt_override_redirect); 899 attributes.override_redirect = !!option (Opt_override_redirect);
898 900
899#if ENABLE_FRILLS 901#if ENABLE_FRILLS
900 if (OPTION (Opt_borderLess)) 902 if (option (Opt_borderLess))
901 { 903 {
902 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 904 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
903 { 905 {
904 /* 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");*/
905 attributes.override_redirect = true; 907 attributes.override_redirect = true;
… …
955 classHint.res_name = (char *)rs[Rs_name]; 957 classHint.res_name = (char *)rs[Rs_name];
956 classHint.res_class = (char *)RESCLASS; 958 classHint.res_class = (char *)RESCLASS;
957 959
958 wmHint.flags = InputHint | StateHint | WindowGroupHint; 960 wmHint.flags = InputHint | StateHint | WindowGroupHint;
959 wmHint.input = True; 961 wmHint.input = True;
960 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 962 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
961 wmHint.window_group = top; 963 wmHint.window_group = top;
962 964
963 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 965 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
964 &szHint, &wmHint, &classHint); 966 &szHint, &wmHint, &classHint);
965 967
… …
1022 attributes.bit_gravity = NorthWestGravity; 1024 attributes.bit_gravity = NorthWestGravity;
1023 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); 1025 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1024 1026
1025 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1027 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1026 1028
1027 if (OPTION (Opt_pointerBlank)) 1029 if (option (Opt_pointerBlank))
1028 vt_emask |= PointerMotionMask; 1030 vt_emask |= PointerMotionMask;
1029 else 1031 else
1030 vt_emask |= Button1MotionMask | Button3MotionMask; 1032 vt_emask |= Button1MotionMask | Button3MotionMask;
1031 1033
1032 vt_select_input (); 1034 vt_select_input ();
1033 1035
1034 vt_ev.start (display, vt); 1036 vt_ev.start (display, vt);
1035 1037
1036#ifdef XPM_BACKGROUND 1038#ifdef XPM_BACKGROUND
1037 if (rs[Rs_backgroundPixmap] != NULL 1039 if (rs[Rs_backgroundPixmap] != NULL
1040#ifndef HAVE_AFTERIMAGE
1038 && !OPTION (Opt_transparent)) 1041 && !option (Opt_transparent)
1042#endif
1043 )
1039 { 1044 {
1040 const char *p = rs[Rs_backgroundPixmap]; 1045 const char *p = rs[Rs_backgroundPixmap];
1041 1046
1042 if ((p = strchr (p, ';')) != NULL) 1047 if ((p = strchr (p, ';')) != NULL)
1043 { 1048 {
… …
1084 * GET TTY CURRENT STATE * 1089 * GET TTY CURRENT STATE *
1085 * ------------------------------------------------------------------------- */ 1090 * ------------------------------------------------------------------------- */
1086void 1091void
1087rxvt_get_ttymode (ttymode_t *tio, int erase) 1092rxvt_get_ttymode (ttymode_t *tio, int erase)
1088{ 1093{
1089#ifdef HAVE_TERMIOS_H
1090 /* 1094 /*
1091 * standard System V termios interface 1095 * standard System V termios interface
1092 */ 1096 */
1093 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1097 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1094 { 1098 {
… …
1161 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1165 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1162# if defined (ECHOCTL) && defined (ECHOKE) 1166# if defined (ECHOCTL) && defined (ECHOKE)
1163 | ECHOCTL | ECHOKE 1167 | ECHOCTL | ECHOKE
1164# endif 1168# endif
1165 | ECHOE | ECHOK); 1169 | ECHOE | ECHOK);
1166# else /* HAVE_TERMIOS_H */
1167
1168 /*
1169 * sgtty interface
1170 */
1171
1172 /* get parameters -- gtty */
1173 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1174 {
1175 tio->sg.sg_erase = CERASE; /* ^H */
1176 tio->sg.sg_kill = CKILL; /* ^U */
1177 }
1178
1179 if (erase != -1)
1180 tio->sg.sg_erase = (char)erase;
1181
1182 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1183
1184 /* get special characters */
1185 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1186 {
1187 tio->tc.t_intrc = CINTR; /* ^C */
1188 tio->tc.t_quitc = CQUIT; /* ^\ */
1189 tio->tc.t_startc = CSTART; /* ^Q */
1190 tio->tc.t_stopc = CSTOP; /* ^S */
1191 tio->tc.t_eofc = CEOF; /* ^D */
1192 tio->tc.t_brkc = -1;
1193 }
1194
1195 /* get local special chars */
1196 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1197 {
1198 tio->lc.t_suspc = CSUSP; /* ^Z */
1199 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1200 tio->lc.t_rprntc = CRPRNT; /* ^R */
1201 tio->lc.t_flushc = CFLUSH; /* ^O */
1202 tio->lc.t_werasc = CWERASE; /* ^W */
1203 tio->lc.t_lnextc = CLNEXT; /* ^V */
1204 }
1205 /* get line discipline */
1206 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1207# ifdef NTTYDISC
1208 tio->line = NTTYDISC;
1209# endif /* NTTYDISC */
1210
1211 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1212#endif /* HAVE_TERMIOS_H */
1213 1170
1214 /* 1171 /*
1215 * Debugging 1172 * Debugging
1216 */ 1173 */
1217#ifdef DEBUG_TTYMODE 1174#ifdef DEBUG_TTYMODE
… …
1318 else 1275 else
1319#endif 1276#endif
1320 if (!pty->get ()) 1277 if (!pty->get ())
1321 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1278 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1322 1279
1323 pty->set_utf8_mode (enc_utf8);
1324
1325 /* set initial window size */
1326 tt_winch ();
1327
1328 int er; 1280 int er;
1329 1281
1330#ifndef NO_BACKSPACE_KEY 1282#ifndef NO_BACKSPACE_KEY
1331 if (key_backspace[0] && !key_backspace[1]) 1283 if (key_backspace[0] && !key_backspace[1])
1332 er = key_backspace[0]; 1284 er = key_backspace[0];
… …
1335 else 1287 else
1336#endif 1288#endif
1337 er = -1; 1289 er = -1;
1338 1290
1339 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 ();
1340 1297
1341#if ENABLE_FRILLS 1298#if ENABLE_FRILLS
1342 if (rs[Rs_pty_fd]) 1299 if (rs[Rs_pty_fd])
1343 return; 1300 return;
1344#endif 1301#endif
… …
1375 } 1332 }
1376 1333
1377 _exit (EXIT_FAILURE); 1334 _exit (EXIT_FAILURE);
1378 1335
1379 default: 1336 default:
1380 if (!OPTION (Opt_utmpInhibit)) 1337 if (!option (Opt_utmpInhibit))
1381 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1338 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1382 1339
1383 pty->close_tty (); 1340 pty->close_tty ();
1384 1341
1385 child_ev.start (cmd_pid); 1342 child_ev.start (cmd_pid);
1386 1343
… …
1399int 1356int
1400rxvt_term::run_child (const char *const *argv) 1357rxvt_term::run_child (const char *const *argv)
1401{ 1358{
1402 char *login; 1359 char *login;
1403 1360
1404 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1405
1406 if (OPTION (Opt_console)) 1361 if (option (Opt_console))
1407 { /* be virtual console, fail silently */ 1362 { /* be virtual console, fail silently */
1408#ifdef TIOCCONS 1363#ifdef TIOCCONS
1409 unsigned int on = 1; 1364 unsigned int on = 1;
1410 1365
1411 ioctl (STDIN_FILENO, TIOCCONS, &on); 1366 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1460 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1415 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1461 shell = "/bin/sh"; 1416 shell = "/bin/sh";
1462 1417
1463 argv0 = (const char *)rxvt_r_basename (shell); 1418 argv0 = (const char *)rxvt_r_basename (shell);
1464 1419
1465 if (OPTION (Opt_loginShell)) 1420 if (option (Opt_loginShell))
1466 { 1421 {
1467 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1422 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1468 1423
1469 login[0] = '-'; 1424 login[0] = '-';
1470 strcpy (&login[1], argv0); 1425 strcpy (&login[1], argv0);

Diff Legend

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