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.138 by root, Wed Feb 16 20:32:05 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#if ENABLE_FRILLS
259 && !rs[Rs_embed]
260#endif
261 )
262 XDestroyWindow (disp, TermWin.parent[0]); 255 XDestroyWindow (disp, parent[0]);
263 } 256 }
264 257
265 // TODO: free pixcolours, colours should become part of rxvt_display 258 // TODO: free pixcolours, colours should become part of rxvt_display
266 259
267 delete pix_colors_focused; 260 delete pix_colors_focused;
268#ifdef OFF_FOCUS_FADING 261#if OFF_FOCUS_FADING
269 delete pix_colors_unfocused; 262 delete pix_colors_unfocused;
270#endif 263#endif
271 264
272 displays.put (display); 265 displays.put (display);
273 266
… …
421{ 414{
422 if (GET_R->allowedxerror == -1) 415 if (GET_R->allowedxerror == -1)
423 GET_R->allowedxerror = event->error_code; 416 GET_R->allowedxerror = event->error_code;
424 else 417 else
425 { 418 {
426 //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,
427 //TODO: maybe just output the error and continue? 420 // so just output the error and continue
428#if ENABLE_FRILLS 421#if ENABLE_FRILLS
429 print_x_error (display, event); 422 print_x_error (display, event);
430#else 423#else
431 old_xerror_handler (display, event); 424 old_xerror_handler (display, event);
432#endif 425#endif
… …
442 DisplayString (display)); 435 DisplayString (display));
443 rxvt_emergency_cleanup (); 436 rxvt_emergency_cleanup ();
444 _exit (EXIT_FAILURE); 437 _exit (EXIT_FAILURE);
445} 438}
446 439
447/*
448 * Catch a fatal signal and tidy up before quitting
449 */
450void
451rxvt_term::sig_term (sig_watcher &w)
452{
453#ifdef DEBUG_CMD
454 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
455#endif
456 rxvt_emergency_cleanup ();
457 signal (w.signum, SIG_DFL);
458 kill (getpid (), w.signum);
459}
460
461/*----------------------------------------------------------------------*/ 440/*----------------------------------------------------------------------*/
462/* rxvt_init () */
463bool 441bool
464rxvt_term::init (int argc, const char *const *argv) 442rxvt_term::init (int argc, const char *const *argv)
465{ 443{
466 SET_R (this); 444 SET_R (this);
467 445
… …
513 check_our_parents (); 491 check_our_parents ();
514 rootwin_ev.start (display, display->root); 492 rootwin_ev.start (display, display->root);
515 } 493 }
516#endif 494#endif
517 495
518 XMapWindow (disp, TermWin.vt); 496 XMapWindow (disp, vt);
519 XMapWindow (disp, TermWin.parent[0]); 497 XMapWindow (disp, parent[0]);
520 498
521 set_colorfgbg (); 499 set_colorfgbg ();
522 500
523 init_command (cmd_argv); 501 init_command (cmd_argv);
524 502
… …
528 506
529 check_ev.start (); 507 check_ev.start ();
530 508
531 return true; 509 return true;
532} 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;
533 551
534void 552void
535rxvt_init () 553rxvt_init ()
536{ 554{
537 /* 555 /*
… …
545 rxvt_privileges (IGNORE); 563 rxvt_privileges (IGNORE);
546 564
547 signal (SIGHUP, SIG_IGN); 565 signal (SIGHUP, SIG_IGN);
548 signal (SIGPIPE, SIG_IGN); 566 signal (SIGPIPE, SIG_IGN);
549 567
568 sig_handlers.sw_chld.start (SIGCHLD);
569 sig_handlers.sw_term.start (SIGTERM);
570 sig_handlers.sw_int.start (SIGINT);
571
550 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 572 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
551 /* signal (SIGURG, SIG_DFL); */ 573 /* signal (SIGURG, SIG_DFL); */
552 574
553 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 575 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
554 // TODO: handle this with exceptions and tolerate the memory loss 576 // TODO: handle this with exceptions and tolerate the memory loss
555 XSetIOErrorHandler (rxvt_xioerror_handler); 577 XSetIOErrorHandler (rxvt_xioerror_handler);
556}
557
558/* ------------------------------------------------------------------------- *
559 * SIGNAL HANDLING & EXIT HANDLER *
560 * ------------------------------------------------------------------------- */
561/*
562 * Catch a SIGCHLD signal and exit if the direct child has died
563 */
564
565void
566rxvt_term::sig_chld (sig_watcher &w)
567{
568 // we are being called for every SIGCHLD, not just ours
569 int pid;
570
571 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
572 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
573 if (pid == (*t)->cmd_pid)
574 {
575 (*t)->destroy ();
576 break;
577 }
578} 578}
579 579
580/* ------------------------------------------------------------------------- * 580/* ------------------------------------------------------------------------- *
581 * MEMORY ALLOCATION WRAPPERS * 581 * MEMORY ALLOCATION WRAPPERS *
582 * ------------------------------------------------------------------------- */ 582 * ------------------------------------------------------------------------- */
… …
589 rxvt_fatal ("memory allocation failure. aborting.\n"); 589 rxvt_fatal ("memory allocation failure. aborting.\n");
590 590
591 return p; 591 return p;
592} 592}
593 593
594/* INTPROTO */ 594void *
595void *
596rxvt_calloc (size_t number, size_t size) 595rxvt_calloc (size_t number, size_t size)
597{ 596{
598 void *p = calloc (number, size); 597 void *p = calloc (number, size);
599 598
600 if (!p) 599 if (!p)
601 rxvt_fatal ("memory allocation failure. aborting.\n"); 600 rxvt_fatal ("memory allocation failure. aborting.\n");
602 601
603 return p; 602 return p;
604} 603}
605 604
606/* INTPROTO */
607void * 605void *
608rxvt_realloc (void *ptr, size_t size) 606rxvt_realloc (void *ptr, size_t size)
609{ 607{
610 void *p = realloc (ptr, size); 608 void *p = realloc (ptr, size);
611 609
… …
693/* 691/*
694 * window size/position calculcations for XSizeHint and other storage. 692 * window size/position calculcations for XSizeHint and other storage.
695 * if width/height are non-zero then override calculated width/height 693 * if width/height are non-zero then override calculated width/height
696 */ 694 */
697void 695void
698rxvt_term::window_calc (unsigned int width, unsigned int height) 696rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
699{ 697{
700 short recalc_x, recalc_y; 698 short recalc_x, recalc_y;
701 int x, y, sb_w, mb_h, flags; 699 int x, y, sb_w, mb_h, flags;
702 unsigned int w, h; 700 unsigned int w, h;
703 unsigned int max_width, max_height; 701 unsigned int max_width, max_height;
704 dDisp; 702 dDisp;
705 703
706 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",
707 TermWin.ncol, TermWin.nrow, szHint.width, 705 ncol, nrow, szHint.width, szHint.height));
708 szHint.height)); 706
709 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 707 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
710 szHint.win_gravity = NorthWestGravity; 708 szHint.win_gravity = NorthWestGravity;
711 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 709 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
712 710
713 recalc_x = recalc_y = 0; 711 recalc_x = recalc_y = 0;
714 flags = 0; 712 flags = 0;
713
715 if (!parsed_geometry) 714 if (!parsed_geometry)
716 { 715 {
717 parsed_geometry = 1; 716 parsed_geometry = 1;
717
718 if (rs[Rs_geometry]) 718 if (rs[Rs_geometry])
719 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 719 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
720 720
721 if (flags & WidthValue) 721 if (flags & WidthValue)
722 { 722 {
723 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 723 ncol = BOUND_POSITIVE_INT16 (w);
724 szHint.flags |= USSize; 724 szHint.flags |= USSize;
725 } 725 }
726 726
727 if (flags & HeightValue) 727 if (flags & HeightValue)
728 { 728 {
729 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 729 nrow = BOUND_POSITIVE_INT16 (h);
730 szHint.flags |= USSize; 730 szHint.flags |= USSize;
731 } 731 }
732 732
733 if (flags & XValue) 733 if (flags & XValue)
734 { 734 {
735 szHint.x = x; 735 szHint.x = x;
736 szHint.flags |= USPosition; 736 szHint.flags |= USPosition;
737
737 if (flags & XNegative) 738 if (flags & XNegative)
738 { 739 {
739 recalc_x = 1; 740 recalc_x = 1;
740 szHint.win_gravity = NorthEastGravity; 741 szHint.win_gravity = NorthEastGravity;
741 } 742 }
… …
743 744
744 if (flags & YValue) 745 if (flags & YValue)
745 { 746 {
746 szHint.y = y; 747 szHint.y = y;
747 szHint.flags |= USPosition; 748 szHint.flags |= USPosition;
749
748 if (flags & YNegative) 750 if (flags & YNegative)
749 { 751 {
750 recalc_y = 1; 752 recalc_y = 1;
753
751 if (szHint.win_gravity == NorthEastGravity) 754 if (szHint.win_gravity == NorthEastGravity)
752 szHint.win_gravity = SouthEastGravity; 755 szHint.win_gravity = SouthEastGravity;
753 else 756 else
754 szHint.win_gravity = SouthWestGravity; 757 szHint.win_gravity = SouthWestGravity;
755 } 758 }
756 } 759 }
757 } 760 }
758 761
759 /* TODO: BOUNDS */ 762 /* TODO: BOUNDS */
760 TermWin.width = TermWin.ncol * TermWin.fwidth; 763 width = ncol * fwidth;
761 TermWin.height = TermWin.nrow * TermWin.fheight; 764 height = nrow * fheight;
762 max_width = MAX_COLS * TermWin.fwidth; 765 max_width = MAX_COLS * fwidth;
763 max_height = MAX_ROWS * TermWin.fheight; 766 max_height = MAX_ROWS * fheight;
764 767
765 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 768 szHint.base_width = szHint.base_height = 2 * int_bwidth;
766 769
767 sb_w = mb_h = 0; 770 sb_w = mb_h = 0;
768 window_vt_x = window_vt_y = TermWin.int_bwidth; 771 window_vt_x = window_vt_y = int_bwidth;
769 772
770 if (scrollbar_visible ()) 773 if (scrollbar_visible ())
771 { 774 {
772 sb_w = scrollbar_TotalWidth (); 775 sb_w = scrollbar_TotalWidth ();
773 szHint.base_width += sb_w; 776 szHint.base_width += sb_w;
… …
780 mb_h = menuBar_TotalHeight (); 783 mb_h = menuBar_TotalHeight ();
781 szHint.base_height += mb_h; 784 szHint.base_height += mb_h;
782 window_vt_y += mb_h; 785 window_vt_y += mb_h;
783 } 786 }
784 787
785 szHint.width_inc = TermWin.fwidth; 788 szHint.width_inc = fwidth;
786 szHint.height_inc = TermWin.fheight; 789 szHint.height_inc = fheight;
787 szHint.min_width = szHint.base_width + szHint.width_inc; 790 szHint.min_width = szHint.base_width + szHint.width_inc;
788 szHint.min_height = szHint.base_height + szHint.height_inc; 791 szHint.min_height = szHint.base_height + szHint.height_inc;
789 792
790 if (width && width - szHint.base_width < max_width) 793 if (newwidth && newwidth - szHint.base_width < max_width)
791 { 794 {
792 szHint.width = width; 795 szHint.width = newwidth;
793 TermWin.width = width - szHint.base_width; 796 width = newwidth - szHint.base_width;
794 } 797 }
795 else 798 else
796 { 799 {
797 MIN_IT (TermWin.width, max_width); 800 MIN_IT (width, max_width);
798 szHint.width = szHint.base_width + TermWin.width; 801 szHint.width = szHint.base_width + width;
799 } 802 }
800 803
801 if (height && height - szHint.base_height < max_height) 804 if (newheight && newheight - szHint.base_height < max_height)
802 { 805 {
803 szHint.height = height; 806 szHint.height = newheight;
804 TermWin.height = height - szHint.base_height; 807 height = newheight - szHint.base_height;
805 } 808 }
806 else 809 else
807 { 810 {
808 MIN_IT (TermWin.height, max_height); 811 MIN_IT (height, max_height);
809 szHint.height = szHint.base_height + TermWin.height; 812 szHint.height = szHint.base_height + height;
810 } 813 }
811 814
812 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 815 if (scrollbar_visible () && (options & Opt_scrollBar_right))
813 window_sb_x = szHint.width - sb_w; 816 window_sb_x = szHint.width - sb_w;
814 817
815 if (recalc_x) 818 if (recalc_x)
816 szHint.x += (DisplayWidth (disp, display->screen) 819 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
817 - szHint.width - 2 * TermWin.ext_bwidth);
818 if (recalc_y) 820 if (recalc_y)
819 szHint.y += (DisplayHeight (disp, display->screen) 821 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
820 - szHint.height - 2 * TermWin.ext_bwidth);
821 822
822 TermWin.ncol = TermWin.width / TermWin.fwidth; 823 ncol = width / fwidth;
823 TermWin.nrow = TermWin.height / TermWin.fheight; 824 nrow = height / fheight;
824 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",
825 TermWin.ncol, TermWin.nrow, szHint.width, 826 ncol, nrow, szHint.width,
826 szHint.height)); 827 szHint.height));
827 return; 828 return;
828} 829}
829 830
830/*----------------------------------------------------------------------*/ 831/*----------------------------------------------------------------------*/
… …
838 if (pty.pty < 0) 839 if (pty.pty < 0)
839 return; 840 return;
840 841
841 struct winsize ws; 842 struct winsize ws;
842 843
843 ws.ws_col = TermWin.ncol; 844 ws.ws_col = ncol;
844 ws.ws_row = TermWin.nrow; 845 ws.ws_row = nrow;
845 ws.ws_xpixel = TermWin.width; 846 ws.ws_xpixel = width;
846 ws.ws_ypixel = TermWin.height; 847 ws.ws_ypixel = height;
847 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 848 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
848 849
849#if 0 850#if 0
850 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 851 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
851 if (cmd_pid) /* force through to the command */ 852 if (cmd_pid) /* force through to the command */
852 kill (cmd_pid, SIGWINCH); 853 kill (-cmd_pid, SIGWINCH);
853#endif 854#endif
854} 855}
855 856
856/*----------------------------------------------------------------------*/ 857/*----------------------------------------------------------------------*/
857/* set_fonts () - load and set the various fonts 858/* set_fonts () - load and set the various fonts
858/* 859 *
859 * init = 1 - initialize 860 * init = 1 - initialize
860 * 861 *
861 * fontname == FONT_UP - switch to bigger font 862 * fontname == FONT_UP - switch to bigger font
862 * fontname == FONT_DN - switch to smaller font 863 * fontname == FONT_DN - switch to smaller font
863 */ 864 */
… …
875 return false; 876 return false;
876 } 877 }
877 878
878#if ENABLE_STYLES 879#if ENABLE_STYLES
879 for (int i = RS_styleCount; --i; ) 880 for (int i = RS_styleCount; --i; )
880 if (TermWin.fontset[i] != TermWin.fontset[0]) 881 if (fontset[i] != fontset[0])
881 delete TermWin.fontset[i]; 882 delete fontset[i];
882#endif 883#endif
883 884
884 delete TermWin.fontset[0]; 885 delete fontset[0];
885 TermWin.fontset[0] = fs; 886 fontset[0] = fs;
886 887
887 prop = (*fs)[1]->properties (); 888 prop = (*fs)[1]->properties ();
888 prop.height += TermWin.lineSpace; 889 prop.height += lineSpace;
889 fs->set_prop (prop); 890 fs->set_prop (prop);
890 891
891 TermWin.fwidth = prop.width; 892 fwidth = prop.width;
892 TermWin.fheight = prop.height; 893 fheight = prop.height;
893 TermWin.fweight = prop.weight; 894 fweight = prop.weight;
894 TermWin.fslant = prop.slant; 895 fslant = prop.slant;
895 TermWin.fbase = (*fs)[1]->ascent; 896 fbase = (*fs)[1]->ascent;
896 897
897 for (int style = 1; style < 4; style++) 898 for (int style = 1; style < 4; style++)
898 { 899 {
899#if ENABLE_STYLES 900#if ENABLE_STYLES
900 const char *res = rs[Rs_font + style]; 901 const char *res = rs[Rs_font + style];
901 902
902 if (res && !*res) 903 if (res && !*res)
903 TermWin.fontset[style] = TermWin.fontset[0]; 904 fontset[style] = fontset[0];
904 else 905 else
905 { 906 {
906 TermWin.fontset[style] = fs = new rxvt_fontset (this); 907 fontset[style] = fs = new rxvt_fontset (this);
907 rxvt_fontprop prop2 = prop; 908 rxvt_fontprop prop2 = prop;
908 909
909 if (res) 910 if (res)
910 prop2.weight = prop2.slant = rxvt_fontprop::unset; 911 prop2.weight = prop2.slant = rxvt_fontprop::unset;
911 else 912 else
912 { 913 {
913 res = TermWin.fontset[0]->fontdesc; 914 res = fontset[0]->fontdesc;
914 915
915 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;
916 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;
917 } 918 }
918 919
919 fs->populate (res); 920 fs->populate (res);
920 fs->set_prop (prop2); 921 fs->set_prop (prop2);
921 } 922 }
922#else 923#else
923 TermWin.fontset[style] = TermWin.fontset[0]; 924 fontset[style] = fontset[0];
924#endif 925#endif
925 } 926 }
926 927
927 if (TermWin.parent[0]) 928 if (parent[0])
928 { 929 {
929 resize_all_windows (0, 0, 0); 930 resize_all_windows (0, 0, 0);
930 scr_remap_chars (); 931 scr_remap_chars ();
931 scr_touch (true); 932 scr_touch (true);
932 } 933 }
… …
935} 936}
936 937
937void 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)
938{ 939{
939 // TODO: SMART_WINDOW_TITLE 940 // TODO: SMART_WINDOW_TITLE
940 XChangeProperty (display->display, TermWin.parent[0], 941 XChangeProperty (display->display, parent[0],
941 prop, XA_STRING, 8, PropModeReplace, 942 prop, XA_STRING, 8, PropModeReplace,
942 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 943 (const unsigned char *)str, len >= 0 ? len : strlen (str));
943} 944}
944 945
945void 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)
946{ 947{
947 // TODO: SMART_WINDOW_TITLE 948 // TODO: SMART_WINDOW_TITLE
948 wchar_t *ws = rxvt_mbstowcs (str, len); 949 wchar_t *ws = rxvt_mbstowcs (str, len);
949 char *s = rxvt_wcstoutf8 (ws); 950 char *s = rxvt_wcstoutf8 (ws);
950 951
951 XChangeProperty (display->display, TermWin.parent[0], 952 XChangeProperty (display->display, parent[0],
952 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 953 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
953 (const unsigned char *)s, strlen (s)); 954 (const unsigned char *)s, strlen (s));
954 955
955 free (s); 956 free (s);
956 free (ws); 957 free (ws);
… …
961/* xterm sequences - title, iconName, color (exptl) */ 962/* xterm sequences - title, iconName, color (exptl) */
962void 963void
963rxvt_term::set_title (const char *str) 964rxvt_term::set_title (const char *str)
964{ 965{
965 set_string_property (XA_WM_NAME, str); 966 set_string_property (XA_WM_NAME, str);
966#if ENABLE_FRILLS 967#if ENABLE_EWMH
967 set_utf8_property (xa[XA_NET_WM_NAME], str); 968 set_utf8_property (xa[XA_NET_WM_NAME], str);
968#endif 969#endif
969} 970}
970 971
971void 972void
972rxvt_term::set_icon_name (const char *str) 973rxvt_term::set_icon_name (const char *str)
973{ 974{
974 set_string_property (XA_WM_ICON_NAME, str); 975 set_string_property (XA_WM_ICON_NAME, str);
975#if ENABLE_FRILLS 976#if ENABLE_EWMH
976 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 977 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
977#endif 978#endif
978} 979}
979 980
980#ifdef XTERM_COLOR_CHANGE 981#ifdef XTERM_COLOR_CHANGE
… …
996 { /* bright colors */ 997 { /* bright colors */
997 i -= 8; 998 i -= 8;
998# ifndef NO_BRIGHTCOLOR 999# ifndef NO_BRIGHTCOLOR
999 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1000 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1000 SET_PIXCOLOR (idx); 1001 SET_PIXCOLOR (idx);
1001 goto Done; 1002 goto done;
1002# endif 1003# endif
1003 } 1004 }
1004 1005
1005 if (i >= 0 && i <= 7) 1006 if (i >= 0 && i <= 7)
1006 { /* normal colors */ 1007 { /* normal colors */
1007 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1008 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1008 SET_PIXCOLOR (idx); 1009 SET_PIXCOLOR (idx);
1009 goto Done; 1010 goto done;
1010 } 1011 }
1011 } 1012 }
1012 1013
1013 if (!rXParseAllocColor (&xcol, color)) 1014 if (!rXParseAllocColor (&xcol, color))
1014 return; 1015 return;
… …
1034 pix_colors_focused[idx] = xcol; 1035 pix_colors_focused[idx] = xcol;
1035 SET_PIXCOLOR (idx); 1036 SET_PIXCOLOR (idx);
1036 1037
1037 /* XSetWindowAttributes attr; */ 1038 /* XSetWindowAttributes attr; */
1038 /* Cursor cursor; */ 1039 /* Cursor cursor; */
1039Done: 1040done:
1041
1040#ifdef OFF_FOCUS_FADING 1042#if OFF_FOCUS_FADING
1041 if (rs[Rs_fade]) 1043 if (rs[Rs_fade])
1042 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]);
1043#endif 1045#endif
1044 1046
1045 /*TODO: handle Color_BD, scrollbar background, etc. */ 1047 /*TODO: handle Color_BD, scrollbar background, etc. */
1046 1048
1047 recolour_cursor (); 1049 recolour_cursor ();
… …
1118 1120
1119/* -------------------------------------------------------------------- * 1121/* -------------------------------------------------------------------- *
1120 * - WINDOW RESIZING - * 1122 * - WINDOW RESIZING - *
1121 * -------------------------------------------------------------------- */ 1123 * -------------------------------------------------------------------- */
1122void 1124void
1123rxvt_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)
1124{ 1126{
1125 int fix_screen; 1127 int fix_screen;
1126#ifdef SMART_RESIZE
1127 int old_width = szHint.width, old_height = szHint.height; 1128 int old_width = szHint.width, old_height = szHint.height;
1128#endif
1129 dDisp; 1129 dDisp;
1130 1130
1131 window_calc (width, height); 1131 window_calc (newwidth, newheight);
1132 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 1132 XSetWMNormalHints (disp, parent[0], &szHint);
1133 1133
1134 if (!ignoreparent) 1134 if (!ignoreparent)
1135 { 1135 {
1136#ifdef SMART_RESIZE 1136#ifdef SMART_RESIZE
1137 /* 1137 /*
… …
1141 int x, y, x1, y1; 1141 int x, y, x1, y1;
1142 int dx, dy; 1142 int dx, dy;
1143 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1143 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1144 Window unused_cr; 1144 Window unused_cr;
1145 1145
1146 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 1146 XTranslateCoordinates (disp, parent[0], display->root,
1147 0, 0, &x, &y, &unused_cr); 1147 0, 0, &x, &y, &unused_cr);
1148 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 1148 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1149 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1149 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1150 /* 1150 /*
1151 * 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
1152 * our position for handles and decorations. Counter it 1152 * our position for handles and decorations. Counter it
1153 */ 1153 */
… …
1170 if (y < y1) /* top half */ 1170 if (y < y1) /* top half */
1171 dy = 0; 1171 dy = 0;
1172 else if (y == y1) /* exact center */ 1172 else if (y == y1) /* exact center */
1173 dy /= 2; 1173 dy /= 2;
1174 1174
1175 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 1175 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1176 szHint.width, szHint.height); 1176 szHint.width, szHint.height);
1177#else 1177#else
1178 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 1178 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1179#endif 1179#endif
1180 } 1180 }
1181 1181
1182 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1182 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1183 1183
1184 if (fix_screen || width != old_width || height != old_height) 1184 if (fix_screen || newwidth != old_width || newheight != old_height)
1185 { 1185 {
1186 if (scrollbar_visible ()) 1186 if (scrollbar_visible ())
1187 { 1187 {
1188 XMoveResizeWindow (disp, scrollBar.win, 1188 XMoveResizeWindow (disp, scrollBar.win,
1189 window_sb_x, 0, 1189 window_sb_x, 0,
… …
1194 if (menubar_visible ()) 1194 if (menubar_visible ())
1195 XMoveResizeWindow (disp, menuBar.win, 1195 XMoveResizeWindow (disp, menuBar.win,
1196 window_vt_x, 0, 1196 window_vt_x, 0,
1197 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1197 TermWin_TotalWidth (), menuBar_TotalHeight ());
1198 1198
1199 XMoveResizeWindow (disp, TermWin.vt, 1199 XMoveResizeWindow (disp, vt,
1200 window_vt_x, window_vt_y, 1200 window_vt_x, window_vt_y,
1201 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1201 TermWin_TotalWidth (), TermWin_TotalHeight ());
1202 1202
1203 scr_clear (); 1203 scr_clear ();
1204#ifdef XPM_BACKGROUND 1204#ifdef XPM_BACKGROUND
… …
1212 int old_ncol = prev_ncol; 1212 int old_ncol = prev_ncol;
1213 1213
1214 /* scr_reset only works on the primary screen */ 1214 /* scr_reset only works on the primary screen */
1215 if (old_height) /* this is not the first time through */ 1215 if (old_height) /* this is not the first time through */
1216 { 1216 {
1217 unsigned int ncol = TermWin.ncol; 1217 unsigned int ocol = ncol;
1218 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
1219 curr_screen = scr_change_screen (PRIMARY); 1219 curr_screen = scr_change_screen (PRIMARY);
1220 TermWin.ncol = ncol; 1220 ncol = ocol;
1221 } 1221 }
1222 1222
1223 scr_reset (); 1223 scr_reset ();
1224 1224
1225 if (curr_screen >= 0) /* this is not the first time through */ 1225 if (curr_screen >= 0) /* this is not the first time through */
1226 { 1226 {
1227 scr_change_screen (curr_screen); 1227 scr_change_screen (curr_screen);
1228 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1228 selection_check (old_ncol != ncol ? 4 : 0);
1229 } 1229 }
1230 } 1230 }
1231 1231
1232 old_width = szHint.width; 1232 old_width = szHint.width;
1233 old_height = szHint.height; 1233 old_height = szHint.height;
1234 1234
1235#ifdef XPM_BACKGROUND 1235#ifdef XPM_BACKGROUND
1236 if (TermWin.pixmap) 1236 if (pixmap)
1237 scr_touch (false); 1237 scr_touch (false);
1238#endif 1238#endif
1239 1239
1240#ifdef USE_XIM 1240#ifdef USE_XIM
1241 IMSetStatusPosition (); 1241 IMSetStatusPosition ();
… …
1245/* 1245/*
1246 * 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.
1247 * good for toggling 80/132 columns 1247 * good for toggling 80/132 columns
1248 */ 1248 */
1249void 1249void
1250rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1250rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1251{ 1251{
1252 XWindowAttributes wattr; 1252 XWindowAttributes wattr;
1253 1253
1254 if (width == 0 || height == 0) 1254 if (newwidth == 0 || newheight == 0)
1255 { 1255 {
1256 XGetWindowAttributes (display->display, display->root, &wattr); 1256 XGetWindowAttributes (display->display, display->root, &wattr);
1257
1257 if (width == 0) 1258 if (newwidth == 0)
1258 width = wattr.width - szHint.base_width; 1259 newwidth = wattr.width - szHint.base_width;
1259 if (height == 0) 1260 if (newheight == 0)
1260 height = wattr.height - szHint.base_height; 1261 newheight = wattr.height - szHint.base_height;
1261 }
1262
1263 if (width != TermWin.width || height != TermWin.height)
1264 { 1262 }
1263
1264 if (newwidth != width || newheight != height)
1265 {
1265 width += szHint.base_width; 1266 newwidth += szHint.base_width;
1266 height += szHint.base_height; 1267 newheight += szHint.base_height;
1267 resize_all_windows (width, height, 0); 1268 resize_all_windows (newwidth, newheight, 0);
1268 } 1269 }
1269} 1270}
1270 1271
1271/* -------------------------------------------------------------------- * 1272/* -------------------------------------------------------------------- *
1272 * - X INPUT METHOD ROUTINES - * 1273 * - X INPUT METHOD ROUTINES - *
… …
1282 1283
1283void 1284void
1284rxvt_term::im_set_size (XRectangle &size) 1285rxvt_term::im_set_size (XRectangle &size)
1285{ 1286{
1286 // the int_bwidth terms make no sense to me 1287 // the int_bwidth terms make no sense to me
1287 size.x = TermWin.int_bwidth; 1288 size.x = int_bwidth;
1288 size.y = TermWin.int_bwidth; 1289 size.y = int_bwidth;
1289 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1290 size.width = Width2Pixel (ncol) + int_bwidth;
1290 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1291 size.height = Height2Pixel (nrow) + int_bwidth;
1291} 1292}
1292 1293
1293void 1294void
1294rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1295rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1295 XRectangle &status_rect, 1296 XRectangle &status_rect,
1296 const XRectangle &needed_rect) 1297 const XRectangle &needed_rect)
1297{ 1298{
1298 preedit_rect.x = needed_rect.width; 1299 preedit_rect.x = needed_rect.width;
1299 preedit_rect.y = 0; 1300 preedit_rect.y = 0;
1300 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1301 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1301 preedit_rect.height = TermWin.fheight; 1302 preedit_rect.height = fheight;
1302 1303
1303 status_rect.x = 0; 1304 status_rect.x = 0;
1304 status_rect.y = 0; 1305 status_rect.y = 0;
1305 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;
1306 status_rect.height = TermWin.fheight; 1307 status_rect.height = fheight;
1307} 1308}
1308 1309
1309/* Checking whether input method is running. */ 1310/* Checking whether input method is running. */
1310bool 1311bool
1311rxvt_term::IMisRunning () 1312rxvt_term::IMisRunning ()
… …
1339{ 1340{
1340 XPoint nspot; 1341 XPoint nspot;
1341 XVaNestedList preedit_attr; 1342 XVaNestedList preedit_attr;
1342 1343
1343 if (!Input_Context 1344 if (!Input_Context
1344 || !TermWin.focus 1345 || !focus
1345 || !(input_style & XIMPreeditPosition)) 1346 || !(input_style & XIMPreeditPosition))
1346 return; 1347 return;
1347 1348
1348 im_set_position (nspot); 1349 im_set_position (nspot);
1349 1350
… …
1469 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1470 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1470 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1471 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1471 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1472 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1472 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1473 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1473 "*", 1474 "*",
1474 TermWin.fheight, 1475 fheight,
1475 TermWin.fheight + 1, TermWin.fheight - 1, 1476 fheight + 1, fheight - 1,
1476 TermWin.fheight - 2, TermWin.fheight + 2); 1477 fheight - 2, fheight + 2);
1477 1478
1478 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1479 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1479 &missing_charset_list, &missing_charset_count, &def_string); 1480 &missing_charset_list, &missing_charset_count, &def_string);
1480 1481
1481 if (missing_charset_list) 1482 if (missing_charset_list)
… …
1527 NULL); 1528 NULL);
1528 } 1529 }
1529 1530
1530 Input_Context = XCreateIC (xim, 1531 Input_Context = XCreateIC (xim,
1531 XNInputStyle, input_style, 1532 XNInputStyle, input_style,
1532 XNClientWindow, TermWin.vt, 1533 XNClientWindow, vt,
1533 XNFocusWindow, TermWin.parent[0], 1534 XNFocusWindow, parent[0],
1534 preedit_attr ? XNPreeditAttributes : NULL, 1535 preedit_attr ? XNPreeditAttributes : NULL,
1535 preedit_attr, 1536 preedit_attr,
1536 status_attr ? XNStatusAttributes : NULL, 1537 status_attr ? XNStatusAttributes : NULL,
1537 status_attr, NULL); 1538 status_attr, NULL);
1538 1539
… …
1555} 1556}
1556 1557
1557void 1558void
1558rxvt_term::im_cb () 1559rxvt_term::im_cb ()
1559{ 1560{
1560 int i, found, had_im; 1561 int i;
1561 const char *p; 1562 const char *p;
1562 char **s; 1563 char **s;
1563 char buf[IMBUFSIZ]; 1564 char buf[IMBUFSIZ];
1564 1565
1565 SET_R (this); 1566 SET_R (this);
… …
1622{ 1623{
1623 XRectangle preedit_rect, status_rect, *needed_rect; 1624 XRectangle preedit_rect, status_rect, *needed_rect;
1624 XVaNestedList preedit_attr, status_attr; 1625 XVaNestedList preedit_attr, status_attr;
1625 1626
1626 if (!Input_Context 1627 if (!Input_Context
1627 || !TermWin.focus 1628 || !focus
1628 || !(input_style & XIMPreeditArea) 1629 || !(input_style & XIMPreeditArea)
1629 || !IMisRunning ()) 1630 || !IMisRunning ())
1630 return; 1631 return;
1631 1632
1632 /* 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