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.116 by root, Sun Feb 20 19:45:30 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",
… …
344 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 347 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
345 rs[Rs_display_name] = ":0"; 348 rs[Rs_display_name] = ":0";
346 349
347 get_options (r_argc, r_argv); 350 get_options (r_argc, r_argv);
348 351
349#ifdef LOCAL_X_IS_UNIX
350 if (rs[Rs_display_name][0] == ':')
351 {
352 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
353 strcpy (val, "unix");
354 strcat (val, rs[Rs_display_name]);
355 display = displays.get (val);
356 free (val);
357 }
358#endif
359
360 if (!display
361 && ! (display = displays.get (rs[Rs_display_name]))) 352 if (!(display = displays.get (rs[Rs_display_name])))
362 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 353 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
363 354
364 extract_resources (); 355 extract_resources ();
365 free (r_argv); 356 free (r_argv);
366 357
… …
749 } 740 }
750 } 741 }
751 } 742 }
752 743
753 pix_colors[i] = xcol; 744 pix_colors[i] = xcol;
745 SET_PIXCOLOR (i);
746 }
747
754#ifdef OFF_FOCUS_FADING 748#ifdef OFF_FOCUS_FADING
755 if (rs[Rs_fade]) 749 if (rs[Rs_fade])
750 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
756 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]);
757#endif 752#endif
758 SET_PIXCOLOR (i);
759 }
760 753
761 if (display->depth <= 2) 754 if (display->depth <= 2)
762 { 755 {
763 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];
764 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];
… …
772 * from the fvwm window manager. 765 * from the fvwm window manager.
773 */ 766 */
774#ifdef KEEP_SCROLLCOLOR 767#ifdef KEEP_SCROLLCOLOR
775 768
776 if (display->depth <= 2) 769 if (display->depth <= 2)
770 {
777 { /* Monochrome */ 771 /* Monochrome */
778 pix_colors[Color_scroll] = pix_colors[Color_fg]; 772 pix_colors[Color_scroll] = pix_colors[Color_fg];
779 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 773 pix_colors[Color_topShadow] = pix_colors[Color_bg];
780 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 774 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
781 } 775 }
782 else 776 else
… …
1211 tio->c_cc[VKILL] = CKILL; 1205 tio->c_cc[VKILL] = CKILL;
1212 tio->c_cc[VSTART] = CSTART; 1206 tio->c_cc[VSTART] = CSTART;
1213 tio->c_cc[VSTOP] = CSTOP; 1207 tio->c_cc[VSTOP] = CSTOP;
1214 tio->c_cc[VSUSP] = CSUSP; 1208 tio->c_cc[VSUSP] = CSUSP;
1215# ifdef VDSUSP 1209# ifdef VDSUSP
1216
1217 tio->c_cc[VDSUSP] = CDSUSP; 1210 tio->c_cc[VDSUSP] = CDSUSP;
1218# endif 1211# endif
1219# ifdef VREPRINT 1212# ifdef VREPRINT
1220
1221 tio->c_cc[VREPRINT] = CRPRNT; 1213 tio->c_cc[VREPRINT] = CRPRNT;
1222# endif 1214# endif
1223# ifdef VDISCRD 1215# ifdef VDISCRD
1224
1225 tio->c_cc[VDISCRD] = CFLUSH; 1216 tio->c_cc[VDISCRD] = CFLUSH;
1226# endif 1217# endif
1227# ifdef VWERSE 1218# ifdef VWERSE
1228
1229 tio->c_cc[VWERSE] = CWERASE; 1219 tio->c_cc[VWERSE] = CWERASE;
1230# endif 1220# endif
1231# ifdef VLNEXT 1221# ifdef VLNEXT
1232
1233 tio->c_cc[VLNEXT] = CLNEXT; 1222 tio->c_cc[VLNEXT] = CLNEXT;
1234# endif 1223# endif
1235
1236 } 1224 }
1225
1237 tio->c_cc[VEOF] = CEOF; 1226 tio->c_cc[VEOF] = CEOF;
1238 tio->c_cc[VEOL] = VDISABLE; 1227 tio->c_cc[VEOL] = VDISABLE;
1239# ifdef VEOL2 1228# ifdef VEOL2
1240
1241 tio->c_cc[VEOL2] = VDISABLE; 1229 tio->c_cc[VEOL2] = VDISABLE;
1242# endif 1230# endif
1243# ifdef VSWTC 1231# ifdef VSWTC
1244
1245 tio->c_cc[VSWTC] = VDISABLE; 1232 tio->c_cc[VSWTC] = VDISABLE;
1246# endif 1233# endif
1247# ifdef VSWTCH 1234# ifdef VSWTCH
1248
1249 tio->c_cc[VSWTCH] = VDISABLE; 1235 tio->c_cc[VSWTCH] = VDISABLE;
1250# endif 1236# endif
1251# if VMIN != VEOF 1237# if VMIN != VEOF
1252
1253 tio->c_cc[VMIN] = 1; 1238 tio->c_cc[VMIN] = 1;
1254# endif 1239# endif
1255# if VTIME != VEOL 1240# if VTIME != VEOL
1256
1257 tio->c_cc[VTIME] = 0; 1241 tio->c_cc[VTIME] = 0;
1258# endif 1242# endif
1259 1243
1260 if (erase != -1) 1244 if (erase != -1)
1261 tio->c_cc[VERASE] = (char)erase; 1245 tio->c_cc[VERASE] = (char)erase;
… …
1289 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1273 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1290 { 1274 {
1291 tio->sg.sg_erase = CERASE; /* ^H */ 1275 tio->sg.sg_erase = CERASE; /* ^H */
1292 tio->sg.sg_kill = CKILL; /* ^U */ 1276 tio->sg.sg_kill = CKILL; /* ^U */
1293 } 1277 }
1278
1294 if (erase != -1) 1279 if (erase != -1)
1295 tio->sg.sg_erase = (char)erase; 1280 tio->sg.sg_erase = (char)erase;
1296 1281
1297 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1282 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1298 1283
… …
1304 tio->tc.t_startc = CSTART; /* ^Q */ 1289 tio->tc.t_startc = CSTART; /* ^Q */
1305 tio->tc.t_stopc = CSTOP; /* ^S */ 1290 tio->tc.t_stopc = CSTOP; /* ^S */
1306 tio->tc.t_eofc = CEOF; /* ^D */ 1291 tio->tc.t_eofc = CEOF; /* ^D */
1307 tio->tc.t_brkc = -1; 1292 tio->tc.t_brkc = -1;
1308 } 1293 }
1294
1309 /* get local special chars */ 1295 /* get local special chars */
1310 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1296 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1311 { 1297 {
1312 tio->lc.t_suspc = CSUSP; /* ^Z */ 1298 tio->lc.t_suspc = CSUSP; /* ^Z */
1313 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1299 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1317 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1303 tio->lc.t_lnextc = CLNEXT; /* ^V */
1318 } 1304 }
1319 /* get line discipline */ 1305 /* get line discipline */
1320 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1306 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1321# ifdef NTTYDISC 1307# ifdef NTTYDISC
1322
1323 tio->line = NTTYDISC; 1308 tio->line = NTTYDISC;
1324# endif /* NTTYDISC */ 1309# endif /* NTTYDISC */
1325 1310
1326 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1311 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1327#endif /* HAVE_TERMIOS_H */ 1312#endif /* HAVE_TERMIOS_H */
… …
1350 FOO (IGNCR, "IGNCR"); 1335 FOO (IGNCR, "IGNCR");
1351 FOO (ICRNL, "ICRNL"); 1336 FOO (ICRNL, "ICRNL");
1352 FOO (IXON, "IXON"); 1337 FOO (IXON, "IXON");
1353 FOO (IXOFF, "IXOFF"); 1338 FOO (IXOFF, "IXOFF");
1354# ifdef IUCLC 1339# ifdef IUCLC
1355
1356 FOO (IUCLC, "IUCLC"); 1340 FOO (IUCLC, "IUCLC");
1357# endif 1341# endif
1358# ifdef IXANY 1342# ifdef IXANY
1359
1360 FOO (IXANY, "IXANY"); 1343 FOO (IXANY, "IXANY");
1361# endif 1344# endif
1362# ifdef IMAXBEL 1345# ifdef IMAXBEL
1363
1364 FOO (IMAXBEL, "IMAXBEL"); 1346 FOO (IMAXBEL, "IMAXBEL");
1365# endif 1347# endif
1366 1348
1367 fprintf (stderr, "\n"); 1349 fprintf (stderr, "\n");
1368 1350
… …
1375 FOO (VERASE, "VERASE"); 1357 FOO (VERASE, "VERASE");
1376 FOO (VKILL, "VKILL"); 1358 FOO (VKILL, "VKILL");
1377 FOO (VEOF, "VEOF"); 1359 FOO (VEOF, "VEOF");
1378 FOO (VEOL, "VEOL"); 1360 FOO (VEOL, "VEOL");
1379# ifdef VEOL2 1361# ifdef VEOL2
1380
1381 FOO (VEOL2, "VEOL2"); 1362 FOO (VEOL2, "VEOL2");
1382# endif 1363# endif
1383# ifdef VSWTC 1364# ifdef VSWTC
1384
1385 FOO (VSWTC, "VSWTC"); 1365 FOO (VSWTC, "VSWTC");
1386# endif 1366# endif
1387# ifdef VSWTCH 1367# ifdef VSWTCH
1388
1389 FOO (VSWTCH, "VSWTCH"); 1368 FOO (VSWTCH, "VSWTCH");
1390# endif 1369# endif
1391
1392 FOO (VSTART, "VSTART"); 1370 FOO (VSTART, "VSTART");
1393 FOO (VSTOP, "VSTOP"); 1371 FOO (VSTOP, "VSTOP");
1394 FOO (VSUSP, "VSUSP"); 1372 FOO (VSUSP, "VSUSP");
1395# ifdef VDSUSP 1373# ifdef VDSUSP
1396
1397 FOO (VDSUSP, "VDSUSP"); 1374 FOO (VDSUSP, "VDSUSP");
1398# endif 1375# endif
1399# ifdef VREPRINT 1376# ifdef VREPRINT
1400
1401 FOO (VREPRINT, "VREPRINT"); 1377 FOO (VREPRINT, "VREPRINT");
1402# endif 1378# endif
1403# ifdef VDISCRD 1379# ifdef VDISCRD
1404
1405 FOO (VDISCRD, "VDISCRD"); 1380 FOO (VDISCRD, "VDISCRD");
1406# endif 1381# endif
1407# ifdef VWERSE 1382# ifdef VWERSE
1408
1409 FOO (VWERSE, "VWERSE"); 1383 FOO (VWERSE, "VWERSE");
1410# endif 1384# endif
1411# ifdef VLNEXT 1385# ifdef VLNEXT
1412
1413 FOO (VLNEXT, "VLNEXT"); 1386 FOO (VLNEXT, "VLNEXT");
1414# endif 1387# endif
1415 1388
1416 fprintf (stderr, "\n"); 1389 fprintf (stderr, "\n");
1417# undef FOO 1390# undef FOO

Diff Legend

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