ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.147 by root, Mon Nov 28 19:35:04 2005 UTC vs.
Revision 1.165 by root, Sun Jan 8 00:20:12 2006 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "keyboard.h"
36#include "rxvtperl.h"
37
38#include <limits>
35 39
36#include <csignal> 40#include <csignal>
37#include <cstring> 41#include <cstring>
38 42
39#ifdef TTY_GID_SUPPORT 43#ifdef TTY_GID_SUPPORT
… …
42 46
43#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
44# include <termios.h> 48# include <termios.h>
45#endif 49#endif
46 50
47#ifdef KEYSYM_RESOURCE
48# include "keyboard.h"
49#endif
50
51vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
52 52
53static char curlocale[128]; 53static char curlocale[128], savelocale[128];
54 54
55bool 55bool
56rxvt_set_locale (const char *locale) 56rxvt_set_locale (const char *locale)
57{ 57{
58 if (!locale || !strncmp (locale, curlocale, 128)) 58 if (!locale || !strncmp (locale, curlocale, 128))
59 return false; 59 return false;
60 60
61 strncpy (curlocale, locale, 128); 61 strncpy (curlocale, locale, 128);
62 setlocale (LC_CTYPE, curlocale); 62 setlocale (LC_CTYPE, curlocale);
63 return true; 63 return true;
64}
65
66bool
67rxvt_push_locale (const char *locale)
68{
69 strcpy (savelocale, curlocale);
70 rxvt_set_locale (locale);
71}
72
73void
74rxvt_pop_locale ()
75{
76 rxvt_set_locale (savelocale);
64} 77}
65 78
66#if ENABLE_COMBINING 79#if ENABLE_COMBINING
67class rxvt_composite_vec rxvt_composite; 80class rxvt_composite_vec rxvt_composite;
68 81
… …
157 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
158#endif 171#endif
159#ifdef USE_XIM 172#ifdef USE_XIM
160 im_ev (this, &rxvt_term::im_cb), 173 im_ev (this, &rxvt_term::im_cb),
161#endif 174#endif
162 sw_term (this, &rxvt_term::sig_term),
163 sw_int (this, &rxvt_term::sig_term),
164 sw_chld (this, &rxvt_term::sig_chld),
165 termwin_ev (this, &rxvt_term::x_cb), 175 termwin_ev (this, &rxvt_term::x_cb),
166 vt_ev (this, &rxvt_term::x_cb), 176 vt_ev (this, &rxvt_term::x_cb),
167 check_ev (this, &rxvt_term::check_cb), 177 check_ev (this, &rxvt_term::check_cb),
168 flush_ev (this, &rxvt_term::flush_cb), 178 flush_ev (this, &rxvt_term::flush_cb),
169 destroy_ev (this, &rxvt_term::destroy_cb), 179 destroy_ev (this, &rxvt_term::destroy_cb),
… …
196 pty.put (); 206 pty.put ();
197} 207}
198 208
199rxvt_term::~rxvt_term () 209rxvt_term::~rxvt_term ()
200{ 210{
211 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
212
201 termlist.erase (find (termlist.begin (), termlist.end(), this)); 213 termlist.erase (find (termlist.begin (), termlist.end(), this));
202 214
203 emergency_cleanup (); 215 emergency_cleanup ();
204 216
205#if ENABLE_STYLES 217#if ENABLE_STYLES
206 for (int i = RS_styleCount; --i; ) 218 for (int i = RS_styleCount; --i; )
207 if (TermWin.fontset[i] != TermWin.fontset[0]) 219 if (fontset[i] != fontset[0])
208 delete TermWin.fontset[i]; 220 delete fontset[i];
209#endif 221#endif
210 delete TermWin.fontset[0]; 222 delete fontset[0];
211 223
212 if (display) 224 if (display)
213 { 225 {
214 dDisp; 226 dDisp;
215 227
… …
243#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 255#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
244 if (topShadowGC) XFreeGC (disp, topShadowGC); 256 if (topShadowGC) XFreeGC (disp, topShadowGC);
245 if (botShadowGC) XFreeGC (disp, botShadowGC); 257 if (botShadowGC) XFreeGC (disp, botShadowGC);
246 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 258 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
247#endif 259#endif
248 if (TermWin.gc) XFreeGC (disp, TermWin.gc); 260 if (gc) XFreeGC (disp, gc);
249 261
250#if defined(MENUBAR) && (MENUBAR_MAX > 1) 262#if defined(MENUBAR) && (MENUBAR_MAX > 1)
251 delete menuBar.drawable; 263 delete menuBar.drawable;
252 //if (menuBar.win) 264 //if (menuBar.win)
253 // XDestroyWindow (disp, menuBar.win); 265 // XDestroyWindow (disp, menuBar.win);
254#endif 266#endif
255 delete TermWin.drawable; 267 delete drawable;
256 // destroy all windows 268 // destroy all windows
257 if (TermWin.parent[0]) 269 if (parent[0])
258 XDestroyWindow (disp, TermWin.parent[0]); 270 XDestroyWindow (disp, parent[0]);
259 } 271 }
260 272
261 // TODO: free pixcolours, colours should become part of rxvt_display 273 // TODO: free pixcolours, colours should become part of rxvt_display
262 274
263 delete pix_colors_focused; 275 delete pix_colors_focused;
… …
287 delete argv; 299 delete argv;
288 300
289#ifdef KEYSYM_RESOURCE 301#ifdef KEYSYM_RESOURCE
290 delete keyboard; 302 delete keyboard;
291#endif 303#endif
304}
305
306void
307rxvt_term::child_exit ()
308{
309 cmd_pid = 0;
310
311 if (!OPTION (Opt_hold))
312 destroy ();
292} 313}
293 314
294void 315void
295rxvt_term::destroy () 316rxvt_term::destroy ()
296{ 317{
… …
438 DisplayString (display)); 459 DisplayString (display));
439 rxvt_emergency_cleanup (); 460 rxvt_emergency_cleanup ();
440 _exit (EXIT_FAILURE); 461 _exit (EXIT_FAILURE);
441} 462}
442 463
443/*
444 * Catch a fatal signal and tidy up before quitting
445 */
446void
447rxvt_term::sig_term (sig_watcher &w)
448{
449#ifdef DEBUG_CMD
450 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
451#endif
452 rxvt_emergency_cleanup ();
453 signal (w.signum, SIG_DFL);
454 kill (getpid (), w.signum);
455}
456
457/*----------------------------------------------------------------------*/ 464/*----------------------------------------------------------------------*/
458/* rxvt_init () */
459bool 465bool
460rxvt_term::init (int argc, const char *const *argv) 466rxvt_term::init (int argc, const char *const *argv)
461{ 467{
462 SET_R (this); 468 SET_R (this);
463 469
… …
476 482
477#if MENUBAR_MAX 483#if MENUBAR_MAX
478 menubar_read (rs[Rs_menu]); 484 menubar_read (rs[Rs_menu]);
479#endif 485#endif
480#ifdef HAVE_SCROLLBARS 486#ifdef HAVE_SCROLLBARS
481 if (options & Opt_scrollBar) 487 if (OPTION (Opt_scrollBar))
482 scrollBar.setIdle (); /* set existence for size calculations */ 488 scrollBar.setIdle (); /* set existence for size calculations */
489#endif
490
491#if ENABLE_PERL
492 if (!rs[Rs_perl_ext_1])
493 rs[Rs_perl_ext_1] = "default";
494
495 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
496 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
497 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
498 {
499 rxvt_perl.init ();
500 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
501 }
483#endif 502#endif
484 503
485 create_windows (argc, argv); 504 create_windows (argc, argv);
486 505
487 dDisp; 506 dDisp;
… …
493#if 0 512#if 0
494 XSynchronize (disp, True); 513 XSynchronize (disp, True);
495#endif 514#endif
496 515
497#ifdef HAVE_SCROLLBARS 516#ifdef HAVE_SCROLLBARS
498 if (options & Opt_scrollBar) 517 if (OPTION (Opt_scrollBar))
499 resize_scrollbar (); /* create and map scrollbar */ 518 resize_scrollbar (); /* create and map scrollbar */
500#endif 519#endif
501#if (MENUBAR_MAX) 520#if (MENUBAR_MAX)
502 if (menubar_visible ()) 521 if (menubar_visible ())
503 XMapWindow (disp, menuBar.win); 522 XMapWindow (disp, menuBar.win);
504#endif 523#endif
505#ifdef TRANSPARENT 524#ifdef TRANSPARENT
506 if (options & Opt_transparent) 525 if (OPTION (Opt_transparent))
507 { 526 {
508 XSelectInput (disp, display->root, PropertyChangeMask); 527 XSelectInput (disp, display->root, PropertyChangeMask);
509 check_our_parents (); 528 check_our_parents ();
510 rootwin_ev.start (display, display->root); 529 rootwin_ev.start (display, display->root);
511 } 530 }
512#endif 531#endif
513 532
514 XMapWindow (disp, TermWin.vt); 533 XMapWindow (disp, vt);
515 XMapWindow (disp, TermWin.parent[0]); 534 XMapWindow (disp, parent[0]);
516 535
517 set_colorfgbg (); 536 set_colorfgbg ();
518 537
519 init_command (cmd_argv); 538 init_command (cmd_argv);
520 539
521 free (cmd_argv); 540 free (cmd_argv);
522 541
542 if (pty.pty >= 0)
523 pty_ev.start (pty.pty, EVENT_READ); 543 pty_ev.start (pty.pty, EVENT_READ);
524 544
525 check_ev.start (); 545 check_ev.start ();
526 546
547 HOOK_INVOKE ((this, HOOK_START, DT_END));
548
527 return true; 549 return true;
528} 550}
551
552static struct sig_handlers
553{
554 sig_watcher sw_chld, sw_term, sw_int;
555
556 void sig_chld (sig_watcher &w)
557 {
558 // we are being called for every SIGCHLD, find the corresponding term
559 int pid;
560
561 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
562 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
563 if (pid == (*t)->cmd_pid)
564 {
565 (*t)->child_exit ();
566 break;
567 }
568 }
569
570 /*
571 * Catch a fatal signal and tidy up before quitting
572 */
573 void
574 sig_term (sig_watcher &w)
575 {
576#ifdef DEBUG_CMD
577 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
578#endif
579 rxvt_emergency_cleanup ();
580 signal (w.signum, SIG_DFL);
581 kill (getpid (), w.signum);
582 }
583
584 sig_handlers ()
585 : sw_chld (this, &sig_handlers::sig_chld),
586 sw_term (this, &sig_handlers::sig_term),
587 sw_int (this, &sig_handlers::sig_term)
588 {
589 }
590} sig_handlers;
529 591
530void 592void
531rxvt_init () 593rxvt_init ()
532{ 594{
533 /* 595 /*
… …
541 rxvt_privileges (IGNORE); 603 rxvt_privileges (IGNORE);
542 604
543 signal (SIGHUP, SIG_IGN); 605 signal (SIGHUP, SIG_IGN);
544 signal (SIGPIPE, SIG_IGN); 606 signal (SIGPIPE, SIG_IGN);
545 607
608 sig_handlers.sw_chld.start (SIGCHLD);
609 sig_handlers.sw_term.start (SIGTERM);
610 sig_handlers.sw_int.start (SIGINT);
611
546 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 612 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
547 /* signal (SIGURG, SIG_DFL); */ 613 /* signal (SIGURG, SIG_DFL); */
548 614
549 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 615 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
550 // TODO: handle this with exceptions and tolerate the memory loss 616 // TODO: handle this with exceptions and tolerate the memory loss
551 XSetIOErrorHandler (rxvt_xioerror_handler); 617 XSetIOErrorHandler (rxvt_xioerror_handler);
552}
553
554/* ------------------------------------------------------------------------- *
555 * SIGNAL HANDLING & EXIT HANDLER *
556 * ------------------------------------------------------------------------- */
557/*
558 * Catch a SIGCHLD signal and exit if the direct child has died
559 */
560
561void
562rxvt_term::sig_chld (sig_watcher &w)
563{
564 // we are being called for every SIGCHLD, not just ours
565 int pid;
566
567 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
568 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
569 if (pid == (*t)->cmd_pid)
570 {
571 (*t)->destroy ();
572 break;
573 }
574} 618}
575 619
576/* ------------------------------------------------------------------------- * 620/* ------------------------------------------------------------------------- *
577 * MEMORY ALLOCATION WRAPPERS * 621 * MEMORY ALLOCATION WRAPPERS *
578 * ------------------------------------------------------------------------- */ 622 * ------------------------------------------------------------------------- */
… …
585 rxvt_fatal ("memory allocation failure. aborting.\n"); 629 rxvt_fatal ("memory allocation failure. aborting.\n");
586 630
587 return p; 631 return p;
588} 632}
589 633
590void * 634void *
591rxvt_calloc (size_t number, size_t size) 635rxvt_calloc (size_t number, size_t size)
592{ 636{
593 void *p = calloc (number, size); 637 void *p = calloc (number, size);
594 638
595 if (!p) 639 if (!p)
… …
666 710
667#ifdef UTMP_SUPPORT 711#ifdef UTMP_SUPPORT
668void 712void
669rxvt_term::privileged_utmp (rxvt_privaction action) 713rxvt_term::privileged_utmp (rxvt_privaction action)
670{ 714{
671 if ((options & Opt_utmpInhibit) 715 if (OPTION (Opt_utmpInhibit)
672 || !pty.name || !*pty.name) 716 || !pty.name || !*pty.name)
673 return; 717 return;
674 718
675 rxvt_privileges (RESTORE); 719 rxvt_privileges (RESTORE);
676 720
… …
687/* 731/*
688 * window size/position calculcations for XSizeHint and other storage. 732 * window size/position calculcations for XSizeHint and other storage.
689 * if width/height are non-zero then override calculated width/height 733 * if width/height are non-zero then override calculated width/height
690 */ 734 */
691void 735void
692rxvt_term::window_calc (unsigned int width, unsigned int height) 736rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
693{ 737{
694 short recalc_x, recalc_y; 738 short recalc_x, recalc_y;
695 int x, y, sb_w, mb_h, flags; 739 int x, y, sb_w, mb_h, flags;
696 unsigned int w, h; 740 unsigned int w, h;
697 unsigned int max_width, max_height; 741 unsigned int max_width, max_height;
698 dDisp; 742 dDisp;
699 743
700 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 744 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
701 TermWin.ncol, TermWin.nrow, szHint.width, 745 ncol, nrow, szHint.width, szHint.height));
702 szHint.height)); 746
703 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 747 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
704 szHint.win_gravity = NorthWestGravity; 748 szHint.win_gravity = NorthWestGravity;
705 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 749 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
706 750
707 recalc_x = recalc_y = 0; 751 recalc_x = recalc_y = 0;
708 flags = 0; 752 flags = 0;
753
709 if (!parsed_geometry) 754 if (!parsed_geometry)
710 { 755 {
711 parsed_geometry = 1; 756 parsed_geometry = 1;
757
712 if (rs[Rs_geometry]) 758 if (rs[Rs_geometry])
713 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 759 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
714 760
715 if (flags & WidthValue) 761 if (flags & WidthValue)
716 { 762 {
717 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 763 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
718 szHint.flags |= USSize; 764 szHint.flags |= USSize;
719 } 765 }
720 766
721 if (flags & HeightValue) 767 if (flags & HeightValue)
722 { 768 {
723 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 769 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
724 szHint.flags |= USSize; 770 szHint.flags |= USSize;
725 } 771 }
726 772
727 if (flags & XValue) 773 if (flags & XValue)
728 { 774 {
729 szHint.x = x; 775 szHint.x = x;
730 szHint.flags |= USPosition; 776 szHint.flags |= USPosition;
777
731 if (flags & XNegative) 778 if (flags & XNegative)
732 { 779 {
733 recalc_x = 1; 780 recalc_x = 1;
734 szHint.win_gravity = NorthEastGravity; 781 szHint.win_gravity = NorthEastGravity;
735 } 782 }
… …
737 784
738 if (flags & YValue) 785 if (flags & YValue)
739 { 786 {
740 szHint.y = y; 787 szHint.y = y;
741 szHint.flags |= USPosition; 788 szHint.flags |= USPosition;
789
742 if (flags & YNegative) 790 if (flags & YNegative)
743 { 791 {
744 recalc_y = 1; 792 recalc_y = 1;
793
745 if (szHint.win_gravity == NorthEastGravity) 794 if (szHint.win_gravity == NorthEastGravity)
746 szHint.win_gravity = SouthEastGravity; 795 szHint.win_gravity = SouthEastGravity;
747 else 796 else
748 szHint.win_gravity = SouthWestGravity; 797 szHint.win_gravity = SouthWestGravity;
749 } 798 }
750 } 799 }
751 } 800 }
752 801
753 /* TODO: BOUNDS */ 802 /* TODO: BOUNDS */
754 TermWin.width = TermWin.ncol * TermWin.fwidth; 803 width = ncol * fwidth;
755 TermWin.height = TermWin.nrow * TermWin.fheight; 804 height = nrow * fheight;
756 max_width = MAX_COLS * TermWin.fwidth; 805 max_width = MAX_COLS * fwidth;
757 max_height = MAX_ROWS * TermWin.fheight; 806 max_height = MAX_ROWS * fheight;
758 807
759 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 808 szHint.base_width = szHint.base_height = 2 * int_bwidth;
760 809
761 sb_w = mb_h = 0; 810 sb_w = mb_h = 0;
762 window_vt_x = window_vt_y = TermWin.int_bwidth; 811 window_vt_x = window_vt_y = int_bwidth;
763 812
764 if (scrollbar_visible ()) 813 if (scrollbar_visible ())
765 { 814 {
766 sb_w = scrollbar_TotalWidth (); 815 sb_w = scrollbar_TotalWidth ();
767 szHint.base_width += sb_w; 816 szHint.base_width += sb_w;
768 if (!(options & Opt_scrollBar_right)) 817 if (!OPTION (Opt_scrollBar_right))
769 window_vt_x += sb_w; 818 window_vt_x += sb_w;
770 } 819 }
771 820
772 if (menubar_visible ()) 821 if (menubar_visible ())
773 { 822 {
774 mb_h = menuBar_TotalHeight (); 823 mb_h = menuBar_TotalHeight ();
775 szHint.base_height += mb_h; 824 szHint.base_height += mb_h;
776 window_vt_y += mb_h; 825 window_vt_y += mb_h;
777 } 826 }
778 827
779 szHint.width_inc = TermWin.fwidth; 828 szHint.width_inc = fwidth;
780 szHint.height_inc = TermWin.fheight; 829 szHint.height_inc = fheight;
781 szHint.min_width = szHint.base_width + szHint.width_inc; 830 szHint.min_width = szHint.base_width + szHint.width_inc;
782 szHint.min_height = szHint.base_height + szHint.height_inc; 831 szHint.min_height = szHint.base_height + szHint.height_inc;
783 832
784 if (width && width - szHint.base_width < max_width) 833 if (newwidth && newwidth - szHint.base_width < max_width)
785 { 834 {
786 szHint.width = width; 835 szHint.width = newwidth;
787 TermWin.width = width - szHint.base_width; 836 width = newwidth - szHint.base_width;
788 } 837 }
789 else 838 else
790 { 839 {
791 MIN_IT (TermWin.width, max_width); 840 min_it (width, max_width);
792 szHint.width = szHint.base_width + TermWin.width; 841 szHint.width = szHint.base_width + width;
793 } 842 }
794 843
795 if (height && height - szHint.base_height < max_height) 844 if (newheight && newheight - szHint.base_height < max_height)
796 { 845 {
797 szHint.height = height; 846 szHint.height = newheight;
798 TermWin.height = height - szHint.base_height; 847 height = newheight - szHint.base_height;
799 } 848 }
800 else 849 else
801 { 850 {
802 MIN_IT (TermWin.height, max_height); 851 min_it (height, max_height);
803 szHint.height = szHint.base_height + TermWin.height; 852 szHint.height = szHint.base_height + height;
804 } 853 }
805 854
806 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 855 if (scrollbar_visible () && OPTION (Opt_scrollBar_right))
807 window_sb_x = szHint.width - sb_w; 856 window_sb_x = szHint.width - sb_w;
808 857
809 if (recalc_x) 858 if (recalc_x)
810 szHint.x += (DisplayWidth (disp, display->screen) 859 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
811 - szHint.width - 2 * TermWin.ext_bwidth);
812 if (recalc_y) 860 if (recalc_y)
813 szHint.y += (DisplayHeight (disp, display->screen) 861 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
814 - szHint.height - 2 * TermWin.ext_bwidth);
815 862
816 TermWin.ncol = TermWin.width / TermWin.fwidth; 863 ncol = width / fwidth;
817 TermWin.nrow = TermWin.height / TermWin.fheight; 864 nrow = height / fheight;
818 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 865 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
819 TermWin.ncol, TermWin.nrow, szHint.width, 866 ncol, nrow, szHint.width,
820 szHint.height)); 867 szHint.height));
821 return; 868 return;
822} 869}
823 870
824/*----------------------------------------------------------------------*/ 871/*----------------------------------------------------------------------*/
… …
832 if (pty.pty < 0) 879 if (pty.pty < 0)
833 return; 880 return;
834 881
835 struct winsize ws; 882 struct winsize ws;
836 883
837 ws.ws_col = TermWin.ncol; 884 ws.ws_col = ncol;
838 ws.ws_row = TermWin.nrow; 885 ws.ws_row = nrow;
839 ws.ws_xpixel = TermWin.width; 886 ws.ws_xpixel = width;
840 ws.ws_ypixel = TermWin.height; 887 ws.ws_ypixel = height;
841 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 888 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
842 889
843#if 0 890#if 0
844 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 891 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
845 if (cmd_pid) /* force through to the command */ 892 if (cmd_pid) /* force through to the command */
… …
869 return false; 916 return false;
870 } 917 }
871 918
872#if ENABLE_STYLES 919#if ENABLE_STYLES
873 for (int i = RS_styleCount; --i; ) 920 for (int i = RS_styleCount; --i; )
874 if (TermWin.fontset[i] != TermWin.fontset[0]) 921 if (fontset[i] != fontset[0])
875 delete TermWin.fontset[i]; 922 delete fontset[i];
876#endif 923#endif
877 924
878 delete TermWin.fontset[0]; 925 delete fontset[0];
879 TermWin.fontset[0] = fs; 926 fontset[0] = fs;
880 927
881 prop = (*fs)[1]->properties (); 928 prop = (*fs)[1]->properties ();
882 prop.height += TermWin.lineSpace; 929 prop.height += lineSpace;
883 fs->set_prop (prop); 930 fs->set_prop (prop);
884 931
885 TermWin.fwidth = prop.width; 932 fwidth = prop.width;
886 TermWin.fheight = prop.height; 933 fheight = prop.height;
887 TermWin.fweight = prop.weight; 934 fbase = prop.ascent;
888 TermWin.fslant = prop.slant;
889 TermWin.fbase = (*fs)[1]->ascent;
890 935
891 for (int style = 1; style < 4; style++) 936 for (int style = 1; style < 4; style++)
892 { 937 {
893#if ENABLE_STYLES 938#if ENABLE_STYLES
894 const char *res = rs[Rs_font + style]; 939 const char *res = rs[Rs_font + style];
895 940
896 if (res && !*res) 941 if (res && !*res)
897 TermWin.fontset[style] = TermWin.fontset[0]; 942 fontset[style] = fontset[0];
898 else 943 else
899 { 944 {
900 TermWin.fontset[style] = fs = new rxvt_fontset (this); 945 fontset[style] = fs = new rxvt_fontset (this);
901 rxvt_fontprop prop2 = prop; 946 rxvt_fontprop prop2 = prop;
902 947
903 if (res) 948 if (res)
904 prop2.weight = prop2.slant = rxvt_fontprop::unset; 949 prop2.weight = prop2.slant = rxvt_fontprop::unset;
905 else 950 else
906 { 951 {
907 res = TermWin.fontset[0]->fontdesc; 952 res = fontset[0]->fontdesc;
908 953
909 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 954 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
910 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 955 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
911 } 956 }
912 957
913 fs->populate (res); 958 fs->populate (res);
914 fs->set_prop (prop2); 959 fs->set_prop (prop2);
915 } 960 }
916#else 961#else
917 TermWin.fontset[style] = TermWin.fontset[0]; 962 fontset[style] = fontset[0];
918#endif 963#endif
919 } 964 }
920 965
921 if (TermWin.parent[0]) 966 if (parent[0])
922 { 967 {
923 resize_all_windows (0, 0, 0); 968 resize_all_windows (0, 0, 0);
924 scr_remap_chars (); 969 scr_remap_chars ();
925 scr_touch (true); 970 scr_touch (true);
926 } 971 }
… …
928 return true; 973 return true;
929} 974}
930 975
931void rxvt_term::set_string_property (Atom prop, const char *str, int len) 976void rxvt_term::set_string_property (Atom prop, const char *str, int len)
932{ 977{
933 // TODO: SMART_WINDOW_TITLE
934 XChangeProperty (display->display, TermWin.parent[0], 978 XChangeProperty (display->display, parent[0],
935 prop, XA_STRING, 8, PropModeReplace, 979 prop, XA_STRING, 8, PropModeReplace,
936 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 980 (const unsigned char *)str, len >= 0 ? len : strlen (str));
937} 981}
938 982
939void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 983void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
940{ 984{
941 // TODO: SMART_WINDOW_TITLE
942 wchar_t *ws = rxvt_mbstowcs (str, len); 985 wchar_t *ws = rxvt_mbstowcs (str, len);
943 char *s = rxvt_wcstoutf8 (ws); 986 char *s = rxvt_wcstoutf8 (ws);
944 987
945 XChangeProperty (display->display, TermWin.parent[0], 988 XChangeProperty (display->display, parent[0],
946 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 989 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
947 (const unsigned char *)s, strlen (s)); 990 (const unsigned char *)s, strlen (s));
948 991
949 free (s); 992 free (s);
950 free (ws); 993 free (ws);
… …
987 i = atoi (color); 1030 i = atoi (color);
988 1031
989 if (i >= 8 && i <= 15) 1032 if (i >= 8 && i <= 15)
990 { /* bright colors */ 1033 { /* bright colors */
991 i -= 8; 1034 i -= 8;
992# ifndef NO_BRIGHTCOLOR
993 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1035 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
994 SET_PIXCOLOR (idx); 1036 SET_PIXCOLOR (idx);
995 goto done; 1037 goto done;
996# endif
997 } 1038 }
998 1039
999 if (i >= 0 && i <= 7) 1040 if (i >= 0 && i <= 7)
1000 { /* normal colors */ 1041 { /* normal colors */
1001 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1042 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
… …
1113 1154
1114/* -------------------------------------------------------------------- * 1155/* -------------------------------------------------------------------- *
1115 * - WINDOW RESIZING - * 1156 * - WINDOW RESIZING - *
1116 * -------------------------------------------------------------------- */ 1157 * -------------------------------------------------------------------- */
1117void 1158void
1118rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1159rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1119{ 1160{
1120 int fix_screen; 1161 int fix_screen;
1121#ifdef SMART_RESIZE
1122 int old_width = szHint.width, old_height = szHint.height; 1162 int old_width = szHint.width, old_height = szHint.height;
1123#endif
1124 dDisp; 1163 dDisp;
1125 1164
1126 window_calc (width, height); 1165 window_calc (newwidth, newheight);
1127 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 1166 XSetWMNormalHints (disp, parent[0], &szHint);
1128 1167
1129 if (!ignoreparent) 1168 if (!ignoreparent)
1130 { 1169 {
1131#ifdef SMART_RESIZE 1170#ifdef SMART_RESIZE
1132 /* 1171 /*
… …
1136 int x, y, x1, y1; 1175 int x, y, x1, y1;
1137 int dx, dy; 1176 int dx, dy;
1138 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1177 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1139 Window unused_cr; 1178 Window unused_cr;
1140 1179
1141 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 1180 XTranslateCoordinates (disp, parent[0], display->root,
1142 0, 0, &x, &y, &unused_cr); 1181 0, 0, &x, &y, &unused_cr);
1143 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 1182 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1144 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1183 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1145 /* 1184 /*
1146 * if display->root isn't the parent window, a WM will probably have offset 1185 * if display->root isn't the parent window, a WM will probably have offset
1147 * our position for handles and decorations. Counter it 1186 * our position for handles and decorations. Counter it
1148 */ 1187 */
… …
1165 if (y < y1) /* top half */ 1204 if (y < y1) /* top half */
1166 dy = 0; 1205 dy = 0;
1167 else if (y == y1) /* exact center */ 1206 else if (y == y1) /* exact center */
1168 dy /= 2; 1207 dy /= 2;
1169 1208
1170 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 1209 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1171 szHint.width, szHint.height); 1210 szHint.width, szHint.height);
1172#else 1211#else
1173 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 1212 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1174#endif 1213#endif
1175 } 1214 }
1176 1215
1177 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1216 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1178 1217
1179 if (fix_screen || width != old_width || height != old_height) 1218 if (fix_screen || newwidth != old_width || newheight != old_height)
1180 { 1219 {
1181 if (scrollbar_visible ()) 1220 if (scrollbar_visible ())
1182 { 1221 {
1183 XMoveResizeWindow (disp, scrollBar.win, 1222 XMoveResizeWindow (disp, scrollBar.win,
1184 window_sb_x, 0, 1223 window_sb_x, 0,
… …
1187 } 1226 }
1188 1227
1189 if (menubar_visible ()) 1228 if (menubar_visible ())
1190 XMoveResizeWindow (disp, menuBar.win, 1229 XMoveResizeWindow (disp, menuBar.win,
1191 window_vt_x, 0, 1230 window_vt_x, 0,
1192 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1231 width, menuBar_TotalHeight ());
1193 1232
1194 XMoveResizeWindow (disp, TermWin.vt, 1233 XMoveResizeWindow (disp, vt,
1195 window_vt_x, window_vt_y, 1234 window_vt_x, window_vt_y,
1196 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1235 width, height);
1197 1236
1198 scr_clear (); 1237 scr_clear ();
1199#ifdef XPM_BACKGROUND 1238#ifdef XPM_BACKGROUND
1200 resize_pixmap (); 1239 resize_pixmap ();
1201#endif 1240#endif
… …
1207 int old_ncol = prev_ncol; 1246 int old_ncol = prev_ncol;
1208 1247
1209 /* scr_reset only works on the primary screen */ 1248 /* scr_reset only works on the primary screen */
1210 if (old_height) /* this is not the first time through */ 1249 if (old_height) /* this is not the first time through */
1211 { 1250 {
1212 unsigned int ncol = TermWin.ncol; 1251 unsigned int ocol = ncol;
1213 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1252 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1214 curr_screen = scr_change_screen (PRIMARY); 1253 curr_screen = scr_change_screen (PRIMARY);
1215 TermWin.ncol = ncol; 1254 ncol = ocol;
1216 } 1255 }
1217 1256
1218 scr_reset (); 1257 scr_reset ();
1219 1258
1220 if (curr_screen >= 0) /* this is not the first time through */ 1259 if (curr_screen >= 0) /* this is not the first time through */
1221 { 1260 {
1222 scr_change_screen (curr_screen); 1261 scr_change_screen (curr_screen);
1223 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1262 selection_check (old_ncol != ncol ? 4 : 0);
1224 } 1263 }
1225 } 1264 }
1226 1265
1227 old_width = szHint.width; 1266 old_width = szHint.width;
1228 old_height = szHint.height; 1267 old_height = szHint.height;
1229 1268
1230#ifdef XPM_BACKGROUND 1269#ifdef XPM_BACKGROUND
1231 if (TermWin.pixmap) 1270 if (pixmap)
1232 scr_touch (false); 1271 scr_touch (false);
1233#endif 1272#endif
1234 1273
1235#ifdef USE_XIM 1274#ifdef USE_XIM
1236 IMSetStatusPosition (); 1275 IMSetStatusPosition ();
… …
1240/* 1279/*
1241 * Set the width/height of the vt window in characters. Units are pixels. 1280 * Set the width/height of the vt window in characters. Units are pixels.
1242 * good for toggling 80/132 columns 1281 * good for toggling 80/132 columns
1243 */ 1282 */
1244void 1283void
1245rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1284rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1246{ 1285{
1247 XWindowAttributes wattr; 1286 XWindowAttributes wattr;
1248 1287
1249 if (width == 0 || height == 0) 1288 if (newwidth == 0 || newheight == 0)
1250 { 1289 {
1251 XGetWindowAttributes (display->display, display->root, &wattr); 1290 XGetWindowAttributes (display->display, display->root, &wattr);
1252 1291
1253 if (width == 0) 1292 if (newwidth == 0)
1254 width = wattr.width - szHint.base_width; 1293 newwidth = wattr.width - szHint.base_width;
1255 if (height == 0) 1294 if (newheight == 0)
1256 height = wattr.height - szHint.base_height; 1295 newheight = wattr.height - szHint.base_height;
1257 }
1258
1259 if (width != TermWin.width || height != TermWin.height)
1260 { 1296 }
1297
1298 if (newwidth != width || newheight != height)
1299 {
1261 width += szHint.base_width; 1300 newwidth += szHint.base_width;
1262 height += szHint.base_height; 1301 newheight += szHint.base_height;
1263 resize_all_windows (width, height, 0); 1302 resize_all_windows (newwidth, newheight, 0);
1264 } 1303 }
1265} 1304}
1266 1305
1267/* -------------------------------------------------------------------- * 1306/* -------------------------------------------------------------------- *
1268 * - X INPUT METHOD ROUTINES - * 1307 * - X INPUT METHOD ROUTINES - *
… …
1278 1317
1279void 1318void
1280rxvt_term::im_set_size (XRectangle &size) 1319rxvt_term::im_set_size (XRectangle &size)
1281{ 1320{
1282 // the int_bwidth terms make no sense to me 1321 // the int_bwidth terms make no sense to me
1283 size.x = TermWin.int_bwidth; 1322 size.x = int_bwidth;
1284 size.y = TermWin.int_bwidth; 1323 size.y = int_bwidth;
1285 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1324 size.width = Width2Pixel (ncol) + int_bwidth;
1286 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1325 size.height = Height2Pixel (nrow) + int_bwidth;
1287} 1326}
1288 1327
1289void 1328void
1290rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1329rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1291 XRectangle &status_rect, 1330 XRectangle &status_rect,
1292 const XRectangle &needed_rect) 1331 const XRectangle &needed_rect)
1293{ 1332{
1294 preedit_rect.x = needed_rect.width; 1333 preedit_rect.x = needed_rect.width;
1295 preedit_rect.y = 0; 1334 preedit_rect.y = 0;
1296 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1335 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1297 preedit_rect.height = TermWin.fheight; 1336 preedit_rect.height = fheight;
1298 1337
1299 status_rect.x = 0; 1338 status_rect.x = 0;
1300 status_rect.y = 0; 1339 status_rect.y = 0;
1301 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1340 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1302 status_rect.height = TermWin.fheight; 1341 status_rect.height = fheight;
1303} 1342}
1304 1343
1305/* Checking whether input method is running. */ 1344/* Checking whether input method is running. */
1306bool 1345bool
1307rxvt_term::IMisRunning () 1346rxvt_term::IMisRunning ()
… …
1335{ 1374{
1336 XPoint nspot; 1375 XPoint nspot;
1337 XVaNestedList preedit_attr; 1376 XVaNestedList preedit_attr;
1338 1377
1339 if (!Input_Context 1378 if (!Input_Context
1340 || !TermWin.focus 1379 || !focus
1341 || !(input_style & XIMPreeditPosition)) 1380 || !(input_style & XIMPreeditPosition))
1342 return; 1381 return;
1343 1382
1344 im_set_position (nspot); 1383 im_set_position (nspot);
1345 1384
… …
1465 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1504 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1466 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1505 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1467 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1506 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1468 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1507 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1469 "*", 1508 "*",
1470 TermWin.fheight, 1509 fheight,
1471 TermWin.fheight + 1, TermWin.fheight - 1, 1510 fheight + 1, fheight - 1,
1472 TermWin.fheight - 2, TermWin.fheight + 2); 1511 fheight - 2, fheight + 2);
1473 1512
1474 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1513 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1475 &missing_charset_list, &missing_charset_count, &def_string); 1514 &missing_charset_list, &missing_charset_count, &def_string);
1476 1515
1477 if (missing_charset_list) 1516 if (missing_charset_list)
… …
1523 NULL); 1562 NULL);
1524 } 1563 }
1525 1564
1526 Input_Context = XCreateIC (xim, 1565 Input_Context = XCreateIC (xim,
1527 XNInputStyle, input_style, 1566 XNInputStyle, input_style,
1528 XNClientWindow, TermWin.vt, 1567 XNClientWindow, vt,
1529 XNFocusWindow, TermWin.parent[0], 1568 XNFocusWindow, parent[0],
1530 preedit_attr ? XNPreeditAttributes : NULL, 1569 preedit_attr ? XNPreeditAttributes : NULL,
1531 preedit_attr, 1570 preedit_attr,
1532 status_attr ? XNStatusAttributes : NULL, 1571 status_attr ? XNStatusAttributes : NULL,
1533 status_attr, NULL); 1572 status_attr, NULL);
1534 1573
… …
1618{ 1657{
1619 XRectangle preedit_rect, status_rect, *needed_rect; 1658 XRectangle preedit_rect, status_rect, *needed_rect;
1620 XVaNestedList preedit_attr, status_attr; 1659 XVaNestedList preedit_attr, status_attr;
1621 1660
1622 if (!Input_Context 1661 if (!Input_Context
1623 || !TermWin.focus 1662 || !focus
1624 || !(input_style & XIMPreeditArea) 1663 || !(input_style & XIMPreeditArea)
1625 || !IMisRunning ()) 1664 || !IMisRunning ())
1626 return; 1665 return;
1627 1666
1628 /* Getting the necessary width of preedit area */ 1667 /* Getting the necessary width of preedit area */

Diff Legend

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