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.119 by root, Thu Aug 11 02:05:07 2005 UTC vs.
Revision 1.121 by root, Wed Nov 30 21:05:39 2005 UTC

… …
216 }; 216 };
217 217
218bool 218bool
219rxvt_term::init_vars () 219rxvt_term::init_vars ()
220{ 220{
221 sw_term.start (SIGTERM);
222 sw_int.start (SIGINT);
223
224 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 221 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
225#ifdef OFF_FOCUS_FADING 222#ifdef OFF_FOCUS_FADING
226 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
227#endif 224#endif
228 pix_colors = pix_colors_focused; 225 pix_colors = pix_colors_focused;
… …
1205 tio->c_cc[VKILL] = CKILL; 1202 tio->c_cc[VKILL] = CKILL;
1206 tio->c_cc[VSTART] = CSTART; 1203 tio->c_cc[VSTART] = CSTART;
1207 tio->c_cc[VSTOP] = CSTOP; 1204 tio->c_cc[VSTOP] = CSTOP;
1208 tio->c_cc[VSUSP] = CSUSP; 1205 tio->c_cc[VSUSP] = CSUSP;
1209# ifdef VDSUSP 1206# ifdef VDSUSP
1210
1211 tio->c_cc[VDSUSP] = CDSUSP; 1207 tio->c_cc[VDSUSP] = CDSUSP;
1212# endif 1208# endif
1213# ifdef VREPRINT 1209# ifdef VREPRINT
1214
1215 tio->c_cc[VREPRINT] = CRPRNT; 1210 tio->c_cc[VREPRINT] = CRPRNT;
1216# endif 1211# endif
1217# ifdef VDISCRD 1212# ifdef VDISCRD
1218
1219 tio->c_cc[VDISCRD] = CFLUSH; 1213 tio->c_cc[VDISCRD] = CFLUSH;
1220# endif 1214# endif
1221# ifdef VWERSE 1215# ifdef VWERSE
1222
1223 tio->c_cc[VWERSE] = CWERASE; 1216 tio->c_cc[VWERSE] = CWERASE;
1224# endif 1217# endif
1225# ifdef VLNEXT 1218# ifdef VLNEXT
1226
1227 tio->c_cc[VLNEXT] = CLNEXT; 1219 tio->c_cc[VLNEXT] = CLNEXT;
1228# endif 1220# endif
1229
1230 } 1221 }
1222
1231 tio->c_cc[VEOF] = CEOF; 1223 tio->c_cc[VEOF] = CEOF;
1232 tio->c_cc[VEOL] = VDISABLE; 1224 tio->c_cc[VEOL] = VDISABLE;
1233# ifdef VEOL2 1225# ifdef VEOL2
1234
1235 tio->c_cc[VEOL2] = VDISABLE; 1226 tio->c_cc[VEOL2] = VDISABLE;
1236# endif 1227# endif
1237# ifdef VSWTC 1228# ifdef VSWTC
1238
1239 tio->c_cc[VSWTC] = VDISABLE; 1229 tio->c_cc[VSWTC] = VDISABLE;
1240# endif 1230# endif
1241# ifdef VSWTCH 1231# ifdef VSWTCH
1242
1243 tio->c_cc[VSWTCH] = VDISABLE; 1232 tio->c_cc[VSWTCH] = VDISABLE;
1244# endif 1233# endif
1245# if VMIN != VEOF 1234# if VMIN != VEOF
1246
1247 tio->c_cc[VMIN] = 1; 1235 tio->c_cc[VMIN] = 1;
1248# endif 1236# endif
1249# if VTIME != VEOL 1237# if VTIME != VEOL
1250
1251 tio->c_cc[VTIME] = 0; 1238 tio->c_cc[VTIME] = 0;
1252# endif 1239# endif
1253 1240
1254 if (erase != -1) 1241 if (erase != -1)
1255 tio->c_cc[VERASE] = (char)erase; 1242 tio->c_cc[VERASE] = (char)erase;
… …
1283 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1270 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1284 { 1271 {
1285 tio->sg.sg_erase = CERASE; /* ^H */ 1272 tio->sg.sg_erase = CERASE; /* ^H */
1286 tio->sg.sg_kill = CKILL; /* ^U */ 1273 tio->sg.sg_kill = CKILL; /* ^U */
1287 } 1274 }
1275
1288 if (erase != -1) 1276 if (erase != -1)
1289 tio->sg.sg_erase = (char)erase; 1277 tio->sg.sg_erase = (char)erase;
1290 1278
1291 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1279 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1292 1280
… …
1298 tio->tc.t_startc = CSTART; /* ^Q */ 1286 tio->tc.t_startc = CSTART; /* ^Q */
1299 tio->tc.t_stopc = CSTOP; /* ^S */ 1287 tio->tc.t_stopc = CSTOP; /* ^S */
1300 tio->tc.t_eofc = CEOF; /* ^D */ 1288 tio->tc.t_eofc = CEOF; /* ^D */
1301 tio->tc.t_brkc = -1; 1289 tio->tc.t_brkc = -1;
1302 } 1290 }
1291
1303 /* get local special chars */ 1292 /* get local special chars */
1304 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1293 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1305 { 1294 {
1306 tio->lc.t_suspc = CSUSP; /* ^Z */ 1295 tio->lc.t_suspc = CSUSP; /* ^Z */
1307 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1296 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1311 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1300 tio->lc.t_lnextc = CLNEXT; /* ^V */
1312 } 1301 }
1313 /* get line discipline */ 1302 /* get line discipline */
1314 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1303 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1315# ifdef NTTYDISC 1304# ifdef NTTYDISC
1316
1317 tio->line = NTTYDISC; 1305 tio->line = NTTYDISC;
1318# endif /* NTTYDISC */ 1306# endif /* NTTYDISC */
1319 1307
1320 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1308 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1321#endif /* HAVE_TERMIOS_H */ 1309#endif /* HAVE_TERMIOS_H */
… …
1344 FOO (IGNCR, "IGNCR"); 1332 FOO (IGNCR, "IGNCR");
1345 FOO (ICRNL, "ICRNL"); 1333 FOO (ICRNL, "ICRNL");
1346 FOO (IXON, "IXON"); 1334 FOO (IXON, "IXON");
1347 FOO (IXOFF, "IXOFF"); 1335 FOO (IXOFF, "IXOFF");
1348# ifdef IUCLC 1336# ifdef IUCLC
1349
1350 FOO (IUCLC, "IUCLC"); 1337 FOO (IUCLC, "IUCLC");
1351# endif 1338# endif
1352# ifdef IXANY 1339# ifdef IXANY
1353
1354 FOO (IXANY, "IXANY"); 1340 FOO (IXANY, "IXANY");
1355# endif 1341# endif
1356# ifdef IMAXBEL 1342# ifdef IMAXBEL
1357
1358 FOO (IMAXBEL, "IMAXBEL"); 1343 FOO (IMAXBEL, "IMAXBEL");
1359# endif 1344# endif
1360 1345
1361 fprintf (stderr, "\n"); 1346 fprintf (stderr, "\n");
1362 1347
… …
1369 FOO (VERASE, "VERASE"); 1354 FOO (VERASE, "VERASE");
1370 FOO (VKILL, "VKILL"); 1355 FOO (VKILL, "VKILL");
1371 FOO (VEOF, "VEOF"); 1356 FOO (VEOF, "VEOF");
1372 FOO (VEOL, "VEOL"); 1357 FOO (VEOL, "VEOL");
1373# ifdef VEOL2 1358# ifdef VEOL2
1374
1375 FOO (VEOL2, "VEOL2"); 1359 FOO (VEOL2, "VEOL2");
1376# endif 1360# endif
1377# ifdef VSWTC 1361# ifdef VSWTC
1378
1379 FOO (VSWTC, "VSWTC"); 1362 FOO (VSWTC, "VSWTC");
1380# endif 1363# endif
1381# ifdef VSWTCH 1364# ifdef VSWTCH
1382
1383 FOO (VSWTCH, "VSWTCH"); 1365 FOO (VSWTCH, "VSWTCH");
1384# endif 1366# endif
1385
1386 FOO (VSTART, "VSTART"); 1367 FOO (VSTART, "VSTART");
1387 FOO (VSTOP, "VSTOP"); 1368 FOO (VSTOP, "VSTOP");
1388 FOO (VSUSP, "VSUSP"); 1369 FOO (VSUSP, "VSUSP");
1389# ifdef VDSUSP 1370# ifdef VDSUSP
1390
1391 FOO (VDSUSP, "VDSUSP"); 1371 FOO (VDSUSP, "VDSUSP");
1392# endif 1372# endif
1393# ifdef VREPRINT 1373# ifdef VREPRINT
1394
1395 FOO (VREPRINT, "VREPRINT"); 1374 FOO (VREPRINT, "VREPRINT");
1396# endif 1375# endif
1397# ifdef VDISCRD 1376# ifdef VDISCRD
1398
1399 FOO (VDISCRD, "VDISCRD"); 1377 FOO (VDISCRD, "VDISCRD");
1400# endif 1378# endif
1401# ifdef VWERSE 1379# ifdef VWERSE
1402
1403 FOO (VWERSE, "VWERSE"); 1380 FOO (VWERSE, "VWERSE");
1404# endif 1381# endif
1405# ifdef VLNEXT 1382# ifdef VLNEXT
1406
1407 FOO (VLNEXT, "VLNEXT"); 1383 FOO (VLNEXT, "VLNEXT");
1408# endif 1384# endif
1409 1385
1410 fprintf (stderr, "\n"); 1386 fprintf (stderr, "\n");
1411# undef FOO 1387# undef FOO
… …
1453 1429
1454#if ENABLE_FRILLS 1430#if ENABLE_FRILLS
1455 if (rs[Rs_pty_fd]) 1431 if (rs[Rs_pty_fd])
1456 return; 1432 return;
1457#endif 1433#endif
1458
1459 sw_chld.start (SIGCHLD);
1460 1434
1461#ifndef __QNX__ 1435#ifndef __QNX__
1462 /* spin off the command interpreter */ 1436 /* spin off the command interpreter */
1463 switch (cmd_pid = fork ()) 1437 switch (cmd_pid = fork ())
1464 { 1438 {

Diff Legend

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