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.139 by root, Wed Feb 16 21:37:10 2005 UTC vs.
Revision 1.155 by root, Mon Jan 2 15:35:43 2006 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 "keyboard.h"
36#include "rxvtperl.h"
37
38#include <limits>
35 39
36#include <csignal> 40#include <csignal>
37#include <cstring> 41#include <cstring>
38 42
39#ifdef TTY_GID_SUPPORT 43#ifdef TTY_GID_SUPPORT
40# include <grp.h> 44# include <grp.h>
41#endif 45#endif
42 46
43#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
44# include <termios.h> 48# include <termios.h>
45#endif
46
47#ifdef KEYSYM_RESOURCE
48# include "keyboard.h"
49#endif 49#endif
50 50
51vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
52 52
53static char curlocale[128]; 53static char curlocale[128];
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),
196 pty.put (); 193 pty.put ();
197} 194}
198 195
199rxvt_term::~rxvt_term () 196rxvt_term::~rxvt_term ()
200{ 197{
198 PERL_INVOKE ((this, HOOK_DESTROY, DT_END));
199
201 termlist.erase (find (termlist.begin (), termlist.end(), this)); 200 termlist.erase (find (termlist.begin (), termlist.end(), this));
202 201
203 emergency_cleanup (); 202 emergency_cleanup ();
204 203
205#if ENABLE_STYLES 204#if ENABLE_STYLES
206 for (int i = RS_styleCount; --i; ) 205 for (int i = RS_styleCount; --i; )
207 if (TermWin.fontset[i] != TermWin.fontset[0]) 206 if (fontset[i] != fontset[0])
208 delete TermWin.fontset[i]; 207 delete fontset[i];
209#endif 208#endif
210 delete TermWin.fontset[0]; 209 delete fontset[0];
211 210
212 if (display) 211 if (display)
213 { 212 {
214 dDisp; 213 dDisp;
215 214
243#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 242#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
244 if (topShadowGC) XFreeGC (disp, topShadowGC); 243 if (topShadowGC) XFreeGC (disp, topShadowGC);
245 if (botShadowGC) XFreeGC (disp, botShadowGC); 244 if (botShadowGC) XFreeGC (disp, botShadowGC);
246 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 245 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
247#endif 246#endif
248 if (TermWin.gc) XFreeGC (disp, TermWin.gc); 247 if (gc) XFreeGC (disp, gc);
249 248
250#if defined(MENUBAR) && (MENUBAR_MAX > 1) 249#if defined(MENUBAR) && (MENUBAR_MAX > 1)
251 delete menuBar.drawable; 250 delete menuBar.drawable;
252 //if (menuBar.win) 251 //if (menuBar.win)
253 // XDestroyWindow (disp, menuBar.win); 252 // XDestroyWindow (disp, menuBar.win);
254#endif 253#endif
255 delete TermWin.drawable; 254 delete drawable;
256 // destroy all windows 255 // destroy all windows
257 if (TermWin.parent[0] 256 if (parent[0])
258#if ENABLE_FRILLS
259 && !rs[Rs_embed]
260#endif
261 )
262 XDestroyWindow (disp, TermWin.parent[0]); 257 XDestroyWindow (disp, parent[0]);
263 } 258 }
264 259
265 // TODO: free pixcolours, colours should become part of rxvt_display 260 // TODO: free pixcolours, colours should become part of rxvt_display
266 261
267 delete pix_colors_focused; 262 delete pix_colors_focused;
268#ifdef OFF_FOCUS_FADING 263#if OFF_FOCUS_FADING
269 delete pix_colors_unfocused; 264 delete pix_colors_unfocused;
270#endif 265#endif
271 266
272 displays.put (display); 267 displays.put (display);
273 268
291 delete argv; 286 delete argv;
292 287
293#ifdef KEYSYM_RESOURCE 288#ifdef KEYSYM_RESOURCE
294 delete keyboard; 289 delete keyboard;
295#endif 290#endif
291}
292
293void
294rxvt_term::child_exit ()
295{
296 cmd_pid = 0;
297
298 if (!OPTION (Opt_hold))
299 destroy ();
296} 300}
297 301
298void 302void
299rxvt_term::destroy () 303rxvt_term::destroy ()
300{ 304{
421{ 425{
422 if (GET_R->allowedxerror == -1) 426 if (GET_R->allowedxerror == -1)
423 GET_R->allowedxerror = event->error_code; 427 GET_R->allowedxerror = event->error_code;
424 else 428 else
425 { 429 {
426 //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,
427 //TODO: maybe just output the error and continue? 431 // so just output the error and continue
428#if ENABLE_FRILLS 432#if ENABLE_FRILLS
429 print_x_error (display, event); 433 print_x_error (display, event);
430#else 434#else
431 old_xerror_handler (display, event); 435 old_xerror_handler (display, event);
432#endif 436#endif
442 DisplayString (display)); 446 DisplayString (display));
443 rxvt_emergency_cleanup (); 447 rxvt_emergency_cleanup ();
444 _exit (EXIT_FAILURE); 448 _exit (EXIT_FAILURE);
445} 449}
446 450
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/*----------------------------------------------------------------------*/ 451/*----------------------------------------------------------------------*/
462/* rxvt_init () */
463bool 452bool
464rxvt_term::init (int argc, const char *const *argv) 453rxvt_term::init (int argc, const char *const *argv)
465{ 454{
466 SET_R (this); 455 SET_R (this);
467 456
480 469
481#if MENUBAR_MAX 470#if MENUBAR_MAX
482 menubar_read (rs[Rs_menu]); 471 menubar_read (rs[Rs_menu]);
483#endif 472#endif
484#ifdef HAVE_SCROLLBARS 473#ifdef HAVE_SCROLLBARS
485 if (options & Opt_scrollBar) 474 if (OPTION (Opt_scrollBar))
486 scrollBar.setIdle (); /* set existence for size calculations */ 475 scrollBar.setIdle (); /* set existence for size calculations */
487#endif 476#endif
477
478#if ENABLE_PERL
479 rxvt_perl.init ();
480#endif
481
482 PERL_INVOKE ((this, HOOK_INIT, DT_END));
488 483
489 create_windows (argc, argv); 484 create_windows (argc, argv);
490 485
491 dDisp; 486 dDisp;
492 487
497#if 0 492#if 0
498 XSynchronize (disp, True); 493 XSynchronize (disp, True);
499#endif 494#endif
500 495
501#ifdef HAVE_SCROLLBARS 496#ifdef HAVE_SCROLLBARS
502 if (options & Opt_scrollBar) 497 if (OPTION (Opt_scrollBar))
503 resize_scrollbar (); /* create and map scrollbar */ 498 resize_scrollbar (); /* create and map scrollbar */
504#endif 499#endif
505#if (MENUBAR_MAX) 500#if (MENUBAR_MAX)
506 if (menubar_visible ()) 501 if (menubar_visible ())
507 XMapWindow (disp, menuBar.win); 502 XMapWindow (disp, menuBar.win);
508#endif 503#endif
509#ifdef TRANSPARENT 504#ifdef TRANSPARENT
510 if (options & Opt_transparent) 505 if (OPTION (Opt_transparent))
511 { 506 {
512 XSelectInput (disp, display->root, PropertyChangeMask); 507 XSelectInput (disp, display->root, PropertyChangeMask);
513 check_our_parents (); 508 check_our_parents ();
514 rootwin_ev.start (display, display->root); 509 rootwin_ev.start (display, display->root);
515 } 510 }
516#endif 511#endif
517 512
518 XMapWindow (disp, TermWin.vt); 513 XMapWindow (disp, vt);
519 XMapWindow (disp, TermWin.parent[0]); 514 XMapWindow (disp, parent[0]);
520 515
521 set_colorfgbg (); 516 set_colorfgbg ();
522 517
523 init_command (cmd_argv); 518 init_command (cmd_argv);
524 519
526 521
527 pty_ev.start (pty.pty, EVENT_READ); 522 pty_ev.start (pty.pty, EVENT_READ);
528 523
529 check_ev.start (); 524 check_ev.start ();
530 525
526 PERL_INVOKE ((this, HOOK_START, DT_END));
527
531 return true; 528 return true;
532} 529}
530
531static struct sig_handlers
532{
533 sig_watcher sw_chld, sw_term, sw_int;
534
535 void sig_chld (sig_watcher &w)
536 {
537 // we are being called for every SIGCHLD, find the corresponding term
538 int pid;
539
540 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
541 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
542 if (pid == (*t)->cmd_pid)
543 {
544 (*t)->child_exit ();
545 break;
546 }
547 }
548
549 /*
550 * Catch a fatal signal and tidy up before quitting
551 */
552 void
553 sig_term (sig_watcher &w)
554 {
555#ifdef DEBUG_CMD
556 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
557#endif
558 rxvt_emergency_cleanup ();
559 signal (w.signum, SIG_DFL);
560 kill (getpid (), w.signum);
561 }
562
563 sig_handlers ()
564 : sw_chld (this, &sig_handlers::sig_chld),
565 sw_term (this, &sig_handlers::sig_term),
566 sw_int (this, &sig_handlers::sig_term)
567 {
568 }
569} sig_handlers;
533 570
534void 571void
535rxvt_init () 572rxvt_init ()
536{ 573{
537 /* 574 /*
545 rxvt_privileges (IGNORE); 582 rxvt_privileges (IGNORE);
546 583
547 signal (SIGHUP, SIG_IGN); 584 signal (SIGHUP, SIG_IGN);
548 signal (SIGPIPE, SIG_IGN); 585 signal (SIGPIPE, SIG_IGN);
549 586
587 sig_handlers.sw_chld.start (SIGCHLD);
588 sig_handlers.sw_term.start (SIGTERM);
589 sig_handlers.sw_int.start (SIGINT);
590
550 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 591 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
551 /* signal (SIGURG, SIG_DFL); */ 592 /* signal (SIGURG, SIG_DFL); */
552 593
553 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 594 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
554 // TODO: handle this with exceptions and tolerate the memory loss 595 // TODO: handle this with exceptions and tolerate the memory loss
555 XSetIOErrorHandler (rxvt_xioerror_handler); 596 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} 597}
579 598
580/* ------------------------------------------------------------------------- * 599/* ------------------------------------------------------------------------- *
581 * MEMORY ALLOCATION WRAPPERS * 600 * MEMORY ALLOCATION WRAPPERS *
582 * ------------------------------------------------------------------------- */ 601 * ------------------------------------------------------------------------- */
589 rxvt_fatal ("memory allocation failure. aborting.\n"); 608 rxvt_fatal ("memory allocation failure. aborting.\n");
590 609
591 return p; 610 return p;
592} 611}
593 612
594void * 613void *
595rxvt_calloc (size_t number, size_t size) 614rxvt_calloc (size_t number, size_t size)
596{ 615{
597 void *p = calloc (number, size); 616 void *p = calloc (number, size);
598 617
599 if (!p) 618 if (!p)
670 689
671#ifdef UTMP_SUPPORT 690#ifdef UTMP_SUPPORT
672void 691void
673rxvt_term::privileged_utmp (rxvt_privaction action) 692rxvt_term::privileged_utmp (rxvt_privaction action)
674{ 693{
675 if ((options & Opt_utmpInhibit) 694 if (OPTION (Opt_utmpInhibit)
676 || !pty.name || !*pty.name) 695 || !pty.name || !*pty.name)
677 return; 696 return;
678 697
679 rxvt_privileges (RESTORE); 698 rxvt_privileges (RESTORE);
680 699
691/* 710/*
692 * window size/position calculcations for XSizeHint and other storage. 711 * window size/position calculcations for XSizeHint and other storage.
693 * if width/height are non-zero then override calculated width/height 712 * if width/height are non-zero then override calculated width/height
694 */ 713 */
695void 714void
696rxvt_term::window_calc (unsigned int width, unsigned int height) 715rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
697{ 716{
698 short recalc_x, recalc_y; 717 short recalc_x, recalc_y;
699 int x, y, sb_w, mb_h, flags; 718 int x, y, sb_w, mb_h, flags;
700 unsigned int w, h; 719 unsigned int w, h;
701 unsigned int max_width, max_height; 720 unsigned int max_width, max_height;
702 dDisp; 721 dDisp;
703 722
704 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 723 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
705 TermWin.ncol, TermWin.nrow, szHint.width, 724 ncol, nrow, szHint.width, szHint.height));
706 szHint.height)); 725
707 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 726 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
708 szHint.win_gravity = NorthWestGravity; 727 szHint.win_gravity = NorthWestGravity;
709 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 728 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
710 729
711 recalc_x = recalc_y = 0; 730 recalc_x = recalc_y = 0;
712 flags = 0; 731 flags = 0;
732
713 if (!parsed_geometry) 733 if (!parsed_geometry)
714 { 734 {
715 parsed_geometry = 1; 735 parsed_geometry = 1;
736
716 if (rs[Rs_geometry]) 737 if (rs[Rs_geometry])
717 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 738 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
718 739
719 if (flags & WidthValue) 740 if (flags & WidthValue)
720 { 741 {
721 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 742 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
722 szHint.flags |= USSize; 743 szHint.flags |= USSize;
723 } 744 }
724 745
725 if (flags & HeightValue) 746 if (flags & HeightValue)
726 { 747 {
727 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 748 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
728 szHint.flags |= USSize; 749 szHint.flags |= USSize;
729 } 750 }
730 751
731 if (flags & XValue) 752 if (flags & XValue)
732 { 753 {
733 szHint.x = x; 754 szHint.x = x;
734 szHint.flags |= USPosition; 755 szHint.flags |= USPosition;
756
735 if (flags & XNegative) 757 if (flags & XNegative)
736 { 758 {
737 recalc_x = 1; 759 recalc_x = 1;
738 szHint.win_gravity = NorthEastGravity; 760 szHint.win_gravity = NorthEastGravity;
739 } 761 }
741 763
742 if (flags & YValue) 764 if (flags & YValue)
743 { 765 {
744 szHint.y = y; 766 szHint.y = y;
745 szHint.flags |= USPosition; 767 szHint.flags |= USPosition;
768
746 if (flags & YNegative) 769 if (flags & YNegative)
747 { 770 {
748 recalc_y = 1; 771 recalc_y = 1;
772
749 if (szHint.win_gravity == NorthEastGravity) 773 if (szHint.win_gravity == NorthEastGravity)
750 szHint.win_gravity = SouthEastGravity; 774 szHint.win_gravity = SouthEastGravity;
751 else 775 else
752 szHint.win_gravity = SouthWestGravity; 776 szHint.win_gravity = SouthWestGravity;
753 } 777 }
754 } 778 }
755 } 779 }
756 780
757 /* TODO: BOUNDS */ 781 /* TODO: BOUNDS */
758 TermWin.width = TermWin.ncol * TermWin.fwidth; 782 width = ncol * fwidth;
759 TermWin.height = TermWin.nrow * TermWin.fheight; 783 height = nrow * fheight;
760 max_width = MAX_COLS * TermWin.fwidth; 784 max_width = MAX_COLS * fwidth;
761 max_height = MAX_ROWS * TermWin.fheight; 785 max_height = MAX_ROWS * fheight;
762 786
763 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 787 szHint.base_width = szHint.base_height = 2 * int_bwidth;
764 788
765 sb_w = mb_h = 0; 789 sb_w = mb_h = 0;
766 window_vt_x = window_vt_y = TermWin.int_bwidth; 790 window_vt_x = window_vt_y = int_bwidth;
767 791
768 if (scrollbar_visible ()) 792 if (scrollbar_visible ())
769 { 793 {
770 sb_w = scrollbar_TotalWidth (); 794 sb_w = scrollbar_TotalWidth ();
771 szHint.base_width += sb_w; 795 szHint.base_width += sb_w;
772 if (!(options & Opt_scrollBar_right)) 796 if (!OPTION (Opt_scrollBar_right))
773 window_vt_x += sb_w; 797 window_vt_x += sb_w;
774 } 798 }
775 799
776 if (menubar_visible ()) 800 if (menubar_visible ())
777 { 801 {
778 mb_h = menuBar_TotalHeight (); 802 mb_h = menuBar_TotalHeight ();
779 szHint.base_height += mb_h; 803 szHint.base_height += mb_h;
780 window_vt_y += mb_h; 804 window_vt_y += mb_h;
781 } 805 }
782 806
783 szHint.width_inc = TermWin.fwidth; 807 szHint.width_inc = fwidth;
784 szHint.height_inc = TermWin.fheight; 808 szHint.height_inc = fheight;
785 szHint.min_width = szHint.base_width + szHint.width_inc; 809 szHint.min_width = szHint.base_width + szHint.width_inc;
786 szHint.min_height = szHint.base_height + szHint.height_inc; 810 szHint.min_height = szHint.base_height + szHint.height_inc;
787 811
788 if (width && width - szHint.base_width < max_width) 812 if (newwidth && newwidth - szHint.base_width < max_width)
789 { 813 {
790 szHint.width = width; 814 szHint.width = newwidth;
791 TermWin.width = width - szHint.base_width; 815 width = newwidth - szHint.base_width;
792 } 816 }
793 else 817 else
794 { 818 {
795 MIN_IT (TermWin.width, max_width); 819 min_it (width, max_width);
796 szHint.width = szHint.base_width + TermWin.width; 820 szHint.width = szHint.base_width + width;
797 } 821 }
798 822
799 if (height && height - szHint.base_height < max_height) 823 if (newheight && newheight - szHint.base_height < max_height)
800 { 824 {
801 szHint.height = height; 825 szHint.height = newheight;
802 TermWin.height = height - szHint.base_height; 826 height = newheight - szHint.base_height;
803 } 827 }
804 else 828 else
805 { 829 {
806 MIN_IT (TermWin.height, max_height); 830 min_it (height, max_height);
807 szHint.height = szHint.base_height + TermWin.height; 831 szHint.height = szHint.base_height + height;
808 } 832 }
809 833
810 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 834 if (scrollbar_visible () && OPTION (Opt_scrollBar_right))
811 window_sb_x = szHint.width - sb_w; 835 window_sb_x = szHint.width - sb_w;
812 836
813 if (recalc_x) 837 if (recalc_x)
814 szHint.x += (DisplayWidth (disp, display->screen) 838 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
815 - szHint.width - 2 * TermWin.ext_bwidth);
816 if (recalc_y) 839 if (recalc_y)
817 szHint.y += (DisplayHeight (disp, display->screen) 840 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
818 - szHint.height - 2 * TermWin.ext_bwidth);
819 841
820 TermWin.ncol = TermWin.width / TermWin.fwidth; 842 ncol = width / fwidth;
821 TermWin.nrow = TermWin.height / TermWin.fheight; 843 nrow = height / fheight;
822 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 844 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
823 TermWin.ncol, TermWin.nrow, szHint.width, 845 ncol, nrow, szHint.width,
824 szHint.height)); 846 szHint.height));
825 return; 847 return;
826} 848}
827 849
828/*----------------------------------------------------------------------*/ 850/*----------------------------------------------------------------------*/
836 if (pty.pty < 0) 858 if (pty.pty < 0)
837 return; 859 return;
838 860
839 struct winsize ws; 861 struct winsize ws;
840 862
841 ws.ws_col = TermWin.ncol; 863 ws.ws_col = ncol;
842 ws.ws_row = TermWin.nrow; 864 ws.ws_row = nrow;
843 ws.ws_xpixel = TermWin.width; 865 ws.ws_xpixel = width;
844 ws.ws_ypixel = TermWin.height; 866 ws.ws_ypixel = height;
845 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 867 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
846 868
847#if 0 869#if 0
848 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 870 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
849 if (cmd_pid) /* force through to the command */ 871 if (cmd_pid) /* force through to the command */
850 kill (cmd_pid, SIGWINCH); 872 kill (-cmd_pid, SIGWINCH);
851#endif 873#endif
852} 874}
853 875
854/*----------------------------------------------------------------------*/ 876/*----------------------------------------------------------------------*/
855/* set_fonts () - load and set the various fonts 877/* set_fonts () - load and set the various fonts
856/* 878 *
857 * init = 1 - initialize 879 * init = 1 - initialize
858 * 880 *
859 * fontname == FONT_UP - switch to bigger font 881 * fontname == FONT_UP - switch to bigger font
860 * fontname == FONT_DN - switch to smaller font 882 * fontname == FONT_DN - switch to smaller font
861 */ 883 */
873 return false; 895 return false;
874 } 896 }
875 897
876#if ENABLE_STYLES 898#if ENABLE_STYLES
877 for (int i = RS_styleCount; --i; ) 899 for (int i = RS_styleCount; --i; )
878 if (TermWin.fontset[i] != TermWin.fontset[0]) 900 if (fontset[i] != fontset[0])
879 delete TermWin.fontset[i]; 901 delete fontset[i];
880#endif 902#endif
881 903
882 delete TermWin.fontset[0]; 904 delete fontset[0];
883 TermWin.fontset[0] = fs; 905 fontset[0] = fs;
884 906
885 prop = (*fs)[1]->properties (); 907 prop = (*fs)[1]->properties ();
886 prop.height += TermWin.lineSpace; 908 prop.height += lineSpace;
887 fs->set_prop (prop); 909 fs->set_prop (prop);
888 910
889 TermWin.fwidth = prop.width; 911 fwidth = prop.width;
890 TermWin.fheight = prop.height; 912 fheight = prop.height;
891 TermWin.fweight = prop.weight;
892 TermWin.fslant = prop.slant;
893 TermWin.fbase = (*fs)[1]->ascent; 913 fbase = (*fs)[1]->ascent;
894 914
895 for (int style = 1; style < 4; style++) 915 for (int style = 1; style < 4; style++)
896 { 916 {
897#if ENABLE_STYLES 917#if ENABLE_STYLES
898 const char *res = rs[Rs_font + style]; 918 const char *res = rs[Rs_font + style];
899 919
900 if (res && !*res) 920 if (res && !*res)
901 TermWin.fontset[style] = TermWin.fontset[0]; 921 fontset[style] = fontset[0];
902 else 922 else
903 { 923 {
904 TermWin.fontset[style] = fs = new rxvt_fontset (this); 924 fontset[style] = fs = new rxvt_fontset (this);
905 rxvt_fontprop prop2 = prop; 925 rxvt_fontprop prop2 = prop;
906 926
907 if (res) 927 if (res)
908 prop2.weight = prop2.slant = rxvt_fontprop::unset; 928 prop2.weight = prop2.slant = rxvt_fontprop::unset;
909 else 929 else
910 { 930 {
911 res = TermWin.fontset[0]->fontdesc; 931 res = fontset[0]->fontdesc;
912 932
913 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 933 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
914 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 934 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
915 } 935 }
916 936
917 fs->populate (res); 937 fs->populate (res);
918 fs->set_prop (prop2); 938 fs->set_prop (prop2);
919 } 939 }
920#else 940#else
921 TermWin.fontset[style] = TermWin.fontset[0]; 941 fontset[style] = fontset[0];
922#endif 942#endif
923 } 943 }
924 944
925 if (TermWin.parent[0]) 945 if (parent[0])
926 { 946 {
927 resize_all_windows (0, 0, 0); 947 resize_all_windows (0, 0, 0);
928 scr_remap_chars (); 948 scr_remap_chars ();
929 scr_touch (true); 949 scr_touch (true);
930 } 950 }
932 return true; 952 return true;
933} 953}
934 954
935void rxvt_term::set_string_property (Atom prop, const char *str, int len) 955void rxvt_term::set_string_property (Atom prop, const char *str, int len)
936{ 956{
937 // TODO: SMART_WINDOW_TITLE
938 XChangeProperty (display->display, TermWin.parent[0], 957 XChangeProperty (display->display, parent[0],
939 prop, XA_STRING, 8, PropModeReplace, 958 prop, XA_STRING, 8, PropModeReplace,
940 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 959 (const unsigned char *)str, len >= 0 ? len : strlen (str));
941} 960}
942 961
943void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 962void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
944{ 963{
945 // TODO: SMART_WINDOW_TITLE
946 wchar_t *ws = rxvt_mbstowcs (str, len); 964 wchar_t *ws = rxvt_mbstowcs (str, len);
947 char *s = rxvt_wcstoutf8 (ws); 965 char *s = rxvt_wcstoutf8 (ws);
948 966
949 XChangeProperty (display->display, TermWin.parent[0], 967 XChangeProperty (display->display, parent[0],
950 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 968 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
951 (const unsigned char *)s, strlen (s)); 969 (const unsigned char *)s, strlen (s));
952 970
953 free (s); 971 free (s);
954 free (ws); 972 free (ws);
959/* xterm sequences - title, iconName, color (exptl) */ 977/* xterm sequences - title, iconName, color (exptl) */
960void 978void
961rxvt_term::set_title (const char *str) 979rxvt_term::set_title (const char *str)
962{ 980{
963 set_string_property (XA_WM_NAME, str); 981 set_string_property (XA_WM_NAME, str);
964#if ENABLE_FRILLS 982#if ENABLE_EWMH
965 set_utf8_property (xa[XA_NET_WM_NAME], str); 983 set_utf8_property (xa[XA_NET_WM_NAME], str);
966#endif 984#endif
967} 985}
968 986
969void 987void
970rxvt_term::set_icon_name (const char *str) 988rxvt_term::set_icon_name (const char *str)
971{ 989{
972 set_string_property (XA_WM_ICON_NAME, str); 990 set_string_property (XA_WM_ICON_NAME, str);
973#if ENABLE_FRILLS 991#if ENABLE_EWMH
974 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 992 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
975#endif 993#endif
976} 994}
977 995
978#ifdef XTERM_COLOR_CHANGE 996#ifdef XTERM_COLOR_CHANGE
994 { /* bright colors */ 1012 { /* bright colors */
995 i -= 8; 1013 i -= 8;
996# ifndef NO_BRIGHTCOLOR 1014# ifndef NO_BRIGHTCOLOR
997 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1015 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
998 SET_PIXCOLOR (idx); 1016 SET_PIXCOLOR (idx);
999 goto Done; 1017 goto done;
1000# endif 1018# endif
1001 } 1019 }
1002 1020
1003 if (i >= 0 && i <= 7) 1021 if (i >= 0 && i <= 7)
1004 { /* normal colors */ 1022 { /* normal colors */
1005 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1023 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1006 SET_PIXCOLOR (idx); 1024 SET_PIXCOLOR (idx);
1007 goto Done; 1025 goto done;
1008 } 1026 }
1009 } 1027 }
1010 1028
1011 if (!rXParseAllocColor (&xcol, color)) 1029 if (!rXParseAllocColor (&xcol, color))
1012 return; 1030 return;
1032 pix_colors_focused[idx] = xcol; 1050 pix_colors_focused[idx] = xcol;
1033 SET_PIXCOLOR (idx); 1051 SET_PIXCOLOR (idx);
1034 1052
1035 /* XSetWindowAttributes attr; */ 1053 /* XSetWindowAttributes attr; */
1036 /* Cursor cursor; */ 1054 /* Cursor cursor; */
1037Done: 1055done:
1056
1038#ifdef OFF_FOCUS_FADING 1057#if OFF_FOCUS_FADING
1039 if (rs[Rs_fade]) 1058 if (rs[Rs_fade])
1040 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 1059 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1041#endif 1060#endif
1042 1061
1043 /*TODO: handle Color_BD, scrollbar background, etc. */ 1062 /*TODO: handle Color_BD, scrollbar background, etc. */
1044 1063
1045 recolour_cursor (); 1064 recolour_cursor ();
1116 1135
1117/* -------------------------------------------------------------------- * 1136/* -------------------------------------------------------------------- *
1118 * - WINDOW RESIZING - * 1137 * - WINDOW RESIZING - *
1119 * -------------------------------------------------------------------- */ 1138 * -------------------------------------------------------------------- */
1120void 1139void
1121rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1140rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1122{ 1141{
1123 int fix_screen; 1142 int fix_screen;
1124#ifdef SMART_RESIZE
1125 int old_width = szHint.width, old_height = szHint.height; 1143 int old_width = szHint.width, old_height = szHint.height;
1126#endif
1127 dDisp; 1144 dDisp;
1128 1145
1129 window_calc (width, height); 1146 window_calc (newwidth, newheight);
1130 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 1147 XSetWMNormalHints (disp, parent[0], &szHint);
1131 1148
1132 if (!ignoreparent) 1149 if (!ignoreparent)
1133 { 1150 {
1134#ifdef SMART_RESIZE 1151#ifdef SMART_RESIZE
1135 /* 1152 /*
1139 int x, y, x1, y1; 1156 int x, y, x1, y1;
1140 int dx, dy; 1157 int dx, dy;
1141 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1158 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1142 Window unused_cr; 1159 Window unused_cr;
1143 1160
1144 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 1161 XTranslateCoordinates (disp, parent[0], display->root,
1145 0, 0, &x, &y, &unused_cr); 1162 0, 0, &x, &y, &unused_cr);
1146 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 1163 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1147 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1164 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1148 /* 1165 /*
1149 * if display->root isn't the parent window, a WM will probably have offset 1166 * if display->root isn't the parent window, a WM will probably have offset
1150 * our position for handles and decorations. Counter it 1167 * our position for handles and decorations. Counter it
1151 */ 1168 */
1168 if (y < y1) /* top half */ 1185 if (y < y1) /* top half */
1169 dy = 0; 1186 dy = 0;
1170 else if (y == y1) /* exact center */ 1187 else if (y == y1) /* exact center */
1171 dy /= 2; 1188 dy /= 2;
1172 1189
1173 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 1190 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1174 szHint.width, szHint.height); 1191 szHint.width, szHint.height);
1175#else 1192#else
1176 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 1193 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1177#endif 1194#endif
1178 } 1195 }
1179 1196
1180 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1197 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1181 1198
1182 if (fix_screen || width != old_width || height != old_height) 1199 if (fix_screen || newwidth != old_width || newheight != old_height)
1183 { 1200 {
1184 if (scrollbar_visible ()) 1201 if (scrollbar_visible ())
1185 { 1202 {
1186 XMoveResizeWindow (disp, scrollBar.win, 1203 XMoveResizeWindow (disp, scrollBar.win,
1187 window_sb_x, 0, 1204 window_sb_x, 0,
1192 if (menubar_visible ()) 1209 if (menubar_visible ())
1193 XMoveResizeWindow (disp, menuBar.win, 1210 XMoveResizeWindow (disp, menuBar.win,
1194 window_vt_x, 0, 1211 window_vt_x, 0,
1195 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1212 TermWin_TotalWidth (), menuBar_TotalHeight ());
1196 1213
1197 XMoveResizeWindow (disp, TermWin.vt, 1214 XMoveResizeWindow (disp, vt,
1198 window_vt_x, window_vt_y, 1215 window_vt_x, window_vt_y,
1199 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1216 TermWin_TotalWidth (), TermWin_TotalHeight ());
1200 1217
1201 scr_clear (); 1218 scr_clear ();
1202#ifdef XPM_BACKGROUND 1219#ifdef XPM_BACKGROUND
1210 int old_ncol = prev_ncol; 1227 int old_ncol = prev_ncol;
1211 1228
1212 /* scr_reset only works on the primary screen */ 1229 /* scr_reset only works on the primary screen */
1213 if (old_height) /* this is not the first time through */ 1230 if (old_height) /* this is not the first time through */
1214 { 1231 {
1215 unsigned int ncol = TermWin.ncol; 1232 unsigned int ocol = ncol;
1216 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1233 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1217 curr_screen = scr_change_screen (PRIMARY); 1234 curr_screen = scr_change_screen (PRIMARY);
1218 TermWin.ncol = ncol; 1235 ncol = ocol;
1219 } 1236 }
1220 1237
1221 scr_reset (); 1238 scr_reset ();
1222 1239
1223 if (curr_screen >= 0) /* this is not the first time through */ 1240 if (curr_screen >= 0) /* this is not the first time through */
1224 { 1241 {
1225 scr_change_screen (curr_screen); 1242 scr_change_screen (curr_screen);
1226 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1243 selection_check (old_ncol != ncol ? 4 : 0);
1227 } 1244 }
1228 } 1245 }
1229 1246
1230 old_width = szHint.width; 1247 old_width = szHint.width;
1231 old_height = szHint.height; 1248 old_height = szHint.height;
1232 1249
1233#ifdef XPM_BACKGROUND 1250#ifdef XPM_BACKGROUND
1234 if (TermWin.pixmap) 1251 if (pixmap)
1235 scr_touch (false); 1252 scr_touch (false);
1236#endif 1253#endif
1237 1254
1238#ifdef USE_XIM 1255#ifdef USE_XIM
1239 IMSetStatusPosition (); 1256 IMSetStatusPosition ();
1243/* 1260/*
1244 * Set the width/height of the vt window in characters. Units are pixels. 1261 * Set the width/height of the vt window in characters. Units are pixels.
1245 * good for toggling 80/132 columns 1262 * good for toggling 80/132 columns
1246 */ 1263 */
1247void 1264void
1248rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1265rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1249{ 1266{
1250 XWindowAttributes wattr; 1267 XWindowAttributes wattr;
1251 1268
1252 if (width == 0 || height == 0) 1269 if (newwidth == 0 || newheight == 0)
1253 { 1270 {
1254 XGetWindowAttributes (display->display, display->root, &wattr); 1271 XGetWindowAttributes (display->display, display->root, &wattr);
1272
1255 if (width == 0) 1273 if (newwidth == 0)
1256 width = wattr.width - szHint.base_width; 1274 newwidth = wattr.width - szHint.base_width;
1257 if (height == 0) 1275 if (newheight == 0)
1258 height = wattr.height - szHint.base_height; 1276 newheight = wattr.height - szHint.base_height;
1259 }
1260
1261 if (width != TermWin.width || height != TermWin.height)
1262 { 1277 }
1278
1279 if (newwidth != width || newheight != height)
1280 {
1263 width += szHint.base_width; 1281 newwidth += szHint.base_width;
1264 height += szHint.base_height; 1282 newheight += szHint.base_height;
1265 resize_all_windows (width, height, 0); 1283 resize_all_windows (newwidth, newheight, 0);
1266 } 1284 }
1267} 1285}
1268 1286
1269/* -------------------------------------------------------------------- * 1287/* -------------------------------------------------------------------- *
1270 * - X INPUT METHOD ROUTINES - * 1288 * - X INPUT METHOD ROUTINES - *
1280 1298
1281void 1299void
1282rxvt_term::im_set_size (XRectangle &size) 1300rxvt_term::im_set_size (XRectangle &size)
1283{ 1301{
1284 // the int_bwidth terms make no sense to me 1302 // the int_bwidth terms make no sense to me
1285 size.x = TermWin.int_bwidth; 1303 size.x = int_bwidth;
1286 size.y = TermWin.int_bwidth; 1304 size.y = int_bwidth;
1287 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1305 size.width = Width2Pixel (ncol) + int_bwidth;
1288 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1306 size.height = Height2Pixel (nrow) + int_bwidth;
1289} 1307}
1290 1308
1291void 1309void
1292rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1310rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1293 XRectangle &status_rect, 1311 XRectangle &status_rect,
1294 const XRectangle &needed_rect) 1312 const XRectangle &needed_rect)
1295{ 1313{
1296 preedit_rect.x = needed_rect.width; 1314 preedit_rect.x = needed_rect.width;
1297 preedit_rect.y = 0; 1315 preedit_rect.y = 0;
1298 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1316 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1299 preedit_rect.height = TermWin.fheight; 1317 preedit_rect.height = fheight;
1300 1318
1301 status_rect.x = 0; 1319 status_rect.x = 0;
1302 status_rect.y = 0; 1320 status_rect.y = 0;
1303 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1321 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1304 status_rect.height = TermWin.fheight; 1322 status_rect.height = fheight;
1305} 1323}
1306 1324
1307/* Checking whether input method is running. */ 1325/* Checking whether input method is running. */
1308bool 1326bool
1309rxvt_term::IMisRunning () 1327rxvt_term::IMisRunning ()
1337{ 1355{
1338 XPoint nspot; 1356 XPoint nspot;
1339 XVaNestedList preedit_attr; 1357 XVaNestedList preedit_attr;
1340 1358
1341 if (!Input_Context 1359 if (!Input_Context
1342 || !TermWin.focus 1360 || !focus
1343 || !(input_style & XIMPreeditPosition)) 1361 || !(input_style & XIMPreeditPosition))
1344 return; 1362 return;
1345 1363
1346 im_set_position (nspot); 1364 im_set_position (nspot);
1347 1365
1467 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1485 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1468 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1486 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1469 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1487 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1470 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1488 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1471 "*", 1489 "*",
1472 TermWin.fheight, 1490 fheight,
1473 TermWin.fheight + 1, TermWin.fheight - 1, 1491 fheight + 1, fheight - 1,
1474 TermWin.fheight - 2, TermWin.fheight + 2); 1492 fheight - 2, fheight + 2);
1475 1493
1476 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1494 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1477 &missing_charset_list, &missing_charset_count, &def_string); 1495 &missing_charset_list, &missing_charset_count, &def_string);
1478 1496
1479 if (missing_charset_list) 1497 if (missing_charset_list)
1525 NULL); 1543 NULL);
1526 } 1544 }
1527 1545
1528 Input_Context = XCreateIC (xim, 1546 Input_Context = XCreateIC (xim,
1529 XNInputStyle, input_style, 1547 XNInputStyle, input_style,
1530 XNClientWindow, TermWin.vt, 1548 XNClientWindow, vt,
1531 XNFocusWindow, TermWin.parent[0], 1549 XNFocusWindow, parent[0],
1532 preedit_attr ? XNPreeditAttributes : NULL, 1550 preedit_attr ? XNPreeditAttributes : NULL,
1533 preedit_attr, 1551 preedit_attr,
1534 status_attr ? XNStatusAttributes : NULL, 1552 status_attr ? XNStatusAttributes : NULL,
1535 status_attr, NULL); 1553 status_attr, NULL);
1536 1554
1553} 1571}
1554 1572
1555void 1573void
1556rxvt_term::im_cb () 1574rxvt_term::im_cb ()
1557{ 1575{
1558 int i, found, had_im; 1576 int i;
1559 const char *p; 1577 const char *p;
1560 char **s; 1578 char **s;
1561 char buf[IMBUFSIZ]; 1579 char buf[IMBUFSIZ];
1562 1580
1563 SET_R (this); 1581 SET_R (this);
1620{ 1638{
1621 XRectangle preedit_rect, status_rect, *needed_rect; 1639 XRectangle preedit_rect, status_rect, *needed_rect;
1622 XVaNestedList preedit_attr, status_attr; 1640 XVaNestedList preedit_attr, status_attr;
1623 1641
1624 if (!Input_Context 1642 if (!Input_Context
1625 || !TermWin.focus 1643 || !focus
1626 || !(input_style & XIMPreeditArea) 1644 || !(input_style & XIMPreeditArea)
1627 || !IMisRunning ()) 1645 || !IMisRunning ())
1628 return; 1646 return;
1629 1647
1630 /* Getting the necessary width of preedit area */ 1648 /* Getting the necessary width of preedit area */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines