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.172 by root, Mon Feb 20 22:42:00 2006 UTC vs.
Revision 1.178 by root, Sat Jan 20 00:51:31 2007 UTC

… …
300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
301 301
302 // using a local pointer decreases code size a lot 302 // using a local pointer decreases code size a lot
303 xa = display->xa; 303 xa = display->xa;
304 304
305 set (display);
306 extract_resources ();
307
305#if XFT 308#if XFT
306 if (rs[Rs_depth]) 309 if (rs[Rs_depth])
307 set (display, strtol (rs[Rs_depth], 0, 0)); 310 select_visual (strtol (rs[Rs_depth], 0, 0));
308 else
309#endif 311#endif
310 set (display);
311
312 extract_resources ();
313 312
314 free (r_argv); 313 free (r_argv);
315 314
316 for (int i = NUM_RESOURCES; i--; ) 315 for (int i = NUM_RESOURCES; i--; )
317 if (rs [i] == resval_undef) 316 if (rs [i] == resval_undef)
… …
749 alias_color (Color_topShadow, Color_White); 748 alias_color (Color_topShadow, Color_White);
750 } 749 }
751#endif /* KEEP_SCROLLCOLOR */ 750#endif /* KEEP_SCROLLCOLOR */
752 751
753#ifdef OFF_FOCUS_FADING 752#ifdef OFF_FOCUS_FADING
754 if (rs[Rs_fade])
755 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 753 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
756 { 754 update_fade_color (i);
757 rgba c;
758 pix_colors [Color_fade].get (c);
759 pix_colors_focused [i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
760 }
761#endif 755#endif
762} 756}
763 757
764/*----------------------------------------------------------------------*/ 758/*----------------------------------------------------------------------*/
765/* color aliases, fg/bg bright-bold */ 759/* color aliases, fg/bg bright-bold */
… …
1085 * GET TTY CURRENT STATE * 1079 * GET TTY CURRENT STATE *
1086 * ------------------------------------------------------------------------- */ 1080 * ------------------------------------------------------------------------- */
1087void 1081void
1088rxvt_get_ttymode (ttymode_t *tio, int erase) 1082rxvt_get_ttymode (ttymode_t *tio, int erase)
1089{ 1083{
1090#ifdef HAVE_TERMIOS_H
1091 /* 1084 /*
1092 * standard System V termios interface 1085 * standard System V termios interface
1093 */ 1086 */
1094 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1087 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1095 { 1088 {
… …
1162 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1155 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1163# if defined (ECHOCTL) && defined (ECHOKE) 1156# if defined (ECHOCTL) && defined (ECHOKE)
1164 | ECHOCTL | ECHOKE 1157 | ECHOCTL | ECHOKE
1165# endif 1158# endif
1166 | ECHOE | ECHOK); 1159 | ECHOE | ECHOK);
1167# else /* HAVE_TERMIOS_H */
1168
1169 /*
1170 * sgtty interface
1171 */
1172
1173 /* get parameters -- gtty */
1174 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1175 {
1176 tio->sg.sg_erase = CERASE; /* ^H */
1177 tio->sg.sg_kill = CKILL; /* ^U */
1178 }
1179
1180 if (erase != -1)
1181 tio->sg.sg_erase = (char)erase;
1182
1183 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1184
1185 /* get special characters */
1186 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1187 {
1188 tio->tc.t_intrc = CINTR; /* ^C */
1189 tio->tc.t_quitc = CQUIT; /* ^\ */
1190 tio->tc.t_startc = CSTART; /* ^Q */
1191 tio->tc.t_stopc = CSTOP; /* ^S */
1192 tio->tc.t_eofc = CEOF; /* ^D */
1193 tio->tc.t_brkc = -1;
1194 }
1195
1196 /* get local special chars */
1197 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1198 {
1199 tio->lc.t_suspc = CSUSP; /* ^Z */
1200 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1201 tio->lc.t_rprntc = CRPRNT; /* ^R */
1202 tio->lc.t_flushc = CFLUSH; /* ^O */
1203 tio->lc.t_werasc = CWERASE; /* ^W */
1204 tio->lc.t_lnextc = CLNEXT; /* ^V */
1205 }
1206 /* get line discipline */
1207 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1208# ifdef NTTYDISC
1209 tio->line = NTTYDISC;
1210# endif /* NTTYDISC */
1211
1212 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1213#endif /* HAVE_TERMIOS_H */
1214 1160
1215 /* 1161 /*
1216 * Debugging 1162 * Debugging
1217 */ 1163 */
1218#ifdef DEBUG_TTYMODE 1164#ifdef DEBUG_TTYMODE
… …
1319 else 1265 else
1320#endif 1266#endif
1321 if (!pty->get ()) 1267 if (!pty->get ())
1322 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1268 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1323 1269
1324 pty->set_utf8_mode (enc_utf8);
1325
1326 /* set initial window size */
1327 tt_winch ();
1328
1329 int er; 1270 int er;
1330 1271
1331#ifndef NO_BACKSPACE_KEY 1272#ifndef NO_BACKSPACE_KEY
1332 if (key_backspace[0] && !key_backspace[1]) 1273 if (key_backspace[0] && !key_backspace[1])
1333 er = key_backspace[0]; 1274 er = key_backspace[0];
… …
1336 else 1277 else
1337#endif 1278#endif
1338 er = -1; 1279 er = -1;
1339 1280
1340 rxvt_get_ttymode (&tio, er); 1281 rxvt_get_ttymode (&tio, er);
1282 pty->set_utf8_mode (enc_utf8);
1283 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1284
1285 /* set initial window size */
1286 tt_winch ();
1341 1287
1342#if ENABLE_FRILLS 1288#if ENABLE_FRILLS
1343 if (rs[Rs_pty_fd]) 1289 if (rs[Rs_pty_fd])
1344 return; 1290 return;
1345#endif 1291#endif
… …
1399 */ 1345 */
1400int 1346int
1401rxvt_term::run_child (const char *const *argv) 1347rxvt_term::run_child (const char *const *argv)
1402{ 1348{
1403 char *login; 1349 char *login;
1404
1405 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1406 1350
1407 if (OPTION (Opt_console)) 1351 if (OPTION (Opt_console))
1408 { /* be virtual console, fail silently */ 1352 { /* be virtual console, fail silently */
1409#ifdef TIOCCONS 1353#ifdef TIOCCONS
1410 unsigned int on = 1; 1354 unsigned int on = 1;

Diff Legend

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