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.117 by root, Thu Jul 7 19:37:47 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];
… …
760 * from the fvwm window manager. 762 * from the fvwm window manager.
761 */ 763 */
762#ifdef KEEP_SCROLLCOLOR 764#ifdef KEEP_SCROLLCOLOR
763 765
764 if (display->depth <= 2) 766 if (display->depth <= 2)
767 {
765 { /* Monochrome */ 768 /* Monochrome */
766 pix_colors[Color_scroll] = pix_colors[Color_fg]; 769 pix_colors[Color_scroll] = pix_colors[Color_fg];
767 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 770 pix_colors[Color_topShadow] = pix_colors[Color_bg];
768 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 771 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
769 } 772 }
770 else 773 else
… …
1199 tio->c_cc[VKILL] = CKILL; 1202 tio->c_cc[VKILL] = CKILL;
1200 tio->c_cc[VSTART] = CSTART; 1203 tio->c_cc[VSTART] = CSTART;
1201 tio->c_cc[VSTOP] = CSTOP; 1204 tio->c_cc[VSTOP] = CSTOP;
1202 tio->c_cc[VSUSP] = CSUSP; 1205 tio->c_cc[VSUSP] = CSUSP;
1203# ifdef VDSUSP 1206# ifdef VDSUSP
1204
1205 tio->c_cc[VDSUSP] = CDSUSP; 1207 tio->c_cc[VDSUSP] = CDSUSP;
1206# endif 1208# endif
1207# ifdef VREPRINT 1209# ifdef VREPRINT
1208
1209 tio->c_cc[VREPRINT] = CRPRNT; 1210 tio->c_cc[VREPRINT] = CRPRNT;
1210# endif 1211# endif
1211# ifdef VDISCRD 1212# ifdef VDISCRD
1212
1213 tio->c_cc[VDISCRD] = CFLUSH; 1213 tio->c_cc[VDISCRD] = CFLUSH;
1214# endif 1214# endif
1215# ifdef VWERSE 1215# ifdef VWERSE
1216
1217 tio->c_cc[VWERSE] = CWERASE; 1216 tio->c_cc[VWERSE] = CWERASE;
1218# endif 1217# endif
1219# ifdef VLNEXT 1218# ifdef VLNEXT
1220
1221 tio->c_cc[VLNEXT] = CLNEXT; 1219 tio->c_cc[VLNEXT] = CLNEXT;
1222# endif 1220# endif
1223
1224 } 1221 }
1222
1225 tio->c_cc[VEOF] = CEOF; 1223 tio->c_cc[VEOF] = CEOF;
1226 tio->c_cc[VEOL] = VDISABLE; 1224 tio->c_cc[VEOL] = VDISABLE;
1227# ifdef VEOL2 1225# ifdef VEOL2
1228
1229 tio->c_cc[VEOL2] = VDISABLE; 1226 tio->c_cc[VEOL2] = VDISABLE;
1230# endif 1227# endif
1231# ifdef VSWTC 1228# ifdef VSWTC
1232
1233 tio->c_cc[VSWTC] = VDISABLE; 1229 tio->c_cc[VSWTC] = VDISABLE;
1234# endif 1230# endif
1235# ifdef VSWTCH 1231# ifdef VSWTCH
1236
1237 tio->c_cc[VSWTCH] = VDISABLE; 1232 tio->c_cc[VSWTCH] = VDISABLE;
1238# endif 1233# endif
1239# if VMIN != VEOF 1234# if VMIN != VEOF
1240
1241 tio->c_cc[VMIN] = 1; 1235 tio->c_cc[VMIN] = 1;
1242# endif 1236# endif
1243# if VTIME != VEOL 1237# if VTIME != VEOL
1244
1245 tio->c_cc[VTIME] = 0; 1238 tio->c_cc[VTIME] = 0;
1246# endif 1239# endif
1247 1240
1248 if (erase != -1) 1241 if (erase != -1)
1249 tio->c_cc[VERASE] = (char)erase; 1242 tio->c_cc[VERASE] = (char)erase;
… …
1277 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1270 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1278 { 1271 {
1279 tio->sg.sg_erase = CERASE; /* ^H */ 1272 tio->sg.sg_erase = CERASE; /* ^H */
1280 tio->sg.sg_kill = CKILL; /* ^U */ 1273 tio->sg.sg_kill = CKILL; /* ^U */
1281 } 1274 }
1275
1282 if (erase != -1) 1276 if (erase != -1)
1283 tio->sg.sg_erase = (char)erase; 1277 tio->sg.sg_erase = (char)erase;
1284 1278
1285 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1279 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1286 1280
… …
1292 tio->tc.t_startc = CSTART; /* ^Q */ 1286 tio->tc.t_startc = CSTART; /* ^Q */
1293 tio->tc.t_stopc = CSTOP; /* ^S */ 1287 tio->tc.t_stopc = CSTOP; /* ^S */
1294 tio->tc.t_eofc = CEOF; /* ^D */ 1288 tio->tc.t_eofc = CEOF; /* ^D */
1295 tio->tc.t_brkc = -1; 1289 tio->tc.t_brkc = -1;
1296 } 1290 }
1291
1297 /* get local special chars */ 1292 /* get local special chars */
1298 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1293 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1299 { 1294 {
1300 tio->lc.t_suspc = CSUSP; /* ^Z */ 1295 tio->lc.t_suspc = CSUSP; /* ^Z */
1301 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1296 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1305 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1300 tio->lc.t_lnextc = CLNEXT; /* ^V */
1306 } 1301 }
1307 /* get line discipline */ 1302 /* get line discipline */
1308 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1303 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1309# ifdef NTTYDISC 1304# ifdef NTTYDISC
1310
1311 tio->line = NTTYDISC; 1305 tio->line = NTTYDISC;
1312# endif /* NTTYDISC */ 1306# endif /* NTTYDISC */
1313 1307
1314 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1308 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1315#endif /* HAVE_TERMIOS_H */ 1309#endif /* HAVE_TERMIOS_H */
… …
1338 FOO (IGNCR, "IGNCR"); 1332 FOO (IGNCR, "IGNCR");
1339 FOO (ICRNL, "ICRNL"); 1333 FOO (ICRNL, "ICRNL");
1340 FOO (IXON, "IXON"); 1334 FOO (IXON, "IXON");
1341 FOO (IXOFF, "IXOFF"); 1335 FOO (IXOFF, "IXOFF");
1342# ifdef IUCLC 1336# ifdef IUCLC
1343
1344 FOO (IUCLC, "IUCLC"); 1337 FOO (IUCLC, "IUCLC");
1345# endif 1338# endif
1346# ifdef IXANY 1339# ifdef IXANY
1347
1348 FOO (IXANY, "IXANY"); 1340 FOO (IXANY, "IXANY");
1349# endif 1341# endif
1350# ifdef IMAXBEL 1342# ifdef IMAXBEL
1351
1352 FOO (IMAXBEL, "IMAXBEL"); 1343 FOO (IMAXBEL, "IMAXBEL");
1353# endif 1344# endif
1354 1345
1355 fprintf (stderr, "\n"); 1346 fprintf (stderr, "\n");
1356 1347
… …
1363 FOO (VERASE, "VERASE"); 1354 FOO (VERASE, "VERASE");
1364 FOO (VKILL, "VKILL"); 1355 FOO (VKILL, "VKILL");
1365 FOO (VEOF, "VEOF"); 1356 FOO (VEOF, "VEOF");
1366 FOO (VEOL, "VEOL"); 1357 FOO (VEOL, "VEOL");
1367# ifdef VEOL2 1358# ifdef VEOL2
1368
1369 FOO (VEOL2, "VEOL2"); 1359 FOO (VEOL2, "VEOL2");
1370# endif 1360# endif
1371# ifdef VSWTC 1361# ifdef VSWTC
1372
1373 FOO (VSWTC, "VSWTC"); 1362 FOO (VSWTC, "VSWTC");
1374# endif 1363# endif
1375# ifdef VSWTCH 1364# ifdef VSWTCH
1376
1377 FOO (VSWTCH, "VSWTCH"); 1365 FOO (VSWTCH, "VSWTCH");
1378# endif 1366# endif
1379
1380 FOO (VSTART, "VSTART"); 1367 FOO (VSTART, "VSTART");
1381 FOO (VSTOP, "VSTOP"); 1368 FOO (VSTOP, "VSTOP");
1382 FOO (VSUSP, "VSUSP"); 1369 FOO (VSUSP, "VSUSP");
1383# ifdef VDSUSP 1370# ifdef VDSUSP
1384
1385 FOO (VDSUSP, "VDSUSP"); 1371 FOO (VDSUSP, "VDSUSP");
1386# endif 1372# endif
1387# ifdef VREPRINT 1373# ifdef VREPRINT
1388
1389 FOO (VREPRINT, "VREPRINT"); 1374 FOO (VREPRINT, "VREPRINT");
1390# endif 1375# endif
1391# ifdef VDISCRD 1376# ifdef VDISCRD
1392
1393 FOO (VDISCRD, "VDISCRD"); 1377 FOO (VDISCRD, "VDISCRD");
1394# endif 1378# endif
1395# ifdef VWERSE 1379# ifdef VWERSE
1396
1397 FOO (VWERSE, "VWERSE"); 1380 FOO (VWERSE, "VWERSE");
1398# endif 1381# endif
1399# ifdef VLNEXT 1382# ifdef VLNEXT
1400
1401 FOO (VLNEXT, "VLNEXT"); 1383 FOO (VLNEXT, "VLNEXT");
1402# endif 1384# endif
1403 1385
1404 fprintf (stderr, "\n"); 1386 fprintf (stderr, "\n");
1405# undef FOO 1387# undef FOO
… …
1447 1429
1448#if ENABLE_FRILLS 1430#if ENABLE_FRILLS
1449 if (rs[Rs_pty_fd]) 1431 if (rs[Rs_pty_fd])
1450 return; 1432 return;
1451#endif 1433#endif
1452
1453 sw_chld.start (SIGCHLD);
1454 1434
1455#ifndef __QNX__ 1435#ifndef __QNX__
1456 /* spin off the command interpreter */ 1436 /* spin off the command interpreter */
1457 switch (cmd_pid = fork ()) 1437 switch (cmd_pid = fork ())
1458 { 1438 {

Diff Legend

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