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.156 by root, Mon Jan 2 18:20:23 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
42 46
43#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
44# include <termios.h> 48# include <termios.h>
45#endif 49#endif
46 50
47#ifdef KEYSYM_RESOURCE
48# include "keyboard.h"
49#endif
50
51vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
52 52
53static char curlocale[128]; 53static char curlocale[128], savelocale[128];
54 54
55bool 55bool
56rxvt_set_locale (const char *locale) 56rxvt_set_locale (const char *locale)
57{ 57{
58 if (!locale || !strncmp (locale, curlocale, 128)) 58 if (!locale || !strncmp (locale, curlocale, 128))
59 return false; 59 return false;
60 60
61 strncpy (curlocale, locale, 128); 61 strncpy (curlocale, locale, 128);
62 setlocale (LC_CTYPE, curlocale); 62 setlocale (LC_CTYPE, curlocale);
63 return true; 63 return true;
64}
65
66bool
67rxvt_push_locale (const char *locale)
68{
69 strcpy (savelocale, curlocale);
70 rxvt_set_locale (locale);
71}
72
73void
74rxvt_pop_locale ()
75{
76 rxvt_set_locale (savelocale);
64} 77}
65 78
66#if ENABLE_COMBINING 79#if ENABLE_COMBINING
67class rxvt_composite_vec rxvt_composite; 80class rxvt_composite_vec rxvt_composite;
68 81
157 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
158#endif 171#endif
159#ifdef USE_XIM 172#ifdef USE_XIM
160 im_ev (this, &rxvt_term::im_cb), 173 im_ev (this, &rxvt_term::im_cb),
161#endif 174#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), 175 termwin_ev (this, &rxvt_term::x_cb),
166 vt_ev (this, &rxvt_term::x_cb), 176 vt_ev (this, &rxvt_term::x_cb),
167 check_ev (this, &rxvt_term::check_cb), 177 check_ev (this, &rxvt_term::check_cb),
168 flush_ev (this, &rxvt_term::flush_cb), 178 flush_ev (this, &rxvt_term::flush_cb),
169 destroy_ev (this, &rxvt_term::destroy_cb), 179 destroy_ev (this, &rxvt_term::destroy_cb),
196 pty.put (); 206 pty.put ();
197} 207}
198 208
199rxvt_term::~rxvt_term () 209rxvt_term::~rxvt_term ()
200{ 210{
211 PERL_INVOKE ((this, HOOK_DESTROY, DT_END));
212
201 termlist.erase (find (termlist.begin (), termlist.end(), this)); 213 termlist.erase (find (termlist.begin (), termlist.end(), this));
202 214
203 emergency_cleanup (); 215 emergency_cleanup ();
204 216
205#if ENABLE_STYLES 217#if ENABLE_STYLES
206 for (int i = RS_styleCount; --i; ) 218 for (int i = RS_styleCount; --i; )
207 if (TermWin.fontset[i] != TermWin.fontset[0]) 219 if (fontset[i] != fontset[0])
208 delete TermWin.fontset[i]; 220 delete fontset[i];
209#endif 221#endif
210 delete TermWin.fontset[0]; 222 delete fontset[0];
211 223
212 if (display) 224 if (display)
213 { 225 {
214 dDisp; 226 dDisp;
215 227
243#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 255#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
244 if (topShadowGC) XFreeGC (disp, topShadowGC); 256 if (topShadowGC) XFreeGC (disp, topShadowGC);
245 if (botShadowGC) XFreeGC (disp, botShadowGC); 257 if (botShadowGC) XFreeGC (disp, botShadowGC);
246 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 258 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
247#endif 259#endif
248 if (TermWin.gc) XFreeGC (disp, TermWin.gc); 260 if (gc) XFreeGC (disp, gc);
249 261
250#if defined(MENUBAR) && (MENUBAR_MAX > 1) 262#if defined(MENUBAR) && (MENUBAR_MAX > 1)
251 delete menuBar.drawable; 263 delete menuBar.drawable;
252 //if (menuBar.win) 264 //if (menuBar.win)
253 // XDestroyWindow (disp, menuBar.win); 265 // XDestroyWindow (disp, menuBar.win);
254#endif 266#endif
255 delete TermWin.drawable; 267 delete drawable;
256 // destroy all windows 268 // destroy all windows
257 if (TermWin.parent[0] 269 if (parent[0])
258#if ENABLE_FRILLS
259 && !rs[Rs_embed]
260#endif
261 )
262 XDestroyWindow (disp, TermWin.parent[0]); 270 XDestroyWindow (disp, parent[0]);
263 } 271 }
264 272
265 // TODO: free pixcolours, colours should become part of rxvt_display 273 // TODO: free pixcolours, colours should become part of rxvt_display
266 274
267 delete pix_colors_focused; 275 delete pix_colors_focused;
268#ifdef OFF_FOCUS_FADING 276#if OFF_FOCUS_FADING
269 delete pix_colors_unfocused; 277 delete pix_colors_unfocused;
270#endif 278#endif
271 279
272 displays.put (display); 280 displays.put (display);
273 281
291 delete argv; 299 delete argv;
292 300
293#ifdef KEYSYM_RESOURCE 301#ifdef KEYSYM_RESOURCE
294 delete keyboard; 302 delete keyboard;
295#endif 303#endif
304}
305
306void
307rxvt_term::child_exit ()
308{
309 cmd_pid = 0;
310
311 if (!OPTION (Opt_hold))
312 destroy ();
296} 313}
297 314
298void 315void
299rxvt_term::destroy () 316rxvt_term::destroy ()
300{ 317{
421{ 438{
422 if (GET_R->allowedxerror == -1) 439 if (GET_R->allowedxerror == -1)
423 GET_R->allowedxerror = event->error_code; 440 GET_R->allowedxerror = event->error_code;
424 else 441 else
425 { 442 {
426 //TODO: GET_R is most likely not the terminal which caused the error 443 // GET_R is most likely not the terminal which caused the error,
427 //TODO: maybe just output the error and continue? 444 // so just output the error and continue
428#if ENABLE_FRILLS 445#if ENABLE_FRILLS
429 print_x_error (display, event); 446 print_x_error (display, event);
430#else 447#else
431 old_xerror_handler (display, event); 448 old_xerror_handler (display, event);
432#endif 449#endif
442 DisplayString (display)); 459 DisplayString (display));
443 rxvt_emergency_cleanup (); 460 rxvt_emergency_cleanup ();
444 _exit (EXIT_FAILURE); 461 _exit (EXIT_FAILURE);
445} 462}
446 463
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/*----------------------------------------------------------------------*/ 464/*----------------------------------------------------------------------*/
462/* rxvt_init () */
463bool 465bool
464rxvt_term::init (int argc, const char *const *argv) 466rxvt_term::init (int argc, const char *const *argv)
465{ 467{
466 SET_R (this); 468 SET_R (this);
467 469
480 482
481#if MENUBAR_MAX 483#if MENUBAR_MAX
482 menubar_read (rs[Rs_menu]); 484 menubar_read (rs[Rs_menu]);
483#endif 485#endif
484#ifdef HAVE_SCROLLBARS 486#ifdef HAVE_SCROLLBARS
485 if (options & Opt_scrollBar) 487 if (OPTION (Opt_scrollBar))
486 scrollBar.setIdle (); /* set existence for size calculations */ 488 scrollBar.setIdle (); /* set existence for size calculations */
487#endif 489#endif
490
491#if ENABLE_PERL
492 rxvt_perl.init ();
493#endif
494
495 PERL_INVOKE ((this, HOOK_INIT, DT_END));
488 496
489 create_windows (argc, argv); 497 create_windows (argc, argv);
490 498
491 dDisp; 499 dDisp;
492 500
497#if 0 505#if 0
498 XSynchronize (disp, True); 506 XSynchronize (disp, True);
499#endif 507#endif
500 508
501#ifdef HAVE_SCROLLBARS 509#ifdef HAVE_SCROLLBARS
502 if (options & Opt_scrollBar) 510 if (OPTION (Opt_scrollBar))
503 resize_scrollbar (); /* create and map scrollbar */ 511 resize_scrollbar (); /* create and map scrollbar */
504#endif 512#endif
505#if (MENUBAR_MAX) 513#if (MENUBAR_MAX)
506 if (menubar_visible ()) 514 if (menubar_visible ())
507 XMapWindow (disp, menuBar.win); 515 XMapWindow (disp, menuBar.win);
508#endif 516#endif
509#ifdef TRANSPARENT 517#ifdef TRANSPARENT
510 if (options & Opt_transparent) 518 if (OPTION (Opt_transparent))
511 { 519 {
512 XSelectInput (disp, display->root, PropertyChangeMask); 520 XSelectInput (disp, display->root, PropertyChangeMask);
513 check_our_parents (); 521 check_our_parents ();
514 rootwin_ev.start (display, display->root); 522 rootwin_ev.start (display, display->root);
515 } 523 }
516#endif 524#endif
517 525
518 XMapWindow (disp, TermWin.vt); 526 XMapWindow (disp, vt);
519 XMapWindow (disp, TermWin.parent[0]); 527 XMapWindow (disp, parent[0]);
520 528
521 set_colorfgbg (); 529 set_colorfgbg ();
522 530
523 init_command (cmd_argv); 531 init_command (cmd_argv);
524 532
526 534
527 pty_ev.start (pty.pty, EVENT_READ); 535 pty_ev.start (pty.pty, EVENT_READ);
528 536
529 check_ev.start (); 537 check_ev.start ();
530 538
539 PERL_INVOKE ((this, HOOK_START, DT_END));
540
531 return true; 541 return true;
532} 542}
543
544static struct sig_handlers
545{
546 sig_watcher sw_chld, sw_term, sw_int;
547
548 void sig_chld (sig_watcher &w)
549 {
550 // we are being called for every SIGCHLD, find the corresponding term
551 int pid;
552
553 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
554 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
555 if (pid == (*t)->cmd_pid)
556 {
557 (*t)->child_exit ();
558 break;
559 }
560 }
561
562 /*
563 * Catch a fatal signal and tidy up before quitting
564 */
565 void
566 sig_term (sig_watcher &w)
567 {
568#ifdef DEBUG_CMD
569 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
570#endif
571 rxvt_emergency_cleanup ();
572 signal (w.signum, SIG_DFL);
573 kill (getpid (), w.signum);
574 }
575
576 sig_handlers ()
577 : sw_chld (this, &sig_handlers::sig_chld),
578 sw_term (this, &sig_handlers::sig_term),
579 sw_int (this, &sig_handlers::sig_term)
580 {
581 }
582} sig_handlers;
533 583
534void 584void
535rxvt_init () 585rxvt_init ()
536{ 586{
537 /* 587 /*
545 rxvt_privileges (IGNORE); 595 rxvt_privileges (IGNORE);
546 596
547 signal (SIGHUP, SIG_IGN); 597 signal (SIGHUP, SIG_IGN);
548 signal (SIGPIPE, SIG_IGN); 598 signal (SIGPIPE, SIG_IGN);
549 599
600 sig_handlers.sw_chld.start (SIGCHLD);
601 sig_handlers.sw_term.start (SIGTERM);
602 sig_handlers.sw_int.start (SIGINT);
603
550 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 604 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
551 /* signal (SIGURG, SIG_DFL); */ 605 /* signal (SIGURG, SIG_DFL); */
552 606
553 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 607 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
554 // TODO: handle this with exceptions and tolerate the memory loss 608 // TODO: handle this with exceptions and tolerate the memory loss
555 XSetIOErrorHandler (rxvt_xioerror_handler); 609 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} 610}
579 611
580/* ------------------------------------------------------------------------- * 612/* ------------------------------------------------------------------------- *
581 * MEMORY ALLOCATION WRAPPERS * 613 * MEMORY ALLOCATION WRAPPERS *
582 * ------------------------------------------------------------------------- */ 614 * ------------------------------------------------------------------------- */
589 rxvt_fatal ("memory allocation failure. aborting.\n"); 621 rxvt_fatal ("memory allocation failure. aborting.\n");
590 622
591 return p; 623 return p;
592} 624}
593 625
594/* INTPROTO */ 626void *
595void *
596rxvt_calloc (size_t number, size_t size) 627rxvt_calloc (size_t number, size_t size)
597{ 628{
598 void *p = calloc (number, size); 629 void *p = calloc (number, size);
599 630
600 if (!p) 631 if (!p)
601 rxvt_fatal ("memory allocation failure. aborting.\n"); 632 rxvt_fatal ("memory allocation failure. aborting.\n");
602 633
603 return p; 634 return p;
604} 635}
605 636
606/* INTPROTO */
607void * 637void *
608rxvt_realloc (void *ptr, size_t size) 638rxvt_realloc (void *ptr, size_t size)
609{ 639{
610 void *p = realloc (ptr, size); 640 void *p = realloc (ptr, size);
611 641
672 702
673#ifdef UTMP_SUPPORT 703#ifdef UTMP_SUPPORT
674void 704void
675rxvt_term::privileged_utmp (rxvt_privaction action) 705rxvt_term::privileged_utmp (rxvt_privaction action)
676{ 706{
677 if ((options & Opt_utmpInhibit) 707 if (OPTION (Opt_utmpInhibit)
678 || !pty.name || !*pty.name) 708 || !pty.name || !*pty.name)
679 return; 709 return;
680 710
681 rxvt_privileges (RESTORE); 711 rxvt_privileges (RESTORE);
682 712
693/* 723/*
694 * window size/position calculcations for XSizeHint and other storage. 724 * window size/position calculcations for XSizeHint and other storage.
695 * if width/height are non-zero then override calculated width/height 725 * if width/height are non-zero then override calculated width/height
696 */ 726 */
697void 727void
698rxvt_term::window_calc (unsigned int width, unsigned int height) 728rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
699{ 729{
700 short recalc_x, recalc_y; 730 short recalc_x, recalc_y;
701 int x, y, sb_w, mb_h, flags; 731 int x, y, sb_w, mb_h, flags;
702 unsigned int w, h; 732 unsigned int w, h;
703 unsigned int max_width, max_height; 733 unsigned int max_width, max_height;
704 dDisp; 734 dDisp;
705 735
706 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 736 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
707 TermWin.ncol, TermWin.nrow, szHint.width, 737 ncol, nrow, szHint.width, szHint.height));
708 szHint.height)); 738
709 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 739 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
710 szHint.win_gravity = NorthWestGravity; 740 szHint.win_gravity = NorthWestGravity;
711 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 741 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
712 742
713 recalc_x = recalc_y = 0; 743 recalc_x = recalc_y = 0;
714 flags = 0; 744 flags = 0;
745
715 if (!parsed_geometry) 746 if (!parsed_geometry)
716 { 747 {
717 parsed_geometry = 1; 748 parsed_geometry = 1;
749
718 if (rs[Rs_geometry]) 750 if (rs[Rs_geometry])
719 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 751 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
720 752
721 if (flags & WidthValue) 753 if (flags & WidthValue)
722 { 754 {
723 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 755 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
724 szHint.flags |= USSize; 756 szHint.flags |= USSize;
725 } 757 }
726 758
727 if (flags & HeightValue) 759 if (flags & HeightValue)
728 { 760 {
729 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 761 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
730 szHint.flags |= USSize; 762 szHint.flags |= USSize;
731 } 763 }
732 764
733 if (flags & XValue) 765 if (flags & XValue)
734 { 766 {
735 szHint.x = x; 767 szHint.x = x;
736 szHint.flags |= USPosition; 768 szHint.flags |= USPosition;
769
737 if (flags & XNegative) 770 if (flags & XNegative)
738 { 771 {
739 recalc_x = 1; 772 recalc_x = 1;
740 szHint.win_gravity = NorthEastGravity; 773 szHint.win_gravity = NorthEastGravity;
741 } 774 }
743 776
744 if (flags & YValue) 777 if (flags & YValue)
745 { 778 {
746 szHint.y = y; 779 szHint.y = y;
747 szHint.flags |= USPosition; 780 szHint.flags |= USPosition;
781
748 if (flags & YNegative) 782 if (flags & YNegative)
749 { 783 {
750 recalc_y = 1; 784 recalc_y = 1;
785
751 if (szHint.win_gravity == NorthEastGravity) 786 if (szHint.win_gravity == NorthEastGravity)
752 szHint.win_gravity = SouthEastGravity; 787 szHint.win_gravity = SouthEastGravity;
753 else 788 else
754 szHint.win_gravity = SouthWestGravity; 789 szHint.win_gravity = SouthWestGravity;
755 } 790 }
756 } 791 }
757 } 792 }
758 793
759 /* TODO: BOUNDS */ 794 /* TODO: BOUNDS */
760 TermWin.width = TermWin.ncol * TermWin.fwidth; 795 width = ncol * fwidth;
761 TermWin.height = TermWin.nrow * TermWin.fheight; 796 height = nrow * fheight;
762 max_width = MAX_COLS * TermWin.fwidth; 797 max_width = MAX_COLS * fwidth;
763 max_height = MAX_ROWS * TermWin.fheight; 798 max_height = MAX_ROWS * fheight;
764 799
765 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 800 szHint.base_width = szHint.base_height = 2 * int_bwidth;
766 801
767 sb_w = mb_h = 0; 802 sb_w = mb_h = 0;
768 window_vt_x = window_vt_y = TermWin.int_bwidth; 803 window_vt_x = window_vt_y = int_bwidth;
769 804
770 if (scrollbar_visible ()) 805 if (scrollbar_visible ())
771 { 806 {
772 sb_w = scrollbar_TotalWidth (); 807 sb_w = scrollbar_TotalWidth ();
773 szHint.base_width += sb_w; 808 szHint.base_width += sb_w;
774 if (!(options & Opt_scrollBar_right)) 809 if (!OPTION (Opt_scrollBar_right))
775 window_vt_x += sb_w; 810 window_vt_x += sb_w;
776 } 811 }
777 812
778 if (menubar_visible ()) 813 if (menubar_visible ())
779 { 814 {
780 mb_h = menuBar_TotalHeight (); 815 mb_h = menuBar_TotalHeight ();
781 szHint.base_height += mb_h; 816 szHint.base_height += mb_h;
782 window_vt_y += mb_h; 817 window_vt_y += mb_h;
783 } 818 }
784 819
785 szHint.width_inc = TermWin.fwidth; 820 szHint.width_inc = fwidth;
786 szHint.height_inc = TermWin.fheight; 821 szHint.height_inc = fheight;
787 szHint.min_width = szHint.base_width + szHint.width_inc; 822 szHint.min_width = szHint.base_width + szHint.width_inc;
788 szHint.min_height = szHint.base_height + szHint.height_inc; 823 szHint.min_height = szHint.base_height + szHint.height_inc;
789 824
790 if (width && width - szHint.base_width < max_width) 825 if (newwidth && newwidth - szHint.base_width < max_width)
791 { 826 {
792 szHint.width = width; 827 szHint.width = newwidth;
793 TermWin.width = width - szHint.base_width; 828 width = newwidth - szHint.base_width;
794 } 829 }
795 else 830 else
796 { 831 {
797 MIN_IT (TermWin.width, max_width); 832 min_it (width, max_width);
798 szHint.width = szHint.base_width + TermWin.width; 833 szHint.width = szHint.base_width + width;
799 } 834 }
800 835
801 if (height && height - szHint.base_height < max_height) 836 if (newheight && newheight - szHint.base_height < max_height)
802 { 837 {
803 szHint.height = height; 838 szHint.height = newheight;
804 TermWin.height = height - szHint.base_height; 839 height = newheight - szHint.base_height;
805 } 840 }
806 else 841 else
807 { 842 {
808 MIN_IT (TermWin.height, max_height); 843 min_it (height, max_height);
809 szHint.height = szHint.base_height + TermWin.height; 844 szHint.height = szHint.base_height + height;
810 } 845 }
811 846
812 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 847 if (scrollbar_visible () && OPTION (Opt_scrollBar_right))
813 window_sb_x = szHint.width - sb_w; 848 window_sb_x = szHint.width - sb_w;
814 849
815 if (recalc_x) 850 if (recalc_x)
816 szHint.x += (DisplayWidth (disp, display->screen) 851 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
817 - szHint.width - 2 * TermWin.ext_bwidth);
818 if (recalc_y) 852 if (recalc_y)
819 szHint.y += (DisplayHeight (disp, display->screen) 853 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
820 - szHint.height - 2 * TermWin.ext_bwidth);
821 854
822 TermWin.ncol = TermWin.width / TermWin.fwidth; 855 ncol = width / fwidth;
823 TermWin.nrow = TermWin.height / TermWin.fheight; 856 nrow = height / fheight;
824 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 857 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
825 TermWin.ncol, TermWin.nrow, szHint.width, 858 ncol, nrow, szHint.width,
826 szHint.height)); 859 szHint.height));
827 return; 860 return;
828} 861}
829 862
830/*----------------------------------------------------------------------*/ 863/*----------------------------------------------------------------------*/
838 if (pty.pty < 0) 871 if (pty.pty < 0)
839 return; 872 return;
840 873
841 struct winsize ws; 874 struct winsize ws;
842 875
843 ws.ws_col = TermWin.ncol; 876 ws.ws_col = ncol;
844 ws.ws_row = TermWin.nrow; 877 ws.ws_row = nrow;
845 ws.ws_xpixel = TermWin.width; 878 ws.ws_xpixel = width;
846 ws.ws_ypixel = TermWin.height; 879 ws.ws_ypixel = height;
847 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 880 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
848 881
849#if 0 882#if 0
850 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 883 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
851 if (cmd_pid) /* force through to the command */ 884 if (cmd_pid) /* force through to the command */
852 kill (cmd_pid, SIGWINCH); 885 kill (-cmd_pid, SIGWINCH);
853#endif 886#endif
854} 887}
855 888
856/*----------------------------------------------------------------------*/ 889/*----------------------------------------------------------------------*/
857/* set_fonts () - load and set the various fonts 890/* set_fonts () - load and set the various fonts
858/* 891 *
859 * init = 1 - initialize 892 * init = 1 - initialize
860 * 893 *
861 * fontname == FONT_UP - switch to bigger font 894 * fontname == FONT_UP - switch to bigger font
862 * fontname == FONT_DN - switch to smaller font 895 * fontname == FONT_DN - switch to smaller font
863 */ 896 */
875 return false; 908 return false;
876 } 909 }
877 910
878#if ENABLE_STYLES 911#if ENABLE_STYLES
879 for (int i = RS_styleCount; --i; ) 912 for (int i = RS_styleCount; --i; )
880 if (TermWin.fontset[i] != TermWin.fontset[0]) 913 if (fontset[i] != fontset[0])
881 delete TermWin.fontset[i]; 914 delete fontset[i];
882#endif 915#endif
883 916
884 delete TermWin.fontset[0]; 917 delete fontset[0];
885 TermWin.fontset[0] = fs; 918 fontset[0] = fs;
886 919
887 prop = (*fs)[1]->properties (); 920 prop = (*fs)[1]->properties ();
888 prop.height += TermWin.lineSpace; 921 prop.height += lineSpace;
889 fs->set_prop (prop); 922 fs->set_prop (prop);
890 923
891 TermWin.fwidth = prop.width; 924 fwidth = prop.width;
892 TermWin.fheight = prop.height; 925 fheight = prop.height;
893 TermWin.fweight = prop.weight;
894 TermWin.fslant = prop.slant;
895 TermWin.fbase = (*fs)[1]->ascent; 926 fbase = (*fs)[1]->ascent;
896 927
897 for (int style = 1; style < 4; style++) 928 for (int style = 1; style < 4; style++)
898 { 929 {
899#if ENABLE_STYLES 930#if ENABLE_STYLES
900 const char *res = rs[Rs_font + style]; 931 const char *res = rs[Rs_font + style];
901 932
902 if (res && !*res) 933 if (res && !*res)
903 TermWin.fontset[style] = TermWin.fontset[0]; 934 fontset[style] = fontset[0];
904 else 935 else
905 { 936 {
906 TermWin.fontset[style] = fs = new rxvt_fontset (this); 937 fontset[style] = fs = new rxvt_fontset (this);
907 rxvt_fontprop prop2 = prop; 938 rxvt_fontprop prop2 = prop;
908 939
909 if (res) 940 if (res)
910 prop2.weight = prop2.slant = rxvt_fontprop::unset; 941 prop2.weight = prop2.slant = rxvt_fontprop::unset;
911 else 942 else
912 { 943 {
913 res = TermWin.fontset[0]->fontdesc; 944 res = fontset[0]->fontdesc;
914 945
915 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 946 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; 947 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
917 } 948 }
918 949
919 fs->populate (res); 950 fs->populate (res);
920 fs->set_prop (prop2); 951 fs->set_prop (prop2);
921 } 952 }
922#else 953#else
923 TermWin.fontset[style] = TermWin.fontset[0]; 954 fontset[style] = fontset[0];
924#endif 955#endif
925 } 956 }
926 957
927 if (TermWin.parent[0]) 958 if (parent[0])
928 { 959 {
929 resize_all_windows (0, 0, 0); 960 resize_all_windows (0, 0, 0);
930 scr_remap_chars (); 961 scr_remap_chars ();
931 scr_touch (true); 962 scr_touch (true);
932 } 963 }
934 return true; 965 return true;
935} 966}
936 967
937void rxvt_term::set_string_property (Atom prop, const char *str, int len) 968void rxvt_term::set_string_property (Atom prop, const char *str, int len)
938{ 969{
939 // TODO: SMART_WINDOW_TITLE
940 XChangeProperty (display->display, TermWin.parent[0], 970 XChangeProperty (display->display, parent[0],
941 prop, XA_STRING, 8, PropModeReplace, 971 prop, XA_STRING, 8, PropModeReplace,
942 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 972 (const unsigned char *)str, len >= 0 ? len : strlen (str));
943} 973}
944 974
945void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 975void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
946{ 976{
947 // TODO: SMART_WINDOW_TITLE
948 wchar_t *ws = rxvt_mbstowcs (str, len); 977 wchar_t *ws = rxvt_mbstowcs (str, len);
949 char *s = rxvt_wcstoutf8 (ws); 978 char *s = rxvt_wcstoutf8 (ws);
950 979
951 XChangeProperty (display->display, TermWin.parent[0], 980 XChangeProperty (display->display, parent[0],
952 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 981 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
953 (const unsigned char *)s, strlen (s)); 982 (const unsigned char *)s, strlen (s));
954 983
955 free (s); 984 free (s);
956 free (ws); 985 free (ws);
961/* xterm sequences - title, iconName, color (exptl) */ 990/* xterm sequences - title, iconName, color (exptl) */
962void 991void
963rxvt_term::set_title (const char *str) 992rxvt_term::set_title (const char *str)
964{ 993{
965 set_string_property (XA_WM_NAME, str); 994 set_string_property (XA_WM_NAME, str);
966#if ENABLE_FRILLS 995#if ENABLE_EWMH
967 set_utf8_property (xa[XA_NET_WM_NAME], str); 996 set_utf8_property (xa[XA_NET_WM_NAME], str);
968#endif 997#endif
969} 998}
970 999
971void 1000void
972rxvt_term::set_icon_name (const char *str) 1001rxvt_term::set_icon_name (const char *str)
973{ 1002{
974 set_string_property (XA_WM_ICON_NAME, str); 1003 set_string_property (XA_WM_ICON_NAME, str);
975#if ENABLE_FRILLS 1004#if ENABLE_EWMH
976 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 1005 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
977#endif 1006#endif
978} 1007}
979 1008
980#ifdef XTERM_COLOR_CHANGE 1009#ifdef XTERM_COLOR_CHANGE
996 { /* bright colors */ 1025 { /* bright colors */
997 i -= 8; 1026 i -= 8;
998# ifndef NO_BRIGHTCOLOR 1027# ifndef NO_BRIGHTCOLOR
999 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1028 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1000 SET_PIXCOLOR (idx); 1029 SET_PIXCOLOR (idx);
1001 goto Done; 1030 goto done;
1002# endif 1031# endif
1003 } 1032 }
1004 1033
1005 if (i >= 0 && i <= 7) 1034 if (i >= 0 && i <= 7)
1006 { /* normal colors */ 1035 { /* normal colors */
1007 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1036 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1008 SET_PIXCOLOR (idx); 1037 SET_PIXCOLOR (idx);
1009 goto Done; 1038 goto done;
1010 } 1039 }
1011 } 1040 }
1012 1041
1013 if (!rXParseAllocColor (&xcol, color)) 1042 if (!rXParseAllocColor (&xcol, color))
1014 return; 1043 return;
1034 pix_colors_focused[idx] = xcol; 1063 pix_colors_focused[idx] = xcol;
1035 SET_PIXCOLOR (idx); 1064 SET_PIXCOLOR (idx);
1036 1065
1037 /* XSetWindowAttributes attr; */ 1066 /* XSetWindowAttributes attr; */
1038 /* Cursor cursor; */ 1067 /* Cursor cursor; */
1039Done: 1068done:
1069
1040#ifdef OFF_FOCUS_FADING 1070#if OFF_FOCUS_FADING
1041 if (rs[Rs_fade]) 1071 if (rs[Rs_fade])
1042 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 1072 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1043#endif 1073#endif
1044 1074
1045 /*TODO: handle Color_BD, scrollbar background, etc. */ 1075 /*TODO: handle Color_BD, scrollbar background, etc. */
1046 1076
1047 recolour_cursor (); 1077 recolour_cursor ();
1118 1148
1119/* -------------------------------------------------------------------- * 1149/* -------------------------------------------------------------------- *
1120 * - WINDOW RESIZING - * 1150 * - WINDOW RESIZING - *
1121 * -------------------------------------------------------------------- */ 1151 * -------------------------------------------------------------------- */
1122void 1152void
1123rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1153rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1124{ 1154{
1125 int fix_screen; 1155 int fix_screen;
1126#ifdef SMART_RESIZE
1127 int old_width = szHint.width, old_height = szHint.height; 1156 int old_width = szHint.width, old_height = szHint.height;
1128#endif
1129 dDisp; 1157 dDisp;
1130 1158
1131 window_calc (width, height); 1159 window_calc (newwidth, newheight);
1132 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 1160 XSetWMNormalHints (disp, parent[0], &szHint);
1133 1161
1134 if (!ignoreparent) 1162 if (!ignoreparent)
1135 { 1163 {
1136#ifdef SMART_RESIZE 1164#ifdef SMART_RESIZE
1137 /* 1165 /*
1141 int x, y, x1, y1; 1169 int x, y, x1, y1;
1142 int dx, dy; 1170 int dx, dy;
1143 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1171 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1144 Window unused_cr; 1172 Window unused_cr;
1145 1173
1146 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 1174 XTranslateCoordinates (disp, parent[0], display->root,
1147 0, 0, &x, &y, &unused_cr); 1175 0, 0, &x, &y, &unused_cr);
1148 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 1176 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1149 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1177 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1150 /* 1178 /*
1151 * if display->root isn't the parent window, a WM will probably have offset 1179 * if display->root isn't the parent window, a WM will probably have offset
1152 * our position for handles and decorations. Counter it 1180 * our position for handles and decorations. Counter it
1153 */ 1181 */
1170 if (y < y1) /* top half */ 1198 if (y < y1) /* top half */
1171 dy = 0; 1199 dy = 0;
1172 else if (y == y1) /* exact center */ 1200 else if (y == y1) /* exact center */
1173 dy /= 2; 1201 dy /= 2;
1174 1202
1175 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 1203 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1176 szHint.width, szHint.height); 1204 szHint.width, szHint.height);
1177#else 1205#else
1178 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 1206 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1179#endif 1207#endif
1180 } 1208 }
1181 1209
1182 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1210 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1183 1211
1184 if (fix_screen || width != old_width || height != old_height) 1212 if (fix_screen || newwidth != old_width || newheight != old_height)
1185 { 1213 {
1186 if (scrollbar_visible ()) 1214 if (scrollbar_visible ())
1187 { 1215 {
1188 XMoveResizeWindow (disp, scrollBar.win, 1216 XMoveResizeWindow (disp, scrollBar.win,
1189 window_sb_x, 0, 1217 window_sb_x, 0,
1194 if (menubar_visible ()) 1222 if (menubar_visible ())
1195 XMoveResizeWindow (disp, menuBar.win, 1223 XMoveResizeWindow (disp, menuBar.win,
1196 window_vt_x, 0, 1224 window_vt_x, 0,
1197 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1225 TermWin_TotalWidth (), menuBar_TotalHeight ());
1198 1226
1199 XMoveResizeWindow (disp, TermWin.vt, 1227 XMoveResizeWindow (disp, vt,
1200 window_vt_x, window_vt_y, 1228 window_vt_x, window_vt_y,
1201 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1229 TermWin_TotalWidth (), TermWin_TotalHeight ());
1202 1230
1203 scr_clear (); 1231 scr_clear ();
1204#ifdef XPM_BACKGROUND 1232#ifdef XPM_BACKGROUND
1212 int old_ncol = prev_ncol; 1240 int old_ncol = prev_ncol;
1213 1241
1214 /* scr_reset only works on the primary screen */ 1242 /* scr_reset only works on the primary screen */
1215 if (old_height) /* this is not the first time through */ 1243 if (old_height) /* this is not the first time through */
1216 { 1244 {
1217 unsigned int ncol = TermWin.ncol; 1245 unsigned int ocol = ncol;
1218 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1246 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1219 curr_screen = scr_change_screen (PRIMARY); 1247 curr_screen = scr_change_screen (PRIMARY);
1220 TermWin.ncol = ncol; 1248 ncol = ocol;
1221 } 1249 }
1222 1250
1223 scr_reset (); 1251 scr_reset ();
1224 1252
1225 if (curr_screen >= 0) /* this is not the first time through */ 1253 if (curr_screen >= 0) /* this is not the first time through */
1226 { 1254 {
1227 scr_change_screen (curr_screen); 1255 scr_change_screen (curr_screen);
1228 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1256 selection_check (old_ncol != ncol ? 4 : 0);
1229 } 1257 }
1230 } 1258 }
1231 1259
1232 old_width = szHint.width; 1260 old_width = szHint.width;
1233 old_height = szHint.height; 1261 old_height = szHint.height;
1234 1262
1235#ifdef XPM_BACKGROUND 1263#ifdef XPM_BACKGROUND
1236 if (TermWin.pixmap) 1264 if (pixmap)
1237 scr_touch (false); 1265 scr_touch (false);
1238#endif 1266#endif
1239 1267
1240#ifdef USE_XIM 1268#ifdef USE_XIM
1241 IMSetStatusPosition (); 1269 IMSetStatusPosition ();
1245/* 1273/*
1246 * Set the width/height of the vt window in characters. Units are pixels. 1274 * Set the width/height of the vt window in characters. Units are pixels.
1247 * good for toggling 80/132 columns 1275 * good for toggling 80/132 columns
1248 */ 1276 */
1249void 1277void
1250rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1278rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1251{ 1279{
1252 XWindowAttributes wattr; 1280 XWindowAttributes wattr;
1253 1281
1254 if (width == 0 || height == 0) 1282 if (newwidth == 0 || newheight == 0)
1255 { 1283 {
1256 XGetWindowAttributes (display->display, display->root, &wattr); 1284 XGetWindowAttributes (display->display, display->root, &wattr);
1285
1257 if (width == 0) 1286 if (newwidth == 0)
1258 width = wattr.width - szHint.base_width; 1287 newwidth = wattr.width - szHint.base_width;
1259 if (height == 0) 1288 if (newheight == 0)
1260 height = wattr.height - szHint.base_height; 1289 newheight = wattr.height - szHint.base_height;
1261 }
1262
1263 if (width != TermWin.width || height != TermWin.height)
1264 { 1290 }
1291
1292 if (newwidth != width || newheight != height)
1293 {
1265 width += szHint.base_width; 1294 newwidth += szHint.base_width;
1266 height += szHint.base_height; 1295 newheight += szHint.base_height;
1267 resize_all_windows (width, height, 0); 1296 resize_all_windows (newwidth, newheight, 0);
1268 } 1297 }
1269} 1298}
1270 1299
1271/* -------------------------------------------------------------------- * 1300/* -------------------------------------------------------------------- *
1272 * - X INPUT METHOD ROUTINES - * 1301 * - X INPUT METHOD ROUTINES - *
1282 1311
1283void 1312void
1284rxvt_term::im_set_size (XRectangle &size) 1313rxvt_term::im_set_size (XRectangle &size)
1285{ 1314{
1286 // the int_bwidth terms make no sense to me 1315 // the int_bwidth terms make no sense to me
1287 size.x = TermWin.int_bwidth; 1316 size.x = int_bwidth;
1288 size.y = TermWin.int_bwidth; 1317 size.y = int_bwidth;
1289 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1318 size.width = Width2Pixel (ncol) + int_bwidth;
1290 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1319 size.height = Height2Pixel (nrow) + int_bwidth;
1291} 1320}
1292 1321
1293void 1322void
1294rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1323rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1295 XRectangle &status_rect, 1324 XRectangle &status_rect,
1296 const XRectangle &needed_rect) 1325 const XRectangle &needed_rect)
1297{ 1326{
1298 preedit_rect.x = needed_rect.width; 1327 preedit_rect.x = needed_rect.width;
1299 preedit_rect.y = 0; 1328 preedit_rect.y = 0;
1300 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1329 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1301 preedit_rect.height = TermWin.fheight; 1330 preedit_rect.height = fheight;
1302 1331
1303 status_rect.x = 0; 1332 status_rect.x = 0;
1304 status_rect.y = 0; 1333 status_rect.y = 0;
1305 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1334 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1306 status_rect.height = TermWin.fheight; 1335 status_rect.height = fheight;
1307} 1336}
1308 1337
1309/* Checking whether input method is running. */ 1338/* Checking whether input method is running. */
1310bool 1339bool
1311rxvt_term::IMisRunning () 1340rxvt_term::IMisRunning ()
1339{ 1368{
1340 XPoint nspot; 1369 XPoint nspot;
1341 XVaNestedList preedit_attr; 1370 XVaNestedList preedit_attr;
1342 1371
1343 if (!Input_Context 1372 if (!Input_Context
1344 || !TermWin.focus 1373 || !focus
1345 || !(input_style & XIMPreeditPosition)) 1374 || !(input_style & XIMPreeditPosition))
1346 return; 1375 return;
1347 1376
1348 im_set_position (nspot); 1377 im_set_position (nspot);
1349 1378
1469 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1498 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1470 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1499 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1471 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1500 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1472 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1501 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1473 "*", 1502 "*",
1474 TermWin.fheight, 1503 fheight,
1475 TermWin.fheight + 1, TermWin.fheight - 1, 1504 fheight + 1, fheight - 1,
1476 TermWin.fheight - 2, TermWin.fheight + 2); 1505 fheight - 2, fheight + 2);
1477 1506
1478 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1507 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1479 &missing_charset_list, &missing_charset_count, &def_string); 1508 &missing_charset_list, &missing_charset_count, &def_string);
1480 1509
1481 if (missing_charset_list) 1510 if (missing_charset_list)
1527 NULL); 1556 NULL);
1528 } 1557 }
1529 1558
1530 Input_Context = XCreateIC (xim, 1559 Input_Context = XCreateIC (xim,
1531 XNInputStyle, input_style, 1560 XNInputStyle, input_style,
1532 XNClientWindow, TermWin.vt, 1561 XNClientWindow, vt,
1533 XNFocusWindow, TermWin.parent[0], 1562 XNFocusWindow, parent[0],
1534 preedit_attr ? XNPreeditAttributes : NULL, 1563 preedit_attr ? XNPreeditAttributes : NULL,
1535 preedit_attr, 1564 preedit_attr,
1536 status_attr ? XNStatusAttributes : NULL, 1565 status_attr ? XNStatusAttributes : NULL,
1537 status_attr, NULL); 1566 status_attr, NULL);
1538 1567
1555} 1584}
1556 1585
1557void 1586void
1558rxvt_term::im_cb () 1587rxvt_term::im_cb ()
1559{ 1588{
1560 int i, found, had_im; 1589 int i;
1561 const char *p; 1590 const char *p;
1562 char **s; 1591 char **s;
1563 char buf[IMBUFSIZ]; 1592 char buf[IMBUFSIZ];
1564 1593
1565 SET_R (this); 1594 SET_R (this);
1622{ 1651{
1623 XRectangle preedit_rect, status_rect, *needed_rect; 1652 XRectangle preedit_rect, status_rect, *needed_rect;
1624 XVaNestedList preedit_attr, status_attr; 1653 XVaNestedList preedit_attr, status_attr;
1625 1654
1626 if (!Input_Context 1655 if (!Input_Context
1627 || !TermWin.focus 1656 || !focus
1628 || !(input_style & XIMPreeditArea) 1657 || !(input_style & XIMPreeditArea)
1629 || !IMisRunning ()) 1658 || !IMisRunning ())
1630 return; 1659 return;
1631 1660
1632 /* Getting the necessary width of preedit area */ 1661 /* Getting the necessary width of preedit area */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines