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.146 by root, Mon Nov 28 18:37:42 2005 UTC vs.
Revision 1.152 by root, Thu Dec 22 16:44:10 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;
… …
287 delete argv; 286 delete argv;
288 287
289#ifdef KEYSYM_RESOURCE 288#ifdef KEYSYM_RESOURCE
290 delete keyboard; 289 delete keyboard;
291#endif 290#endif
291}
292
293void
294rxvt_term::child_exit ()
295{
296 cmd_pid = 0;
297
298 if (!(options & Opt_hold))
299 destroy ();
292} 300}
293 301
294void 302void
295rxvt_term::destroy () 303rxvt_term::destroy ()
296{ 304{
… …
438 DisplayString (display)); 446 DisplayString (display));
439 rxvt_emergency_cleanup (); 447 rxvt_emergency_cleanup ();
440 _exit (EXIT_FAILURE); 448 _exit (EXIT_FAILURE);
441} 449}
442 450
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/*----------------------------------------------------------------------*/ 451/*----------------------------------------------------------------------*/
458/* rxvt_init () */
459bool 452bool
460rxvt_term::init (int argc, const char *const *argv) 453rxvt_term::init (int argc, const char *const *argv)
461{ 454{
462 SET_R (this); 455 SET_R (this);
463 456
… …
509 check_our_parents (); 502 check_our_parents ();
510 rootwin_ev.start (display, display->root); 503 rootwin_ev.start (display, display->root);
511 } 504 }
512#endif 505#endif
513 506
514 XMapWindow (disp, TermWin.vt); 507 XMapWindow (disp, vt);
515 XMapWindow (disp, TermWin.parent[0]); 508 XMapWindow (disp, parent[0]);
516 509
517 set_colorfgbg (); 510 set_colorfgbg ();
518 511
519 init_command (cmd_argv); 512 init_command (cmd_argv);
520 513
… …
524 517
525 check_ev.start (); 518 check_ev.start ();
526 519
527 return true; 520 return true;
528} 521}
522
523static struct sig_handlers
524{
525 sig_watcher sw_chld, sw_term, sw_int;
526
527 void sig_chld (sig_watcher &w)
528 {
529 // we are being called for every SIGCHLD, find the corresponding term
530 int pid;
531
532 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
533 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
534 if (pid == (*t)->cmd_pid)
535 {
536 (*t)->child_exit ();
537 break;
538 }
539 }
540
541 /*
542 * Catch a fatal signal and tidy up before quitting
543 */
544 void
545 sig_term (sig_watcher &w)
546 {
547#ifdef DEBUG_CMD
548 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
549#endif
550 rxvt_emergency_cleanup ();
551 signal (w.signum, SIG_DFL);
552 kill (getpid (), w.signum);
553 }
554
555 sig_handlers ()
556 : sw_chld (this, &sig_handlers::sig_chld),
557 sw_term (this, &sig_handlers::sig_term),
558 sw_int (this, &sig_handlers::sig_term)
559 {
560 }
561} sig_handlers;
529 562
530void 563void
531rxvt_init () 564rxvt_init ()
532{ 565{
533 /* 566 /*
… …
541 rxvt_privileges (IGNORE); 574 rxvt_privileges (IGNORE);
542 575
543 signal (SIGHUP, SIG_IGN); 576 signal (SIGHUP, SIG_IGN);
544 signal (SIGPIPE, SIG_IGN); 577 signal (SIGPIPE, SIG_IGN);
545 578
579 sig_handlers.sw_chld.start (SIGCHLD);
580 sig_handlers.sw_term.start (SIGTERM);
581 sig_handlers.sw_int.start (SIGINT);
582
546 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 583 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
547 /* signal (SIGURG, SIG_DFL); */ 584 /* signal (SIGURG, SIG_DFL); */
548 585
549 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 586 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
550 // TODO: handle this with exceptions and tolerate the memory loss 587 // TODO: handle this with exceptions and tolerate the memory loss
551 XSetIOErrorHandler (rxvt_xioerror_handler); 588 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} 589}
575 590
576/* ------------------------------------------------------------------------- * 591/* ------------------------------------------------------------------------- *
577 * MEMORY ALLOCATION WRAPPERS * 592 * MEMORY ALLOCATION WRAPPERS *
578 * ------------------------------------------------------------------------- */ 593 * ------------------------------------------------------------------------- */
… …
585 rxvt_fatal ("memory allocation failure. aborting.\n"); 600 rxvt_fatal ("memory allocation failure. aborting.\n");
586 601
587 return p; 602 return p;
588} 603}
589 604
590void * 605void *
591rxvt_calloc (size_t number, size_t size) 606rxvt_calloc (size_t number, size_t size)
592{ 607{
593 void *p = calloc (number, size); 608 void *p = calloc (number, size);
594 609
595 if (!p) 610 if (!p)
… …
687/* 702/*
688 * window size/position calculcations for XSizeHint and other storage. 703 * window size/position calculcations for XSizeHint and other storage.
689 * if width/height are non-zero then override calculated width/height 704 * if width/height are non-zero then override calculated width/height
690 */ 705 */
691void 706void
692rxvt_term::window_calc (unsigned int width, unsigned int height) 707rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
693{ 708{
694 short recalc_x, recalc_y; 709 short recalc_x, recalc_y;
695 int x, y, sb_w, mb_h, flags; 710 int x, y, sb_w, mb_h, flags;
696 unsigned int w, h; 711 unsigned int w, h;
697 unsigned int max_width, max_height; 712 unsigned int max_width, max_height;
698 dDisp; 713 dDisp;
699 714
700 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 715 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
701 TermWin.ncol, TermWin.nrow, szHint.width, 716 ncol, nrow, szHint.width, szHint.height));
702 szHint.height)); 717
703 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 718 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
704 szHint.win_gravity = NorthWestGravity; 719 szHint.win_gravity = NorthWestGravity;
705 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 720 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
706 721
707 recalc_x = recalc_y = 0; 722 recalc_x = recalc_y = 0;
708 flags = 0; 723 flags = 0;
724
709 if (!parsed_geometry) 725 if (!parsed_geometry)
710 { 726 {
711 parsed_geometry = 1; 727 parsed_geometry = 1;
728
712 if (rs[Rs_geometry]) 729 if (rs[Rs_geometry])
713 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 730 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
714 731
715 if (flags & WidthValue) 732 if (flags & WidthValue)
716 { 733 {
717 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 734 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
718 szHint.flags |= USSize; 735 szHint.flags |= USSize;
719 } 736 }
720 737
721 if (flags & HeightValue) 738 if (flags & HeightValue)
722 { 739 {
723 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 740 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
724 szHint.flags |= USSize; 741 szHint.flags |= USSize;
725 } 742 }
726 743
727 if (flags & XValue) 744 if (flags & XValue)
728 { 745 {
729 szHint.x = x; 746 szHint.x = x;
730 szHint.flags |= USPosition; 747 szHint.flags |= USPosition;
748
731 if (flags & XNegative) 749 if (flags & XNegative)
732 { 750 {
733 recalc_x = 1; 751 recalc_x = 1;
734 szHint.win_gravity = NorthEastGravity; 752 szHint.win_gravity = NorthEastGravity;
735 } 753 }
… …
737 755
738 if (flags & YValue) 756 if (flags & YValue)
739 { 757 {
740 szHint.y = y; 758 szHint.y = y;
741 szHint.flags |= USPosition; 759 szHint.flags |= USPosition;
760
742 if (flags & YNegative) 761 if (flags & YNegative)
743 { 762 {
744 recalc_y = 1; 763 recalc_y = 1;
764
745 if (szHint.win_gravity == NorthEastGravity) 765 if (szHint.win_gravity == NorthEastGravity)
746 szHint.win_gravity = SouthEastGravity; 766 szHint.win_gravity = SouthEastGravity;
747 else 767 else
748 szHint.win_gravity = SouthWestGravity; 768 szHint.win_gravity = SouthWestGravity;
749 } 769 }
750 } 770 }
751 } 771 }
752 772
753 /* TODO: BOUNDS */ 773 /* TODO: BOUNDS */
754 TermWin.width = TermWin.ncol * TermWin.fwidth; 774 width = ncol * fwidth;
755 TermWin.height = TermWin.nrow * TermWin.fheight; 775 height = nrow * fheight;
756 max_width = MAX_COLS * TermWin.fwidth; 776 max_width = MAX_COLS * fwidth;
757 max_height = MAX_ROWS * TermWin.fheight; 777 max_height = MAX_ROWS * fheight;
758 778
759 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 779 szHint.base_width = szHint.base_height = 2 * int_bwidth;
760 780
761 sb_w = mb_h = 0; 781 sb_w = mb_h = 0;
762 window_vt_x = window_vt_y = TermWin.int_bwidth; 782 window_vt_x = window_vt_y = int_bwidth;
763 783
764 if (scrollbar_visible ()) 784 if (scrollbar_visible ())
765 { 785 {
766 sb_w = scrollbar_TotalWidth (); 786 sb_w = scrollbar_TotalWidth ();
767 szHint.base_width += sb_w; 787 szHint.base_width += sb_w;
… …
774 mb_h = menuBar_TotalHeight (); 794 mb_h = menuBar_TotalHeight ();
775 szHint.base_height += mb_h; 795 szHint.base_height += mb_h;
776 window_vt_y += mb_h; 796 window_vt_y += mb_h;
777 } 797 }
778 798
779 szHint.width_inc = TermWin.fwidth; 799 szHint.width_inc = fwidth;
780 szHint.height_inc = TermWin.fheight; 800 szHint.height_inc = fheight;
781 szHint.min_width = szHint.base_width + szHint.width_inc; 801 szHint.min_width = szHint.base_width + szHint.width_inc;
782 szHint.min_height = szHint.base_height + szHint.height_inc; 802 szHint.min_height = szHint.base_height + szHint.height_inc;
783 803
784 if (width && width - szHint.base_width < max_width) 804 if (newwidth && newwidth - szHint.base_width < max_width)
785 { 805 {
786 szHint.width = width; 806 szHint.width = newwidth;
787 TermWin.width = width - szHint.base_width; 807 width = newwidth - szHint.base_width;
788 } 808 }
789 else 809 else
790 { 810 {
791 MIN_IT (TermWin.width, max_width); 811 min_it (width, max_width);
792 szHint.width = szHint.base_width + TermWin.width; 812 szHint.width = szHint.base_width + width;
793 } 813 }
794 814
795 if (height && height - szHint.base_height < max_height) 815 if (newheight && newheight - szHint.base_height < max_height)
796 { 816 {
797 szHint.height = height; 817 szHint.height = newheight;
798 TermWin.height = height - szHint.base_height; 818 height = newheight - szHint.base_height;
799 } 819 }
800 else 820 else
801 { 821 {
802 MIN_IT (TermWin.height, max_height); 822 min_it (height, max_height);
803 szHint.height = szHint.base_height + TermWin.height; 823 szHint.height = szHint.base_height + height;
804 } 824 }
805 825
806 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 826 if (scrollbar_visible () && (options & Opt_scrollBar_right))
807 window_sb_x = szHint.width - sb_w; 827 window_sb_x = szHint.width - sb_w;
808 828
809 if (recalc_x) 829 if (recalc_x)
810 szHint.x += (DisplayWidth (disp, display->screen) 830 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
811 - szHint.width - 2 * TermWin.ext_bwidth);
812 if (recalc_y) 831 if (recalc_y)
813 szHint.y += (DisplayHeight (disp, display->screen) 832 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
814 - szHint.height - 2 * TermWin.ext_bwidth);
815 833
816 TermWin.ncol = TermWin.width / TermWin.fwidth; 834 ncol = width / fwidth;
817 TermWin.nrow = TermWin.height / TermWin.fheight; 835 nrow = height / fheight;
818 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 836 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
819 TermWin.ncol, TermWin.nrow, szHint.width, 837 ncol, nrow, szHint.width,
820 szHint.height)); 838 szHint.height));
821 return; 839 return;
822} 840}
823 841
824/*----------------------------------------------------------------------*/ 842/*----------------------------------------------------------------------*/
… …
832 if (pty.pty < 0) 850 if (pty.pty < 0)
833 return; 851 return;
834 852
835 struct winsize ws; 853 struct winsize ws;
836 854
837 ws.ws_col = TermWin.ncol; 855 ws.ws_col = ncol;
838 ws.ws_row = TermWin.nrow; 856 ws.ws_row = nrow;
839 ws.ws_xpixel = TermWin.width; 857 ws.ws_xpixel = width;
840 ws.ws_ypixel = TermWin.height; 858 ws.ws_ypixel = height;
841 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 859 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
842 860
843#if 0 861#if 0
844 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 862 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
845 if (cmd_pid) /* force through to the command */ 863 if (cmd_pid) /* force through to the command */
… …
847#endif 865#endif
848} 866}
849 867
850/*----------------------------------------------------------------------*/ 868/*----------------------------------------------------------------------*/
851/* set_fonts () - load and set the various fonts 869/* set_fonts () - load and set the various fonts
852/* 870 *
853 * init = 1 - initialize 871 * init = 1 - initialize
854 * 872 *
855 * fontname == FONT_UP - switch to bigger font 873 * fontname == FONT_UP - switch to bigger font
856 * fontname == FONT_DN - switch to smaller font 874 * fontname == FONT_DN - switch to smaller font
857 */ 875 */
… …
869 return false; 887 return false;
870 } 888 }
871 889
872#if ENABLE_STYLES 890#if ENABLE_STYLES
873 for (int i = RS_styleCount; --i; ) 891 for (int i = RS_styleCount; --i; )
874 if (TermWin.fontset[i] != TermWin.fontset[0]) 892 if (fontset[i] != fontset[0])
875 delete TermWin.fontset[i]; 893 delete fontset[i];
876#endif 894#endif
877 895
878 delete TermWin.fontset[0]; 896 delete fontset[0];
879 TermWin.fontset[0] = fs; 897 fontset[0] = fs;
880 898
881 prop = (*fs)[1]->properties (); 899 prop = (*fs)[1]->properties ();
882 prop.height += TermWin.lineSpace; 900 prop.height += lineSpace;
883 fs->set_prop (prop); 901 fs->set_prop (prop);
884 902
885 TermWin.fwidth = prop.width; 903 fwidth = prop.width;
886 TermWin.fheight = prop.height; 904 fheight = prop.height;
887 TermWin.fweight = prop.weight;
888 TermWin.fslant = prop.slant;
889 TermWin.fbase = (*fs)[1]->ascent; 905 fbase = (*fs)[1]->ascent;
890 906
891 for (int style = 1; style < 4; style++) 907 for (int style = 1; style < 4; style++)
892 { 908 {
893#if ENABLE_STYLES 909#if ENABLE_STYLES
894 const char *res = rs[Rs_font + style]; 910 const char *res = rs[Rs_font + style];
895 911
896 if (res && !*res) 912 if (res && !*res)
897 TermWin.fontset[style] = TermWin.fontset[0]; 913 fontset[style] = fontset[0];
898 else 914 else
899 { 915 {
900 TermWin.fontset[style] = fs = new rxvt_fontset (this); 916 fontset[style] = fs = new rxvt_fontset (this);
901 rxvt_fontprop prop2 = prop; 917 rxvt_fontprop prop2 = prop;
902 918
903 if (res) 919 if (res)
904 prop2.weight = prop2.slant = rxvt_fontprop::unset; 920 prop2.weight = prop2.slant = rxvt_fontprop::unset;
905 else 921 else
906 { 922 {
907 res = TermWin.fontset[0]->fontdesc; 923 res = fontset[0]->fontdesc;
908 924
909 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 925 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; 926 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
911 } 927 }
912 928
913 fs->populate (res); 929 fs->populate (res);
914 fs->set_prop (prop2); 930 fs->set_prop (prop2);
915 } 931 }
916#else 932#else
917 TermWin.fontset[style] = TermWin.fontset[0]; 933 fontset[style] = fontset[0];
918#endif 934#endif
919 } 935 }
920 936
921 if (TermWin.parent[0]) 937 if (parent[0])
922 { 938 {
923 resize_all_windows (0, 0, 0); 939 resize_all_windows (0, 0, 0);
924 scr_remap_chars (); 940 scr_remap_chars ();
925 scr_touch (true); 941 scr_touch (true);
926 } 942 }
… …
929} 945}
930 946
931void rxvt_term::set_string_property (Atom prop, const char *str, int len) 947void rxvt_term::set_string_property (Atom prop, const char *str, int len)
932{ 948{
933 // TODO: SMART_WINDOW_TITLE 949 // TODO: SMART_WINDOW_TITLE
934 XChangeProperty (display->display, TermWin.parent[0], 950 XChangeProperty (display->display, parent[0],
935 prop, XA_STRING, 8, PropModeReplace, 951 prop, XA_STRING, 8, PropModeReplace,
936 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 952 (const unsigned char *)str, len >= 0 ? len : strlen (str));
937} 953}
938 954
939void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 955void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
940{ 956{
941 // TODO: SMART_WINDOW_TITLE 957 // TODO: SMART_WINDOW_TITLE
942 wchar_t *ws = rxvt_mbstowcs (str, len); 958 wchar_t *ws = rxvt_mbstowcs (str, len);
943 char *s = rxvt_wcstoutf8 (ws); 959 char *s = rxvt_wcstoutf8 (ws);
944 960
945 XChangeProperty (display->display, TermWin.parent[0], 961 XChangeProperty (display->display, parent[0],
946 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 962 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
947 (const unsigned char *)s, strlen (s)); 963 (const unsigned char *)s, strlen (s));
948 964
949 free (s); 965 free (s);
950 free (ws); 966 free (ws);
… …
1113 1129
1114/* -------------------------------------------------------------------- * 1130/* -------------------------------------------------------------------- *
1115 * - WINDOW RESIZING - * 1131 * - WINDOW RESIZING - *
1116 * -------------------------------------------------------------------- */ 1132 * -------------------------------------------------------------------- */
1117void 1133void
1118rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1134rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1119{ 1135{
1120 int fix_screen; 1136 int fix_screen;
1121#ifdef SMART_RESIZE
1122 int old_width = szHint.width, old_height = szHint.height; 1137 int old_width = szHint.width, old_height = szHint.height;
1123#endif
1124 dDisp; 1138 dDisp;
1125 1139
1126 window_calc (width, height); 1140 window_calc (newwidth, newheight);
1127 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 1141 XSetWMNormalHints (disp, parent[0], &szHint);
1128 1142
1129 if (!ignoreparent) 1143 if (!ignoreparent)
1130 { 1144 {
1131#ifdef SMART_RESIZE 1145#ifdef SMART_RESIZE
1132 /* 1146 /*
… …
1136 int x, y, x1, y1; 1150 int x, y, x1, y1;
1137 int dx, dy; 1151 int dx, dy;
1138 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1152 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1139 Window unused_cr; 1153 Window unused_cr;
1140 1154
1141 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 1155 XTranslateCoordinates (disp, parent[0], display->root,
1142 0, 0, &x, &y, &unused_cr); 1156 0, 0, &x, &y, &unused_cr);
1143 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 1157 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1144 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1158 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1145 /* 1159 /*
1146 * if display->root isn't the parent window, a WM will probably have offset 1160 * if display->root isn't the parent window, a WM will probably have offset
1147 * our position for handles and decorations. Counter it 1161 * our position for handles and decorations. Counter it
1148 */ 1162 */
… …
1165 if (y < y1) /* top half */ 1179 if (y < y1) /* top half */
1166 dy = 0; 1180 dy = 0;
1167 else if (y == y1) /* exact center */ 1181 else if (y == y1) /* exact center */
1168 dy /= 2; 1182 dy /= 2;
1169 1183
1170 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 1184 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1171 szHint.width, szHint.height); 1185 szHint.width, szHint.height);
1172#else 1186#else
1173 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 1187 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1174#endif 1188#endif
1175 } 1189 }
1176 1190
1177 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1191 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1178 1192
1179 if (fix_screen || width != old_width || height != old_height) 1193 if (fix_screen || newwidth != old_width || newheight != old_height)
1180 { 1194 {
1181 if (scrollbar_visible ()) 1195 if (scrollbar_visible ())
1182 { 1196 {
1183 XMoveResizeWindow (disp, scrollBar.win, 1197 XMoveResizeWindow (disp, scrollBar.win,
1184 window_sb_x, 0, 1198 window_sb_x, 0,
… …
1189 if (menubar_visible ()) 1203 if (menubar_visible ())
1190 XMoveResizeWindow (disp, menuBar.win, 1204 XMoveResizeWindow (disp, menuBar.win,
1191 window_vt_x, 0, 1205 window_vt_x, 0,
1192 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1206 TermWin_TotalWidth (), menuBar_TotalHeight ());
1193 1207
1194 XMoveResizeWindow (disp, TermWin.vt, 1208 XMoveResizeWindow (disp, vt,
1195 window_vt_x, window_vt_y, 1209 window_vt_x, window_vt_y,
1196 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1210 TermWin_TotalWidth (), TermWin_TotalHeight ());
1197 1211
1198 scr_clear (); 1212 scr_clear ();
1199#ifdef XPM_BACKGROUND 1213#ifdef XPM_BACKGROUND
… …
1207 int old_ncol = prev_ncol; 1221 int old_ncol = prev_ncol;
1208 1222
1209 /* scr_reset only works on the primary screen */ 1223 /* scr_reset only works on the primary screen */
1210 if (old_height) /* this is not the first time through */ 1224 if (old_height) /* this is not the first time through */
1211 { 1225 {
1212 unsigned int ncol = TermWin.ncol; 1226 unsigned int ocol = ncol;
1213 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1227 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1214 curr_screen = scr_change_screen (PRIMARY); 1228 curr_screen = scr_change_screen (PRIMARY);
1215 TermWin.ncol = ncol; 1229 ncol = ocol;
1216 } 1230 }
1217 1231
1218 scr_reset (); 1232 scr_reset ();
1219 1233
1220 if (curr_screen >= 0) /* this is not the first time through */ 1234 if (curr_screen >= 0) /* this is not the first time through */
1221 { 1235 {
1222 scr_change_screen (curr_screen); 1236 scr_change_screen (curr_screen);
1223 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1237 selection_check (old_ncol != ncol ? 4 : 0);
1224 } 1238 }
1225 } 1239 }
1226 1240
1227 old_width = szHint.width; 1241 old_width = szHint.width;
1228 old_height = szHint.height; 1242 old_height = szHint.height;
1229 1243
1230#ifdef XPM_BACKGROUND 1244#ifdef XPM_BACKGROUND
1231 if (TermWin.pixmap) 1245 if (pixmap)
1232 scr_touch (false); 1246 scr_touch (false);
1233#endif 1247#endif
1234 1248
1235#ifdef USE_XIM 1249#ifdef USE_XIM
1236 IMSetStatusPosition (); 1250 IMSetStatusPosition ();
… …
1240/* 1254/*
1241 * Set the width/height of the vt window in characters. Units are pixels. 1255 * Set the width/height of the vt window in characters. Units are pixels.
1242 * good for toggling 80/132 columns 1256 * good for toggling 80/132 columns
1243 */ 1257 */
1244void 1258void
1245rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1259rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1246{ 1260{
1247 XWindowAttributes wattr; 1261 XWindowAttributes wattr;
1248 1262
1249 if (width == 0 || height == 0) 1263 if (newwidth == 0 || newheight == 0)
1250 { 1264 {
1251 XGetWindowAttributes (display->display, display->root, &wattr); 1265 XGetWindowAttributes (display->display, display->root, &wattr);
1252 1266
1253 if (width == 0) 1267 if (newwidth == 0)
1254 width = wattr.width - szHint.base_width; 1268 newwidth = wattr.width - szHint.base_width;
1255 if (height == 0) 1269 if (newheight == 0)
1256 height = wattr.height - szHint.base_height; 1270 newheight = wattr.height - szHint.base_height;
1257 }
1258
1259 if (width != TermWin.width || height != TermWin.height)
1260 { 1271 }
1272
1273 if (newwidth != width || newheight != height)
1274 {
1261 width += szHint.base_width; 1275 newwidth += szHint.base_width;
1262 height += szHint.base_height; 1276 newheight += szHint.base_height;
1263 resize_all_windows (width, height, 0); 1277 resize_all_windows (newwidth, newheight, 0);
1264 } 1278 }
1265} 1279}
1266 1280
1267/* -------------------------------------------------------------------- * 1281/* -------------------------------------------------------------------- *
1268 * - X INPUT METHOD ROUTINES - * 1282 * - X INPUT METHOD ROUTINES - *
… …
1278 1292
1279void 1293void
1280rxvt_term::im_set_size (XRectangle &size) 1294rxvt_term::im_set_size (XRectangle &size)
1281{ 1295{
1282 // the int_bwidth terms make no sense to me 1296 // the int_bwidth terms make no sense to me
1283 size.x = TermWin.int_bwidth; 1297 size.x = int_bwidth;
1284 size.y = TermWin.int_bwidth; 1298 size.y = int_bwidth;
1285 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1299 size.width = Width2Pixel (ncol) + int_bwidth;
1286 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1300 size.height = Height2Pixel (nrow) + int_bwidth;
1287} 1301}
1288 1302
1289void 1303void
1290rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1304rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1291 XRectangle &status_rect, 1305 XRectangle &status_rect,
1292 const XRectangle &needed_rect) 1306 const XRectangle &needed_rect)
1293{ 1307{
1294 preedit_rect.x = needed_rect.width; 1308 preedit_rect.x = needed_rect.width;
1295 preedit_rect.y = 0; 1309 preedit_rect.y = 0;
1296 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1310 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1297 preedit_rect.height = TermWin.fheight; 1311 preedit_rect.height = fheight;
1298 1312
1299 status_rect.x = 0; 1313 status_rect.x = 0;
1300 status_rect.y = 0; 1314 status_rect.y = 0;
1301 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1315 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1302 status_rect.height = TermWin.fheight; 1316 status_rect.height = fheight;
1303} 1317}
1304 1318
1305/* Checking whether input method is running. */ 1319/* Checking whether input method is running. */
1306bool 1320bool
1307rxvt_term::IMisRunning () 1321rxvt_term::IMisRunning ()
… …
1335{ 1349{
1336 XPoint nspot; 1350 XPoint nspot;
1337 XVaNestedList preedit_attr; 1351 XVaNestedList preedit_attr;
1338 1352
1339 if (!Input_Context 1353 if (!Input_Context
1340 || !TermWin.focus 1354 || !focus
1341 || !(input_style & XIMPreeditPosition)) 1355 || !(input_style & XIMPreeditPosition))
1342 return; 1356 return;
1343 1357
1344 im_set_position (nspot); 1358 im_set_position (nspot);
1345 1359
… …
1465 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1479 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1466 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1480 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1467 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1481 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1468 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1482 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1469 "*", 1483 "*",
1470 TermWin.fheight, 1484 fheight,
1471 TermWin.fheight + 1, TermWin.fheight - 1, 1485 fheight + 1, fheight - 1,
1472 TermWin.fheight - 2, TermWin.fheight + 2); 1486 fheight - 2, fheight + 2);
1473 1487
1474 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1488 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1475 &missing_charset_list, &missing_charset_count, &def_string); 1489 &missing_charset_list, &missing_charset_count, &def_string);
1476 1490
1477 if (missing_charset_list) 1491 if (missing_charset_list)
… …
1523 NULL); 1537 NULL);
1524 } 1538 }
1525 1539
1526 Input_Context = XCreateIC (xim, 1540 Input_Context = XCreateIC (xim,
1527 XNInputStyle, input_style, 1541 XNInputStyle, input_style,
1528 XNClientWindow, TermWin.vt, 1542 XNClientWindow, vt,
1529 XNFocusWindow, TermWin.parent[0], 1543 XNFocusWindow, parent[0],
1530 preedit_attr ? XNPreeditAttributes : NULL, 1544 preedit_attr ? XNPreeditAttributes : NULL,
1531 preedit_attr, 1545 preedit_attr,
1532 status_attr ? XNStatusAttributes : NULL, 1546 status_attr ? XNStatusAttributes : NULL,
1533 status_attr, NULL); 1547 status_attr, NULL);
1534 1548
… …
1551} 1565}
1552 1566
1553void 1567void
1554rxvt_term::im_cb () 1568rxvt_term::im_cb ()
1555{ 1569{
1556 int i, found, had_im; 1570 int i;
1557 const char *p; 1571 const char *p;
1558 char **s; 1572 char **s;
1559 char buf[IMBUFSIZ]; 1573 char buf[IMBUFSIZ];
1560 1574
1561 SET_R (this); 1575 SET_R (this);
… …
1618{ 1632{
1619 XRectangle preedit_rect, status_rect, *needed_rect; 1633 XRectangle preedit_rect, status_rect, *needed_rect;
1620 XVaNestedList preedit_attr, status_attr; 1634 XVaNestedList preedit_attr, status_attr;
1621 1635
1622 if (!Input_Context 1636 if (!Input_Context
1623 || !TermWin.focus 1637 || !focus
1624 || !(input_style & XIMPreeditArea) 1638 || !(input_style & XIMPreeditArea)
1625 || !IMisRunning ()) 1639 || !IMisRunning ())
1626 return; 1640 return;
1627 1641
1628 /* Getting the necessary width of preedit area */ 1642 /* Getting the necessary width of preedit area */

Diff Legend

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