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.136 by root, Mon Feb 14 18:47:54 2005 UTC vs.
Revision 1.152 by root, Thu Dec 22 16:44:10 2005 UTC

… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "main.intpro" /* PROTOS for internal routines */ 35
36#include <limits>
36 37
37#include <csignal> 38#include <csignal>
38#include <cstring> 39#include <cstring>
39 40
40#ifdef TTY_GID_SUPPORT 41#ifdef TTY_GID_SUPPORT
… …
158 pointer_ev (this, &rxvt_term::pointer_cb), 159 pointer_ev (this, &rxvt_term::pointer_cb),
159#endif 160#endif
160#ifdef USE_XIM 161#ifdef USE_XIM
161 im_ev (this, &rxvt_term::im_cb), 162 im_ev (this, &rxvt_term::im_cb),
162#endif 163#endif
163 sw_term (this, &rxvt_term::sig_term),
164 sw_int (this, &rxvt_term::sig_term),
165 sw_chld (this, &rxvt_term::sig_chld),
166 termwin_ev (this, &rxvt_term::x_cb), 164 termwin_ev (this, &rxvt_term::x_cb),
167 vt_ev (this, &rxvt_term::x_cb), 165 vt_ev (this, &rxvt_term::x_cb),
168 check_ev (this, &rxvt_term::check_cb), 166 check_ev (this, &rxvt_term::check_cb),
169 flush_ev (this, &rxvt_term::flush_cb), 167 flush_ev (this, &rxvt_term::flush_cb),
170 destroy_ev (this, &rxvt_term::destroy_cb), 168 destroy_ev (this, &rxvt_term::destroy_cb),
… …
203 201
204 emergency_cleanup (); 202 emergency_cleanup ();
205 203
206#if ENABLE_STYLES 204#if ENABLE_STYLES
207 for (int i = RS_styleCount; --i; ) 205 for (int i = RS_styleCount; --i; )
208 if (TermWin.fontset[i] != TermWin.fontset[0]) 206 if (fontset[i] != fontset[0])
209 delete TermWin.fontset[i]; 207 delete fontset[i];
210#endif 208#endif
211 delete TermWin.fontset[0]; 209 delete fontset[0];
212 210
213 if (display) 211 if (display)
214 { 212 {
215 dDisp; 213 dDisp;
216 214
… …
244#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 242#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
245 if (topShadowGC) XFreeGC (disp, topShadowGC); 243 if (topShadowGC) XFreeGC (disp, topShadowGC);
246 if (botShadowGC) XFreeGC (disp, botShadowGC); 244 if (botShadowGC) XFreeGC (disp, botShadowGC);
247 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 245 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
248#endif 246#endif
249 if (TermWin.gc) XFreeGC (disp, TermWin.gc); 247 if (gc) XFreeGC (disp, gc);
250 248
251#if defined(MENUBAR) && (MENUBAR_MAX > 1) 249#if defined(MENUBAR) && (MENUBAR_MAX > 1)
252 delete menuBar.drawable; 250 delete menuBar.drawable;
253 //if (menuBar.win) 251 //if (menuBar.win)
254 // XDestroyWindow (disp, menuBar.win); 252 // XDestroyWindow (disp, menuBar.win);
255#endif 253#endif
256 delete TermWin.drawable; 254 delete drawable;
257 // destroy all windows 255 // destroy all windows
258 if (TermWin.parent[0] && !rs[Rs_embed]) 256 if (parent[0])
259 XDestroyWindow (disp, TermWin.parent[0]); 257 XDestroyWindow (disp, parent[0]);
260 } 258 }
261 259
262 // TODO: free pixcolours, colours should become part of rxvt_display 260 // TODO: free pixcolours, colours should become part of rxvt_display
263 261
264 delete pix_colors_focused; 262 delete pix_colors_focused;
265#ifdef OFF_FOCUS_FADING 263#if OFF_FOCUS_FADING
266 delete pix_colors_unfocused; 264 delete pix_colors_unfocused;
267#endif 265#endif
268 266
269 displays.put (display); 267 displays.put (display);
270 268
… …
288 delete argv; 286 delete argv;
289 287
290#ifdef KEYSYM_RESOURCE 288#ifdef KEYSYM_RESOURCE
291 delete keyboard; 289 delete keyboard;
292#endif 290#endif
291}
292
293void
294rxvt_term::child_exit ()
295{
296 cmd_pid = 0;
297
298 if (!(options & Opt_hold))
299 destroy ();
293} 300}
294 301
295void 302void
296rxvt_term::destroy () 303rxvt_term::destroy ()
297{ 304{
… …
418{ 425{
419 if (GET_R->allowedxerror == -1) 426 if (GET_R->allowedxerror == -1)
420 GET_R->allowedxerror = event->error_code; 427 GET_R->allowedxerror = event->error_code;
421 else 428 else
422 { 429 {
423 //TODO: GET_R is most likely not the terminal which caused the error 430 // GET_R is most likely not the terminal which caused the error,
424 //TODO: maybe just output the error and continue? 431 // so just output the error and continue
425#if ENABLE_FRILLS 432#if ENABLE_FRILLS
426 print_x_error (display, event); 433 print_x_error (display, event);
427#else 434#else
428 old_xerror_handler (display, event); 435 old_xerror_handler (display, event);
429#endif 436#endif
… …
439 DisplayString (display)); 446 DisplayString (display));
440 rxvt_emergency_cleanup (); 447 rxvt_emergency_cleanup ();
441 _exit (EXIT_FAILURE); 448 _exit (EXIT_FAILURE);
442} 449}
443 450
444/*
445 * Catch a fatal signal and tidy up before quitting
446 */
447void
448rxvt_term::sig_term (sig_watcher &w)
449{
450#ifdef DEBUG_CMD
451 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
452#endif
453 rxvt_emergency_cleanup ();
454 signal (w.signum, SIG_DFL);
455 kill (getpid (), w.signum);
456}
457
458/*----------------------------------------------------------------------*/ 451/*----------------------------------------------------------------------*/
459/* rxvt_init () */
460bool 452bool
461rxvt_term::init (int argc, const char *const *argv) 453rxvt_term::init (int argc, const char *const *argv)
462{ 454{
463 SET_R (this); 455 SET_R (this);
464 456
… …
510 check_our_parents (); 502 check_our_parents ();
511 rootwin_ev.start (display, display->root); 503 rootwin_ev.start (display, display->root);
512 } 504 }
513#endif 505#endif
514 506
515 XMapWindow (disp, TermWin.vt); 507 XMapWindow (disp, vt);
516 XMapWindow (disp, TermWin.parent[0]); 508 XMapWindow (disp, parent[0]);
517 509
518 set_colorfgbg (); 510 set_colorfgbg ();
519 511
520 init_command (cmd_argv); 512 init_command (cmd_argv);
521 513
… …
525 517
526 check_ev.start (); 518 check_ev.start ();
527 519
528 return true; 520 return true;
529} 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;
530 562
531void 563void
532rxvt_init () 564rxvt_init ()
533{ 565{
534 /* 566 /*
… …
542 rxvt_privileges (IGNORE); 574 rxvt_privileges (IGNORE);
543 575
544 signal (SIGHUP, SIG_IGN); 576 signal (SIGHUP, SIG_IGN);
545 signal (SIGPIPE, SIG_IGN); 577 signal (SIGPIPE, SIG_IGN);
546 578
579 sig_handlers.sw_chld.start (SIGCHLD);
580 sig_handlers.sw_term.start (SIGTERM);
581 sig_handlers.sw_int.start (SIGINT);
582
547 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 583 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
548 /* signal (SIGURG, SIG_DFL); */ 584 /* signal (SIGURG, SIG_DFL); */
549 585
550 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 586 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
551 // TODO: handle this with exceptions and tolerate the memory loss 587 // TODO: handle this with exceptions and tolerate the memory loss
552 XSetIOErrorHandler (rxvt_xioerror_handler); 588 XSetIOErrorHandler (rxvt_xioerror_handler);
553}
554
555/* ------------------------------------------------------------------------- *
556 * SIGNAL HANDLING & EXIT HANDLER *
557 * ------------------------------------------------------------------------- */
558/*
559 * Catch a SIGCHLD signal and exit if the direct child has died
560 */
561
562void
563rxvt_term::sig_chld (sig_watcher &w)
564{
565 // we are being called for every SIGCHLD, not just ours
566 int pid;
567
568 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
569 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
570 if (pid == (*t)->cmd_pid)
571 {
572 (*t)->destroy ();
573 break;
574 }
575} 589}
576 590
577/* ------------------------------------------------------------------------- * 591/* ------------------------------------------------------------------------- *
578 * MEMORY ALLOCATION WRAPPERS * 592 * MEMORY ALLOCATION WRAPPERS *
579 * ------------------------------------------------------------------------- */ 593 * ------------------------------------------------------------------------- */
… …
586 rxvt_fatal ("memory allocation failure. aborting.\n"); 600 rxvt_fatal ("memory allocation failure. aborting.\n");
587 601
588 return p; 602 return p;
589} 603}
590 604
591/* INTPROTO */ 605void *
592void *
593rxvt_calloc (size_t number, size_t size) 606rxvt_calloc (size_t number, size_t size)
594{ 607{
595 void *p = calloc (number, size); 608 void *p = calloc (number, size);
596 609
597 if (!p) 610 if (!p)
598 rxvt_fatal ("memory allocation failure. aborting.\n"); 611 rxvt_fatal ("memory allocation failure. aborting.\n");
599 612
600 return p; 613 return p;
601} 614}
602 615
603/* INTPROTO */
604void * 616void *
605rxvt_realloc (void *ptr, size_t size) 617rxvt_realloc (void *ptr, size_t size)
606{ 618{
607 void *p = realloc (ptr, size); 619 void *p = realloc (ptr, size);
608 620
… …
690/* 702/*
691 * window size/position calculcations for XSizeHint and other storage. 703 * window size/position calculcations for XSizeHint and other storage.
692 * if width/height are non-zero then override calculated width/height 704 * if width/height are non-zero then override calculated width/height
693 */ 705 */
694void 706void
695rxvt_term::window_calc (unsigned int width, unsigned int height) 707rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
696{ 708{
697 short recalc_x, recalc_y; 709 short recalc_x, recalc_y;
698 int x, y, sb_w, mb_h, flags; 710 int x, y, sb_w, mb_h, flags;
699 unsigned int w, h; 711 unsigned int w, h;
700 unsigned int max_width, max_height; 712 unsigned int max_width, max_height;
701 dDisp; 713 dDisp;
702 714
703 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",
704 TermWin.ncol, TermWin.nrow, szHint.width, 716 ncol, nrow, szHint.width, szHint.height));
705 szHint.height)); 717
706 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 718 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
707 szHint.win_gravity = NorthWestGravity; 719 szHint.win_gravity = NorthWestGravity;
708 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 720 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
709 721
710 recalc_x = recalc_y = 0; 722 recalc_x = recalc_y = 0;
711 flags = 0; 723 flags = 0;
724
712 if (!parsed_geometry) 725 if (!parsed_geometry)
713 { 726 {
714 parsed_geometry = 1; 727 parsed_geometry = 1;
728
715 if (rs[Rs_geometry]) 729 if (rs[Rs_geometry])
716 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 730 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
717 731
718 if (flags & WidthValue) 732 if (flags & WidthValue)
719 { 733 {
720 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 734 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
721 szHint.flags |= USSize; 735 szHint.flags |= USSize;
722 } 736 }
723 737
724 if (flags & HeightValue) 738 if (flags & HeightValue)
725 { 739 {
726 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 740 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
727 szHint.flags |= USSize; 741 szHint.flags |= USSize;
728 } 742 }
729 743
730 if (flags & XValue) 744 if (flags & XValue)
731 { 745 {
732 szHint.x = x; 746 szHint.x = x;
733 szHint.flags |= USPosition; 747 szHint.flags |= USPosition;
748
734 if (flags & XNegative) 749 if (flags & XNegative)
735 { 750 {
736 recalc_x = 1; 751 recalc_x = 1;
737 szHint.win_gravity = NorthEastGravity; 752 szHint.win_gravity = NorthEastGravity;
738 } 753 }
… …
740 755
741 if (flags & YValue) 756 if (flags & YValue)
742 { 757 {
743 szHint.y = y; 758 szHint.y = y;
744 szHint.flags |= USPosition; 759 szHint.flags |= USPosition;
760
745 if (flags & YNegative) 761 if (flags & YNegative)
746 { 762 {
747 recalc_y = 1; 763 recalc_y = 1;
764
748 if (szHint.win_gravity == NorthEastGravity) 765 if (szHint.win_gravity == NorthEastGravity)
749 szHint.win_gravity = SouthEastGravity; 766 szHint.win_gravity = SouthEastGravity;
750 else 767 else
751 szHint.win_gravity = SouthWestGravity; 768 szHint.win_gravity = SouthWestGravity;
752 } 769 }
753 } 770 }
754 } 771 }
755 772
756 /* TODO: BOUNDS */ 773 /* TODO: BOUNDS */
757 TermWin.width = TermWin.ncol * TermWin.fwidth; 774 width = ncol * fwidth;
758 TermWin.height = TermWin.nrow * TermWin.fheight; 775 height = nrow * fheight;
759 max_width = MAX_COLS * TermWin.fwidth; 776 max_width = MAX_COLS * fwidth;
760 max_height = MAX_ROWS * TermWin.fheight; 777 max_height = MAX_ROWS * fheight;
761 778
762 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 779 szHint.base_width = szHint.base_height = 2 * int_bwidth;
763 780
764 sb_w = mb_h = 0; 781 sb_w = mb_h = 0;
765 window_vt_x = window_vt_y = TermWin.int_bwidth; 782 window_vt_x = window_vt_y = int_bwidth;
766 783
767 if (scrollbar_visible ()) 784 if (scrollbar_visible ())
768 { 785 {
769 sb_w = scrollbar_TotalWidth (); 786 sb_w = scrollbar_TotalWidth ();
770 szHint.base_width += sb_w; 787 szHint.base_width += sb_w;
… …
777 mb_h = menuBar_TotalHeight (); 794 mb_h = menuBar_TotalHeight ();
778 szHint.base_height += mb_h; 795 szHint.base_height += mb_h;
779 window_vt_y += mb_h; 796 window_vt_y += mb_h;
780 } 797 }
781 798
782 szHint.width_inc = TermWin.fwidth; 799 szHint.width_inc = fwidth;
783 szHint.height_inc = TermWin.fheight; 800 szHint.height_inc = fheight;
784 szHint.min_width = szHint.base_width + szHint.width_inc; 801 szHint.min_width = szHint.base_width + szHint.width_inc;
785 szHint.min_height = szHint.base_height + szHint.height_inc; 802 szHint.min_height = szHint.base_height + szHint.height_inc;
786 803
787 if (width && width - szHint.base_width < max_width) 804 if (newwidth && newwidth - szHint.base_width < max_width)
788 { 805 {
789 szHint.width = width; 806 szHint.width = newwidth;
790 TermWin.width = width - szHint.base_width; 807 width = newwidth - szHint.base_width;
791 } 808 }
792 else 809 else
793 { 810 {
794 MIN_IT (TermWin.width, max_width); 811 min_it (width, max_width);
795 szHint.width = szHint.base_width + TermWin.width; 812 szHint.width = szHint.base_width + width;
796 } 813 }
797 814
798 if (height && height - szHint.base_height < max_height) 815 if (newheight && newheight - szHint.base_height < max_height)
799 { 816 {
800 szHint.height = height; 817 szHint.height = newheight;
801 TermWin.height = height - szHint.base_height; 818 height = newheight - szHint.base_height;
802 } 819 }
803 else 820 else
804 { 821 {
805 MIN_IT (TermWin.height, max_height); 822 min_it (height, max_height);
806 szHint.height = szHint.base_height + TermWin.height; 823 szHint.height = szHint.base_height + height;
807 } 824 }
808 825
809 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 826 if (scrollbar_visible () && (options & Opt_scrollBar_right))
810 window_sb_x = szHint.width - sb_w; 827 window_sb_x = szHint.width - sb_w;
811 828
812 if (recalc_x) 829 if (recalc_x)
813 szHint.x += (DisplayWidth (disp, display->screen) 830 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
814 - szHint.width - 2 * TermWin.ext_bwidth);
815 if (recalc_y) 831 if (recalc_y)
816 szHint.y += (DisplayHeight (disp, display->screen) 832 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
817 - szHint.height - 2 * TermWin.ext_bwidth);
818 833
819 TermWin.ncol = TermWin.width / TermWin.fwidth; 834 ncol = width / fwidth;
820 TermWin.nrow = TermWin.height / TermWin.fheight; 835 nrow = height / fheight;
821 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",
822 TermWin.ncol, TermWin.nrow, szHint.width, 837 ncol, nrow, szHint.width,
823 szHint.height)); 838 szHint.height));
824 return; 839 return;
825} 840}
826 841
827/*----------------------------------------------------------------------*/ 842/*----------------------------------------------------------------------*/
… …
835 if (pty.pty < 0) 850 if (pty.pty < 0)
836 return; 851 return;
837 852
838 struct winsize ws; 853 struct winsize ws;
839 854
840 ws.ws_col = TermWin.ncol; 855 ws.ws_col = ncol;
841 ws.ws_row = TermWin.nrow; 856 ws.ws_row = nrow;
842 ws.ws_xpixel = TermWin.width; 857 ws.ws_xpixel = width;
843 ws.ws_ypixel = TermWin.height; 858 ws.ws_ypixel = height;
844 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 859 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
845 860
846#if 0 861#if 0
847 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 862 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
848 if (cmd_pid) /* force through to the command */ 863 if (cmd_pid) /* force through to the command */
849 kill (cmd_pid, SIGWINCH); 864 kill (-cmd_pid, SIGWINCH);
850#endif 865#endif
851} 866}
852 867
853/*----------------------------------------------------------------------*/ 868/*----------------------------------------------------------------------*/
854/* set_fonts () - load and set the various fonts 869/* set_fonts () - load and set the various fonts
855/* 870 *
856 * init = 1 - initialize 871 * init = 1 - initialize
857 * 872 *
858 * fontname == FONT_UP - switch to bigger font 873 * fontname == FONT_UP - switch to bigger font
859 * fontname == FONT_DN - switch to smaller font 874 * fontname == FONT_DN - switch to smaller font
860 */ 875 */
… …
872 return false; 887 return false;
873 } 888 }
874 889
875#if ENABLE_STYLES 890#if ENABLE_STYLES
876 for (int i = RS_styleCount; --i; ) 891 for (int i = RS_styleCount; --i; )
877 if (TermWin.fontset[i] != TermWin.fontset[0]) 892 if (fontset[i] != fontset[0])
878 delete TermWin.fontset[i]; 893 delete fontset[i];
879#endif 894#endif
880 895
881 delete TermWin.fontset[0]; 896 delete fontset[0];
882 TermWin.fontset[0] = fs; 897 fontset[0] = fs;
883 898
884 prop = (*fs)[1]->properties (); 899 prop = (*fs)[1]->properties ();
885 prop.height += TermWin.lineSpace; 900 prop.height += lineSpace;
886 fs->set_prop (prop); 901 fs->set_prop (prop);
887 902
888 TermWin.fwidth = prop.width; 903 fwidth = prop.width;
889 TermWin.fheight = prop.height; 904 fheight = prop.height;
890 TermWin.fweight = prop.weight;
891 TermWin.fslant = prop.slant;
892 TermWin.fbase = (*fs)[1]->ascent; 905 fbase = (*fs)[1]->ascent;
893 906
894 for (int style = 1; style < 4; style++) 907 for (int style = 1; style < 4; style++)
895 { 908 {
896#if ENABLE_STYLES 909#if ENABLE_STYLES
897 const char *res = rs[Rs_font + style]; 910 const char *res = rs[Rs_font + style];
898 911
899 if (res && !*res) 912 if (res && !*res)
900 TermWin.fontset[style] = TermWin.fontset[0]; 913 fontset[style] = fontset[0];
901 else 914 else
902 { 915 {
903 TermWin.fontset[style] = fs = new rxvt_fontset (this); 916 fontset[style] = fs = new rxvt_fontset (this);
904 rxvt_fontprop prop2 = prop; 917 rxvt_fontprop prop2 = prop;
905 918
906 if (res) 919 if (res)
907 prop2.weight = prop2.slant = rxvt_fontprop::unset; 920 prop2.weight = prop2.slant = rxvt_fontprop::unset;
908 else 921 else
909 { 922 {
910 res = TermWin.fontset[0]->fontdesc; 923 res = fontset[0]->fontdesc;
911 924
912 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;
913 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;
914 } 927 }
915 928
916 fs->populate (res); 929 fs->populate (res);
917 fs->set_prop (prop2); 930 fs->set_prop (prop2);
918 } 931 }
919#else 932#else
920 TermWin.fontset[style] = TermWin.fontset[0]; 933 fontset[style] = fontset[0];
921#endif 934#endif
922 } 935 }
923 936
924 if (TermWin.parent[0]) 937 if (parent[0])
925 { 938 {
926 resize_all_windows (0, 0, 0); 939 resize_all_windows (0, 0, 0);
927 scr_remap_chars (); 940 scr_remap_chars ();
928 scr_touch (true); 941 scr_touch (true);
929 } 942 }
… …
932} 945}
933 946
934void 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)
935{ 948{
936 // TODO: SMART_WINDOW_TITLE 949 // TODO: SMART_WINDOW_TITLE
937 XChangeProperty (display->display, TermWin.parent[0], 950 XChangeProperty (display->display, parent[0],
938 prop, XA_STRING, 8, PropModeReplace, 951 prop, XA_STRING, 8, PropModeReplace,
939 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 952 (const unsigned char *)str, len >= 0 ? len : strlen (str));
940} 953}
941 954
942void 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)
943{ 956{
944 // TODO: SMART_WINDOW_TITLE 957 // TODO: SMART_WINDOW_TITLE
945 wchar_t *ws = rxvt_mbstowcs (str, len); 958 wchar_t *ws = rxvt_mbstowcs (str, len);
946 char *s = rxvt_wcstoutf8 (ws); 959 char *s = rxvt_wcstoutf8 (ws);
947 960
948 XChangeProperty (display->display, TermWin.parent[0], 961 XChangeProperty (display->display, parent[0],
949 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 962 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
950 (const unsigned char *)s, strlen (s)); 963 (const unsigned char *)s, strlen (s));
951 964
952 free (s); 965 free (s);
953 free (ws); 966 free (ws);
… …
958/* xterm sequences - title, iconName, color (exptl) */ 971/* xterm sequences - title, iconName, color (exptl) */
959void 972void
960rxvt_term::set_title (const char *str) 973rxvt_term::set_title (const char *str)
961{ 974{
962 set_string_property (XA_WM_NAME, str); 975 set_string_property (XA_WM_NAME, str);
963#if ENABLE_FRILLS 976#if ENABLE_EWMH
964 set_utf8_property (xa[XA_NET_WM_NAME], str); 977 set_utf8_property (xa[XA_NET_WM_NAME], str);
965#endif 978#endif
966} 979}
967 980
968void 981void
969rxvt_term::set_icon_name (const char *str) 982rxvt_term::set_icon_name (const char *str)
970{ 983{
971 set_string_property (XA_WM_ICON_NAME, str); 984 set_string_property (XA_WM_ICON_NAME, str);
972#if ENABLE_FRILLS 985#if ENABLE_EWMH
973 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 986 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
974#endif 987#endif
975} 988}
976 989
977#ifdef XTERM_COLOR_CHANGE 990#ifdef XTERM_COLOR_CHANGE
… …
993 { /* bright colors */ 1006 { /* bright colors */
994 i -= 8; 1007 i -= 8;
995# ifndef NO_BRIGHTCOLOR 1008# ifndef NO_BRIGHTCOLOR
996 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1009 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
997 SET_PIXCOLOR (idx); 1010 SET_PIXCOLOR (idx);
998 goto Done; 1011 goto done;
999# endif 1012# endif
1000 } 1013 }
1001 1014
1002 if (i >= 0 && i <= 7) 1015 if (i >= 0 && i <= 7)
1003 { /* normal colors */ 1016 { /* normal colors */
1004 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1017 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1005 SET_PIXCOLOR (idx); 1018 SET_PIXCOLOR (idx);
1006 goto Done; 1019 goto done;
1007 } 1020 }
1008 } 1021 }
1009 1022
1010 if (!rXParseAllocColor (&xcol, color)) 1023 if (!rXParseAllocColor (&xcol, color))
1011 return; 1024 return;
… …
1031 pix_colors_focused[idx] = xcol; 1044 pix_colors_focused[idx] = xcol;
1032 SET_PIXCOLOR (idx); 1045 SET_PIXCOLOR (idx);
1033 1046
1034 /* XSetWindowAttributes attr; */ 1047 /* XSetWindowAttributes attr; */
1035 /* Cursor cursor; */ 1048 /* Cursor cursor; */
1036Done: 1049done:
1050
1037#ifdef OFF_FOCUS_FADING 1051#if OFF_FOCUS_FADING
1038 if (rs[Rs_fade]) 1052 if (rs[Rs_fade])
1039 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 1053 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1040#endif 1054#endif
1041 1055
1042 /*TODO: handle Color_BD, scrollbar background, etc. */ 1056 /*TODO: handle Color_BD, scrollbar background, etc. */
1043 1057
1044 recolour_cursor (); 1058 recolour_cursor ();
… …
1115 1129
1116/* -------------------------------------------------------------------- * 1130/* -------------------------------------------------------------------- *
1117 * - WINDOW RESIZING - * 1131 * - WINDOW RESIZING - *
1118 * -------------------------------------------------------------------- */ 1132 * -------------------------------------------------------------------- */
1119void 1133void
1120rxvt_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)
1121{ 1135{
1122 int fix_screen; 1136 int fix_screen;
1123#ifdef SMART_RESIZE
1124 int old_width = szHint.width, old_height = szHint.height; 1137 int old_width = szHint.width, old_height = szHint.height;
1125#endif
1126 dDisp; 1138 dDisp;
1127 1139
1128 window_calc (width, height); 1140 window_calc (newwidth, newheight);
1129 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 1141 XSetWMNormalHints (disp, parent[0], &szHint);
1130 1142
1131 if (!ignoreparent) 1143 if (!ignoreparent)
1132 { 1144 {
1133#ifdef SMART_RESIZE 1145#ifdef SMART_RESIZE
1134 /* 1146 /*
… …
1138 int x, y, x1, y1; 1150 int x, y, x1, y1;
1139 int dx, dy; 1151 int dx, dy;
1140 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1152 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1141 Window unused_cr; 1153 Window unused_cr;
1142 1154
1143 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 1155 XTranslateCoordinates (disp, parent[0], display->root,
1144 0, 0, &x, &y, &unused_cr); 1156 0, 0, &x, &y, &unused_cr);
1145 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 1157 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1146 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1158 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1147 /* 1159 /*
1148 * 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
1149 * our position for handles and decorations. Counter it 1161 * our position for handles and decorations. Counter it
1150 */ 1162 */
… …
1167 if (y < y1) /* top half */ 1179 if (y < y1) /* top half */
1168 dy = 0; 1180 dy = 0;
1169 else if (y == y1) /* exact center */ 1181 else if (y == y1) /* exact center */
1170 dy /= 2; 1182 dy /= 2;
1171 1183
1172 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 1184 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1173 szHint.width, szHint.height); 1185 szHint.width, szHint.height);
1174#else 1186#else
1175 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 1187 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1176#endif 1188#endif
1177 } 1189 }
1178 1190
1179 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1191 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1180 1192
1181 if (fix_screen || width != old_width || height != old_height) 1193 if (fix_screen || newwidth != old_width || newheight != old_height)
1182 { 1194 {
1183 if (scrollbar_visible ()) 1195 if (scrollbar_visible ())
1184 { 1196 {
1185 XMoveResizeWindow (disp, scrollBar.win, 1197 XMoveResizeWindow (disp, scrollBar.win,
1186 window_sb_x, 0, 1198 window_sb_x, 0,
… …
1191 if (menubar_visible ()) 1203 if (menubar_visible ())
1192 XMoveResizeWindow (disp, menuBar.win, 1204 XMoveResizeWindow (disp, menuBar.win,
1193 window_vt_x, 0, 1205 window_vt_x, 0,
1194 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1206 TermWin_TotalWidth (), menuBar_TotalHeight ());
1195 1207
1196 XMoveResizeWindow (disp, TermWin.vt, 1208 XMoveResizeWindow (disp, vt,
1197 window_vt_x, window_vt_y, 1209 window_vt_x, window_vt_y,
1198 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1210 TermWin_TotalWidth (), TermWin_TotalHeight ());
1199 1211
1200 scr_clear (); 1212 scr_clear ();
1201#ifdef XPM_BACKGROUND 1213#ifdef XPM_BACKGROUND
… …
1209 int old_ncol = prev_ncol; 1221 int old_ncol = prev_ncol;
1210 1222
1211 /* scr_reset only works on the primary screen */ 1223 /* scr_reset only works on the primary screen */
1212 if (old_height) /* this is not the first time through */ 1224 if (old_height) /* this is not the first time through */
1213 { 1225 {
1214 unsigned int ncol = TermWin.ncol; 1226 unsigned int ocol = ncol;
1215 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
1216 curr_screen = scr_change_screen (PRIMARY); 1228 curr_screen = scr_change_screen (PRIMARY);
1217 TermWin.ncol = ncol; 1229 ncol = ocol;
1218 } 1230 }
1219 1231
1220 scr_reset (); 1232 scr_reset ();
1221 1233
1222 if (curr_screen >= 0) /* this is not the first time through */ 1234 if (curr_screen >= 0) /* this is not the first time through */
1223 { 1235 {
1224 scr_change_screen (curr_screen); 1236 scr_change_screen (curr_screen);
1225 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1237 selection_check (old_ncol != ncol ? 4 : 0);
1226 } 1238 }
1227 } 1239 }
1228 1240
1229 old_width = szHint.width; 1241 old_width = szHint.width;
1230 old_height = szHint.height; 1242 old_height = szHint.height;
1231 1243
1232#ifdef XPM_BACKGROUND 1244#ifdef XPM_BACKGROUND
1233 if (TermWin.pixmap) 1245 if (pixmap)
1234 scr_touch (false); 1246 scr_touch (false);
1235#endif 1247#endif
1236 1248
1237#ifdef USE_XIM 1249#ifdef USE_XIM
1238 IMSetStatusPosition (); 1250 IMSetStatusPosition ();
… …
1242/* 1254/*
1243 * 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.
1244 * good for toggling 80/132 columns 1256 * good for toggling 80/132 columns
1245 */ 1257 */
1246void 1258void
1247rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1259rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1248{ 1260{
1249 XWindowAttributes wattr; 1261 XWindowAttributes wattr;
1250 1262
1251 if (width == 0 || height == 0) 1263 if (newwidth == 0 || newheight == 0)
1252 { 1264 {
1253 XGetWindowAttributes (display->display, display->root, &wattr); 1265 XGetWindowAttributes (display->display, display->root, &wattr);
1266
1254 if (width == 0) 1267 if (newwidth == 0)
1255 width = wattr.width - szHint.base_width; 1268 newwidth = wattr.width - szHint.base_width;
1256 if (height == 0) 1269 if (newheight == 0)
1257 height = wattr.height - szHint.base_height; 1270 newheight = wattr.height - szHint.base_height;
1258 }
1259
1260 if (width != TermWin.width || height != TermWin.height)
1261 { 1271 }
1272
1273 if (newwidth != width || newheight != height)
1274 {
1262 width += szHint.base_width; 1275 newwidth += szHint.base_width;
1263 height += szHint.base_height; 1276 newheight += szHint.base_height;
1264 resize_all_windows (width, height, 0); 1277 resize_all_windows (newwidth, newheight, 0);
1265 } 1278 }
1266} 1279}
1267 1280
1268/* -------------------------------------------------------------------- * 1281/* -------------------------------------------------------------------- *
1269 * - X INPUT METHOD ROUTINES - * 1282 * - X INPUT METHOD ROUTINES - *
… …
1279 1292
1280void 1293void
1281rxvt_term::im_set_size (XRectangle &size) 1294rxvt_term::im_set_size (XRectangle &size)
1282{ 1295{
1283 // the int_bwidth terms make no sense to me 1296 // the int_bwidth terms make no sense to me
1284 size.x = TermWin.int_bwidth; 1297 size.x = int_bwidth;
1285 size.y = TermWin.int_bwidth; 1298 size.y = int_bwidth;
1286 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1299 size.width = Width2Pixel (ncol) + int_bwidth;
1287 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1300 size.height = Height2Pixel (nrow) + int_bwidth;
1288} 1301}
1289 1302
1290void 1303void
1291rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1304rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1292 XRectangle &status_rect, 1305 XRectangle &status_rect,
1293 const XRectangle &needed_rect) 1306 const XRectangle &needed_rect)
1294{ 1307{
1295 preedit_rect.x = needed_rect.width; 1308 preedit_rect.x = needed_rect.width;
1296 preedit_rect.y = 0; 1309 preedit_rect.y = 0;
1297 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1310 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1298 preedit_rect.height = TermWin.fheight; 1311 preedit_rect.height = fheight;
1299 1312
1300 status_rect.x = 0; 1313 status_rect.x = 0;
1301 status_rect.y = 0; 1314 status_rect.y = 0;
1302 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;
1303 status_rect.height = TermWin.fheight; 1316 status_rect.height = fheight;
1304} 1317}
1305 1318
1306/* Checking whether input method is running. */ 1319/* Checking whether input method is running. */
1307bool 1320bool
1308rxvt_term::IMisRunning () 1321rxvt_term::IMisRunning ()
… …
1336{ 1349{
1337 XPoint nspot; 1350 XPoint nspot;
1338 XVaNestedList preedit_attr; 1351 XVaNestedList preedit_attr;
1339 1352
1340 if (!Input_Context 1353 if (!Input_Context
1341 || !TermWin.focus 1354 || !focus
1342 || !(input_style & XIMPreeditPosition)) 1355 || !(input_style & XIMPreeditPosition))
1343 return; 1356 return;
1344 1357
1345 im_set_position (nspot); 1358 im_set_position (nspot);
1346 1359
… …
1466 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1479 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1467 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1480 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1468 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1481 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1469 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1482 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1470 "*", 1483 "*",
1471 TermWin.fheight, 1484 fheight,
1472 TermWin.fheight + 1, TermWin.fheight - 1, 1485 fheight + 1, fheight - 1,
1473 TermWin.fheight - 2, TermWin.fheight + 2); 1486 fheight - 2, fheight + 2);
1474 1487
1475 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1488 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1476 &missing_charset_list, &missing_charset_count, &def_string); 1489 &missing_charset_list, &missing_charset_count, &def_string);
1477 1490
1478 if (missing_charset_list) 1491 if (missing_charset_list)
… …
1524 NULL); 1537 NULL);
1525 } 1538 }
1526 1539
1527 Input_Context = XCreateIC (xim, 1540 Input_Context = XCreateIC (xim,
1528 XNInputStyle, input_style, 1541 XNInputStyle, input_style,
1529 XNClientWindow, TermWin.vt, 1542 XNClientWindow, vt,
1530 XNFocusWindow, TermWin.parent[0], 1543 XNFocusWindow, parent[0],
1531 preedit_attr ? XNPreeditAttributes : NULL, 1544 preedit_attr ? XNPreeditAttributes : NULL,
1532 preedit_attr, 1545 preedit_attr,
1533 status_attr ? XNStatusAttributes : NULL, 1546 status_attr ? XNStatusAttributes : NULL,
1534 status_attr, NULL); 1547 status_attr, NULL);
1535 1548
… …
1552} 1565}
1553 1566
1554void 1567void
1555rxvt_term::im_cb () 1568rxvt_term::im_cb ()
1556{ 1569{
1557 int i, found, had_im; 1570 int i;
1558 const char *p; 1571 const char *p;
1559 char **s; 1572 char **s;
1560 char buf[IMBUFSIZ]; 1573 char buf[IMBUFSIZ];
1561 1574
1562 SET_R (this); 1575 SET_R (this);
… …
1619{ 1632{
1620 XRectangle preedit_rect, status_rect, *needed_rect; 1633 XRectangle preedit_rect, status_rect, *needed_rect;
1621 XVaNestedList preedit_attr, status_attr; 1634 XVaNestedList preedit_attr, status_attr;
1622 1635
1623 if (!Input_Context 1636 if (!Input_Context
1624 || !TermWin.focus 1637 || !focus
1625 || !(input_style & XIMPreeditArea) 1638 || !(input_style & XIMPreeditArea)
1626 || !IMisRunning ()) 1639 || !IMisRunning ())
1627 return; 1640 return;
1628 1641
1629 /* 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