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