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.145 by root, Thu Aug 11 02:05:07 2005 UTC vs.
Revision 1.157 by root, Tue Jan 3 18:11:34 2006 UTC

… …
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 PERL_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{
… …
417{ 438{
418 if (GET_R->allowedxerror == -1) 439 if (GET_R->allowedxerror == -1)
419 GET_R->allowedxerror = event->error_code; 440 GET_R->allowedxerror = event->error_code;
420 else 441 else
421 { 442 {
422 //TODO: GET_R is most likely not the terminal which caused the error 443 // GET_R is most likely not the terminal which caused the error,
423 //TODO: maybe just output the error and continue? 444 // so just output the error and continue
424#if ENABLE_FRILLS 445#if ENABLE_FRILLS
425 print_x_error (display, event); 446 print_x_error (display, event);
426#else 447#else
427 old_xerror_handler (display, event); 448 old_xerror_handler (display, event);
428#endif 449#endif
… …
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] && *rs[Rs_perl_ext])
493 {
494 rxvt_perl.init ();
495 PERL_INVOKE ((this, HOOK_INIT, DT_END));
496 }
483#endif 497#endif
484 498
485 create_windows (argc, argv); 499 create_windows (argc, argv);
486 500
487 dDisp; 501 dDisp;
… …
493#if 0 507#if 0
494 XSynchronize (disp, True); 508 XSynchronize (disp, True);
495#endif 509#endif
496 510
497#ifdef HAVE_SCROLLBARS 511#ifdef HAVE_SCROLLBARS
498 if (options & Opt_scrollBar) 512 if (OPTION (Opt_scrollBar))
499 resize_scrollbar (); /* create and map scrollbar */ 513 resize_scrollbar (); /* create and map scrollbar */
500#endif 514#endif
501#if (MENUBAR_MAX) 515#if (MENUBAR_MAX)
502 if (menubar_visible ()) 516 if (menubar_visible ())
503 XMapWindow (disp, menuBar.win); 517 XMapWindow (disp, menuBar.win);
504#endif 518#endif
505#ifdef TRANSPARENT 519#ifdef TRANSPARENT
506 if (options & Opt_transparent) 520 if (OPTION (Opt_transparent))
507 { 521 {
508 XSelectInput (disp, display->root, PropertyChangeMask); 522 XSelectInput (disp, display->root, PropertyChangeMask);
509 check_our_parents (); 523 check_our_parents ();
510 rootwin_ev.start (display, display->root); 524 rootwin_ev.start (display, display->root);
511 } 525 }
512#endif 526#endif
513 527
514 XMapWindow (disp, TermWin.vt); 528 XMapWindow (disp, vt);
515 XMapWindow (disp, TermWin.parent[0]); 529 XMapWindow (disp, parent[0]);
516 530
517 set_colorfgbg (); 531 set_colorfgbg ();
518 532
519 init_command (cmd_argv); 533 init_command (cmd_argv);
520 534
… …
522 536
523 pty_ev.start (pty.pty, EVENT_READ); 537 pty_ev.start (pty.pty, EVENT_READ);
524 538
525 check_ev.start (); 539 check_ev.start ();
526 540
541 PERL_INVOKE ((this, HOOK_START, DT_END));
542
527 return true; 543 return true;
528} 544}
545
546static struct sig_handlers
547{
548 sig_watcher sw_chld, sw_term, sw_int;
549
550 void sig_chld (sig_watcher &w)
551 {
552 // we are being called for every SIGCHLD, find the corresponding term
553 int pid;
554
555 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
556 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
557 if (pid == (*t)->cmd_pid)
558 {
559 (*t)->child_exit ();
560 break;
561 }
562 }
563
564 /*
565 * Catch a fatal signal and tidy up before quitting
566 */
567 void
568 sig_term (sig_watcher &w)
569 {
570#ifdef DEBUG_CMD
571 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
572#endif
573 rxvt_emergency_cleanup ();
574 signal (w.signum, SIG_DFL);
575 kill (getpid (), w.signum);
576 }
577
578 sig_handlers ()
579 : sw_chld (this, &sig_handlers::sig_chld),
580 sw_term (this, &sig_handlers::sig_term),
581 sw_int (this, &sig_handlers::sig_term)
582 {
583 }
584} sig_handlers;
529 585
530void 586void
531rxvt_init () 587rxvt_init ()
532{ 588{
533 /* 589 /*
… …
541 rxvt_privileges (IGNORE); 597 rxvt_privileges (IGNORE);
542 598
543 signal (SIGHUP, SIG_IGN); 599 signal (SIGHUP, SIG_IGN);
544 signal (SIGPIPE, SIG_IGN); 600 signal (SIGPIPE, SIG_IGN);
545 601
602 sig_handlers.sw_chld.start (SIGCHLD);
603 sig_handlers.sw_term.start (SIGTERM);
604 sig_handlers.sw_int.start (SIGINT);
605
546 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 606 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
547 /* signal (SIGURG, SIG_DFL); */ 607 /* signal (SIGURG, SIG_DFL); */
548 608
549 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 609 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
550 // TODO: handle this with exceptions and tolerate the memory loss 610 // TODO: handle this with exceptions and tolerate the memory loss
551 XSetIOErrorHandler (rxvt_xioerror_handler); 611 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} 612}
575 613
576/* ------------------------------------------------------------------------- * 614/* ------------------------------------------------------------------------- *
577 * MEMORY ALLOCATION WRAPPERS * 615 * MEMORY ALLOCATION WRAPPERS *
578 * ------------------------------------------------------------------------- */ 616 * ------------------------------------------------------------------------- */
… …
585 rxvt_fatal ("memory allocation failure. aborting.\n"); 623 rxvt_fatal ("memory allocation failure. aborting.\n");
586 624
587 return p; 625 return p;
588} 626}
589 627
590void * 628void *
591rxvt_calloc (size_t number, size_t size) 629rxvt_calloc (size_t number, size_t size)
592{ 630{
593 void *p = calloc (number, size); 631 void *p = calloc (number, size);
594 632
595 if (!p) 633 if (!p)
… …
666 704
667#ifdef UTMP_SUPPORT 705#ifdef UTMP_SUPPORT
668void 706void
669rxvt_term::privileged_utmp (rxvt_privaction action) 707rxvt_term::privileged_utmp (rxvt_privaction action)
670{ 708{
671 if ((options & Opt_utmpInhibit) 709 if (OPTION (Opt_utmpInhibit)
672 || !pty.name || !*pty.name) 710 || !pty.name || !*pty.name)
673 return; 711 return;
674 712
675 rxvt_privileges (RESTORE); 713 rxvt_privileges (RESTORE);
676 714
… …
687/* 725/*
688 * window size/position calculcations for XSizeHint and other storage. 726 * window size/position calculcations for XSizeHint and other storage.
689 * if width/height are non-zero then override calculated width/height 727 * if width/height are non-zero then override calculated width/height
690 */ 728 */
691void 729void
692rxvt_term::window_calc (unsigned int width, unsigned int height) 730rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
693{ 731{
694 short recalc_x, recalc_y; 732 short recalc_x, recalc_y;
695 int x, y, sb_w, mb_h, flags; 733 int x, y, sb_w, mb_h, flags;
696 unsigned int w, h; 734 unsigned int w, h;
697 unsigned int max_width, max_height; 735 unsigned int max_width, max_height;
698 dDisp; 736 dDisp;
699 737
700 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 738 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
701 TermWin.ncol, TermWin.nrow, szHint.width, 739 ncol, nrow, szHint.width, szHint.height));
702 szHint.height)); 740
703 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 741 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
704 szHint.win_gravity = NorthWestGravity; 742 szHint.win_gravity = NorthWestGravity;
705 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 743 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
706 744
707 recalc_x = recalc_y = 0; 745 recalc_x = recalc_y = 0;
708 flags = 0; 746 flags = 0;
747
709 if (!parsed_geometry) 748 if (!parsed_geometry)
710 { 749 {
711 parsed_geometry = 1; 750 parsed_geometry = 1;
751
712 if (rs[Rs_geometry]) 752 if (rs[Rs_geometry])
713 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 753 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
714 754
715 if (flags & WidthValue) 755 if (flags & WidthValue)
716 { 756 {
717 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 757 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
718 szHint.flags |= USSize; 758 szHint.flags |= USSize;
719 } 759 }
720 760
721 if (flags & HeightValue) 761 if (flags & HeightValue)
722 { 762 {
723 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 763 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
724 szHint.flags |= USSize; 764 szHint.flags |= USSize;
725 } 765 }
726 766
727 if (flags & XValue) 767 if (flags & XValue)
728 { 768 {
729 szHint.x = x; 769 szHint.x = x;
730 szHint.flags |= USPosition; 770 szHint.flags |= USPosition;
771
731 if (flags & XNegative) 772 if (flags & XNegative)
732 { 773 {
733 recalc_x = 1; 774 recalc_x = 1;
734 szHint.win_gravity = NorthEastGravity; 775 szHint.win_gravity = NorthEastGravity;
735 } 776 }
… …
737 778
738 if (flags & YValue) 779 if (flags & YValue)
739 { 780 {
740 szHint.y = y; 781 szHint.y = y;
741 szHint.flags |= USPosition; 782 szHint.flags |= USPosition;
783
742 if (flags & YNegative) 784 if (flags & YNegative)
743 { 785 {
744 recalc_y = 1; 786 recalc_y = 1;
787
745 if (szHint.win_gravity == NorthEastGravity) 788 if (szHint.win_gravity == NorthEastGravity)
746 szHint.win_gravity = SouthEastGravity; 789 szHint.win_gravity = SouthEastGravity;
747 else 790 else
748 szHint.win_gravity = SouthWestGravity; 791 szHint.win_gravity = SouthWestGravity;
749 } 792 }
750 } 793 }
751 } 794 }
752 795
753 /* TODO: BOUNDS */ 796 /* TODO: BOUNDS */
754 TermWin.width = TermWin.ncol * TermWin.fwidth; 797 width = ncol * fwidth;
755 TermWin.height = TermWin.nrow * TermWin.fheight; 798 height = nrow * fheight;
756 max_width = MAX_COLS * TermWin.fwidth; 799 max_width = MAX_COLS * fwidth;
757 max_height = MAX_ROWS * TermWin.fheight; 800 max_height = MAX_ROWS * fheight;
758 801
759 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 802 szHint.base_width = szHint.base_height = 2 * int_bwidth;
760 803
761 sb_w = mb_h = 0; 804 sb_w = mb_h = 0;
762 window_vt_x = window_vt_y = TermWin.int_bwidth; 805 window_vt_x = window_vt_y = int_bwidth;
763 806
764 if (scrollbar_visible ()) 807 if (scrollbar_visible ())
765 { 808 {
766 sb_w = scrollbar_TotalWidth (); 809 sb_w = scrollbar_TotalWidth ();
767 szHint.base_width += sb_w; 810 szHint.base_width += sb_w;
768 if (!(options & Opt_scrollBar_right)) 811 if (!OPTION (Opt_scrollBar_right))
769 window_vt_x += sb_w; 812 window_vt_x += sb_w;
770 } 813 }
771 814
772 if (menubar_visible ()) 815 if (menubar_visible ())
773 { 816 {
774 mb_h = menuBar_TotalHeight (); 817 mb_h = menuBar_TotalHeight ();
775 szHint.base_height += mb_h; 818 szHint.base_height += mb_h;
776 window_vt_y += mb_h; 819 window_vt_y += mb_h;
777 } 820 }
778 821
779 szHint.width_inc = TermWin.fwidth; 822 szHint.width_inc = fwidth;
780 szHint.height_inc = TermWin.fheight; 823 szHint.height_inc = fheight;
781 szHint.min_width = szHint.base_width + szHint.width_inc; 824 szHint.min_width = szHint.base_width + szHint.width_inc;
782 szHint.min_height = szHint.base_height + szHint.height_inc; 825 szHint.min_height = szHint.base_height + szHint.height_inc;
783 826
784 if (width && width - szHint.base_width < max_width) 827 if (newwidth && newwidth - szHint.base_width < max_width)
785 { 828 {
786 szHint.width = width; 829 szHint.width = newwidth;
787 TermWin.width = width - szHint.base_width; 830 width = newwidth - szHint.base_width;
788 } 831 }
789 else 832 else
790 { 833 {
791 MIN_IT (TermWin.width, max_width); 834 min_it (width, max_width);
792 szHint.width = szHint.base_width + TermWin.width; 835 szHint.width = szHint.base_width + width;
793 } 836 }
794 837
795 if (height && height - szHint.base_height < max_height) 838 if (newheight && newheight - szHint.base_height < max_height)
796 { 839 {
797 szHint.height = height; 840 szHint.height = newheight;
798 TermWin.height = height - szHint.base_height; 841 height = newheight - szHint.base_height;
799 } 842 }
800 else 843 else
801 { 844 {
802 MIN_IT (TermWin.height, max_height); 845 min_it (height, max_height);
803 szHint.height = szHint.base_height + TermWin.height; 846 szHint.height = szHint.base_height + height;
804 } 847 }
805 848
806 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 849 if (scrollbar_visible () && OPTION (Opt_scrollBar_right))
807 window_sb_x = szHint.width - sb_w; 850 window_sb_x = szHint.width - sb_w;
808 851
809 if (recalc_x) 852 if (recalc_x)
810 szHint.x += (DisplayWidth (disp, display->screen) 853 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
811 - szHint.width - 2 * TermWin.ext_bwidth);
812 if (recalc_y) 854 if (recalc_y)
813 szHint.y += (DisplayHeight (disp, display->screen) 855 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
814 - szHint.height - 2 * TermWin.ext_bwidth);
815 856
816 TermWin.ncol = TermWin.width / TermWin.fwidth; 857 ncol = width / fwidth;
817 TermWin.nrow = TermWin.height / TermWin.fheight; 858 nrow = height / fheight;
818 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 859 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
819 TermWin.ncol, TermWin.nrow, szHint.width, 860 ncol, nrow, szHint.width,
820 szHint.height)); 861 szHint.height));
821 return; 862 return;
822} 863}
823 864
824/*----------------------------------------------------------------------*/ 865/*----------------------------------------------------------------------*/
… …
832 if (pty.pty < 0) 873 if (pty.pty < 0)
833 return; 874 return;
834 875
835 struct winsize ws; 876 struct winsize ws;
836 877
837 ws.ws_col = TermWin.ncol; 878 ws.ws_col = ncol;
838 ws.ws_row = TermWin.nrow; 879 ws.ws_row = nrow;
839 ws.ws_xpixel = TermWin.width; 880 ws.ws_xpixel = width;
840 ws.ws_ypixel = TermWin.height; 881 ws.ws_ypixel = height;
841 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 882 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
842 883
843#if 0 884#if 0
844 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 885 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
845 if (cmd_pid) /* force through to the command */ 886 if (cmd_pid) /* force through to the command */
… …
847#endif 888#endif
848} 889}
849 890
850/*----------------------------------------------------------------------*/ 891/*----------------------------------------------------------------------*/
851/* set_fonts () - load and set the various fonts 892/* set_fonts () - load and set the various fonts
852/* 893 *
853 * init = 1 - initialize 894 * init = 1 - initialize
854 * 895 *
855 * fontname == FONT_UP - switch to bigger font 896 * fontname == FONT_UP - switch to bigger font
856 * fontname == FONT_DN - switch to smaller font 897 * fontname == FONT_DN - switch to smaller font
857 */ 898 */
… …
869 return false; 910 return false;
870 } 911 }
871 912
872#if ENABLE_STYLES 913#if ENABLE_STYLES
873 for (int i = RS_styleCount; --i; ) 914 for (int i = RS_styleCount; --i; )
874 if (TermWin.fontset[i] != TermWin.fontset[0]) 915 if (fontset[i] != fontset[0])
875 delete TermWin.fontset[i]; 916 delete fontset[i];
876#endif 917#endif
877 918
878 delete TermWin.fontset[0]; 919 delete fontset[0];
879 TermWin.fontset[0] = fs; 920 fontset[0] = fs;
880 921
881 prop = (*fs)[1]->properties (); 922 prop = (*fs)[1]->properties ();
882 prop.height += TermWin.lineSpace; 923 prop.height += lineSpace;
883 fs->set_prop (prop); 924 fs->set_prop (prop);
884 925
885 TermWin.fwidth = prop.width; 926 fwidth = prop.width;
886 TermWin.fheight = prop.height; 927 fheight = prop.height;
887 TermWin.fweight = prop.weight;
888 TermWin.fslant = prop.slant;
889 TermWin.fbase = (*fs)[1]->ascent; 928 fbase = (*fs)[1]->ascent;
890 929
891 for (int style = 1; style < 4; style++) 930 for (int style = 1; style < 4; style++)
892 { 931 {
893#if ENABLE_STYLES 932#if ENABLE_STYLES
894 const char *res = rs[Rs_font + style]; 933 const char *res = rs[Rs_font + style];
895 934
896 if (res && !*res) 935 if (res && !*res)
897 TermWin.fontset[style] = TermWin.fontset[0]; 936 fontset[style] = fontset[0];
898 else 937 else
899 { 938 {
900 TermWin.fontset[style] = fs = new rxvt_fontset (this); 939 fontset[style] = fs = new rxvt_fontset (this);
901 rxvt_fontprop prop2 = prop; 940 rxvt_fontprop prop2 = prop;
902 941
903 if (res) 942 if (res)
904 prop2.weight = prop2.slant = rxvt_fontprop::unset; 943 prop2.weight = prop2.slant = rxvt_fontprop::unset;
905 else 944 else
906 { 945 {
907 res = TermWin.fontset[0]->fontdesc; 946 res = fontset[0]->fontdesc;
908 947
909 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 948 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; 949 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
911 } 950 }
912 951
913 fs->populate (res); 952 fs->populate (res);
914 fs->set_prop (prop2); 953 fs->set_prop (prop2);
915 } 954 }
916#else 955#else
917 TermWin.fontset[style] = TermWin.fontset[0]; 956 fontset[style] = fontset[0];
918#endif 957#endif
919 } 958 }
920 959
921 if (TermWin.parent[0]) 960 if (parent[0])
922 { 961 {
923 resize_all_windows (0, 0, 0); 962 resize_all_windows (0, 0, 0);
924 scr_remap_chars (); 963 scr_remap_chars ();
925 scr_touch (true); 964 scr_touch (true);
926 } 965 }
… …
928 return true; 967 return true;
929} 968}
930 969
931void rxvt_term::set_string_property (Atom prop, const char *str, int len) 970void rxvt_term::set_string_property (Atom prop, const char *str, int len)
932{ 971{
933 // TODO: SMART_WINDOW_TITLE
934 XChangeProperty (display->display, TermWin.parent[0], 972 XChangeProperty (display->display, parent[0],
935 prop, XA_STRING, 8, PropModeReplace, 973 prop, XA_STRING, 8, PropModeReplace,
936 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 974 (const unsigned char *)str, len >= 0 ? len : strlen (str));
937} 975}
938 976
939void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 977void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
940{ 978{
941 // TODO: SMART_WINDOW_TITLE
942 wchar_t *ws = rxvt_mbstowcs (str, len); 979 wchar_t *ws = rxvt_mbstowcs (str, len);
943 char *s = rxvt_wcstoutf8 (ws); 980 char *s = rxvt_wcstoutf8 (ws);
944 981
945 XChangeProperty (display->display, TermWin.parent[0], 982 XChangeProperty (display->display, parent[0],
946 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 983 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
947 (const unsigned char *)s, strlen (s)); 984 (const unsigned char *)s, strlen (s));
948 985
949 free (s); 986 free (s);
950 free (ws); 987 free (ws);
… …
1113 1150
1114/* -------------------------------------------------------------------- * 1151/* -------------------------------------------------------------------- *
1115 * - WINDOW RESIZING - * 1152 * - WINDOW RESIZING - *
1116 * -------------------------------------------------------------------- */ 1153 * -------------------------------------------------------------------- */
1117void 1154void
1118rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1155rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1119{ 1156{
1120 int fix_screen; 1157 int fix_screen;
1121#ifdef SMART_RESIZE
1122 int old_width = szHint.width, old_height = szHint.height; 1158 int old_width = szHint.width, old_height = szHint.height;
1123#endif
1124 dDisp; 1159 dDisp;
1125 1160
1126 window_calc (width, height); 1161 window_calc (newwidth, newheight);
1127 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 1162 XSetWMNormalHints (disp, parent[0], &szHint);
1128 1163
1129 if (!ignoreparent) 1164 if (!ignoreparent)
1130 { 1165 {
1131#ifdef SMART_RESIZE 1166#ifdef SMART_RESIZE
1132 /* 1167 /*
… …
1136 int x, y, x1, y1; 1171 int x, y, x1, y1;
1137 int dx, dy; 1172 int dx, dy;
1138 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1173 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1139 Window unused_cr; 1174 Window unused_cr;
1140 1175
1141 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 1176 XTranslateCoordinates (disp, parent[0], display->root,
1142 0, 0, &x, &y, &unused_cr); 1177 0, 0, &x, &y, &unused_cr);
1143 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 1178 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1144 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1179 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1145 /* 1180 /*
1146 * if display->root isn't the parent window, a WM will probably have offset 1181 * if display->root isn't the parent window, a WM will probably have offset
1147 * our position for handles and decorations. Counter it 1182 * our position for handles and decorations. Counter it
1148 */ 1183 */
… …
1165 if (y < y1) /* top half */ 1200 if (y < y1) /* top half */
1166 dy = 0; 1201 dy = 0;
1167 else if (y == y1) /* exact center */ 1202 else if (y == y1) /* exact center */
1168 dy /= 2; 1203 dy /= 2;
1169 1204
1170 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 1205 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1171 szHint.width, szHint.height); 1206 szHint.width, szHint.height);
1172#else 1207#else
1173 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 1208 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1174#endif 1209#endif
1175 } 1210 }
1176 1211
1177 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1212 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1178 1213
1179 if (fix_screen || width != old_width || height != old_height) 1214 if (fix_screen || newwidth != old_width || newheight != old_height)
1180 { 1215 {
1181 if (scrollbar_visible ()) 1216 if (scrollbar_visible ())
1182 { 1217 {
1183 XMoveResizeWindow (disp, scrollBar.win, 1218 XMoveResizeWindow (disp, scrollBar.win,
1184 window_sb_x, 0, 1219 window_sb_x, 0,
… …
1189 if (menubar_visible ()) 1224 if (menubar_visible ())
1190 XMoveResizeWindow (disp, menuBar.win, 1225 XMoveResizeWindow (disp, menuBar.win,
1191 window_vt_x, 0, 1226 window_vt_x, 0,
1192 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1227 TermWin_TotalWidth (), menuBar_TotalHeight ());
1193 1228
1194 XMoveResizeWindow (disp, TermWin.vt, 1229 XMoveResizeWindow (disp, vt,
1195 window_vt_x, window_vt_y, 1230 window_vt_x, window_vt_y,
1196 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1231 TermWin_TotalWidth (), TermWin_TotalHeight ());
1197 1232
1198 scr_clear (); 1233 scr_clear ();
1199#ifdef XPM_BACKGROUND 1234#ifdef XPM_BACKGROUND
… …
1207 int old_ncol = prev_ncol; 1242 int old_ncol = prev_ncol;
1208 1243
1209 /* scr_reset only works on the primary screen */ 1244 /* scr_reset only works on the primary screen */
1210 if (old_height) /* this is not the first time through */ 1245 if (old_height) /* this is not the first time through */
1211 { 1246 {
1212 unsigned int ncol = TermWin.ncol; 1247 unsigned int ocol = ncol;
1213 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1248 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1214 curr_screen = scr_change_screen (PRIMARY); 1249 curr_screen = scr_change_screen (PRIMARY);
1215 TermWin.ncol = ncol; 1250 ncol = ocol;
1216 } 1251 }
1217 1252
1218 scr_reset (); 1253 scr_reset ();
1219 1254
1220 if (curr_screen >= 0) /* this is not the first time through */ 1255 if (curr_screen >= 0) /* this is not the first time through */
1221 { 1256 {
1222 scr_change_screen (curr_screen); 1257 scr_change_screen (curr_screen);
1223 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1258 selection_check (old_ncol != ncol ? 4 : 0);
1224 } 1259 }
1225 } 1260 }
1226 1261
1227 old_width = szHint.width; 1262 old_width = szHint.width;
1228 old_height = szHint.height; 1263 old_height = szHint.height;
1229 1264
1230#ifdef XPM_BACKGROUND 1265#ifdef XPM_BACKGROUND
1231 if (TermWin.pixmap) 1266 if (pixmap)
1232 scr_touch (false); 1267 scr_touch (false);
1233#endif 1268#endif
1234 1269
1235#ifdef USE_XIM 1270#ifdef USE_XIM
1236 IMSetStatusPosition (); 1271 IMSetStatusPosition ();
… …
1240/* 1275/*
1241 * Set the width/height of the vt window in characters. Units are pixels. 1276 * Set the width/height of the vt window in characters. Units are pixels.
1242 * good for toggling 80/132 columns 1277 * good for toggling 80/132 columns
1243 */ 1278 */
1244void 1279void
1245rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1280rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1246{ 1281{
1247 XWindowAttributes wattr; 1282 XWindowAttributes wattr;
1248 1283
1249 if (width == 0 || height == 0) 1284 if (newwidth == 0 || newheight == 0)
1250 { 1285 {
1251 XGetWindowAttributes (display->display, display->root, &wattr); 1286 XGetWindowAttributes (display->display, display->root, &wattr);
1252 1287
1253 if (width == 0) 1288 if (newwidth == 0)
1254 width = wattr.width - szHint.base_width; 1289 newwidth = wattr.width - szHint.base_width;
1255 if (height == 0) 1290 if (newheight == 0)
1256 height = wattr.height - szHint.base_height; 1291 newheight = wattr.height - szHint.base_height;
1257 }
1258
1259 if (width != TermWin.width || height != TermWin.height)
1260 { 1292 }
1293
1294 if (newwidth != width || newheight != height)
1295 {
1261 width += szHint.base_width; 1296 newwidth += szHint.base_width;
1262 height += szHint.base_height; 1297 newheight += szHint.base_height;
1263 resize_all_windows (width, height, 0); 1298 resize_all_windows (newwidth, newheight, 0);
1264 } 1299 }
1265} 1300}
1266 1301
1267/* -------------------------------------------------------------------- * 1302/* -------------------------------------------------------------------- *
1268 * - X INPUT METHOD ROUTINES - * 1303 * - X INPUT METHOD ROUTINES - *
… …
1278 1313
1279void 1314void
1280rxvt_term::im_set_size (XRectangle &size) 1315rxvt_term::im_set_size (XRectangle &size)
1281{ 1316{
1282 // the int_bwidth terms make no sense to me 1317 // the int_bwidth terms make no sense to me
1283 size.x = TermWin.int_bwidth; 1318 size.x = int_bwidth;
1284 size.y = TermWin.int_bwidth; 1319 size.y = int_bwidth;
1285 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1320 size.width = Width2Pixel (ncol) + int_bwidth;
1286 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1321 size.height = Height2Pixel (nrow) + int_bwidth;
1287} 1322}
1288 1323
1289void 1324void
1290rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1325rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1291 XRectangle &status_rect, 1326 XRectangle &status_rect,
1292 const XRectangle &needed_rect) 1327 const XRectangle &needed_rect)
1293{ 1328{
1294 preedit_rect.x = needed_rect.width; 1329 preedit_rect.x = needed_rect.width;
1295 preedit_rect.y = 0; 1330 preedit_rect.y = 0;
1296 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1331 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1297 preedit_rect.height = TermWin.fheight; 1332 preedit_rect.height = fheight;
1298 1333
1299 status_rect.x = 0; 1334 status_rect.x = 0;
1300 status_rect.y = 0; 1335 status_rect.y = 0;
1301 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1336 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1302 status_rect.height = TermWin.fheight; 1337 status_rect.height = fheight;
1303} 1338}
1304 1339
1305/* Checking whether input method is running. */ 1340/* Checking whether input method is running. */
1306bool 1341bool
1307rxvt_term::IMisRunning () 1342rxvt_term::IMisRunning ()
… …
1335{ 1370{
1336 XPoint nspot; 1371 XPoint nspot;
1337 XVaNestedList preedit_attr; 1372 XVaNestedList preedit_attr;
1338 1373
1339 if (!Input_Context 1374 if (!Input_Context
1340 || !TermWin.focus 1375 || !focus
1341 || !(input_style & XIMPreeditPosition)) 1376 || !(input_style & XIMPreeditPosition))
1342 return; 1377 return;
1343 1378
1344 im_set_position (nspot); 1379 im_set_position (nspot);
1345 1380
… …
1465 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1500 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1466 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1501 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1467 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1502 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1468 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1503 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1469 "*", 1504 "*",
1470 TermWin.fheight, 1505 fheight,
1471 TermWin.fheight + 1, TermWin.fheight - 1, 1506 fheight + 1, fheight - 1,
1472 TermWin.fheight - 2, TermWin.fheight + 2); 1507 fheight - 2, fheight + 2);
1473 1508
1474 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1509 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1475 &missing_charset_list, &missing_charset_count, &def_string); 1510 &missing_charset_list, &missing_charset_count, &def_string);
1476 1511
1477 if (missing_charset_list) 1512 if (missing_charset_list)
… …
1523 NULL); 1558 NULL);
1524 } 1559 }
1525 1560
1526 Input_Context = XCreateIC (xim, 1561 Input_Context = XCreateIC (xim,
1527 XNInputStyle, input_style, 1562 XNInputStyle, input_style,
1528 XNClientWindow, TermWin.vt, 1563 XNClientWindow, vt,
1529 XNFocusWindow, TermWin.parent[0], 1564 XNFocusWindow, parent[0],
1530 preedit_attr ? XNPreeditAttributes : NULL, 1565 preedit_attr ? XNPreeditAttributes : NULL,
1531 preedit_attr, 1566 preedit_attr,
1532 status_attr ? XNStatusAttributes : NULL, 1567 status_attr ? XNStatusAttributes : NULL,
1533 status_attr, NULL); 1568 status_attr, NULL);
1534 1569
… …
1551} 1586}
1552 1587
1553void 1588void
1554rxvt_term::im_cb () 1589rxvt_term::im_cb ()
1555{ 1590{
1556 int i, found, had_im; 1591 int i;
1557 const char *p; 1592 const char *p;
1558 char **s; 1593 char **s;
1559 char buf[IMBUFSIZ]; 1594 char buf[IMBUFSIZ];
1560 1595
1561 SET_R (this); 1596 SET_R (this);
… …
1618{ 1653{
1619 XRectangle preedit_rect, status_rect, *needed_rect; 1654 XRectangle preedit_rect, status_rect, *needed_rect;
1620 XVaNestedList preedit_attr, status_attr; 1655 XVaNestedList preedit_attr, status_attr;
1621 1656
1622 if (!Input_Context 1657 if (!Input_Context
1623 || !TermWin.focus 1658 || !focus
1624 || !(input_style & XIMPreeditArea) 1659 || !(input_style & XIMPreeditArea)
1625 || !IMisRunning ()) 1660 || !IMisRunning ())
1626 return; 1661 return;
1627 1662
1628 /* Getting the necessary width of preedit area */ 1663 /* Getting the necessary width of preedit area */

Diff Legend

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