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.118 by root, Wed Aug 10 15:10:06 2005 UTC vs.
Revision 1.121 by root, Wed Nov 30 21:05:39 2005 UTC

… …
169 COLOR_SCROLLTROUGH, 169 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 171#if TINTING
172 NULL, 172 NULL,
173#endif 173#endif
174#if OFF_FOCUS_FADING
175 "black",
176#endif
174 }; 177 };
175 178
176const char *const xa_names[] = 179const char *const xa_names[] =
177 { 180 {
178 "TEXT", 181 "TEXT",
… …
213 }; 216 };
214 217
215bool 218bool
216rxvt_term::init_vars () 219rxvt_term::init_vars ()
217{ 220{
218 sw_term.start (SIGTERM);
219 sw_int.start (SIGINT);
220
221 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 221 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
222#ifdef OFF_FOCUS_FADING 222#ifdef OFF_FOCUS_FADING
223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
224#endif 224#endif
225 pix_colors = pix_colors_focused; 225 pix_colors = pix_colors_focused;
… …
737 } 737 }
738 } 738 }
739 } 739 }
740 740
741 pix_colors[i] = xcol; 741 pix_colors[i] = xcol;
742 SET_PIXCOLOR (i);
743 }
744
742#ifdef OFF_FOCUS_FADING 745#ifdef OFF_FOCUS_FADING
743 if (rs[Rs_fade]) 746 if (rs[Rs_fade])
747 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
744 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade])); 748 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
745#endif 749#endif
746 SET_PIXCOLOR (i);
747 }
748 750
749 if (display->depth <= 2) 751 if (display->depth <= 2)
750 { 752 {
751 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 753 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
752 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 754 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
… …
1200 tio->c_cc[VKILL] = CKILL; 1202 tio->c_cc[VKILL] = CKILL;
1201 tio->c_cc[VSTART] = CSTART; 1203 tio->c_cc[VSTART] = CSTART;
1202 tio->c_cc[VSTOP] = CSTOP; 1204 tio->c_cc[VSTOP] = CSTOP;
1203 tio->c_cc[VSUSP] = CSUSP; 1205 tio->c_cc[VSUSP] = CSUSP;
1204# ifdef VDSUSP 1206# ifdef VDSUSP
1205
1206 tio->c_cc[VDSUSP] = CDSUSP; 1207 tio->c_cc[VDSUSP] = CDSUSP;
1207# endif 1208# endif
1208# ifdef VREPRINT 1209# ifdef VREPRINT
1209
1210 tio->c_cc[VREPRINT] = CRPRNT; 1210 tio->c_cc[VREPRINT] = CRPRNT;
1211# endif 1211# endif
1212# ifdef VDISCRD 1212# ifdef VDISCRD
1213
1214 tio->c_cc[VDISCRD] = CFLUSH; 1213 tio->c_cc[VDISCRD] = CFLUSH;
1215# endif 1214# endif
1216# ifdef VWERSE 1215# ifdef VWERSE
1217
1218 tio->c_cc[VWERSE] = CWERASE; 1216 tio->c_cc[VWERSE] = CWERASE;
1219# endif 1217# endif
1220# ifdef VLNEXT 1218# ifdef VLNEXT
1221
1222 tio->c_cc[VLNEXT] = CLNEXT; 1219 tio->c_cc[VLNEXT] = CLNEXT;
1223# endif 1220# endif
1224
1225 } 1221 }
1222
1226 tio->c_cc[VEOF] = CEOF; 1223 tio->c_cc[VEOF] = CEOF;
1227 tio->c_cc[VEOL] = VDISABLE; 1224 tio->c_cc[VEOL] = VDISABLE;
1228# ifdef VEOL2 1225# ifdef VEOL2
1229
1230 tio->c_cc[VEOL2] = VDISABLE; 1226 tio->c_cc[VEOL2] = VDISABLE;
1231# endif 1227# endif
1232# ifdef VSWTC 1228# ifdef VSWTC
1233
1234 tio->c_cc[VSWTC] = VDISABLE; 1229 tio->c_cc[VSWTC] = VDISABLE;
1235# endif 1230# endif
1236# ifdef VSWTCH 1231# ifdef VSWTCH
1237
1238 tio->c_cc[VSWTCH] = VDISABLE; 1232 tio->c_cc[VSWTCH] = VDISABLE;
1239# endif 1233# endif
1240# if VMIN != VEOF 1234# if VMIN != VEOF
1241
1242 tio->c_cc[VMIN] = 1; 1235 tio->c_cc[VMIN] = 1;
1243# endif 1236# endif
1244# if VTIME != VEOL 1237# if VTIME != VEOL
1245
1246 tio->c_cc[VTIME] = 0; 1238 tio->c_cc[VTIME] = 0;
1247# endif 1239# endif
1248 1240
1249 if (erase != -1) 1241 if (erase != -1)
1250 tio->c_cc[VERASE] = (char)erase; 1242 tio->c_cc[VERASE] = (char)erase;
… …
1278 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1270 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1279 { 1271 {
1280 tio->sg.sg_erase = CERASE; /* ^H */ 1272 tio->sg.sg_erase = CERASE; /* ^H */
1281 tio->sg.sg_kill = CKILL; /* ^U */ 1273 tio->sg.sg_kill = CKILL; /* ^U */
1282 } 1274 }
1275
1283 if (erase != -1) 1276 if (erase != -1)
1284 tio->sg.sg_erase = (char)erase; 1277 tio->sg.sg_erase = (char)erase;
1285 1278
1286 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1279 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1287 1280
… …
1293 tio->tc.t_startc = CSTART; /* ^Q */ 1286 tio->tc.t_startc = CSTART; /* ^Q */
1294 tio->tc.t_stopc = CSTOP; /* ^S */ 1287 tio->tc.t_stopc = CSTOP; /* ^S */
1295 tio->tc.t_eofc = CEOF; /* ^D */ 1288 tio->tc.t_eofc = CEOF; /* ^D */
1296 tio->tc.t_brkc = -1; 1289 tio->tc.t_brkc = -1;
1297 } 1290 }
1291
1298 /* get local special chars */ 1292 /* get local special chars */
1299 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1293 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1300 { 1294 {
1301 tio->lc.t_suspc = CSUSP; /* ^Z */ 1295 tio->lc.t_suspc = CSUSP; /* ^Z */
1302 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1296 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1306 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1300 tio->lc.t_lnextc = CLNEXT; /* ^V */
1307 } 1301 }
1308 /* get line discipline */ 1302 /* get line discipline */
1309 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1303 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1310# ifdef NTTYDISC 1304# ifdef NTTYDISC
1311
1312 tio->line = NTTYDISC; 1305 tio->line = NTTYDISC;
1313# endif /* NTTYDISC */ 1306# endif /* NTTYDISC */
1314 1307
1315 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1308 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1316#endif /* HAVE_TERMIOS_H */ 1309#endif /* HAVE_TERMIOS_H */
… …
1339 FOO (IGNCR, "IGNCR"); 1332 FOO (IGNCR, "IGNCR");
1340 FOO (ICRNL, "ICRNL"); 1333 FOO (ICRNL, "ICRNL");
1341 FOO (IXON, "IXON"); 1334 FOO (IXON, "IXON");
1342 FOO (IXOFF, "IXOFF"); 1335 FOO (IXOFF, "IXOFF");
1343# ifdef IUCLC 1336# ifdef IUCLC
1344
1345 FOO (IUCLC, "IUCLC"); 1337 FOO (IUCLC, "IUCLC");
1346# endif 1338# endif
1347# ifdef IXANY 1339# ifdef IXANY
1348
1349 FOO (IXANY, "IXANY"); 1340 FOO (IXANY, "IXANY");
1350# endif 1341# endif
1351# ifdef IMAXBEL 1342# ifdef IMAXBEL
1352
1353 FOO (IMAXBEL, "IMAXBEL"); 1343 FOO (IMAXBEL, "IMAXBEL");
1354# endif 1344# endif
1355 1345
1356 fprintf (stderr, "\n"); 1346 fprintf (stderr, "\n");
1357 1347
… …
1364 FOO (VERASE, "VERASE"); 1354 FOO (VERASE, "VERASE");
1365 FOO (VKILL, "VKILL"); 1355 FOO (VKILL, "VKILL");
1366 FOO (VEOF, "VEOF"); 1356 FOO (VEOF, "VEOF");
1367 FOO (VEOL, "VEOL"); 1357 FOO (VEOL, "VEOL");
1368# ifdef VEOL2 1358# ifdef VEOL2
1369
1370 FOO (VEOL2, "VEOL2"); 1359 FOO (VEOL2, "VEOL2");
1371# endif 1360# endif
1372# ifdef VSWTC 1361# ifdef VSWTC
1373
1374 FOO (VSWTC, "VSWTC"); 1362 FOO (VSWTC, "VSWTC");
1375# endif 1363# endif
1376# ifdef VSWTCH 1364# ifdef VSWTCH
1377
1378 FOO (VSWTCH, "VSWTCH"); 1365 FOO (VSWTCH, "VSWTCH");
1379# endif 1366# endif
1380
1381 FOO (VSTART, "VSTART"); 1367 FOO (VSTART, "VSTART");
1382 FOO (VSTOP, "VSTOP"); 1368 FOO (VSTOP, "VSTOP");
1383 FOO (VSUSP, "VSUSP"); 1369 FOO (VSUSP, "VSUSP");
1384# ifdef VDSUSP 1370# ifdef VDSUSP
1385
1386 FOO (VDSUSP, "VDSUSP"); 1371 FOO (VDSUSP, "VDSUSP");
1387# endif 1372# endif
1388# ifdef VREPRINT 1373# ifdef VREPRINT
1389
1390 FOO (VREPRINT, "VREPRINT"); 1374 FOO (VREPRINT, "VREPRINT");
1391# endif 1375# endif
1392# ifdef VDISCRD 1376# ifdef VDISCRD
1393
1394 FOO (VDISCRD, "VDISCRD"); 1377 FOO (VDISCRD, "VDISCRD");
1395# endif 1378# endif
1396# ifdef VWERSE 1379# ifdef VWERSE
1397
1398 FOO (VWERSE, "VWERSE"); 1380 FOO (VWERSE, "VWERSE");
1399# endif 1381# endif
1400# ifdef VLNEXT 1382# ifdef VLNEXT
1401
1402 FOO (VLNEXT, "VLNEXT"); 1383 FOO (VLNEXT, "VLNEXT");
1403# endif 1384# endif
1404 1385
1405 fprintf (stderr, "\n"); 1386 fprintf (stderr, "\n");
1406# undef FOO 1387# undef FOO
… …
1448 1429
1449#if ENABLE_FRILLS 1430#if ENABLE_FRILLS
1450 if (rs[Rs_pty_fd]) 1431 if (rs[Rs_pty_fd])
1451 return; 1432 return;
1452#endif 1433#endif
1453
1454 sw_chld.start (SIGCHLD);
1455 1434
1456#ifndef __QNX__ 1435#ifndef __QNX__
1457 /* spin off the command interpreter */ 1436 /* spin off the command interpreter */
1458 switch (cmd_pid = fork ()) 1437 switch (cmd_pid = fork ())
1459 { 1438 {

Diff Legend

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