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.190 by sasha, Thu Jul 12 22:33:16 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)
… …
183 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
184#ifdef OFF_FOCUS_FADING 184#ifdef OFF_FOCUS_FADING
185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
186#endif 186#endif
187 187
188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 188#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY)
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_skipScroll);
219 set_option (Opt_secondaryScreen);
220 set_option (Opt_secondaryScroll);
221 set_option (Opt_pastableTabs);
222 set_option (Opt_intensityStyles);
223 set_option (Opt_iso14755_52);
216 224
217 return true; 225 return true;
218} 226}
219 227
220void 228void
… …
308#if XFT 316#if XFT
309 if (rs[Rs_depth]) 317 if (rs[Rs_depth])
310 select_visual (strtol (rs[Rs_depth], 0, 0)); 318 select_visual (strtol (rs[Rs_depth], 0, 0));
311#endif 319#endif
312 320
321#ifdef HAVE_AFTERIMAGE
322 ::dpy = NULL ; /* init global var from libAfter... */
323 asv = AFTERIMAGE_DPY_OP(create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL));
324#endif
313 free (r_argv); 325 free (r_argv);
314 326
315 for (int i = NUM_RESOURCES; i--; ) 327 for (int i = NUM_RESOURCES; i--; )
316 if (rs [i] == resval_undef) 328 if (rs [i] == resval_undef)
317 rs [i] = 0; 329 rs [i] = 0;
… …
421 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 433 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
422#endif 434#endif
423 435
424#ifdef XTERM_REVERSE_VIDEO 436#ifdef XTERM_REVERSE_VIDEO
425 /* this is how xterm implements reverseVideo */ 437 /* this is how xterm implements reverseVideo */
426 if (OPTION (Opt_reverseVideo)) 438 if (option (Opt_reverseVideo))
427 { 439 {
428 if (!rs[Rs_color + Color_fg]) 440 if (!rs[Rs_color + Color_fg])
429 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 441 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
430 442
431 if (!rs[Rs_color + Color_bg]) 443 if (!rs[Rs_color + Color_bg])
… …
437 if (!rs[Rs_color + i]) 449 if (!rs[Rs_color + i])
438 rs[Rs_color + i] = def_colorName[i]; 450 rs[Rs_color + i] = def_colorName[i];
439 451
440#ifndef XTERM_REVERSE_VIDEO 452#ifndef XTERM_REVERSE_VIDEO
441 /* this is how we implement reverseVideo */ 453 /* this is how we implement reverseVideo */
442 if (OPTION (Opt_reverseVideo)) 454 if (option (Opt_reverseVideo))
443 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 455 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
444#endif 456#endif
445 457
446 /* convenient aliases for setting fg/bg to colors */ 458 /* convenient aliases for setting fg/bg to colors */
447 color_aliases (Color_fg); 459 color_aliases (Color_fg);
… …
621 * Initialize the command connection. 633 * Initialize the command connection.
622 * This should be called after the X server connection is established. 634 * This should be called after the X server connection is established.
623 */ 635 */
624 636
625#ifdef META8_OPTION 637#ifdef META8_OPTION
626 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 638 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
627#endif 639#endif
628 640
629 get_ourmods (); 641 get_ourmods ();
630 642
631 if (!OPTION (Opt_scrollTtyOutput)) 643 if (!option (Opt_scrollTtyOutput))
632 priv_modes |= PrivMode_TtyOutputInh; 644 priv_modes |= PrivMode_TtyOutputInh;
633 if (OPTION (Opt_scrollTtyKeypress)) 645 if (option (Opt_scrollTtyKeypress))
634 priv_modes |= PrivMode_Keypress; 646 priv_modes |= PrivMode_Keypress;
635 if (!OPTION (Opt_jumpScroll)) 647 if (!option (Opt_jumpScroll))
636 priv_modes |= PrivMode_smoothScroll; 648 priv_modes |= PrivMode_smoothScroll;
637 649
638#ifndef NO_BACKSPACE_KEY 650#ifndef NO_BACKSPACE_KEY
639 if (strcmp (key_backspace, "DEC") == 0) 651 if (strcmp (key_backspace, "DEC") == 0)
640 priv_modes |= PrivMode_HaveBackSpace; 652 priv_modes |= PrivMode_HaveBackSpace;
… …
670 rxvt_color xcol; 682 rxvt_color xcol;
671 683
672 if (!set_color (xcol, name)) 684 if (!set_color (xcol, name))
673 { 685 {
674#ifndef XTERM_REVERSE_VIDEO 686#ifndef XTERM_REVERSE_VIDEO
675 if (i < 2 && OPTION (Opt_reverseVideo)) 687 if (i < 2 && option (Opt_reverseVideo))
676 name = def_colorName [1 - i]; 688 name = def_colorName [1 - i];
677 else 689 else
678#endif 690#endif
679 name = def_colorName [i]; 691 name = def_colorName [i];
680 692
… …
748 alias_color (Color_topShadow, Color_White); 760 alias_color (Color_topShadow, Color_White);
749 } 761 }
750#endif /* KEEP_SCROLLCOLOR */ 762#endif /* KEEP_SCROLLCOLOR */
751 763
752#ifdef OFF_FOCUS_FADING 764#ifdef OFF_FOCUS_FADING
753 if (rs[Rs_fade])
754 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 765 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
755 { 766 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 767#endif
761} 768}
762 769
763/*----------------------------------------------------------------------*/ 770/*----------------------------------------------------------------------*/
764/* color aliases, fg/bg bright-bold */ 771/* color aliases, fg/bg bright-bold */
… …
892 if (!set_fonts ()) 899 if (!set_fonts ())
893 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 900 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
894 901
895 parent = display->root; 902 parent = display->root;
896 903
897 attributes.override_redirect = !!OPTION (Opt_override_redirect); 904 attributes.override_redirect = !!option (Opt_override_redirect);
898 905
899#if ENABLE_FRILLS 906#if ENABLE_FRILLS
900 if (OPTION (Opt_borderLess)) 907 if (option (Opt_borderLess))
901 { 908 {
902 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 909 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
903 { 910 {
904 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 911 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
905 attributes.override_redirect = true; 912 attributes.override_redirect = true;
… …
955 classHint.res_name = (char *)rs[Rs_name]; 962 classHint.res_name = (char *)rs[Rs_name];
956 classHint.res_class = (char *)RESCLASS; 963 classHint.res_class = (char *)RESCLASS;
957 964
958 wmHint.flags = InputHint | StateHint | WindowGroupHint; 965 wmHint.flags = InputHint | StateHint | WindowGroupHint;
959 wmHint.input = True; 966 wmHint.input = True;
960 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 967 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
961 wmHint.window_group = top; 968 wmHint.window_group = top;
962 969
963 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 970 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
964 &szHint, &wmHint, &classHint); 971 &szHint, &wmHint, &classHint);
965 972
… …
1022 attributes.bit_gravity = NorthWestGravity; 1029 attributes.bit_gravity = NorthWestGravity;
1023 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); 1030 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1024 1031
1025 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1032 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1026 1033
1027 if (OPTION (Opt_pointerBlank)) 1034 if (option (Opt_pointerBlank))
1028 vt_emask |= PointerMotionMask; 1035 vt_emask |= PointerMotionMask;
1029 else 1036 else
1030 vt_emask |= Button1MotionMask | Button3MotionMask; 1037 vt_emask |= Button1MotionMask | Button3MotionMask;
1031 1038
1032 vt_select_input (); 1039 vt_select_input ();
1033 1040
1034 vt_ev.start (display, vt); 1041 vt_ev.start (display, vt);
1035 1042
1036#ifdef XPM_BACKGROUND 1043#ifdef XPM_BACKGROUND
1037 if (rs[Rs_backgroundPixmap] != NULL 1044 if (rs[Rs_backgroundPixmap] != NULL
1045#ifndef HAVE_AFTERIMAGE
1038 && !OPTION (Opt_transparent)) 1046 && !option (Opt_transparent)
1047#endif
1048 )
1039 { 1049 {
1040 const char *p = rs[Rs_backgroundPixmap]; 1050 const char *p = rs[Rs_backgroundPixmap];
1041 1051
1042 if ((p = strchr (p, ';')) != NULL) 1052 if ((p = strchr (p, ';')) != NULL)
1043 { 1053 {
… …
1084 * GET TTY CURRENT STATE * 1094 * GET TTY CURRENT STATE *
1085 * ------------------------------------------------------------------------- */ 1095 * ------------------------------------------------------------------------- */
1086void 1096void
1087rxvt_get_ttymode (ttymode_t *tio, int erase) 1097rxvt_get_ttymode (ttymode_t *tio, int erase)
1088{ 1098{
1089#ifdef HAVE_TERMIOS_H
1090 /* 1099 /*
1091 * standard System V termios interface 1100 * standard System V termios interface
1092 */ 1101 */
1093 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1102 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1094 { 1103 {
… …
1161 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1170 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1162# if defined (ECHOCTL) && defined (ECHOKE) 1171# if defined (ECHOCTL) && defined (ECHOKE)
1163 | ECHOCTL | ECHOKE 1172 | ECHOCTL | ECHOKE
1164# endif 1173# endif
1165 | ECHOE | ECHOK); 1174 | 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 1175
1214 /* 1176 /*
1215 * Debugging 1177 * Debugging
1216 */ 1178 */
1217#ifdef DEBUG_TTYMODE 1179#ifdef DEBUG_TTYMODE
… …
1318 else 1280 else
1319#endif 1281#endif
1320 if (!pty->get ()) 1282 if (!pty->get ())
1321 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1283 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1322 1284
1323 pty->set_utf8_mode (enc_utf8);
1324
1325 /* set initial window size */
1326 tt_winch ();
1327
1328 int er; 1285 int er;
1329 1286
1330#ifndef NO_BACKSPACE_KEY 1287#ifndef NO_BACKSPACE_KEY
1331 if (key_backspace[0] && !key_backspace[1]) 1288 if (key_backspace[0] && !key_backspace[1])
1332 er = key_backspace[0]; 1289 er = key_backspace[0];
… …
1335 else 1292 else
1336#endif 1293#endif
1337 er = -1; 1294 er = -1;
1338 1295
1339 rxvt_get_ttymode (&tio, er); 1296 rxvt_get_ttymode (&tio, er);
1297 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1298 pty->set_utf8_mode (enc_utf8);
1299
1300 /* set initial window size */
1301 tt_winch ();
1340 1302
1341#if ENABLE_FRILLS 1303#if ENABLE_FRILLS
1342 if (rs[Rs_pty_fd]) 1304 if (rs[Rs_pty_fd])
1343 return; 1305 return;
1344#endif 1306#endif
… …
1375 } 1337 }
1376 1338
1377 _exit (EXIT_FAILURE); 1339 _exit (EXIT_FAILURE);
1378 1340
1379 default: 1341 default:
1380 if (!OPTION (Opt_utmpInhibit)) 1342 if (!option (Opt_utmpInhibit))
1381 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1343 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1382 1344
1383 pty->close_tty (); 1345 pty->close_tty ();
1384 1346
1385 child_ev.start (cmd_pid); 1347 child_ev.start (cmd_pid);
1386 1348
… …
1399int 1361int
1400rxvt_term::run_child (const char *const *argv) 1362rxvt_term::run_child (const char *const *argv)
1401{ 1363{
1402 char *login; 1364 char *login;
1403 1365
1404 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1405
1406 if (OPTION (Opt_console)) 1366 if (option (Opt_console))
1407 { /* be virtual console, fail silently */ 1367 { /* be virtual console, fail silently */
1408#ifdef TIOCCONS 1368#ifdef TIOCCONS
1409 unsigned int on = 1; 1369 unsigned int on = 1;
1410 1370
1411 ioctl (STDIN_FILENO, TIOCCONS, &on); 1371 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1460 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1420 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1461 shell = "/bin/sh"; 1421 shell = "/bin/sh";
1462 1422
1463 argv0 = (const char *)rxvt_r_basename (shell); 1423 argv0 = (const char *)rxvt_r_basename (shell);
1464 1424
1465 if (OPTION (Opt_loginShell)) 1425 if (option (Opt_loginShell))
1466 { 1426 {
1467 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1427 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1468 1428
1469 login[0] = '-'; 1429 login[0] = '-';
1470 strcpy (&login[1], argv0); 1430 strcpy (&login[1], argv0);

Diff Legend

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