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.256 by root, Wed Nov 5 12:28:15 2008 UTC vs.
Revision 1.273 by sf-exg, Mon Jul 26 22:07:38 2010 UTC

… …
174 "rgb:00/00/ff", // 4/12: bright blue (Blue) 174 "rgb:00/00/ff", // 4/12: bright blue (Blue)
175 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) 175 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
176 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) 176 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
177 "rgb:ff/ff/ff", // 7/15: bright white (White) 177 "rgb:ff/ff/ff", // 7/15: bright white (White)
178 178
179#if !USE_256_COLORS
179 // 88 xterm colours 180 // 88 xterm colours
180 "rgb:00/00/00", 181 "rgb:00/00/00",
181 "rgb:00/00/8b", 182 "rgb:00/00/8b",
182 "rgb:00/00/cd", 183 "rgb:00/00/cd",
183 "rgb:00/00/ff", 184 "rgb:00/00/ff",
… …
247 "rgb:8b/8b/8b", 248 "rgb:8b/8b/8b",
248 "rgb:a2/a2/a2", 249 "rgb:a2/a2/a2",
249 "rgb:b9/b9/b9", 250 "rgb:b9/b9/b9",
250 "rgb:d0/d0/d0", 251 "rgb:d0/d0/d0",
251 "rgb:e7/e7/e7", 252 "rgb:e7/e7/e7",
253#else
254 // 256 xterm colours
255 "rgb:00/00/00",
256 "rgb:00/00/5f",
257 "rgb:00/00/87",
258 "rgb:00/00/af",
259 "rgb:00/00/d7",
260 "rgb:00/00/ff",
261 "rgb:00/5f/00",
262 "rgb:00/5f/5f",
263 "rgb:00/5f/87",
264 "rgb:00/5f/af",
265 "rgb:00/5f/d7",
266 "rgb:00/5f/ff",
267 "rgb:00/87/00",
268 "rgb:00/87/5f",
269 "rgb:00/87/87",
270 "rgb:00/87/af",
271 "rgb:00/87/d7",
272 "rgb:00/87/ff",
273 "rgb:00/af/00",
274 "rgb:00/af/5f",
275 "rgb:00/af/87",
276 "rgb:00/af/af",
277 "rgb:00/af/d7",
278 "rgb:00/af/ff",
279 "rgb:00/d7/00",
280 "rgb:00/d7/5f",
281 "rgb:00/d7/87",
282 "rgb:00/d7/af",
283 "rgb:00/d7/d7",
284 "rgb:00/d7/ff",
285 "rgb:00/ff/00",
286 "rgb:00/ff/5f",
287 "rgb:00/ff/87",
288 "rgb:00/ff/af",
289 "rgb:00/ff/d7",
290 "rgb:00/ff/ff",
291 "rgb:5f/00/00",
292 "rgb:5f/00/5f",
293 "rgb:5f/00/87",
294 "rgb:5f/00/af",
295 "rgb:5f/00/d7",
296 "rgb:5f/00/ff",
297 "rgb:5f/5f/00",
298 "rgb:5f/5f/5f",
299 "rgb:5f/5f/87",
300 "rgb:5f/5f/af",
301 "rgb:5f/5f/d7",
302 "rgb:5f/5f/ff",
303 "rgb:5f/87/00",
304 "rgb:5f/87/5f",
305 "rgb:5f/87/87",
306 "rgb:5f/87/af",
307 "rgb:5f/87/d7",
308 "rgb:5f/87/ff",
309 "rgb:5f/af/00",
310 "rgb:5f/af/5f",
311 "rgb:5f/af/87",
312 "rgb:5f/af/af",
313 "rgb:5f/af/d7",
314 "rgb:5f/af/ff",
315 "rgb:5f/d7/00",
316 "rgb:5f/d7/5f",
317 "rgb:5f/d7/87",
318 "rgb:5f/d7/af",
319 "rgb:5f/d7/d7",
320 "rgb:5f/d7/ff",
321 "rgb:5f/ff/00",
322 "rgb:5f/ff/5f",
323 "rgb:5f/ff/87",
324 "rgb:5f/ff/af",
325 "rgb:5f/ff/d7",
326 "rgb:5f/ff/ff",
327 "rgb:87/00/00",
328 "rgb:87/00/5f",
329 "rgb:87/00/87",
330 "rgb:87/00/af",
331 "rgb:87/00/d7",
332 "rgb:87/00/ff",
333 "rgb:87/5f/00",
334 "rgb:87/5f/5f",
335 "rgb:87/5f/87",
336 "rgb:87/5f/af",
337 "rgb:87/5f/d7",
338 "rgb:87/5f/ff",
339 "rgb:87/87/00",
340 "rgb:87/87/5f",
341 "rgb:87/87/87",
342 "rgb:87/87/af",
343 "rgb:87/87/d7",
344 "rgb:87/87/ff",
345 "rgb:87/af/00",
346 "rgb:87/af/5f",
347 "rgb:87/af/87",
348 "rgb:87/af/af",
349 "rgb:87/af/d7",
350 "rgb:87/af/ff",
351 "rgb:87/d7/00",
352 "rgb:87/d7/5f",
353 "rgb:87/d7/87",
354 "rgb:87/d7/af",
355 "rgb:87/d7/d7",
356 "rgb:87/d7/ff",
357 "rgb:87/ff/00",
358 "rgb:87/ff/5f",
359 "rgb:87/ff/87",
360 "rgb:87/ff/af",
361 "rgb:87/ff/d7",
362 "rgb:87/ff/ff",
363 "rgb:af/00/00",
364 "rgb:af/00/5f",
365 "rgb:af/00/87",
366 "rgb:af/00/af",
367 "rgb:af/00/d7",
368 "rgb:af/00/ff",
369 "rgb:af/5f/00",
370 "rgb:af/5f/5f",
371 "rgb:af/5f/87",
372 "rgb:af/5f/af",
373 "rgb:af/5f/d7",
374 "rgb:af/5f/ff",
375 "rgb:af/87/00",
376 "rgb:af/87/5f",
377 "rgb:af/87/87",
378 "rgb:af/87/af",
379 "rgb:af/87/d7",
380 "rgb:af/87/ff",
381 "rgb:af/af/00",
382 "rgb:af/af/5f",
383 "rgb:af/af/87",
384 "rgb:af/af/af",
385 "rgb:af/af/d7",
386 "rgb:af/af/ff",
387 "rgb:af/d7/00",
388 "rgb:af/d7/5f",
389 "rgb:af/d7/87",
390 "rgb:af/d7/af",
391 "rgb:af/d7/d7",
392 "rgb:af/d7/ff",
393 "rgb:af/ff/00",
394 "rgb:af/ff/5f",
395 "rgb:af/ff/87",
396 "rgb:af/ff/af",
397 "rgb:af/ff/d7",
398 "rgb:af/ff/ff",
399 "rgb:d7/00/00",
400 "rgb:d7/00/5f",
401 "rgb:d7/00/87",
402 "rgb:d7/00/af",
403 "rgb:d7/00/d7",
404 "rgb:d7/00/ff",
405 "rgb:d7/5f/00",
406 "rgb:d7/5f/5f",
407 "rgb:d7/5f/87",
408 "rgb:d7/5f/af",
409 "rgb:d7/5f/d7",
410 "rgb:d7/5f/ff",
411 "rgb:d7/87/00",
412 "rgb:d7/87/5f",
413 "rgb:d7/87/87",
414 "rgb:d7/87/af",
415 "rgb:d7/87/d7",
416 "rgb:d7/87/ff",
417 "rgb:d7/af/00",
418 "rgb:d7/af/5f",
419 "rgb:d7/af/87",
420 "rgb:d7/af/af",
421 "rgb:d7/af/d7",
422 "rgb:d7/af/ff",
423 "rgb:d7/d7/00",
424 "rgb:d7/d7/5f",
425 "rgb:d7/d7/87",
426 "rgb:d7/d7/af",
427 "rgb:d7/d7/d7",
428 "rgb:d7/d7/ff",
429 "rgb:d7/ff/00",
430 "rgb:d7/ff/5f",
431 "rgb:d7/ff/87",
432 "rgb:d7/ff/af",
433 "rgb:d7/ff/d7",
434 "rgb:d7/ff/ff",
435 "rgb:ff/00/00",
436 "rgb:ff/00/5f",
437 "rgb:ff/00/87",
438 "rgb:ff/00/af",
439 "rgb:ff/00/d7",
440 "rgb:ff/00/ff",
441 "rgb:ff/5f/00",
442 "rgb:ff/5f/5f",
443 "rgb:ff/5f/87",
444 "rgb:ff/5f/af",
445 "rgb:ff/5f/d7",
446 "rgb:ff/5f/ff",
447 "rgb:ff/87/00",
448 "rgb:ff/87/5f",
449 "rgb:ff/87/87",
450 "rgb:ff/87/af",
451 "rgb:ff/87/d7",
452 "rgb:ff/87/ff",
453 "rgb:ff/af/00",
454 "rgb:ff/af/5f",
455 "rgb:ff/af/87",
456 "rgb:ff/af/af",
457 "rgb:ff/af/d7",
458 "rgb:ff/af/ff",
459 "rgb:ff/d7/00",
460 "rgb:ff/d7/5f",
461 "rgb:ff/d7/87",
462 "rgb:ff/d7/af",
463 "rgb:ff/d7/d7",
464 "rgb:ff/d7/ff",
465 "rgb:ff/ff/00",
466 "rgb:ff/ff/5f",
467 "rgb:ff/ff/87",
468 "rgb:ff/ff/af",
469 "rgb:ff/ff/d7",
470 "rgb:ff/ff/ff",
471 "rgb:08/08/08",
472 "rgb:12/12/12",
473 "rgb:1c/1c/1c",
474 "rgb:26/26/26",
475 "rgb:30/30/30",
476 "rgb:3a/3a/3a",
477 "rgb:44/44/44",
478 "rgb:4e/4e/4e",
479 "rgb:58/58/58",
480 "rgb:62/62/62",
481 "rgb:6c/6c/6c",
482 "rgb:76/76/76",
483 "rgb:80/80/80",
484 "rgb:8a/8a/8a",
485 "rgb:94/94/94",
486 "rgb:9e/9e/9e",
487 "rgb:a8/a8/a8",
488 "rgb:b2/b2/b2",
489 "rgb:bc/bc/bc",
490 "rgb:c6/c6/c6",
491 "rgb:d0/d0/d0",
492 "rgb:da/da/da",
493 "rgb:e4/e4/e4",
494 "rgb:ee/ee/ee",
495#endif
252 496
253#ifndef NO_CURSORCOLOR 497#ifndef NO_CURSORCOLOR
254 COLOR_CURSOR_BACKGROUND, 498 COLOR_CURSOR_BACKGROUND,
255 COLOR_CURSOR_FOREGROUND, 499 COLOR_CURSOR_FOREGROUND,
256#endif /* ! NO_CURSORCOLOR */ 500#endif /* ! NO_CURSORCOLOR */
… …
266#if ENABLE_FRILLS 510#if ENABLE_FRILLS
267 NULL, // Color_underline 511 NULL, // Color_underline
268#endif 512#endif
269#ifdef OPTION_HC 513#ifdef OPTION_HC
270 NULL, 514 NULL,
515 NULL,
271#endif 516#endif
272 COLOR_SCROLLBAR, 517 COLOR_SCROLLBAR,
273#ifdef RXVT_SCROLLBAR 518#ifdef RXVT_SCROLLBAR
274 COLOR_SCROLLTROUGH, 519 COLOR_SCROLLTROUGH,
275#endif 520#endif
… …
293 ncol = 80; 538 ncol = 80;
294 nrow = 24; 539 nrow = 24;
295 int_bwidth = INTERNALBORDERWIDTH; 540 int_bwidth = INTERNALBORDERWIDTH;
296 ext_bwidth = EXTERNALBORDERWIDTH; 541 ext_bwidth = EXTERNALBORDERWIDTH;
297 lineSpace = LINESPACE; 542 lineSpace = LINESPACE;
543 letterSpace = LETTERSPACE;
298 saveLines = SAVELINES; 544 saveLines = SAVELINES;
299 545
300 refresh_type = SLOW_REFRESH; 546 refresh_type = SLOW_REFRESH;
301 547
302 oldcursor.row = oldcursor.col = -1; 548 oldcursor.row = oldcursor.col = -1;
… …
307 set_option (Opt_skipScroll); 553 set_option (Opt_skipScroll);
308 set_option (Opt_secondaryScreen); 554 set_option (Opt_secondaryScreen);
309 set_option (Opt_secondaryScroll); 555 set_option (Opt_secondaryScroll);
310 set_option (Opt_pastableTabs); 556 set_option (Opt_pastableTabs);
311 set_option (Opt_intensityStyles); 557 set_option (Opt_intensityStyles);
558 set_option (Opt_iso14755);
312 set_option (Opt_iso14755_52); 559 set_option (Opt_iso14755_52);
313 set_option (Opt_buffered); 560 set_option (Opt_buffered);
314}
315
316static void
317init_secondary ()
318{
319 int i;
320
321 if ((i = open ("/dev/null", O_RDONLY)) < 0)
322 {
323 dup2 (STDERR_FILENO, STDIN_FILENO);
324 }
325 else if (i != STDIN_FILENO)
326 {
327 dup2 (i, STDIN_FILENO);
328 close (i);
329 }
330
331 dup2 (STDERR_FILENO, STDOUT_FILENO);
332} 561}
333 562
334/*----------------------------------------------------------------------*/ 563/*----------------------------------------------------------------------*/
335const char ** 564const char **
336rxvt_term::init_resources (int argc, const char *const *argv) 565rxvt_term::init_resources (int argc, const char *const *argv)
… …
448 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 677 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
449 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 678 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
450 679
451 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 680 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
452 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 681 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
682
683 if (rs[Rs_letterSpace])
684 letterSpace = atoi (rs[Rs_letterSpace]);
453#endif 685#endif
454 686
455#ifdef POINTER_BLANK 687#ifdef POINTER_BLANK
456 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 688 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
457 pointerBlankDelay = i; 689 pointerBlankDelay = i;
… …
540 set_locale (""); 772 set_locale ("");
541 set_environ (envv); // a few things in X do not call setlocale :( 773 set_environ (envv); // a few things in X do not call setlocale :(
542 774
543 init_vars (); 775 init_vars ();
544 776
545 init_secondary ();
546
547 const char **cmd_argv = init_resources (argc, argv); 777 const char **cmd_argv = init_resources (argc, argv);
548 778
549#ifdef KEYSYM_RESOURCE 779#ifdef KEYSYM_RESOURCE
550 keyboard->register_done (); 780 keyboard->register_done ();
551#endif 781#endif
… …
1124 this->parent[0] = top; 1354 this->parent[0] = top;
1125 1355
1126 old_width = szHint.width; 1356 old_width = szHint.width;
1127 old_height = szHint.height; 1357 old_height = szHint.height;
1128 1358
1129 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1359 set_title (rs [Rs_title]);
1130 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1360 set_icon_name (rs [Rs_iconName]);
1131 1361
1132 classHint.res_name = (char *)rs[Rs_name]; 1362 classHint.res_name = (char *)rs[Rs_name];
1133 classHint.res_class = (char *)RESCLASS; 1363 classHint.res_class = (char *)RESCLASS;
1134 1364
1135 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1365 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
1137 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1367 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1138 wmHint.window_group = top; 1368 wmHint.window_group = top;
1139 1369
1140 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1370 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1141 &szHint, &wmHint, &classHint); 1371 &szHint, &wmHint, &classHint);
1142#if ENABLE_EWMH 1372#if ENABLE_EWMH
1143# ifdef HAVE_AFTERIMAGE 1373# ifdef HAVE_AFTERIMAGE
1144 /* 1374 /*
1145 * set up icon hint 1375 * set up icon hint
1146 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources 1376 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources
1147 */ 1377 */
… …
1153 ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL); 1383 ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1154 if (asv && im) 1384 if (asv && im)
1155 { 1385 {
1156 int w = im->width; 1386 int w = im->width;
1157 int h = im->height; 1387 int h = im->height;
1158 long* buffer = (long *)malloc ((2 + w * h) * sizeof (long)); 1388 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1159 ASImage *result = scale_asimage (asv, im, 1389 ASImage *result = scale_asimage (asv, im,
1160 w, h, ASA_ARGB32, 1390 w, h, ASA_ARGB32,
1161 100, ASIMAGE_QUALITY_DEFAULT); 1391 100, ASIMAGE_QUALITY_DEFAULT);
1162 destroy_asimage (&im); 1392 destroy_asimage (&im);
1163 1393
… …
1170 for (unsigned int i = 0; i < w * h; ++i) 1400 for (unsigned int i = 0; i < w * h; ++i)
1171 buffer [i + 2] = asbuf [i]; 1401 buffer [i + 2] = asbuf [i];
1172 1402
1173 destroy_asimage (&result); 1403 destroy_asimage (&result);
1174 XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32, 1404 XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1175 PropModeReplace, (const unsigned char*) buffer, 2 + w * h); 1405 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1176 free (buffer); 1406 free (buffer);
1177 } 1407 }
1178 else 1408 else
1179 { 1409 {
1180 if (!buffer) 1410 if (!buffer)
… …
1277} 1507}
1278 1508
1279/* ------------------------------------------------------------------------- * 1509/* ------------------------------------------------------------------------- *
1280 * GET TTY CURRENT STATE * 1510 * GET TTY CURRENT STATE *
1281 * ------------------------------------------------------------------------- */ 1511 * ------------------------------------------------------------------------- */
1282void 1512static void
1283rxvt_get_ttymode (struct termios *tio, int erase) 1513rxvt_get_ttymode (struct termios *tio)
1284{ 1514{
1285 /* 1515 /*
1286 * standard System V termios interface 1516 * standard System V termios interface
1287 */ 1517 */
1518 // does not work as stdin is not a tty
1288 if (tcgetattr (STDIN_FILENO, tio) < 0) 1519 // if (tcgetattr (STDIN_FILENO, tio) < 0)
1520 if (1)
1289 { 1521 {
1290 // return error - use system defaults, 1522 // return error - use system defaults,
1291 // where possible, and zero elsewhere 1523 // where possible, and zero elsewhere
1292 memset (tio, 0, sizeof (struct termios)); 1524 memset (tio, 0, sizeof (struct termios));
1525 if (VDISABLE)
1526 for (int i = 0; i < NCCS; i++)
1527 tio->c_cc[i] = VDISABLE;
1293 1528
1294 tio->c_cc[VINTR] = CINTR; 1529 tio->c_cc[VINTR] = CINTR;
1295 tio->c_cc[VQUIT] = CQUIT; 1530 tio->c_cc[VQUIT] = CQUIT;
1296 tio->c_cc[VERASE] = CERASE; 1531 tio->c_cc[VERASE] = CERASE;
1297#ifdef VERASE2 1532#ifdef VERASE2
… …
1317 tio->c_cc[VLNEXT] = CLNEXT; 1552 tio->c_cc[VLNEXT] = CLNEXT;
1318# endif 1553# endif
1319 } 1554 }
1320 1555
1321 tio->c_cc[VEOF] = CEOF; 1556 tio->c_cc[VEOF] = CEOF;
1322 tio->c_cc[VEOL] = VDISABLE;
1323# ifdef VEOL2
1324 tio->c_cc[VEOL2] = VDISABLE;
1325# endif
1326# ifdef VSWTC
1327 tio->c_cc[VSWTC] = VDISABLE;
1328# endif
1329# ifdef VSWTCH
1330 tio->c_cc[VSWTCH] = VDISABLE;
1331# endif
1332# if VMIN != VEOF 1557# if VMIN != VEOF
1333 tio->c_cc[VMIN] = 1; 1558 tio->c_cc[VMIN] = 1;
1334# endif 1559# endif
1335# if VTIME != VEOL 1560# if VTIME != VEOL
1336 tio->c_cc[VTIME] = 0; 1561 tio->c_cc[VTIME] = 0;
1337# endif 1562# endif
1338
1339 if (erase != -1)
1340 tio->c_cc[VERASE] = (char)erase;
1341 1563
1342 /* input modes */ 1564 /* input modes */
1343 tio->c_iflag = (BRKINT | IGNPAR | ICRNL 1565 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1344# ifdef IMAXBEL 1566# ifdef IMAXBEL
1345 | IMAXBEL 1567 | IMAXBEL
… …
1367 fprintf (stderr, "Input flags\n"); 1589 fprintf (stderr, "Input flags\n");
1368 1590
1369 /* cpp token stringize doesn't work on all machines <sigh> */ 1591 /* cpp token stringize doesn't work on all machines <sigh> */
1370# define FOO(flag,name) \ 1592# define FOO(flag,name) \
1371 if ((tio->c_iflag) & flag) \ 1593 if ((tio->c_iflag) & flag) \
1372 fprintf (stderr, "%s ", name) 1594 fprintf (stderr, "%s ", name)
1373 1595
1374 /* c_iflag bits */ 1596 /* c_iflag bits */
1375 FOO (IGNBRK, "IGNBRK"); 1597 FOO (IGNBRK, "IGNBRK");
1376 FOO (BRKINT, "BRKINT"); 1598 FOO (BRKINT, "BRKINT");
1377 FOO (IGNPAR, "IGNPAR"); 1599 FOO (IGNPAR, "IGNPAR");
… …
1464 else 1686 else
1465#endif 1687#endif
1466 if (!pty->get ()) 1688 if (!pty->get ())
1467 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1689 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1468 1690
1469 int er; 1691 rxvt_get_ttymode (&tio);
1470 1692
1471#ifndef NO_BACKSPACE_KEY 1693#ifndef NO_BACKSPACE_KEY
1472 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1694 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1473 er = rs[Rs_backspace_key][0]; 1695 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1474 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1696 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1475 er = '\177'; /* the initial state anyway */ 1697 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1476 else
1477#endif 1698#endif
1478 er = -1;
1479 1699
1480 rxvt_get_ttymode (&tio, er);
1481 /* init terminal attributes */ 1700 /* init terminal attributes */
1482 cfsetospeed (&tio, BAUDRATE); 1701 cfsetospeed (&tio, BAUDRATE);
1483 cfsetispeed (&tio, BAUDRATE); 1702 cfsetispeed (&tio, BAUDRATE);
1484 tcsetattr (pty->tty, TCSANOW, &tio); 1703 tcsetattr (pty->tty, TCSANOW, &tio);
1485 pty->set_utf8_mode (enc_utf8); 1704 pty->set_utf8_mode (enc_utf8);
… …
1572 signal (SIGQUIT, SIG_DFL); 1791 signal (SIGQUIT, SIG_DFL);
1573 signal (SIGCHLD, SIG_DFL); 1792 signal (SIGCHLD, SIG_DFL);
1574 signal (SIGHUP, SIG_DFL); 1793 signal (SIGHUP, SIG_DFL);
1575 signal (SIGPIPE, SIG_DFL); 1794 signal (SIGPIPE, SIG_DFL);
1576 /* 1795 /*
1577 * mimick login's behavior by disabling the job control signals 1796 * mimic login's behavior by disabling the job control signals
1578 * a shell that wants them can turn them back on 1797 * a shell that wants them can turn them back on
1579 */ 1798 */
1580#ifdef SIGTSTP 1799#ifdef SIGTSTP
1581 signal (SIGTSTP, SIG_IGN); 1800 signal (SIGTSTP, SIG_IGN);
1582 signal (SIGTTIN, SIG_IGN); 1801 signal (SIGTTIN, SIG_IGN);
… …
1601 const char *argv0, *shell; 1820 const char *argv0, *shell;
1602 1821
1603 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1822 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1604 shell = "/bin/sh"; 1823 shell = "/bin/sh";
1605 1824
1606 argv0 = (const char *)rxvt_basename (shell); 1825 argv0 = rxvt_basename (shell);
1607 1826
1608 if (option (Opt_loginShell)) 1827 if (option (Opt_loginShell))
1609 { 1828 {
1610 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1829 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1611 1830

Diff Legend

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