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.254 by root, Tue Nov 4 11:03:29 2008 UTC vs.
Revision 1.294 by sf-exg, Thu Apr 7 12:19:40 2011 UTC

… …
10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM> 10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca> 11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
14 * - extensive modifications 14 * - extensive modifications
15 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com> 15 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
16 * 16 *
17 * This program is free software; you can redistribute it and/or modify 17 * This program is free software; you can redistribute it and/or modify
18 * it under the terms of the GNU General Public License as published by 18 * it under the terms of the GNU General Public License as published by
19 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 2 of the License, or
20 * (at your option) any later version. 20 * (at your option) any later version.
… …
143 143
144 return rval; 144 return rval;
145} 145}
146#endif 146#endif
147 147
148const char *const def_colorName[] = 148static const char *const def_colorName[] =
149 { 149 {
150 COLOR_FOREGROUND, 150 COLOR_FOREGROUND,
151 COLOR_BACKGROUND, 151 COLOR_BACKGROUND,
152 /* low-intensity colors */ 152 /* low-intensity colors */
153 "rgb:00/00/00", // 0: black (Black) 153 "rgb:00/00/00", // 0: black (Black)
… …
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)
… …
392#if XFT 621#if XFT
393 if (rs[Rs_depth]) 622 if (rs[Rs_depth])
394 select_visual (strtol (rs[Rs_depth], 0, 0)); 623 select_visual (strtol (rs[Rs_depth], 0, 0));
395#endif 624#endif
396 625
397#ifdef HAVE_AFTERIMAGE
398 set_application_name ((char*)rs[Rs_name]);
399 set_output_threshold (OUTPUT_LEVEL_WARNING);
400 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
401#endif
402 free (r_argv); 626 free (r_argv);
403 627
404 for (int i = NUM_RESOURCES; i--; ) 628 for (int i = NUM_RESOURCES; i--; )
405 if (rs [i] == resval_undef) 629 if (rs [i] == resval_undef)
406 rs [i] = 0; 630 rs [i] = 0;
631
632#ifdef HAVE_AFTERIMAGE
633 set_application_name ((char *)rs[Rs_name]);
634 set_output_threshold (OUTPUT_LEVEL_WARNING);
635#endif
636
637#ifdef HAVE_PIXBUF
638 g_type_init ();
639#endif
407 640
408#if ENABLE_PERL 641#if ENABLE_PERL
409 if (!rs[Rs_perl_ext_1]) 642 if (!rs[Rs_perl_ext_1])
410 rs[Rs_perl_ext_1] = "default"; 643 rs[Rs_perl_ext_1] = "default";
411 644
… …
423 */ 656 */
424 if (cmd_argv && cmd_argv[0]) 657 if (cmd_argv && cmd_argv[0])
425 { 658 {
426 if (!rs[Rs_title]) 659 if (!rs[Rs_title])
427 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 660 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
661
428 if (!rs[Rs_iconName]) 662 if (!rs[Rs_iconName])
429 rs[Rs_iconName] = rs[Rs_title]; 663 rs[Rs_iconName] = rs[Rs_title];
430 } 664 }
431 else 665 else
432 { 666 {
433 if (!rs[Rs_title]) 667 if (!rs[Rs_title])
434 rs[Rs_title] = rs[Rs_name]; 668 rs[Rs_title] = rs[Rs_name];
669
435 if (!rs[Rs_iconName]) 670 if (!rs[Rs_iconName])
436 rs[Rs_iconName] = rs[Rs_name]; 671 rs[Rs_iconName] = rs[Rs_name];
437 } 672 }
438 673
439 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 674 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
446 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 681 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
447 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 682 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
448 683
449 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 684 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
450 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 685 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
686
687 if (rs[Rs_letterSpace])
688 letterSpace = atoi (rs[Rs_letterSpace]);
451#endif 689#endif
452 690
453#ifdef POINTER_BLANK 691#ifdef POINTER_BLANK
454 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 692 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
455 pointerBlankDelay = i; 693 pointerBlankDelay = i;
… …
538 set_locale (""); 776 set_locale ("");
539 set_environ (envv); // a few things in X do not call setlocale :( 777 set_environ (envv); // a few things in X do not call setlocale :(
540 778
541 init_vars (); 779 init_vars ();
542 780
543 init_secondary ();
544
545 const char **cmd_argv = init_resources (argc, argv); 781 const char **cmd_argv = init_resources (argc, argv);
546 782
547#ifdef KEYSYM_RESOURCE 783#ifdef KEYSYM_RESOURCE
548 keyboard->register_done (); 784 keyboard->register_done ();
549#endif 785#endif
… …
565 801
566 create_windows (argc, argv); 802 create_windows (argc, argv);
567 803
568 init_xlocale (); 804 init_xlocale ();
569 805
570 scr_reset (); // initialize screen 806 scr_poweron (); // initialize screen
571 807
572#if 0 808#if 0
573 XSynchronize (dpy, True); 809 XSynchronize (dpy, True);
574#endif 810#endif
575 811
576 if (option (Opt_scrollBar)) 812 if (option (Opt_scrollBar))
577 scrollBar.resize (); /* create and map scrollbar */ 813 scrollBar.resize (); /* create and map scrollbar */
578#ifdef HAVE_BG_PIXMAP 814#ifdef HAVE_BG_PIXMAP
579 { 815 {
580 bgPixmap.set_target (this); 816 bg_init ();
581 bgPixmap.invalidate ();
582 817
583#ifdef ENABLE_TRANSPARENCY 818#ifdef ENABLE_TRANSPARENCY
584 if (option (Opt_transparent)) 819 if (option (Opt_transparent))
585 { 820 {
586 bgPixmap.set_transparent (); 821 bg_set_transparent ();
587 822
588#ifdef HAVE_AFTERIMAGE
589 if (rs [Rs_blurradius]) 823 if (rs [Rs_blurradius])
590 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 824 bg_set_blur (rs [Rs_blurradius]);
591#endif 825
592 if (ISSET_PIXCOLOR (Color_tint)) 826 if (ISSET_PIXCOLOR (Color_tint))
593 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 827 bg_set_tint (pix_colors_focused [Color_tint]);
594 828
595 if (rs [Rs_shade]) 829 if (rs [Rs_shade])
596 bgPixmap.set_shade (rs [Rs_shade]); 830 bg_set_shade (rs [Rs_shade]);
597 831
598 bgPixmap.set_root_pixmap (); 832 bg_set_root_pixmap ();
599 XSelectInput (dpy, display->root, PropertyChangeMask); 833 XSelectInput (dpy, display->root, PropertyChangeMask);
600 rootwin_ev.start (display, display->root); 834 rootwin_ev.start (display, display->root);
601 } 835 }
602#endif 836#endif
603 837
… …
607 const char *p = rs[Rs_backgroundPixmap]; 841 const char *p = rs[Rs_backgroundPixmap];
608 842
609 if ((p = strchr (p, ';')) != 0) 843 if ((p = strchr (p, ';')) != 0)
610 { 844 {
611 p++; 845 p++;
612 bgPixmap.set_geometry (p); 846 bg_set_geometry (p);
613 } 847 }
614 else 848 else
615 bgPixmap.set_defaultGeometry (); 849 bg_set_default_geometry ();
616 850
617 if (bgPixmap.set_file (rs[Rs_backgroundPixmap])) 851 if (bg_set_file (rs[Rs_backgroundPixmap]))
618 if (!bgPixmap.window_position_sensitive ()) 852 if (!bg_window_position_sensitive ())
619 update_background (); 853 update_background ();
620 } 854 }
621#endif 855#endif
622 } 856 }
623#endif 857#endif
… …
640#if ENABLE_XEMBED 874#if ENABLE_XEMBED
641 if (rs[Rs_embed]) 875 if (rs[Rs_embed])
642 { 876 {
643 long info[2] = { 0, XEMBED_MAPPED }; 877 long info[2] = { 0, XEMBED_MAPPED };
644 878
645 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 879 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
646 32, PropModeReplace, (unsigned char *)&info, 2); 880 32, PropModeReplace, (unsigned char *)&info, 2);
647 } 881 }
648#endif 882#endif
649 883
650 XMapWindow (dpy, vt); 884 XMapWindow (dpy, vt);
651 XMapWindow (dpy, parent[0]); 885 XMapWindow (dpy, parent);
652 886
653 refresh_check (); 887 refresh_check ();
654} 888}
655 889
656/*----------------------------------------------------------------------*/ 890/*----------------------------------------------------------------------*/
657void 891void
658rxvt_term::init_env () 892rxvt_term::init_env ()
659{ 893{
660 int i;
661 char *val; 894 char *val;
662 895
663#ifdef DISPLAY_IS_IP 896#ifdef DISPLAY_IS_IP
664 /* Fixup display_name for export over pty to any interested terminal 897 /* Fixup display_name for export over pty to any interested terminal
665 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 898 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
679 val = XDisplayString (dpy); 912 val = XDisplayString (dpy);
680 913
681 if (rs[Rs_display_name] == NULL) 914 if (rs[Rs_display_name] == NULL)
682 rs[Rs_display_name] = val; /* use broken `:0' value */ 915 rs[Rs_display_name] = val; /* use broken `:0' value */
683 916
684 i = strlen (val);
685 env_display = (char *)rxvt_malloc (i + 9); 917 env_display = (char *)rxvt_malloc (strlen (val) + 9);
686 918
687 sprintf (env_display, "DISPLAY=%s", val); 919 sprintf (env_display, "DISPLAY=%s", val);
688 920
689 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 921 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
690 922
691 /* add entries to the environment: 923 /* add entries to the environment:
692 * @ DISPLAY: in case we started with -display 924 * @ DISPLAY: in case we started with -display
693 * @ WINDOWID: X window id number of the window 925 * @ WINDOWID: X window id number of the window
694 * @ COLORTERM: terminal sub-name and also indicates its color 926 * @ COLORTERM: terminal sub-name and also indicates its color
… …
1047 1279
1048 if (i) 1280 if (i)
1049 ModMetaMask = modmasks[i - 1]; 1281 ModMetaMask = modmasks[i - 1];
1050} 1282}
1051 1283
1284void
1285rxvt_term::set_icon (const char *file)
1286{
1287#ifdef HAVE_AFTERIMAGE
1288 init_asv ();
1289
1290 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1291 if (!im)
1292 {
1293 rxvt_warn ("Loading image icon failed, continuing without.\n");
1294 return;
1295 }
1296
1297 unsigned int w = im->width;
1298 unsigned int h = im->height;
1299
1300 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1301 {
1302 rxvt_warn ("Icon image too big, continuing without.\n");
1303 destroy_asimage (&im);
1304 return;
1305 }
1306
1307 ASImage *result = scale_asimage (asv, im,
1308 w, h, ASA_ARGB32,
1309 100, ASIMAGE_QUALITY_DEFAULT);
1310 destroy_asimage (&im);
1311
1312 if (!result)
1313 {
1314 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1315 return;
1316 }
1317
1318 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1319 if (buffer)
1320 {
1321 ARGB32 *asbuf = result->alt.argb32;
1322 buffer [0] = w;
1323 buffer [1] = h;
1324
1325 for (unsigned int i = 0; i < w * h; ++i)
1326 buffer [i + 2] = asbuf [i];
1327
1328 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1329 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1330 free (buffer);
1331 }
1332 else
1333 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1334
1335 destroy_asimage (&result);
1336#endif
1337
1338#ifdef HAVE_PIXBUF
1339 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1340 if (!pixbuf)
1341 {
1342 rxvt_warn ("Loading image icon failed, continuing without.\n");
1343 return;
1344 }
1345
1346 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1347 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1348
1349 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1350 {
1351 rxvt_warn ("Icon image too big, continuing without.\n");
1352 g_object_unref (pixbuf);
1353 return;
1354 }
1355
1356 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1357 {
1358 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1359 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1360 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1361
1362 buffer [0] = w;
1363 buffer [1] = h;
1364 for (int i = 0; i < h; i++)
1365 {
1366 for (int j = 0; j < w; j++)
1367 {
1368 unsigned char *pixel = row + j * channels;
1369 long value;
1370
1371 if (channels == 4)
1372 value = pixel[3];
1373 else
1374 value = (unsigned char)0x00ff;
1375
1376 value = (value << 8) + pixel[0];
1377 value = (value << 8) + pixel[1];
1378 value = (value << 8) + pixel[2];
1379 buffer[(i * w + j) + 2] = value;
1380 }
1381
1382 row += rowstride;
1383 }
1384
1385 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1386 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1387 free (buffer);
1388 }
1389 else
1390 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1391
1392 g_object_unref (pixbuf);
1393#endif
1394}
1395
1052/*----------------------------------------------------------------------*/ 1396/*----------------------------------------------------------------------*/
1053/* rxvt_Create_Windows () - Open and map the window */ 1397/* rxvt_Create_Windows () - Open and map the window */
1054void 1398void
1055rxvt_term::create_windows (int argc, const char *const *argv) 1399rxvt_term::create_windows (int argc, const char *const *argv)
1056{ 1400{
… …
1117 ext_bwidth, 1461 ext_bwidth,
1118 depth, InputOutput, visual, 1462 depth, InputOutput, visual,
1119 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1463 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1120 &attributes); 1464 &attributes);
1121 1465
1122 this->parent[0] = top; 1466 this->parent = top;
1123 1467
1124 old_width = szHint.width; 1468 old_width = szHint.width;
1125 old_height = szHint.height; 1469 old_height = szHint.height;
1126 1470
1127 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1471 set_title (rs [Rs_title]);
1128 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1472 set_icon_name (rs [Rs_iconName]);
1129 1473
1130 classHint.res_name = (char *)rs[Rs_name]; 1474 classHint.res_name = (char *)rs[Rs_name];
1131 classHint.res_class = (char *)RESCLASS; 1475 classHint.res_class = (char *)RESCLASS;
1132 1476
1133 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1477 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
1135 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1479 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1136 wmHint.window_group = top; 1480 wmHint.window_group = top;
1137 1481
1138 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1482 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1139 &szHint, &wmHint, &classHint); 1483 &szHint, &wmHint, &classHint);
1140#if ENABLE_EWMH 1484#if ENABLE_EWMH
1141# ifdef HAVE_AFTERIMAGE
1142 /* 1485 /*
1143 * set up icon hint 1486 * set up icon hint
1144 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources 1487 * rs [Rs_iconfile] is path to icon
1145 */ 1488 */
1489
1146 if (rs [Rs_iconfile] && asv) 1490 if (rs [Rs_iconfile])
1147 {
1148 ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1149 if (im)
1150 {
1151 int w = im->width;
1152 int h = im->height;
1153 long* buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1154 ASImage *result = scale_asimage (asv, im,
1155 w, h, ASA_ARGB32,
1156 100, ASIMAGE_QUALITY_DEFAULT);
1157 destroy_asimage (&im);
1158
1159 if (buffer && result)
1160 {
1161 ARGB32 *asbuf = result->alt.argb32;
1162 buffer [0] = w;
1163 buffer [1] = h;
1164
1165 for (unsigned int i = 0; i < w * h; ++i)
1166 buffer [i + 2] = asbuf [i];
1167
1168 destroy_asimage (&result);
1169 XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1170 PropModeReplace, (const unsigned char*) buffer, 2 + w * h);
1171 free (buffer);
1172 }
1173 else
1174 {
1175 if (!buffer)
1176 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1177
1178 if (!result)
1179 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1180 }
1181 }
1182 else
1183 rxvt_warn ("Loading image icon failed, continuing without.\n");
1184 } 1491 {
1185# endif 1492 set_icon (rs [Rs_iconfile]);
1493 }
1186#endif 1494#endif
1187 1495
1188#if ENABLE_FRILLS 1496#if ENABLE_FRILLS
1189 if (mwmhints.flags) 1497 if (mwmhints.flags)
1190 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1498 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1196#if ENABLE_EWMH 1504#if ENABLE_EWMH
1197 xa[XA_NET_WM_PING], 1505 xa[XA_NET_WM_PING],
1198#endif 1506#endif
1199 }; 1507 };
1200 1508
1201 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1509 XSetWMProtocols (dpy, top, protocols, ARRAY_LENGTH(protocols));
1202 1510
1203#if ENABLE_FRILLS 1511#if ENABLE_FRILLS
1204 if (rs[Rs_transient_for]) 1512 if (rs[Rs_transient_for])
1205 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1513 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1206#endif 1514#endif
… …
1267 pix_colors = pix_colors_unfocused; 1575 pix_colors = pix_colors_unfocused;
1268#endif 1576#endif
1269 1577
1270 pointer_unblank (); 1578 pointer_unblank ();
1271 scr_recolour (); 1579 scr_recolour ();
1272}
1273
1274/* ------------------------------------------------------------------------- *
1275 * GET TTY CURRENT STATE *
1276 * ------------------------------------------------------------------------- */
1277void
1278rxvt_get_ttymode (struct termios *tio, int erase)
1279{
1280 /*
1281 * standard System V termios interface
1282 */
1283 if (tcgetattr (STDIN_FILENO, tio) < 0)
1284 {
1285 // return error - use system defaults,
1286 // where possible, and zero elsewhere
1287 memset (tio, 0, sizeof (struct termios));
1288
1289 tio->c_cc[VINTR] = CINTR;
1290 tio->c_cc[VQUIT] = CQUIT;
1291 tio->c_cc[VERASE] = CERASE;
1292#ifdef VERASE2
1293 tio->c_cc[VERASE2] = CERASE2;
1294#endif
1295 tio->c_cc[VKILL] = CKILL;
1296 tio->c_cc[VSTART] = CSTART;
1297 tio->c_cc[VSTOP] = CSTOP;
1298 tio->c_cc[VSUSP] = CSUSP;
1299# ifdef VDSUSP
1300 tio->c_cc[VDSUSP] = CDSUSP;
1301# endif
1302# ifdef VREPRINT
1303 tio->c_cc[VREPRINT] = CRPRNT;
1304# endif
1305# ifdef VDISCRD
1306 tio->c_cc[VDISCRD] = CFLUSH;
1307# endif
1308# ifdef VWERSE
1309 tio->c_cc[VWERSE] = CWERASE;
1310# endif
1311# ifdef VLNEXT
1312 tio->c_cc[VLNEXT] = CLNEXT;
1313# endif
1314 }
1315
1316 tio->c_cc[VEOF] = CEOF;
1317 tio->c_cc[VEOL] = VDISABLE;
1318# ifdef VEOL2
1319 tio->c_cc[VEOL2] = VDISABLE;
1320# endif
1321# ifdef VSWTC
1322 tio->c_cc[VSWTC] = VDISABLE;
1323# endif
1324# ifdef VSWTCH
1325 tio->c_cc[VSWTCH] = VDISABLE;
1326# endif
1327# if VMIN != VEOF
1328 tio->c_cc[VMIN] = 1;
1329# endif
1330# if VTIME != VEOL
1331 tio->c_cc[VTIME] = 0;
1332# endif
1333
1334 if (erase != -1)
1335 tio->c_cc[VERASE] = (char)erase;
1336
1337 /* input modes */
1338 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1339# ifdef IMAXBEL
1340 | IMAXBEL
1341# endif
1342 | IXON);
1343
1344 /* output modes */
1345 tio->c_oflag = (OPOST | ONLCR);
1346
1347 /* control modes */
1348 tio->c_cflag = (CS8 | CREAD);
1349
1350 /* line discipline modes */
1351 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1352# if defined (ECHOCTL) && defined (ECHOKE)
1353 | ECHOCTL | ECHOKE
1354# endif
1355 | ECHOE | ECHOK);
1356
1357 /*
1358 * Debugging
1359 */
1360#ifdef DEBUG_TTYMODE
1361 /* c_iflag bits */
1362 fprintf (stderr, "Input flags\n");
1363
1364 /* cpp token stringize doesn't work on all machines <sigh> */
1365# define FOO(flag,name) \
1366 if ((tio->c_iflag) & flag) \
1367 fprintf (stderr, "%s ", name)
1368
1369 /* c_iflag bits */
1370 FOO (IGNBRK, "IGNBRK");
1371 FOO (BRKINT, "BRKINT");
1372 FOO (IGNPAR, "IGNPAR");
1373 FOO (PARMRK, "PARMRK");
1374 FOO (INPCK, "INPCK");
1375 FOO (ISTRIP, "ISTRIP");
1376 FOO (INLCR, "INLCR");
1377 FOO (IGNCR, "IGNCR");
1378 FOO (ICRNL, "ICRNL");
1379 FOO (IXON, "IXON");
1380 FOO (IXOFF, "IXOFF");
1381# ifdef IUCLC
1382 FOO (IUCLC, "IUCLC");
1383# endif
1384# ifdef IXANY
1385 FOO (IXANY, "IXANY");
1386# endif
1387# ifdef IMAXBEL
1388 FOO (IMAXBEL, "IMAXBEL");
1389# endif
1390
1391 fprintf (stderr, "\n");
1392
1393# undef FOO
1394# define FOO(entry, name) \
1395 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1396
1397 FOO (VINTR, "VINTR");
1398 FOO (VQUIT, "VQUIT");
1399 FOO (VERASE, "VERASE");
1400 FOO (VKILL, "VKILL");
1401 FOO (VEOF, "VEOF");
1402 FOO (VEOL, "VEOL");
1403# ifdef VEOL2
1404 FOO (VEOL2, "VEOL2");
1405# endif
1406# ifdef VSWTC
1407 FOO (VSWTC, "VSWTC");
1408# endif
1409# ifdef VSWTCH
1410 FOO (VSWTCH, "VSWTCH");
1411# endif
1412 FOO (VSTART, "VSTART");
1413 FOO (VSTOP, "VSTOP");
1414 FOO (VSUSP, "VSUSP");
1415# ifdef VDSUSP
1416 FOO (VDSUSP, "VDSUSP");
1417# endif
1418# ifdef VREPRINT
1419 FOO (VREPRINT, "VREPRINT");
1420# endif
1421# ifdef VDISCRD
1422 FOO (VDISCRD, "VDISCRD");
1423# endif
1424# ifdef VWERSE
1425 FOO (VWERSE, "VWERSE");
1426# endif
1427# ifdef VLNEXT
1428 FOO (VLNEXT, "VLNEXT");
1429# endif
1430
1431 fprintf (stderr, "\n");
1432# undef FOO
1433#endif /* DEBUG_TTYMODE */
1434} 1580}
1435 1581
1436/*----------------------------------------------------------------------*/ 1582/*----------------------------------------------------------------------*/
1437/* 1583/*
1438 * Run the command in a subprocess and return a file descriptor for the 1584 * Run the command in a subprocess and return a file descriptor for the
… …
1459 else 1605 else
1460#endif 1606#endif
1461 if (!pty->get ()) 1607 if (!pty->get ())
1462 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1608 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1463 1609
1464 int er; 1610 struct termios tio = def_tio;
1465 1611
1466#ifndef NO_BACKSPACE_KEY 1612#ifndef NO_BACKSPACE_KEY
1467 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1613 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1468 er = rs[Rs_backspace_key][0]; 1614 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1469 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1615 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1470 er = '\177'; /* the initial state anyway */ 1616 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1471 else
1472#endif 1617#endif
1473 er = -1;
1474 1618
1475 rxvt_get_ttymode (&tio, er);
1476 /* init terminal attributes */ 1619 /* init terminal attributes */
1477 cfsetospeed (&tio, BAUDRATE); 1620 cfsetospeed (&tio, BAUDRATE);
1478 cfsetispeed (&tio, BAUDRATE); 1621 cfsetispeed (&tio, BAUDRATE);
1479 tcsetattr (pty->tty, TCSANOW, &tio); 1622 tcsetattr (pty->tty, TCSANOW, &tio);
1480 pty->set_utf8_mode (enc_utf8); 1623 pty->set_utf8_mode (enc_utf8);
… …
1567 signal (SIGQUIT, SIG_DFL); 1710 signal (SIGQUIT, SIG_DFL);
1568 signal (SIGCHLD, SIG_DFL); 1711 signal (SIGCHLD, SIG_DFL);
1569 signal (SIGHUP, SIG_DFL); 1712 signal (SIGHUP, SIG_DFL);
1570 signal (SIGPIPE, SIG_DFL); 1713 signal (SIGPIPE, SIG_DFL);
1571 /* 1714 /*
1572 * mimick login's behavior by disabling the job control signals 1715 * mimic login's behavior by disabling the job control signals
1573 * a shell that wants them can turn them back on 1716 * a shell that wants them can turn them back on
1574 */ 1717 */
1575#ifdef SIGTSTP 1718#ifdef SIGTSTP
1576 signal (SIGTSTP, SIG_IGN); 1719 signal (SIGTSTP, SIG_IGN);
1577 signal (SIGTTIN, SIG_IGN); 1720 signal (SIGTTIN, SIG_IGN);
… …
1596 const char *argv0, *shell; 1739 const char *argv0, *shell;
1597 1740
1598 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1741 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1599 shell = "/bin/sh"; 1742 shell = "/bin/sh";
1600 1743
1601 argv0 = (const char *)rxvt_basename (shell); 1744 argv0 = rxvt_basename (shell);
1602 1745
1603 if (option (Opt_loginShell)) 1746 if (option (Opt_loginShell))
1604 { 1747 {
1605 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1748 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1606 1749

Diff Legend

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