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.144 by root, Sun Feb 20 19:45:30 2005 UTC vs.
Revision 1.149 by root, Sun Dec 18 00:59:42 2005 UTC

… …
157 pointer_ev (this, &rxvt_term::pointer_cb), 157 pointer_ev (this, &rxvt_term::pointer_cb),
158#endif 158#endif
159#ifdef USE_XIM 159#ifdef USE_XIM
160 im_ev (this, &rxvt_term::im_cb), 160 im_ev (this, &rxvt_term::im_cb),
161#endif 161#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), 162 termwin_ev (this, &rxvt_term::x_cb),
166 vt_ev (this, &rxvt_term::x_cb), 163 vt_ev (this, &rxvt_term::x_cb),
167 check_ev (this, &rxvt_term::check_cb), 164 check_ev (this, &rxvt_term::check_cb),
168 flush_ev (this, &rxvt_term::flush_cb), 165 flush_ev (this, &rxvt_term::flush_cb),
169 destroy_ev (this, &rxvt_term::destroy_cb), 166 destroy_ev (this, &rxvt_term::destroy_cb),
… …
202 199
203 emergency_cleanup (); 200 emergency_cleanup ();
204 201
205#if ENABLE_STYLES 202#if ENABLE_STYLES
206 for (int i = RS_styleCount; --i; ) 203 for (int i = RS_styleCount; --i; )
207 if (TermWin.fontset[i] != TermWin.fontset[0]) 204 if (fontset[i] != fontset[0])
208 delete TermWin.fontset[i]; 205 delete fontset[i];
209#endif 206#endif
210 delete TermWin.fontset[0]; 207 delete fontset[0];
211 208
212 if (display) 209 if (display)
213 { 210 {
214 dDisp; 211 dDisp;
215 212
… …
243#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 240#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
244 if (topShadowGC) XFreeGC (disp, topShadowGC); 241 if (topShadowGC) XFreeGC (disp, topShadowGC);
245 if (botShadowGC) XFreeGC (disp, botShadowGC); 242 if (botShadowGC) XFreeGC (disp, botShadowGC);
246 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 243 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
247#endif 244#endif
248 if (TermWin.gc) XFreeGC (disp, TermWin.gc); 245 if (gc) XFreeGC (disp, gc);
249 246
250#if defined(MENUBAR) && (MENUBAR_MAX > 1) 247#if defined(MENUBAR) && (MENUBAR_MAX > 1)
251 delete menuBar.drawable; 248 delete menuBar.drawable;
252 //if (menuBar.win) 249 //if (menuBar.win)
253 // XDestroyWindow (disp, menuBar.win); 250 // XDestroyWindow (disp, menuBar.win);
254#endif 251#endif
255 delete TermWin.drawable; 252 delete drawable;
256 // destroy all windows 253 // destroy all windows
257 if (TermWin.parent[0]) 254 if (parent[0])
258 XDestroyWindow (disp, TermWin.parent[0]); 255 XDestroyWindow (disp, parent[0]);
259 } 256 }
260 257
261 // TODO: free pixcolours, colours should become part of rxvt_display 258 // TODO: free pixcolours, colours should become part of rxvt_display
262 259
263 delete pix_colors_focused; 260 delete pix_colors_focused;
264#ifdef OFF_FOCUS_FADING 261#if OFF_FOCUS_FADING
265 delete pix_colors_unfocused; 262 delete pix_colors_unfocused;
266#endif 263#endif
267 264
268 displays.put (display); 265 displays.put (display);
269 266
… …
417{ 414{
418 if (GET_R->allowedxerror == -1) 415 if (GET_R->allowedxerror == -1)
419 GET_R->allowedxerror = event->error_code; 416 GET_R->allowedxerror = event->error_code;
420 else 417 else
421 { 418 {
422 //TODO: GET_R is most likely not the terminal which caused the error 419 // GET_R is most likely not the terminal which caused the error,
423 //TODO: maybe just output the error and continue? 420 // so just output the error and continue
424#if ENABLE_FRILLS 421#if ENABLE_FRILLS
425 print_x_error (display, event); 422 print_x_error (display, event);
426#else 423#else
427 old_xerror_handler (display, event); 424 old_xerror_handler (display, event);
428#endif 425#endif
… …
438 DisplayString (display)); 435 DisplayString (display));
439 rxvt_emergency_cleanup (); 436 rxvt_emergency_cleanup ();
440 _exit (EXIT_FAILURE); 437 _exit (EXIT_FAILURE);
441} 438}
442 439
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/*----------------------------------------------------------------------*/ 440/*----------------------------------------------------------------------*/
458/* rxvt_init () */
459bool 441bool
460rxvt_term::init (int argc, const char *const *argv) 442rxvt_term::init (int argc, const char *const *argv)
461{ 443{
462 SET_R (this); 444 SET_R (this);
463 445
… …
509 check_our_parents (); 491 check_our_parents ();
510 rootwin_ev.start (display, display->root); 492 rootwin_ev.start (display, display->root);
511 } 493 }
512#endif 494#endif
513 495
514 XMapWindow (disp, TermWin.vt); 496 XMapWindow (disp, vt);
515 XMapWindow (disp, TermWin.parent[0]); 497 XMapWindow (disp, parent[0]);
516 498
517 set_colorfgbg (); 499 set_colorfgbg ();
518 500
519 init_command (cmd_argv); 501 init_command (cmd_argv);
520 502
… …
524 506
525 check_ev.start (); 507 check_ev.start ();
526 508
527 return true; 509 return true;
528} 510}
511
512static struct sig_handlers
513{
514 sig_watcher sw_chld, sw_term, sw_int;
515
516 void sig_chld (sig_watcher &w)
517 {
518 // we are being called for every SIGCHLD, find the corresponding term
519 int pid;
520
521 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
522 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
523 if (pid == (*t)->cmd_pid)
524 {
525 (*t)->destroy ();
526 break;
527 }
528 }
529
530 /*
531 * Catch a fatal signal and tidy up before quitting
532 */
533 void
534 sig_term (sig_watcher &w)
535 {
536#ifdef DEBUG_CMD
537 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
538#endif
539 rxvt_emergency_cleanup ();
540 signal (w.signum, SIG_DFL);
541 kill (getpid (), w.signum);
542 }
543
544 sig_handlers ()
545 : sw_chld (this, &sig_handlers::sig_chld),
546 sw_term (this, &sig_handlers::sig_term),
547 sw_int (this, &sig_handlers::sig_term)
548 {
549 }
550} sig_handlers;
529 551
530void 552void
531rxvt_init () 553rxvt_init ()
532{ 554{
533 /* 555 /*
… …
541 rxvt_privileges (IGNORE); 563 rxvt_privileges (IGNORE);
542 564
543 signal (SIGHUP, SIG_IGN); 565 signal (SIGHUP, SIG_IGN);
544 signal (SIGPIPE, SIG_IGN); 566 signal (SIGPIPE, SIG_IGN);
545 567
568 sig_handlers.sw_chld.start (SIGCHLD);
569 sig_handlers.sw_term.start (SIGTERM);
570 sig_handlers.sw_int.start (SIGINT);
571
546 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 572 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
547 /* signal (SIGURG, SIG_DFL); */ 573 /* signal (SIGURG, SIG_DFL); */
548 574
549 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 575 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
550 // TODO: handle this with exceptions and tolerate the memory loss 576 // TODO: handle this with exceptions and tolerate the memory loss
551 XSetIOErrorHandler (rxvt_xioerror_handler); 577 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} 578}
575 579
576/* ------------------------------------------------------------------------- * 580/* ------------------------------------------------------------------------- *
577 * MEMORY ALLOCATION WRAPPERS * 581 * MEMORY ALLOCATION WRAPPERS *
578 * ------------------------------------------------------------------------- */ 582 * ------------------------------------------------------------------------- */
… …
585 rxvt_fatal ("memory allocation failure. aborting.\n"); 589 rxvt_fatal ("memory allocation failure. aborting.\n");
586 590
587 return p; 591 return p;
588} 592}
589 593
590void * 594void *
591rxvt_calloc (size_t number, size_t size) 595rxvt_calloc (size_t number, size_t size)
592{ 596{
593 void *p = calloc (number, size); 597 void *p = calloc (number, size);
594 598
595 if (!p) 599 if (!p)
… …
687/* 691/*
688 * window size/position calculcations for XSizeHint and other storage. 692 * window size/position calculcations for XSizeHint and other storage.
689 * if width/height are non-zero then override calculated width/height 693 * if width/height are non-zero then override calculated width/height
690 */ 694 */
691void 695void
692rxvt_term::window_calc (unsigned int width, unsigned int height) 696rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
693{ 697{
694 short recalc_x, recalc_y; 698 short recalc_x, recalc_y;
695 int x, y, sb_w, mb_h, flags; 699 int x, y, sb_w, mb_h, flags;
696 unsigned int w, h; 700 unsigned int w, h;
697 unsigned int max_width, max_height; 701 unsigned int max_width, max_height;
698 dDisp; 702 dDisp;
699 703
700 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 704 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
701 TermWin.ncol, TermWin.nrow, szHint.width, 705 ncol, nrow, szHint.width, szHint.height));
702 szHint.height)); 706
703 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 707 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
704 szHint.win_gravity = NorthWestGravity; 708 szHint.win_gravity = NorthWestGravity;
705 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 709 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
706 710
707 recalc_x = recalc_y = 0; 711 recalc_x = recalc_y = 0;
708 flags = 0; 712 flags = 0;
713
709 if (!parsed_geometry) 714 if (!parsed_geometry)
710 { 715 {
711 parsed_geometry = 1; 716 parsed_geometry = 1;
717
712 if (rs[Rs_geometry]) 718 if (rs[Rs_geometry])
713 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 719 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
714 720
715 if (flags & WidthValue) 721 if (flags & WidthValue)
716 { 722 {
717 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 723 ncol = BOUND_POSITIVE_INT16 (w);
718 szHint.flags |= USSize; 724 szHint.flags |= USSize;
719 } 725 }
720 726
721 if (flags & HeightValue) 727 if (flags & HeightValue)
722 { 728 {
723 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 729 nrow = BOUND_POSITIVE_INT16 (h);
724 szHint.flags |= USSize; 730 szHint.flags |= USSize;
725 } 731 }
726 732
727 if (flags & XValue) 733 if (flags & XValue)
728 { 734 {
729 szHint.x = x; 735 szHint.x = x;
730 szHint.flags |= USPosition; 736 szHint.flags |= USPosition;
737
731 if (flags & XNegative) 738 if (flags & XNegative)
732 { 739 {
733 recalc_x = 1; 740 recalc_x = 1;
734 szHint.win_gravity = NorthEastGravity; 741 szHint.win_gravity = NorthEastGravity;
735 } 742 }
… …
737 744
738 if (flags & YValue) 745 if (flags & YValue)
739 { 746 {
740 szHint.y = y; 747 szHint.y = y;
741 szHint.flags |= USPosition; 748 szHint.flags |= USPosition;
749
742 if (flags & YNegative) 750 if (flags & YNegative)
743 { 751 {
744 recalc_y = 1; 752 recalc_y = 1;
753
745 if (szHint.win_gravity == NorthEastGravity) 754 if (szHint.win_gravity == NorthEastGravity)
746 szHint.win_gravity = SouthEastGravity; 755 szHint.win_gravity = SouthEastGravity;
747 else 756 else
748 szHint.win_gravity = SouthWestGravity; 757 szHint.win_gravity = SouthWestGravity;
749 } 758 }
750 } 759 }
751 } 760 }
752 761
753 /* TODO: BOUNDS */ 762 /* TODO: BOUNDS */
754 TermWin.width = TermWin.ncol * TermWin.fwidth; 763 width = ncol * fwidth;
755 TermWin.height = TermWin.nrow * TermWin.fheight; 764 height = nrow * fheight;
756 max_width = MAX_COLS * TermWin.fwidth; 765 max_width = MAX_COLS * fwidth;
757 max_height = MAX_ROWS * TermWin.fheight; 766 max_height = MAX_ROWS * fheight;
758 767
759 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 768 szHint.base_width = szHint.base_height = 2 * int_bwidth;
760 769
761 sb_w = mb_h = 0; 770 sb_w = mb_h = 0;
762 window_vt_x = window_vt_y = TermWin.int_bwidth; 771 window_vt_x = window_vt_y = int_bwidth;
763 772
764 if (scrollbar_visible ()) 773 if (scrollbar_visible ())
765 { 774 {
766 sb_w = scrollbar_TotalWidth (); 775 sb_w = scrollbar_TotalWidth ();
767 szHint.base_width += sb_w; 776 szHint.base_width += sb_w;
… …
774 mb_h = menuBar_TotalHeight (); 783 mb_h = menuBar_TotalHeight ();
775 szHint.base_height += mb_h; 784 szHint.base_height += mb_h;
776 window_vt_y += mb_h; 785 window_vt_y += mb_h;
777 } 786 }
778 787
779 szHint.width_inc = TermWin.fwidth; 788 szHint.width_inc = fwidth;
780 szHint.height_inc = TermWin.fheight; 789 szHint.height_inc = fheight;
781 szHint.min_width = szHint.base_width + szHint.width_inc; 790 szHint.min_width = szHint.base_width + szHint.width_inc;
782 szHint.min_height = szHint.base_height + szHint.height_inc; 791 szHint.min_height = szHint.base_height + szHint.height_inc;
783 792
784 if (width && width - szHint.base_width < max_width) 793 if (newwidth && newwidth - szHint.base_width < max_width)
785 { 794 {
786 szHint.width = width; 795 szHint.width = newwidth;
787 TermWin.width = width - szHint.base_width; 796 width = newwidth - szHint.base_width;
788 } 797 }
789 else 798 else
790 { 799 {
791 MIN_IT (TermWin.width, max_width); 800 MIN_IT (width, max_width);
792 szHint.width = szHint.base_width + TermWin.width; 801 szHint.width = szHint.base_width + width;
793 } 802 }
794 803
795 if (height && height - szHint.base_height < max_height) 804 if (newheight && newheight - szHint.base_height < max_height)
796 { 805 {
797 szHint.height = height; 806 szHint.height = newheight;
798 TermWin.height = height - szHint.base_height; 807 height = newheight - szHint.base_height;
799 } 808 }
800 else 809 else
801 { 810 {
802 MIN_IT (TermWin.height, max_height); 811 MIN_IT (height, max_height);
803 szHint.height = szHint.base_height + TermWin.height; 812 szHint.height = szHint.base_height + height;
804 } 813 }
805 814
806 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 815 if (scrollbar_visible () && (options & Opt_scrollBar_right))
807 window_sb_x = szHint.width - sb_w; 816 window_sb_x = szHint.width - sb_w;
808 817
809 if (recalc_x) 818 if (recalc_x)
810 szHint.x += (DisplayWidth (disp, display->screen) 819 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
811 - szHint.width - 2 * TermWin.ext_bwidth);
812 if (recalc_y) 820 if (recalc_y)
813 szHint.y += (DisplayHeight (disp, display->screen) 821 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
814 - szHint.height - 2 * TermWin.ext_bwidth);
815 822
816 TermWin.ncol = TermWin.width / TermWin.fwidth; 823 ncol = width / fwidth;
817 TermWin.nrow = TermWin.height / TermWin.fheight; 824 nrow = height / fheight;
818 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 825 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
819 TermWin.ncol, TermWin.nrow, szHint.width, 826 ncol, nrow, szHint.width,
820 szHint.height)); 827 szHint.height));
821 return; 828 return;
822} 829}
823 830
824/*----------------------------------------------------------------------*/ 831/*----------------------------------------------------------------------*/
… …
832 if (pty.pty < 0) 839 if (pty.pty < 0)
833 return; 840 return;
834 841
835 struct winsize ws; 842 struct winsize ws;
836 843
837 ws.ws_col = TermWin.ncol; 844 ws.ws_col = ncol;
838 ws.ws_row = TermWin.nrow; 845 ws.ws_row = nrow;
839 ws.ws_xpixel = TermWin.width; 846 ws.ws_xpixel = width;
840 ws.ws_ypixel = TermWin.height; 847 ws.ws_ypixel = height;
841 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 848 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
842 849
843#if 0 850#if 0
844 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 851 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
845 if (cmd_pid) /* force through to the command */ 852 if (cmd_pid) /* force through to the command */
… …
847#endif 854#endif
848} 855}
849 856
850/*----------------------------------------------------------------------*/ 857/*----------------------------------------------------------------------*/
851/* set_fonts () - load and set the various fonts 858/* set_fonts () - load and set the various fonts
852/* 859 *
853 * init = 1 - initialize 860 * init = 1 - initialize
854 * 861 *
855 * fontname == FONT_UP - switch to bigger font 862 * fontname == FONT_UP - switch to bigger font
856 * fontname == FONT_DN - switch to smaller font 863 * fontname == FONT_DN - switch to smaller font
857 */ 864 */
… …
869 return false; 876 return false;
870 } 877 }
871 878
872#if ENABLE_STYLES 879#if ENABLE_STYLES
873 for (int i = RS_styleCount; --i; ) 880 for (int i = RS_styleCount; --i; )
874 if (TermWin.fontset[i] != TermWin.fontset[0]) 881 if (fontset[i] != fontset[0])
875 delete TermWin.fontset[i]; 882 delete fontset[i];
876#endif 883#endif
877 884
878 delete TermWin.fontset[0]; 885 delete fontset[0];
879 TermWin.fontset[0] = fs; 886 fontset[0] = fs;
880 887
881 prop = (*fs)[1]->properties (); 888 prop = (*fs)[1]->properties ();
882 prop.height += TermWin.lineSpace; 889 prop.height += lineSpace;
883 fs->set_prop (prop); 890 fs->set_prop (prop);
884 891
885 TermWin.fwidth = prop.width; 892 fwidth = prop.width;
886 TermWin.fheight = prop.height; 893 fheight = prop.height;
887 TermWin.fweight = prop.weight; 894 fweight = prop.weight;
888 TermWin.fslant = prop.slant; 895 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);
… …
990 { /* bright colors */ 997 { /* bright colors */
991 i -= 8; 998 i -= 8;
992# ifndef NO_BRIGHTCOLOR 999# ifndef NO_BRIGHTCOLOR
993 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1000 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
994 SET_PIXCOLOR (idx); 1001 SET_PIXCOLOR (idx);
995 goto Done; 1002 goto done;
996# endif 1003# endif
997 } 1004 }
998 1005
999 if (i >= 0 && i <= 7) 1006 if (i >= 0 && i <= 7)
1000 { /* normal colors */ 1007 { /* normal colors */
1001 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1008 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1002 SET_PIXCOLOR (idx); 1009 SET_PIXCOLOR (idx);
1003 goto Done; 1010 goto done;
1004 } 1011 }
1005 } 1012 }
1006 1013
1007 if (!rXParseAllocColor (&xcol, color)) 1014 if (!rXParseAllocColor (&xcol, color))
1008 return; 1015 return;
… …
1028 pix_colors_focused[idx] = xcol; 1035 pix_colors_focused[idx] = xcol;
1029 SET_PIXCOLOR (idx); 1036 SET_PIXCOLOR (idx);
1030 1037
1031 /* XSetWindowAttributes attr; */ 1038 /* XSetWindowAttributes attr; */
1032 /* Cursor cursor; */ 1039 /* Cursor cursor; */
1033Done: 1040done:
1041
1034#ifdef OFF_FOCUS_FADING 1042#if OFF_FOCUS_FADING
1035 if (rs[Rs_fade]) 1043 if (rs[Rs_fade])
1036 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 1044 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1037#endif 1045#endif
1038 1046
1039 /*TODO: handle Color_BD, scrollbar background, etc. */ 1047 /*TODO: handle Color_BD, scrollbar background, etc. */
1040 1048
1041 recolour_cursor (); 1049 recolour_cursor ();
… …
1112 1120
1113/* -------------------------------------------------------------------- * 1121/* -------------------------------------------------------------------- *
1114 * - WINDOW RESIZING - * 1122 * - WINDOW RESIZING - *
1115 * -------------------------------------------------------------------- */ 1123 * -------------------------------------------------------------------- */
1116void 1124void
1117rxvt_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)
1118{ 1126{
1119 int fix_screen; 1127 int fix_screen;
1120#ifdef SMART_RESIZE
1121 int old_width = szHint.width, old_height = szHint.height; 1128 int old_width = szHint.width, old_height = szHint.height;
1122#endif
1123 dDisp; 1129 dDisp;
1124 1130
1125 window_calc (width, height); 1131 window_calc (newwidth, newheight);
1126 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 1132 XSetWMNormalHints (disp, parent[0], &szHint);
1127 1133
1128 if (!ignoreparent) 1134 if (!ignoreparent)
1129 { 1135 {
1130#ifdef SMART_RESIZE 1136#ifdef SMART_RESIZE
1131 /* 1137 /*
… …
1135 int x, y, x1, y1; 1141 int x, y, x1, y1;
1136 int dx, dy; 1142 int dx, dy;
1137 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1143 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1138 Window unused_cr; 1144 Window unused_cr;
1139 1145
1140 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 1146 XTranslateCoordinates (disp, parent[0], display->root,
1141 0, 0, &x, &y, &unused_cr); 1147 0, 0, &x, &y, &unused_cr);
1142 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 1148 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1143 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1149 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1144 /* 1150 /*
1145 * 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
1146 * our position for handles and decorations. Counter it 1152 * our position for handles and decorations. Counter it
1147 */ 1153 */
… …
1164 if (y < y1) /* top half */ 1170 if (y < y1) /* top half */
1165 dy = 0; 1171 dy = 0;
1166 else if (y == y1) /* exact center */ 1172 else if (y == y1) /* exact center */
1167 dy /= 2; 1173 dy /= 2;
1168 1174
1169 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 1175 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1170 szHint.width, szHint.height); 1176 szHint.width, szHint.height);
1171#else 1177#else
1172 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 1178 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1173#endif 1179#endif
1174 } 1180 }
1175 1181
1176 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1182 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1177 1183
1178 if (fix_screen || width != old_width || height != old_height) 1184 if (fix_screen || newwidth != old_width || newheight != old_height)
1179 { 1185 {
1180 if (scrollbar_visible ()) 1186 if (scrollbar_visible ())
1181 { 1187 {
1182 XMoveResizeWindow (disp, scrollBar.win, 1188 XMoveResizeWindow (disp, scrollBar.win,
1183 window_sb_x, 0, 1189 window_sb_x, 0,
… …
1188 if (menubar_visible ()) 1194 if (menubar_visible ())
1189 XMoveResizeWindow (disp, menuBar.win, 1195 XMoveResizeWindow (disp, menuBar.win,
1190 window_vt_x, 0, 1196 window_vt_x, 0,
1191 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1197 TermWin_TotalWidth (), menuBar_TotalHeight ());
1192 1198
1193 XMoveResizeWindow (disp, TermWin.vt, 1199 XMoveResizeWindow (disp, vt,
1194 window_vt_x, window_vt_y, 1200 window_vt_x, window_vt_y,
1195 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1201 TermWin_TotalWidth (), TermWin_TotalHeight ());
1196 1202
1197 scr_clear (); 1203 scr_clear ();
1198#ifdef XPM_BACKGROUND 1204#ifdef XPM_BACKGROUND
… …
1206 int old_ncol = prev_ncol; 1212 int old_ncol = prev_ncol;
1207 1213
1208 /* scr_reset only works on the primary screen */ 1214 /* scr_reset only works on the primary screen */
1209 if (old_height) /* this is not the first time through */ 1215 if (old_height) /* this is not the first time through */
1210 { 1216 {
1211 unsigned int ncol = TermWin.ncol; 1217 unsigned int ocol = ncol;
1212 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
1213 curr_screen = scr_change_screen (PRIMARY); 1219 curr_screen = scr_change_screen (PRIMARY);
1214 TermWin.ncol = ncol; 1220 ncol = ocol;
1215 } 1221 }
1216 1222
1217 scr_reset (); 1223 scr_reset ();
1218 1224
1219 if (curr_screen >= 0) /* this is not the first time through */ 1225 if (curr_screen >= 0) /* this is not the first time through */
1220 { 1226 {
1221 scr_change_screen (curr_screen); 1227 scr_change_screen (curr_screen);
1222 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1228 selection_check (old_ncol != ncol ? 4 : 0);
1223 } 1229 }
1224 } 1230 }
1225 1231
1226 old_width = szHint.width; 1232 old_width = szHint.width;
1227 old_height = szHint.height; 1233 old_height = szHint.height;
1228 1234
1229#ifdef XPM_BACKGROUND 1235#ifdef XPM_BACKGROUND
1230 if (TermWin.pixmap) 1236 if (pixmap)
1231 scr_touch (false); 1237 scr_touch (false);
1232#endif 1238#endif
1233 1239
1234#ifdef USE_XIM 1240#ifdef USE_XIM
1235 IMSetStatusPosition (); 1241 IMSetStatusPosition ();
… …
1239/* 1245/*
1240 * 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.
1241 * good for toggling 80/132 columns 1247 * good for toggling 80/132 columns
1242 */ 1248 */
1243void 1249void
1244rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1250rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1245{ 1251{
1246 XWindowAttributes wattr; 1252 XWindowAttributes wattr;
1247 1253
1248 if (width == 0 || height == 0) 1254 if (newwidth == 0 || newheight == 0)
1249 { 1255 {
1250 XGetWindowAttributes (display->display, display->root, &wattr); 1256 XGetWindowAttributes (display->display, display->root, &wattr);
1251 1257
1252 if (width == 0) 1258 if (newwidth == 0)
1253 width = wattr.width - szHint.base_width; 1259 newwidth = wattr.width - szHint.base_width;
1254 if (height == 0) 1260 if (newheight == 0)
1255 height = wattr.height - szHint.base_height; 1261 newheight = wattr.height - szHint.base_height;
1256 }
1257
1258 if (width != TermWin.width || height != TermWin.height)
1259 { 1262 }
1263
1264 if (newwidth != width || newheight != height)
1265 {
1260 width += szHint.base_width; 1266 newwidth += szHint.base_width;
1261 height += szHint.base_height; 1267 newheight += szHint.base_height;
1262 resize_all_windows (width, height, 0); 1268 resize_all_windows (newwidth, newheight, 0);
1263 } 1269 }
1264} 1270}
1265 1271
1266/* -------------------------------------------------------------------- * 1272/* -------------------------------------------------------------------- *
1267 * - X INPUT METHOD ROUTINES - * 1273 * - X INPUT METHOD ROUTINES - *
… …
1277 1283
1278void 1284void
1279rxvt_term::im_set_size (XRectangle &size) 1285rxvt_term::im_set_size (XRectangle &size)
1280{ 1286{
1281 // the int_bwidth terms make no sense to me 1287 // the int_bwidth terms make no sense to me
1282 size.x = TermWin.int_bwidth; 1288 size.x = int_bwidth;
1283 size.y = TermWin.int_bwidth; 1289 size.y = int_bwidth;
1284 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1290 size.width = Width2Pixel (ncol) + int_bwidth;
1285 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1291 size.height = Height2Pixel (nrow) + int_bwidth;
1286} 1292}
1287 1293
1288void 1294void
1289rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1295rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1290 XRectangle &status_rect, 1296 XRectangle &status_rect,
1291 const XRectangle &needed_rect) 1297 const XRectangle &needed_rect)
1292{ 1298{
1293 preedit_rect.x = needed_rect.width; 1299 preedit_rect.x = needed_rect.width;
1294 preedit_rect.y = 0; 1300 preedit_rect.y = 0;
1295 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1301 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1296 preedit_rect.height = TermWin.fheight; 1302 preedit_rect.height = fheight;
1297 1303
1298 status_rect.x = 0; 1304 status_rect.x = 0;
1299 status_rect.y = 0; 1305 status_rect.y = 0;
1300 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;
1301 status_rect.height = TermWin.fheight; 1307 status_rect.height = fheight;
1302} 1308}
1303 1309
1304/* Checking whether input method is running. */ 1310/* Checking whether input method is running. */
1305bool 1311bool
1306rxvt_term::IMisRunning () 1312rxvt_term::IMisRunning ()
… …
1334{ 1340{
1335 XPoint nspot; 1341 XPoint nspot;
1336 XVaNestedList preedit_attr; 1342 XVaNestedList preedit_attr;
1337 1343
1338 if (!Input_Context 1344 if (!Input_Context
1339 || !TermWin.focus 1345 || !focus
1340 || !(input_style & XIMPreeditPosition)) 1346 || !(input_style & XIMPreeditPosition))
1341 return; 1347 return;
1342 1348
1343 im_set_position (nspot); 1349 im_set_position (nspot);
1344 1350
… …
1464 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1470 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1465 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1471 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1466 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1472 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1467 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1473 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1468 "*", 1474 "*",
1469 TermWin.fheight, 1475 fheight,
1470 TermWin.fheight + 1, TermWin.fheight - 1, 1476 fheight + 1, fheight - 1,
1471 TermWin.fheight - 2, TermWin.fheight + 2); 1477 fheight - 2, fheight + 2);
1472 1478
1473 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1479 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1474 &missing_charset_list, &missing_charset_count, &def_string); 1480 &missing_charset_list, &missing_charset_count, &def_string);
1475 1481
1476 if (missing_charset_list) 1482 if (missing_charset_list)
… …
1522 NULL); 1528 NULL);
1523 } 1529 }
1524 1530
1525 Input_Context = XCreateIC (xim, 1531 Input_Context = XCreateIC (xim,
1526 XNInputStyle, input_style, 1532 XNInputStyle, input_style,
1527 XNClientWindow, TermWin.vt, 1533 XNClientWindow, vt,
1528 XNFocusWindow, TermWin.parent[0], 1534 XNFocusWindow, parent[0],
1529 preedit_attr ? XNPreeditAttributes : NULL, 1535 preedit_attr ? XNPreeditAttributes : NULL,
1530 preedit_attr, 1536 preedit_attr,
1531 status_attr ? XNStatusAttributes : NULL, 1537 status_attr ? XNStatusAttributes : NULL,
1532 status_attr, NULL); 1538 status_attr, NULL);
1533 1539
… …
1550} 1556}
1551 1557
1552void 1558void
1553rxvt_term::im_cb () 1559rxvt_term::im_cb ()
1554{ 1560{
1555 int i, found, had_im; 1561 int i;
1556 const char *p; 1562 const char *p;
1557 char **s; 1563 char **s;
1558 char buf[IMBUFSIZ]; 1564 char buf[IMBUFSIZ];
1559 1565
1560 SET_R (this); 1566 SET_R (this);
… …
1617{ 1623{
1618 XRectangle preedit_rect, status_rect, *needed_rect; 1624 XRectangle preedit_rect, status_rect, *needed_rect;
1619 XVaNestedList preedit_attr, status_attr; 1625 XVaNestedList preedit_attr, status_attr;
1620 1626
1621 if (!Input_Context 1627 if (!Input_Context
1622 || !TermWin.focus 1628 || !focus
1623 || !(input_style & XIMPreeditArea) 1629 || !(input_style & XIMPreeditArea)
1624 || !IMisRunning ()) 1630 || !IMisRunning ())
1625 return; 1631 return;
1626 1632
1627 /* 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