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.120 by root, Mon Nov 28 18:37:42 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",
… …
737 } 740 }
738 } 741 }
739 } 742 }
740 743
741 pix_colors[i] = xcol; 744 pix_colors[i] = xcol;
745 SET_PIXCOLOR (i);
746 }
747
742#ifdef OFF_FOCUS_FADING 748#ifdef OFF_FOCUS_FADING
743 if (rs[Rs_fade]) 749 if (rs[Rs_fade])
750 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
744 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade])); 751 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
745#endif 752#endif
746 SET_PIXCOLOR (i);
747 }
748 753
749 if (display->depth <= 2) 754 if (display->depth <= 2)
750 { 755 {
751 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 756 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]; 757 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
… …
1200 tio->c_cc[VKILL] = CKILL; 1205 tio->c_cc[VKILL] = CKILL;
1201 tio->c_cc[VSTART] = CSTART; 1206 tio->c_cc[VSTART] = CSTART;
1202 tio->c_cc[VSTOP] = CSTOP; 1207 tio->c_cc[VSTOP] = CSTOP;
1203 tio->c_cc[VSUSP] = CSUSP; 1208 tio->c_cc[VSUSP] = CSUSP;
1204# ifdef VDSUSP 1209# ifdef VDSUSP
1205
1206 tio->c_cc[VDSUSP] = CDSUSP; 1210 tio->c_cc[VDSUSP] = CDSUSP;
1207# endif 1211# endif
1208# ifdef VREPRINT 1212# ifdef VREPRINT
1209
1210 tio->c_cc[VREPRINT] = CRPRNT; 1213 tio->c_cc[VREPRINT] = CRPRNT;
1211# endif 1214# endif
1212# ifdef VDISCRD 1215# ifdef VDISCRD
1213
1214 tio->c_cc[VDISCRD] = CFLUSH; 1216 tio->c_cc[VDISCRD] = CFLUSH;
1215# endif 1217# endif
1216# ifdef VWERSE 1218# ifdef VWERSE
1217
1218 tio->c_cc[VWERSE] = CWERASE; 1219 tio->c_cc[VWERSE] = CWERASE;
1219# endif 1220# endif
1220# ifdef VLNEXT 1221# ifdef VLNEXT
1221
1222 tio->c_cc[VLNEXT] = CLNEXT; 1222 tio->c_cc[VLNEXT] = CLNEXT;
1223# endif 1223# endif
1224
1225 } 1224 }
1225
1226 tio->c_cc[VEOF] = CEOF; 1226 tio->c_cc[VEOF] = CEOF;
1227 tio->c_cc[VEOL] = VDISABLE; 1227 tio->c_cc[VEOL] = VDISABLE;
1228# ifdef VEOL2 1228# ifdef VEOL2
1229
1230 tio->c_cc[VEOL2] = VDISABLE; 1229 tio->c_cc[VEOL2] = VDISABLE;
1231# endif 1230# endif
1232# ifdef VSWTC 1231# ifdef VSWTC
1233
1234 tio->c_cc[VSWTC] = VDISABLE; 1232 tio->c_cc[VSWTC] = VDISABLE;
1235# endif 1233# endif
1236# ifdef VSWTCH 1234# ifdef VSWTCH
1237
1238 tio->c_cc[VSWTCH] = VDISABLE; 1235 tio->c_cc[VSWTCH] = VDISABLE;
1239# endif 1236# endif
1240# if VMIN != VEOF 1237# if VMIN != VEOF
1241
1242 tio->c_cc[VMIN] = 1; 1238 tio->c_cc[VMIN] = 1;
1243# endif 1239# endif
1244# if VTIME != VEOL 1240# if VTIME != VEOL
1245
1246 tio->c_cc[VTIME] = 0; 1241 tio->c_cc[VTIME] = 0;
1247# endif 1242# endif
1248 1243
1249 if (erase != -1) 1244 if (erase != -1)
1250 tio->c_cc[VERASE] = (char)erase; 1245 tio->c_cc[VERASE] = (char)erase;
… …
1278 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1273 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1279 { 1274 {
1280 tio->sg.sg_erase = CERASE; /* ^H */ 1275 tio->sg.sg_erase = CERASE; /* ^H */
1281 tio->sg.sg_kill = CKILL; /* ^U */ 1276 tio->sg.sg_kill = CKILL; /* ^U */
1282 } 1277 }
1278
1283 if (erase != -1) 1279 if (erase != -1)
1284 tio->sg.sg_erase = (char)erase; 1280 tio->sg.sg_erase = (char)erase;
1285 1281
1286 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1282 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1287 1283
… …
1293 tio->tc.t_startc = CSTART; /* ^Q */ 1289 tio->tc.t_startc = CSTART; /* ^Q */
1294 tio->tc.t_stopc = CSTOP; /* ^S */ 1290 tio->tc.t_stopc = CSTOP; /* ^S */
1295 tio->tc.t_eofc = CEOF; /* ^D */ 1291 tio->tc.t_eofc = CEOF; /* ^D */
1296 tio->tc.t_brkc = -1; 1292 tio->tc.t_brkc = -1;
1297 } 1293 }
1294
1298 /* get local special chars */ 1295 /* get local special chars */
1299 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1296 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1300 { 1297 {
1301 tio->lc.t_suspc = CSUSP; /* ^Z */ 1298 tio->lc.t_suspc = CSUSP; /* ^Z */
1302 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1299 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1306 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1303 tio->lc.t_lnextc = CLNEXT; /* ^V */
1307 } 1304 }
1308 /* get line discipline */ 1305 /* get line discipline */
1309 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1306 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1310# ifdef NTTYDISC 1307# ifdef NTTYDISC
1311
1312 tio->line = NTTYDISC; 1308 tio->line = NTTYDISC;
1313# endif /* NTTYDISC */ 1309# endif /* NTTYDISC */
1314 1310
1315 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1311 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1316#endif /* HAVE_TERMIOS_H */ 1312#endif /* HAVE_TERMIOS_H */
… …
1339 FOO (IGNCR, "IGNCR"); 1335 FOO (IGNCR, "IGNCR");
1340 FOO (ICRNL, "ICRNL"); 1336 FOO (ICRNL, "ICRNL");
1341 FOO (IXON, "IXON"); 1337 FOO (IXON, "IXON");
1342 FOO (IXOFF, "IXOFF"); 1338 FOO (IXOFF, "IXOFF");
1343# ifdef IUCLC 1339# ifdef IUCLC
1344
1345 FOO (IUCLC, "IUCLC"); 1340 FOO (IUCLC, "IUCLC");
1346# endif 1341# endif
1347# ifdef IXANY 1342# ifdef IXANY
1348
1349 FOO (IXANY, "IXANY"); 1343 FOO (IXANY, "IXANY");
1350# endif 1344# endif
1351# ifdef IMAXBEL 1345# ifdef IMAXBEL
1352
1353 FOO (IMAXBEL, "IMAXBEL"); 1346 FOO (IMAXBEL, "IMAXBEL");
1354# endif 1347# endif
1355 1348
1356 fprintf (stderr, "\n"); 1349 fprintf (stderr, "\n");
1357 1350
… …
1364 FOO (VERASE, "VERASE"); 1357 FOO (VERASE, "VERASE");
1365 FOO (VKILL, "VKILL"); 1358 FOO (VKILL, "VKILL");
1366 FOO (VEOF, "VEOF"); 1359 FOO (VEOF, "VEOF");
1367 FOO (VEOL, "VEOL"); 1360 FOO (VEOL, "VEOL");
1368# ifdef VEOL2 1361# ifdef VEOL2
1369
1370 FOO (VEOL2, "VEOL2"); 1362 FOO (VEOL2, "VEOL2");
1371# endif 1363# endif
1372# ifdef VSWTC 1364# ifdef VSWTC
1373
1374 FOO (VSWTC, "VSWTC"); 1365 FOO (VSWTC, "VSWTC");
1375# endif 1366# endif
1376# ifdef VSWTCH 1367# ifdef VSWTCH
1377
1378 FOO (VSWTCH, "VSWTCH"); 1368 FOO (VSWTCH, "VSWTCH");
1379# endif 1369# endif
1380
1381 FOO (VSTART, "VSTART"); 1370 FOO (VSTART, "VSTART");
1382 FOO (VSTOP, "VSTOP"); 1371 FOO (VSTOP, "VSTOP");
1383 FOO (VSUSP, "VSUSP"); 1372 FOO (VSUSP, "VSUSP");
1384# ifdef VDSUSP 1373# ifdef VDSUSP
1385
1386 FOO (VDSUSP, "VDSUSP"); 1374 FOO (VDSUSP, "VDSUSP");
1387# endif 1375# endif
1388# ifdef VREPRINT 1376# ifdef VREPRINT
1389
1390 FOO (VREPRINT, "VREPRINT"); 1377 FOO (VREPRINT, "VREPRINT");
1391# endif 1378# endif
1392# ifdef VDISCRD 1379# ifdef VDISCRD
1393
1394 FOO (VDISCRD, "VDISCRD"); 1380 FOO (VDISCRD, "VDISCRD");
1395# endif 1381# endif
1396# ifdef VWERSE 1382# ifdef VWERSE
1397
1398 FOO (VWERSE, "VWERSE"); 1383 FOO (VWERSE, "VWERSE");
1399# endif 1384# endif
1400# ifdef VLNEXT 1385# ifdef VLNEXT
1401
1402 FOO (VLNEXT, "VLNEXT"); 1386 FOO (VLNEXT, "VLNEXT");
1403# endif 1387# endif
1404 1388
1405 fprintf (stderr, "\n"); 1389 fprintf (stderr, "\n");
1406# undef FOO 1390# undef FOO

Diff Legend

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