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.151 by root, Wed Dec 21 19:50:16 2005 UTC

… …
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 35
36#include <limits>
37
36#include <csignal> 38#include <csignal>
37#include <cstring> 39#include <cstring>
38 40
39#ifdef TTY_GID_SUPPORT 41#ifdef TTY_GID_SUPPORT
40# include <grp.h> 42# include <grp.h>
… …
157 pointer_ev (this, &rxvt_term::pointer_cb), 159 pointer_ev (this, &rxvt_term::pointer_cb),
158#endif 160#endif
159#ifdef USE_XIM 161#ifdef USE_XIM
160 im_ev (this, &rxvt_term::im_cb), 162 im_ev (this, &rxvt_term::im_cb),
161#endif 163#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), 164 termwin_ev (this, &rxvt_term::x_cb),
166 vt_ev (this, &rxvt_term::x_cb), 165 vt_ev (this, &rxvt_term::x_cb),
167 check_ev (this, &rxvt_term::check_cb), 166 check_ev (this, &rxvt_term::check_cb),
168 flush_ev (this, &rxvt_term::flush_cb), 167 flush_ev (this, &rxvt_term::flush_cb),
169 destroy_ev (this, &rxvt_term::destroy_cb), 168 destroy_ev (this, &rxvt_term::destroy_cb),
… …
202 201
203 emergency_cleanup (); 202 emergency_cleanup ();
204 203
205#if ENABLE_STYLES 204#if ENABLE_STYLES
206 for (int i = RS_styleCount; --i; ) 205 for (int i = RS_styleCount; --i; )
207 if (TermWin.fontset[i] != TermWin.fontset[0]) 206 if (fontset[i] != fontset[0])
208 delete TermWin.fontset[i]; 207 delete fontset[i];
209#endif 208#endif
210 delete TermWin.fontset[0]; 209 delete fontset[0];
211 210
212 if (display) 211 if (display)
213 { 212 {
214 dDisp; 213 dDisp;
215 214
… …
243#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 242#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
244 if (topShadowGC) XFreeGC (disp, topShadowGC); 243 if (topShadowGC) XFreeGC (disp, topShadowGC);
245 if (botShadowGC) XFreeGC (disp, botShadowGC); 244 if (botShadowGC) XFreeGC (disp, botShadowGC);
246 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 245 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
247#endif 246#endif
248 if (TermWin.gc) XFreeGC (disp, TermWin.gc); 247 if (gc) XFreeGC (disp, gc);
249 248
250#if defined(MENUBAR) && (MENUBAR_MAX > 1) 249#if defined(MENUBAR) && (MENUBAR_MAX > 1)
251 delete menuBar.drawable; 250 delete menuBar.drawable;
252 //if (menuBar.win) 251 //if (menuBar.win)
253 // XDestroyWindow (disp, menuBar.win); 252 // XDestroyWindow (disp, menuBar.win);
254#endif 253#endif
255 delete TermWin.drawable; 254 delete drawable;
256 // destroy all windows 255 // destroy all windows
257 if (TermWin.parent[0]) 256 if (parent[0])
258 XDestroyWindow (disp, TermWin.parent[0]); 257 XDestroyWindow (disp, parent[0]);
259 } 258 }
260 259
261 // TODO: free pixcolours, colours should become part of rxvt_display 260 // TODO: free pixcolours, colours should become part of rxvt_display
262 261
263 delete pix_colors_focused; 262 delete pix_colors_focused;
… …
438 DisplayString (display)); 437 DisplayString (display));
439 rxvt_emergency_cleanup (); 438 rxvt_emergency_cleanup ();
440 _exit (EXIT_FAILURE); 439 _exit (EXIT_FAILURE);
441} 440}
442 441
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/*----------------------------------------------------------------------*/ 442/*----------------------------------------------------------------------*/
458/* rxvt_init () */
459bool 443bool
460rxvt_term::init (int argc, const char *const *argv) 444rxvt_term::init (int argc, const char *const *argv)
461{ 445{
462 SET_R (this); 446 SET_R (this);
463 447
… …
509 check_our_parents (); 493 check_our_parents ();
510 rootwin_ev.start (display, display->root); 494 rootwin_ev.start (display, display->root);
511 } 495 }
512#endif 496#endif
513 497
514 XMapWindow (disp, TermWin.vt); 498 XMapWindow (disp, vt);
515 XMapWindow (disp, TermWin.parent[0]); 499 XMapWindow (disp, parent[0]);
516 500
517 set_colorfgbg (); 501 set_colorfgbg ();
518 502
519 init_command (cmd_argv); 503 init_command (cmd_argv);
520 504
… …
524 508
525 check_ev.start (); 509 check_ev.start ();
526 510
527 return true; 511 return true;
528} 512}
513
514static struct sig_handlers
515{
516 sig_watcher sw_chld, sw_term, sw_int;
517
518 void sig_chld (sig_watcher &w)
519 {
520 // we are being called for every SIGCHLD, find the corresponding term
521 int pid;
522
523 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
524 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
525 if (pid == (*t)->cmd_pid)
526 {
527 (*t)->destroy ();
528 break;
529 }
530 }
531
532 /*
533 * Catch a fatal signal and tidy up before quitting
534 */
535 void
536 sig_term (sig_watcher &w)
537 {
538#ifdef DEBUG_CMD
539 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
540#endif
541 rxvt_emergency_cleanup ();
542 signal (w.signum, SIG_DFL);
543 kill (getpid (), w.signum);
544 }
545
546 sig_handlers ()
547 : sw_chld (this, &sig_handlers::sig_chld),
548 sw_term (this, &sig_handlers::sig_term),
549 sw_int (this, &sig_handlers::sig_term)
550 {
551 }
552} sig_handlers;
529 553
530void 554void
531rxvt_init () 555rxvt_init ()
532{ 556{
533 /* 557 /*
… …
541 rxvt_privileges (IGNORE); 565 rxvt_privileges (IGNORE);
542 566
543 signal (SIGHUP, SIG_IGN); 567 signal (SIGHUP, SIG_IGN);
544 signal (SIGPIPE, SIG_IGN); 568 signal (SIGPIPE, SIG_IGN);
545 569
570 sig_handlers.sw_chld.start (SIGCHLD);
571 sig_handlers.sw_term.start (SIGTERM);
572 sig_handlers.sw_int.start (SIGINT);
573
546 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 574 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
547 /* signal (SIGURG, SIG_DFL); */ 575 /* signal (SIGURG, SIG_DFL); */
548 576
549 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 577 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
550 // TODO: handle this with exceptions and tolerate the memory loss 578 // TODO: handle this with exceptions and tolerate the memory loss
551 XSetIOErrorHandler (rxvt_xioerror_handler); 579 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} 580}
575 581
576/* ------------------------------------------------------------------------- * 582/* ------------------------------------------------------------------------- *
577 * MEMORY ALLOCATION WRAPPERS * 583 * MEMORY ALLOCATION WRAPPERS *
578 * ------------------------------------------------------------------------- */ 584 * ------------------------------------------------------------------------- */
… …
585 rxvt_fatal ("memory allocation failure. aborting.\n"); 591 rxvt_fatal ("memory allocation failure. aborting.\n");
586 592
587 return p; 593 return p;
588} 594}
589 595
590void * 596void *
591rxvt_calloc (size_t number, size_t size) 597rxvt_calloc (size_t number, size_t size)
592{ 598{
593 void *p = calloc (number, size); 599 void *p = calloc (number, size);
594 600
595 if (!p) 601 if (!p)
… …
687/* 693/*
688 * window size/position calculcations for XSizeHint and other storage. 694 * window size/position calculcations for XSizeHint and other storage.
689 * if width/height are non-zero then override calculated width/height 695 * if width/height are non-zero then override calculated width/height
690 */ 696 */
691void 697void
692rxvt_term::window_calc (unsigned int width, unsigned int height) 698rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
693{ 699{
694 short recalc_x, recalc_y; 700 short recalc_x, recalc_y;
695 int x, y, sb_w, mb_h, flags; 701 int x, y, sb_w, mb_h, flags;
696 unsigned int w, h; 702 unsigned int w, h;
697 unsigned int max_width, max_height; 703 unsigned int max_width, max_height;
698 dDisp; 704 dDisp;
699 705
700 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 706 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
701 TermWin.ncol, TermWin.nrow, szHint.width, 707 ncol, nrow, szHint.width, szHint.height));
702 szHint.height)); 708
703 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 709 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
704 szHint.win_gravity = NorthWestGravity; 710 szHint.win_gravity = NorthWestGravity;
705 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 711 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
706 712
707 recalc_x = recalc_y = 0; 713 recalc_x = recalc_y = 0;
708 flags = 0; 714 flags = 0;
715
709 if (!parsed_geometry) 716 if (!parsed_geometry)
710 { 717 {
711 parsed_geometry = 1; 718 parsed_geometry = 1;
719
712 if (rs[Rs_geometry]) 720 if (rs[Rs_geometry])
713 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 721 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
714 722
715 if (flags & WidthValue) 723 if (flags & WidthValue)
716 { 724 {
717 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 725 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
718 szHint.flags |= USSize; 726 szHint.flags |= USSize;
719 } 727 }
720 728
721 if (flags & HeightValue) 729 if (flags & HeightValue)
722 { 730 {
723 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 731 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
724 szHint.flags |= USSize; 732 szHint.flags |= USSize;
725 } 733 }
726 734
727 if (flags & XValue) 735 if (flags & XValue)
728 { 736 {
729 szHint.x = x; 737 szHint.x = x;
730 szHint.flags |= USPosition; 738 szHint.flags |= USPosition;
739
731 if (flags & XNegative) 740 if (flags & XNegative)
732 { 741 {
733 recalc_x = 1; 742 recalc_x = 1;
734 szHint.win_gravity = NorthEastGravity; 743 szHint.win_gravity = NorthEastGravity;
735 } 744 }
… …
737 746
738 if (flags & YValue) 747 if (flags & YValue)
739 { 748 {
740 szHint.y = y; 749 szHint.y = y;
741 szHint.flags |= USPosition; 750 szHint.flags |= USPosition;
751
742 if (flags & YNegative) 752 if (flags & YNegative)
743 { 753 {
744 recalc_y = 1; 754 recalc_y = 1;
755
745 if (szHint.win_gravity == NorthEastGravity) 756 if (szHint.win_gravity == NorthEastGravity)
746 szHint.win_gravity = SouthEastGravity; 757 szHint.win_gravity = SouthEastGravity;
747 else 758 else
748 szHint.win_gravity = SouthWestGravity; 759 szHint.win_gravity = SouthWestGravity;
749 } 760 }
750 } 761 }
751 } 762 }
752 763
753 /* TODO: BOUNDS */ 764 /* TODO: BOUNDS */
754 TermWin.width = TermWin.ncol * TermWin.fwidth; 765 width = ncol * fwidth;
755 TermWin.height = TermWin.nrow * TermWin.fheight; 766 height = nrow * fheight;
756 max_width = MAX_COLS * TermWin.fwidth; 767 max_width = MAX_COLS * fwidth;
757 max_height = MAX_ROWS * TermWin.fheight; 768 max_height = MAX_ROWS * fheight;
758 769
759 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 770 szHint.base_width = szHint.base_height = 2 * int_bwidth;
760 771
761 sb_w = mb_h = 0; 772 sb_w = mb_h = 0;
762 window_vt_x = window_vt_y = TermWin.int_bwidth; 773 window_vt_x = window_vt_y = int_bwidth;
763 774
764 if (scrollbar_visible ()) 775 if (scrollbar_visible ())
765 { 776 {
766 sb_w = scrollbar_TotalWidth (); 777 sb_w = scrollbar_TotalWidth ();
767 szHint.base_width += sb_w; 778 szHint.base_width += sb_w;
… …
774 mb_h = menuBar_TotalHeight (); 785 mb_h = menuBar_TotalHeight ();
775 szHint.base_height += mb_h; 786 szHint.base_height += mb_h;
776 window_vt_y += mb_h; 787 window_vt_y += mb_h;
777 } 788 }
778 789
779 szHint.width_inc = TermWin.fwidth; 790 szHint.width_inc = fwidth;
780 szHint.height_inc = TermWin.fheight; 791 szHint.height_inc = fheight;
781 szHint.min_width = szHint.base_width + szHint.width_inc; 792 szHint.min_width = szHint.base_width + szHint.width_inc;
782 szHint.min_height = szHint.base_height + szHint.height_inc; 793 szHint.min_height = szHint.base_height + szHint.height_inc;
783 794
784 if (width && width - szHint.base_width < max_width) 795 if (newwidth && newwidth - szHint.base_width < max_width)
785 { 796 {
786 szHint.width = width; 797 szHint.width = newwidth;
787 TermWin.width = width - szHint.base_width; 798 width = newwidth - szHint.base_width;
788 } 799 }
789 else 800 else
790 { 801 {
791 MIN_IT (TermWin.width, max_width); 802 min_it (width, max_width);
792 szHint.width = szHint.base_width + TermWin.width; 803 szHint.width = szHint.base_width + width;
793 } 804 }
794 805
795 if (height && height - szHint.base_height < max_height) 806 if (newheight && newheight - szHint.base_height < max_height)
796 { 807 {
797 szHint.height = height; 808 szHint.height = newheight;
798 TermWin.height = height - szHint.base_height; 809 height = newheight - szHint.base_height;
799 } 810 }
800 else 811 else
801 { 812 {
802 MIN_IT (TermWin.height, max_height); 813 min_it (height, max_height);
803 szHint.height = szHint.base_height + TermWin.height; 814 szHint.height = szHint.base_height + height;
804 } 815 }
805 816
806 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 817 if (scrollbar_visible () && (options & Opt_scrollBar_right))
807 window_sb_x = szHint.width - sb_w; 818 window_sb_x = szHint.width - sb_w;
808 819
809 if (recalc_x) 820 if (recalc_x)
810 szHint.x += (DisplayWidth (disp, display->screen) 821 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
811 - szHint.width - 2 * TermWin.ext_bwidth);
812 if (recalc_y) 822 if (recalc_y)
813 szHint.y += (DisplayHeight (disp, display->screen) 823 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
814 - szHint.height - 2 * TermWin.ext_bwidth);
815 824
816 TermWin.ncol = TermWin.width / TermWin.fwidth; 825 ncol = width / fwidth;
817 TermWin.nrow = TermWin.height / TermWin.fheight; 826 nrow = height / fheight;
818 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 827 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
819 TermWin.ncol, TermWin.nrow, szHint.width, 828 ncol, nrow, szHint.width,
820 szHint.height)); 829 szHint.height));
821 return; 830 return;
822} 831}
823 832
824/*----------------------------------------------------------------------*/ 833/*----------------------------------------------------------------------*/
… …
832 if (pty.pty < 0) 841 if (pty.pty < 0)
833 return; 842 return;
834 843
835 struct winsize ws; 844 struct winsize ws;
836 845
837 ws.ws_col = TermWin.ncol; 846 ws.ws_col = ncol;
838 ws.ws_row = TermWin.nrow; 847 ws.ws_row = nrow;
839 ws.ws_xpixel = TermWin.width; 848 ws.ws_xpixel = width;
840 ws.ws_ypixel = TermWin.height; 849 ws.ws_ypixel = height;
841 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 850 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
842 851
843#if 0 852#if 0
844 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 853 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
845 if (cmd_pid) /* force through to the command */ 854 if (cmd_pid) /* force through to the command */
… …
869 return false; 878 return false;
870 } 879 }
871 880
872#if ENABLE_STYLES 881#if ENABLE_STYLES
873 for (int i = RS_styleCount; --i; ) 882 for (int i = RS_styleCount; --i; )
874 if (TermWin.fontset[i] != TermWin.fontset[0]) 883 if (fontset[i] != fontset[0])
875 delete TermWin.fontset[i]; 884 delete fontset[i];
876#endif 885#endif
877 886
878 delete TermWin.fontset[0]; 887 delete fontset[0];
879 TermWin.fontset[0] = fs; 888 fontset[0] = fs;
880 889
881 prop = (*fs)[1]->properties (); 890 prop = (*fs)[1]->properties ();
882 prop.height += TermWin.lineSpace; 891 prop.height += lineSpace;
883 fs->set_prop (prop); 892 fs->set_prop (prop);
884 893
885 TermWin.fwidth = prop.width; 894 fwidth = prop.width;
886 TermWin.fheight = prop.height; 895 fheight = prop.height;
887 TermWin.fweight = prop.weight;
888 TermWin.fslant = prop.slant;
889 TermWin.fbase = (*fs)[1]->ascent; 896 fbase = (*fs)[1]->ascent;
890 897
891 for (int style = 1; style < 4; style++) 898 for (int style = 1; style < 4; style++)
892 { 899 {
893#if ENABLE_STYLES 900#if ENABLE_STYLES
894 const char *res = rs[Rs_font + style]; 901 const char *res = rs[Rs_font + style];
895 902
896 if (res && !*res) 903 if (res && !*res)
897 TermWin.fontset[style] = TermWin.fontset[0]; 904 fontset[style] = fontset[0];
898 else 905 else
899 { 906 {
900 TermWin.fontset[style] = fs = new rxvt_fontset (this); 907 fontset[style] = fs = new rxvt_fontset (this);
901 rxvt_fontprop prop2 = prop; 908 rxvt_fontprop prop2 = prop;
902 909
903 if (res) 910 if (res)
904 prop2.weight = prop2.slant = rxvt_fontprop::unset; 911 prop2.weight = prop2.slant = rxvt_fontprop::unset;
905 else 912 else
906 { 913 {
907 res = TermWin.fontset[0]->fontdesc; 914 res = fontset[0]->fontdesc;
908 915
909 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 916 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; 917 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
911 } 918 }
912 919
913 fs->populate (res); 920 fs->populate (res);
914 fs->set_prop (prop2); 921 fs->set_prop (prop2);
915 } 922 }
916#else 923#else
917 TermWin.fontset[style] = TermWin.fontset[0]; 924 fontset[style] = fontset[0];
918#endif 925#endif
919 } 926 }
920 927
921 if (TermWin.parent[0]) 928 if (parent[0])
922 { 929 {
923 resize_all_windows (0, 0, 0); 930 resize_all_windows (0, 0, 0);
924 scr_remap_chars (); 931 scr_remap_chars ();
925 scr_touch (true); 932 scr_touch (true);
926 } 933 }
… …
929} 936}
930 937
931void rxvt_term::set_string_property (Atom prop, const char *str, int len) 938void rxvt_term::set_string_property (Atom prop, const char *str, int len)
932{ 939{
933 // TODO: SMART_WINDOW_TITLE 940 // TODO: SMART_WINDOW_TITLE
934 XChangeProperty (display->display, TermWin.parent[0], 941 XChangeProperty (display->display, parent[0],
935 prop, XA_STRING, 8, PropModeReplace, 942 prop, XA_STRING, 8, PropModeReplace,
936 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 943 (const unsigned char *)str, len >= 0 ? len : strlen (str));
937} 944}
938 945
939void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 946void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
940{ 947{
941 // TODO: SMART_WINDOW_TITLE 948 // TODO: SMART_WINDOW_TITLE
942 wchar_t *ws = rxvt_mbstowcs (str, len); 949 wchar_t *ws = rxvt_mbstowcs (str, len);
943 char *s = rxvt_wcstoutf8 (ws); 950 char *s = rxvt_wcstoutf8 (ws);
944 951
945 XChangeProperty (display->display, TermWin.parent[0], 952 XChangeProperty (display->display, parent[0],
946 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 953 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
947 (const unsigned char *)s, strlen (s)); 954 (const unsigned char *)s, strlen (s));
948 955
949 free (s); 956 free (s);
950 free (ws); 957 free (ws);
… …
1113 1120
1114/* -------------------------------------------------------------------- * 1121/* -------------------------------------------------------------------- *
1115 * - WINDOW RESIZING - * 1122 * - WINDOW RESIZING - *
1116 * -------------------------------------------------------------------- */ 1123 * -------------------------------------------------------------------- */
1117void 1124void
1118rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1125rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1119{ 1126{
1120 int fix_screen; 1127 int fix_screen;
1121#ifdef SMART_RESIZE
1122 int old_width = szHint.width, old_height = szHint.height; 1128 int old_width = szHint.width, old_height = szHint.height;
1123#endif
1124 dDisp; 1129 dDisp;
1125 1130
1126 window_calc (width, height); 1131 window_calc (newwidth, newheight);
1127 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 1132 XSetWMNormalHints (disp, parent[0], &szHint);
1128 1133
1129 if (!ignoreparent) 1134 if (!ignoreparent)
1130 { 1135 {
1131#ifdef SMART_RESIZE 1136#ifdef SMART_RESIZE
1132 /* 1137 /*
… …
1136 int x, y, x1, y1; 1141 int x, y, x1, y1;
1137 int dx, dy; 1142 int dx, dy;
1138 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1143 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1139 Window unused_cr; 1144 Window unused_cr;
1140 1145
1141 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 1146 XTranslateCoordinates (disp, parent[0], display->root,
1142 0, 0, &x, &y, &unused_cr); 1147 0, 0, &x, &y, &unused_cr);
1143 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 1148 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1144 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1149 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1145 /* 1150 /*
1146 * if display->root isn't the parent window, a WM will probably have offset 1151 * if display->root isn't the parent window, a WM will probably have offset
1147 * our position for handles and decorations. Counter it 1152 * our position for handles and decorations. Counter it
1148 */ 1153 */
… …
1165 if (y < y1) /* top half */ 1170 if (y < y1) /* top half */
1166 dy = 0; 1171 dy = 0;
1167 else if (y == y1) /* exact center */ 1172 else if (y == y1) /* exact center */
1168 dy /= 2; 1173 dy /= 2;
1169 1174
1170 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 1175 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1171 szHint.width, szHint.height); 1176 szHint.width, szHint.height);
1172#else 1177#else
1173 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 1178 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1174#endif 1179#endif
1175 } 1180 }
1176 1181
1177 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1182 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1178 1183
1179 if (fix_screen || width != old_width || height != old_height) 1184 if (fix_screen || newwidth != old_width || newheight != old_height)
1180 { 1185 {
1181 if (scrollbar_visible ()) 1186 if (scrollbar_visible ())
1182 { 1187 {
1183 XMoveResizeWindow (disp, scrollBar.win, 1188 XMoveResizeWindow (disp, scrollBar.win,
1184 window_sb_x, 0, 1189 window_sb_x, 0,
… …
1189 if (menubar_visible ()) 1194 if (menubar_visible ())
1190 XMoveResizeWindow (disp, menuBar.win, 1195 XMoveResizeWindow (disp, menuBar.win,
1191 window_vt_x, 0, 1196 window_vt_x, 0,
1192 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1197 TermWin_TotalWidth (), menuBar_TotalHeight ());
1193 1198
1194 XMoveResizeWindow (disp, TermWin.vt, 1199 XMoveResizeWindow (disp, vt,
1195 window_vt_x, window_vt_y, 1200 window_vt_x, window_vt_y,
1196 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1201 TermWin_TotalWidth (), TermWin_TotalHeight ());
1197 1202
1198 scr_clear (); 1203 scr_clear ();
1199#ifdef XPM_BACKGROUND 1204#ifdef XPM_BACKGROUND
… …
1207 int old_ncol = prev_ncol; 1212 int old_ncol = prev_ncol;
1208 1213
1209 /* scr_reset only works on the primary screen */ 1214 /* scr_reset only works on the primary screen */
1210 if (old_height) /* this is not the first time through */ 1215 if (old_height) /* this is not the first time through */
1211 { 1216 {
1212 unsigned int ncol = TermWin.ncol; 1217 unsigned int ocol = ncol;
1213 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1218 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1214 curr_screen = scr_change_screen (PRIMARY); 1219 curr_screen = scr_change_screen (PRIMARY);
1215 TermWin.ncol = ncol; 1220 ncol = ocol;
1216 } 1221 }
1217 1222
1218 scr_reset (); 1223 scr_reset ();
1219 1224
1220 if (curr_screen >= 0) /* this is not the first time through */ 1225 if (curr_screen >= 0) /* this is not the first time through */
1221 { 1226 {
1222 scr_change_screen (curr_screen); 1227 scr_change_screen (curr_screen);
1223 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1228 selection_check (old_ncol != ncol ? 4 : 0);
1224 } 1229 }
1225 } 1230 }
1226 1231
1227 old_width = szHint.width; 1232 old_width = szHint.width;
1228 old_height = szHint.height; 1233 old_height = szHint.height;
1229 1234
1230#ifdef XPM_BACKGROUND 1235#ifdef XPM_BACKGROUND
1231 if (TermWin.pixmap) 1236 if (pixmap)
1232 scr_touch (false); 1237 scr_touch (false);
1233#endif 1238#endif
1234 1239
1235#ifdef USE_XIM 1240#ifdef USE_XIM
1236 IMSetStatusPosition (); 1241 IMSetStatusPosition ();
… …
1240/* 1245/*
1241 * Set the width/height of the vt window in characters. Units are pixels. 1246 * Set the width/height of the vt window in characters. Units are pixels.
1242 * good for toggling 80/132 columns 1247 * good for toggling 80/132 columns
1243 */ 1248 */
1244void 1249void
1245rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1250rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1246{ 1251{
1247 XWindowAttributes wattr; 1252 XWindowAttributes wattr;
1248 1253
1249 if (width == 0 || height == 0) 1254 if (newwidth == 0 || newheight == 0)
1250 { 1255 {
1251 XGetWindowAttributes (display->display, display->root, &wattr); 1256 XGetWindowAttributes (display->display, display->root, &wattr);
1252 1257
1253 if (width == 0) 1258 if (newwidth == 0)
1254 width = wattr.width - szHint.base_width; 1259 newwidth = wattr.width - szHint.base_width;
1255 if (height == 0) 1260 if (newheight == 0)
1256 height = wattr.height - szHint.base_height; 1261 newheight = wattr.height - szHint.base_height;
1257 }
1258
1259 if (width != TermWin.width || height != TermWin.height)
1260 { 1262 }
1263
1264 if (newwidth != width || newheight != height)
1265 {
1261 width += szHint.base_width; 1266 newwidth += szHint.base_width;
1262 height += szHint.base_height; 1267 newheight += szHint.base_height;
1263 resize_all_windows (width, height, 0); 1268 resize_all_windows (newwidth, newheight, 0);
1264 } 1269 }
1265} 1270}
1266 1271
1267/* -------------------------------------------------------------------- * 1272/* -------------------------------------------------------------------- *
1268 * - X INPUT METHOD ROUTINES - * 1273 * - X INPUT METHOD ROUTINES - *
… …
1278 1283
1279void 1284void
1280rxvt_term::im_set_size (XRectangle &size) 1285rxvt_term::im_set_size (XRectangle &size)
1281{ 1286{
1282 // the int_bwidth terms make no sense to me 1287 // the int_bwidth terms make no sense to me
1283 size.x = TermWin.int_bwidth; 1288 size.x = int_bwidth;
1284 size.y = TermWin.int_bwidth; 1289 size.y = int_bwidth;
1285 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1290 size.width = Width2Pixel (ncol) + int_bwidth;
1286 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1291 size.height = Height2Pixel (nrow) + int_bwidth;
1287} 1292}
1288 1293
1289void 1294void
1290rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1295rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1291 XRectangle &status_rect, 1296 XRectangle &status_rect,
1292 const XRectangle &needed_rect) 1297 const XRectangle &needed_rect)
1293{ 1298{
1294 preedit_rect.x = needed_rect.width; 1299 preedit_rect.x = needed_rect.width;
1295 preedit_rect.y = 0; 1300 preedit_rect.y = 0;
1296 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1301 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1297 preedit_rect.height = TermWin.fheight; 1302 preedit_rect.height = fheight;
1298 1303
1299 status_rect.x = 0; 1304 status_rect.x = 0;
1300 status_rect.y = 0; 1305 status_rect.y = 0;
1301 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1306 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1302 status_rect.height = TermWin.fheight; 1307 status_rect.height = fheight;
1303} 1308}
1304 1309
1305/* Checking whether input method is running. */ 1310/* Checking whether input method is running. */
1306bool 1311bool
1307rxvt_term::IMisRunning () 1312rxvt_term::IMisRunning ()
… …
1335{ 1340{
1336 XPoint nspot; 1341 XPoint nspot;
1337 XVaNestedList preedit_attr; 1342 XVaNestedList preedit_attr;
1338 1343
1339 if (!Input_Context 1344 if (!Input_Context
1340 || !TermWin.focus 1345 || !focus
1341 || !(input_style & XIMPreeditPosition)) 1346 || !(input_style & XIMPreeditPosition))
1342 return; 1347 return;
1343 1348
1344 im_set_position (nspot); 1349 im_set_position (nspot);
1345 1350
… …
1465 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1470 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1466 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1471 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1467 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1472 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1468 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1473 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1469 "*", 1474 "*",
1470 TermWin.fheight, 1475 fheight,
1471 TermWin.fheight + 1, TermWin.fheight - 1, 1476 fheight + 1, fheight - 1,
1472 TermWin.fheight - 2, TermWin.fheight + 2); 1477 fheight - 2, fheight + 2);
1473 1478
1474 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1479 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1475 &missing_charset_list, &missing_charset_count, &def_string); 1480 &missing_charset_list, &missing_charset_count, &def_string);
1476 1481
1477 if (missing_charset_list) 1482 if (missing_charset_list)
… …
1523 NULL); 1528 NULL);
1524 } 1529 }
1525 1530
1526 Input_Context = XCreateIC (xim, 1531 Input_Context = XCreateIC (xim,
1527 XNInputStyle, input_style, 1532 XNInputStyle, input_style,
1528 XNClientWindow, TermWin.vt, 1533 XNClientWindow, vt,
1529 XNFocusWindow, TermWin.parent[0], 1534 XNFocusWindow, parent[0],
1530 preedit_attr ? XNPreeditAttributes : NULL, 1535 preedit_attr ? XNPreeditAttributes : NULL,
1531 preedit_attr, 1536 preedit_attr,
1532 status_attr ? XNStatusAttributes : NULL, 1537 status_attr ? XNStatusAttributes : NULL,
1533 status_attr, NULL); 1538 status_attr, NULL);
1534 1539
… …
1618{ 1623{
1619 XRectangle preedit_rect, status_rect, *needed_rect; 1624 XRectangle preedit_rect, status_rect, *needed_rect;
1620 XVaNestedList preedit_attr, status_attr; 1625 XVaNestedList preedit_attr, status_attr;
1621 1626
1622 if (!Input_Context 1627 if (!Input_Context
1623 || !TermWin.focus 1628 || !focus
1624 || !(input_style & XIMPreeditArea) 1629 || !(input_style & XIMPreeditArea)
1625 || !IMisRunning ()) 1630 || !IMisRunning ())
1626 return; 1631 return;
1627 1632
1628 /* Getting the necessary width of preedit area */ 1633 /* Getting the necessary width of preedit area */

Diff Legend

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