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.158 by root, Tue Jan 3 23:40:58 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 */
489#endif
490
491#if ENABLE_PERL
492 if (rs[Rs_perl_ext] && *rs[Rs_perl_ext])
493 {
494 rxvt_perl.init ();
495 PERL_INVOKE ((this, HOOK_INIT, DT_END));
496 }
488#endif 497#endif
489 498
490 create_windows (argc, argv); 499 create_windows (argc, argv);
491 500
492 dDisp; 501 dDisp;
… …
498#if 0 507#if 0
499 XSynchronize (disp, True); 508 XSynchronize (disp, True);
500#endif 509#endif
501 510
502#ifdef HAVE_SCROLLBARS 511#ifdef HAVE_SCROLLBARS
503 if (options & Opt_scrollBar) 512 if (OPTION (Opt_scrollBar))
504 resize_scrollbar (); /* create and map scrollbar */ 513 resize_scrollbar (); /* create and map scrollbar */
505#endif 514#endif
506#if (MENUBAR_MAX) 515#if (MENUBAR_MAX)
507 if (menubar_visible ()) 516 if (menubar_visible ())
508 XMapWindow (disp, menuBar.win); 517 XMapWindow (disp, menuBar.win);
509#endif 518#endif
510#ifdef TRANSPARENT 519#ifdef TRANSPARENT
511 if (options & Opt_transparent) 520 if (OPTION (Opt_transparent))
512 { 521 {
513 XSelectInput (disp, display->root, PropertyChangeMask); 522 XSelectInput (disp, display->root, PropertyChangeMask);
514 check_our_parents (); 523 check_our_parents ();
515 rootwin_ev.start (display, display->root); 524 rootwin_ev.start (display, display->root);
516 } 525 }
517#endif 526#endif
518 527
519 XMapWindow (disp, TermWin.vt); 528 XMapWindow (disp, vt);
520 XMapWindow (disp, TermWin.parent[0]); 529 XMapWindow (disp, parent[0]);
521 530
522 set_colorfgbg (); 531 set_colorfgbg ();
523 532
524 init_command (cmd_argv); 533 init_command (cmd_argv);
525 534
… …
527 536
528 pty_ev.start (pty.pty, EVENT_READ); 537 pty_ev.start (pty.pty, EVENT_READ);
529 538
530 check_ev.start (); 539 check_ev.start ();
531 540
541 PERL_INVOKE ((this, HOOK_START, DT_END));
542
532 return true; 543 return true;
533} 544}
545
546static struct sig_handlers
547{
548 sig_watcher sw_chld, sw_term, sw_int;
549
550 void sig_chld (sig_watcher &w)
551 {
552 // we are being called for every SIGCHLD, find the corresponding term
553 int pid;
554
555 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
556 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
557 if (pid == (*t)->cmd_pid)
558 {
559 (*t)->child_exit ();
560 break;
561 }
562 }
563
564 /*
565 * Catch a fatal signal and tidy up before quitting
566 */
567 void
568 sig_term (sig_watcher &w)
569 {
570#ifdef DEBUG_CMD
571 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
572#endif
573 rxvt_emergency_cleanup ();
574 signal (w.signum, SIG_DFL);
575 kill (getpid (), w.signum);
576 }
577
578 sig_handlers ()
579 : sw_chld (this, &sig_handlers::sig_chld),
580 sw_term (this, &sig_handlers::sig_term),
581 sw_int (this, &sig_handlers::sig_term)
582 {
583 }
584} sig_handlers;
534 585
535void 586void
536rxvt_init () 587rxvt_init ()
537{ 588{
538 /* 589 /*
… …
546 rxvt_privileges (IGNORE); 597 rxvt_privileges (IGNORE);
547 598
548 signal (SIGHUP, SIG_IGN); 599 signal (SIGHUP, SIG_IGN);
549 signal (SIGPIPE, SIG_IGN); 600 signal (SIGPIPE, SIG_IGN);
550 601
602 sig_handlers.sw_chld.start (SIGCHLD);
603 sig_handlers.sw_term.start (SIGTERM);
604 sig_handlers.sw_int.start (SIGINT);
605
551 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 606 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
552 /* signal (SIGURG, SIG_DFL); */ 607 /* signal (SIGURG, SIG_DFL); */
553 608
554 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 609 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
555 // TODO: handle this with exceptions and tolerate the memory loss 610 // TODO: handle this with exceptions and tolerate the memory loss
556 XSetIOErrorHandler (rxvt_xioerror_handler); 611 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} 612}
580 613
581/* ------------------------------------------------------------------------- * 614/* ------------------------------------------------------------------------- *
582 * MEMORY ALLOCATION WRAPPERS * 615 * MEMORY ALLOCATION WRAPPERS *
583 * ------------------------------------------------------------------------- */ 616 * ------------------------------------------------------------------------- */
… …
590 rxvt_fatal ("memory allocation failure. aborting.\n"); 623 rxvt_fatal ("memory allocation failure. aborting.\n");
591 624
592 return p; 625 return p;
593} 626}
594 627
595/* INTPROTO */ 628void *
596void *
597rxvt_calloc (size_t number, size_t size) 629rxvt_calloc (size_t number, size_t size)
598{ 630{
599 void *p = calloc (number, size); 631 void *p = calloc (number, size);
600 632
601 if (!p) 633 if (!p)
602 rxvt_fatal ("memory allocation failure. aborting.\n"); 634 rxvt_fatal ("memory allocation failure. aborting.\n");
603 635
604 return p; 636 return p;
605} 637}
606 638
607/* INTPROTO */
608void * 639void *
609rxvt_realloc (void *ptr, size_t size) 640rxvt_realloc (void *ptr, size_t size)
610{ 641{
611 void *p = realloc (ptr, size); 642 void *p = realloc (ptr, size);
612 643
… …
673 704
674#ifdef UTMP_SUPPORT 705#ifdef UTMP_SUPPORT
675void 706void
676rxvt_term::privileged_utmp (rxvt_privaction action) 707rxvt_term::privileged_utmp (rxvt_privaction action)
677{ 708{
678 if ((options & Opt_utmpInhibit) 709 if (OPTION (Opt_utmpInhibit)
679 || !pty.name || !*pty.name) 710 || !pty.name || !*pty.name)
680 return; 711 return;
681 712
682 rxvt_privileges (RESTORE); 713 rxvt_privileges (RESTORE);
683 714
… …
694/* 725/*
695 * window size/position calculcations for XSizeHint and other storage. 726 * window size/position calculcations for XSizeHint and other storage.
696 * if width/height are non-zero then override calculated width/height 727 * if width/height are non-zero then override calculated width/height
697 */ 728 */
698void 729void
699rxvt_term::window_calc (unsigned int width, unsigned int height) 730rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
700{ 731{
701 short recalc_x, recalc_y; 732 short recalc_x, recalc_y;
702 int x, y, sb_w, mb_h, flags; 733 int x, y, sb_w, mb_h, flags;
703 unsigned int w, h; 734 unsigned int w, h;
704 unsigned int max_width, max_height; 735 unsigned int max_width, max_height;
705 dDisp; 736 dDisp;
706 737
707 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 738 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
708 TermWin.ncol, TermWin.nrow, szHint.width, 739 ncol, nrow, szHint.width, szHint.height));
709 szHint.height)); 740
710 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 741 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
711 szHint.win_gravity = NorthWestGravity; 742 szHint.win_gravity = NorthWestGravity;
712 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 743 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
713 744
714 recalc_x = recalc_y = 0; 745 recalc_x = recalc_y = 0;
715 flags = 0; 746 flags = 0;
747
716 if (!parsed_geometry) 748 if (!parsed_geometry)
717 { 749 {
718 parsed_geometry = 1; 750 parsed_geometry = 1;
751
719 if (rs[Rs_geometry]) 752 if (rs[Rs_geometry])
720 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 753 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
721 754
722 if (flags & WidthValue) 755 if (flags & WidthValue)
723 { 756 {
724 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 757 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
725 szHint.flags |= USSize; 758 szHint.flags |= USSize;
726 } 759 }
727 760
728 if (flags & HeightValue) 761 if (flags & HeightValue)
729 { 762 {
730 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 763 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
731 szHint.flags |= USSize; 764 szHint.flags |= USSize;
732 } 765 }
733 766
734 if (flags & XValue) 767 if (flags & XValue)
735 { 768 {
736 szHint.x = x; 769 szHint.x = x;
737 szHint.flags |= USPosition; 770 szHint.flags |= USPosition;
771
738 if (flags & XNegative) 772 if (flags & XNegative)
739 { 773 {
740 recalc_x = 1; 774 recalc_x = 1;
741 szHint.win_gravity = NorthEastGravity; 775 szHint.win_gravity = NorthEastGravity;
742 } 776 }
… …
744 778
745 if (flags & YValue) 779 if (flags & YValue)
746 { 780 {
747 szHint.y = y; 781 szHint.y = y;
748 szHint.flags |= USPosition; 782 szHint.flags |= USPosition;
783
749 if (flags & YNegative) 784 if (flags & YNegative)
750 { 785 {
751 recalc_y = 1; 786 recalc_y = 1;
787
752 if (szHint.win_gravity == NorthEastGravity) 788 if (szHint.win_gravity == NorthEastGravity)
753 szHint.win_gravity = SouthEastGravity; 789 szHint.win_gravity = SouthEastGravity;
754 else 790 else
755 szHint.win_gravity = SouthWestGravity; 791 szHint.win_gravity = SouthWestGravity;
756 } 792 }
757 } 793 }
758 } 794 }
759 795
760 /* TODO: BOUNDS */ 796 /* TODO: BOUNDS */
761 TermWin.width = TermWin.ncol * TermWin.fwidth; 797 width = ncol * fwidth;
762 TermWin.height = TermWin.nrow * TermWin.fheight; 798 height = nrow * fheight;
763 max_width = MAX_COLS * TermWin.fwidth; 799 max_width = MAX_COLS * fwidth;
764 max_height = MAX_ROWS * TermWin.fheight; 800 max_height = MAX_ROWS * fheight;
765 801
766 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 802 szHint.base_width = szHint.base_height = 2 * int_bwidth;
767 803
768 sb_w = mb_h = 0; 804 sb_w = mb_h = 0;
769 window_vt_x = window_vt_y = TermWin.int_bwidth; 805 window_vt_x = window_vt_y = int_bwidth;
770 806
771 if (scrollbar_visible ()) 807 if (scrollbar_visible ())
772 { 808 {
773 sb_w = scrollbar_TotalWidth (); 809 sb_w = scrollbar_TotalWidth ();
774 szHint.base_width += sb_w; 810 szHint.base_width += sb_w;
775 if (!(options & Opt_scrollBar_right)) 811 if (!OPTION (Opt_scrollBar_right))
776 window_vt_x += sb_w; 812 window_vt_x += sb_w;
777 } 813 }
778 814
779 if (menubar_visible ()) 815 if (menubar_visible ())
780 { 816 {
781 mb_h = menuBar_TotalHeight (); 817 mb_h = menuBar_TotalHeight ();
782 szHint.base_height += mb_h; 818 szHint.base_height += mb_h;
783 window_vt_y += mb_h; 819 window_vt_y += mb_h;
784 } 820 }
785 821
786 szHint.width_inc = TermWin.fwidth; 822 szHint.width_inc = fwidth;
787 szHint.height_inc = TermWin.fheight; 823 szHint.height_inc = fheight;
788 szHint.min_width = szHint.base_width + szHint.width_inc; 824 szHint.min_width = szHint.base_width + szHint.width_inc;
789 szHint.min_height = szHint.base_height + szHint.height_inc; 825 szHint.min_height = szHint.base_height + szHint.height_inc;
790 826
791 if (width && width - szHint.base_width < max_width) 827 if (newwidth && newwidth - szHint.base_width < max_width)
792 { 828 {
793 szHint.width = width; 829 szHint.width = newwidth;
794 TermWin.width = width - szHint.base_width; 830 width = newwidth - szHint.base_width;
795 } 831 }
796 else 832 else
797 { 833 {
798 MIN_IT (TermWin.width, max_width); 834 min_it (width, max_width);
799 szHint.width = szHint.base_width + TermWin.width; 835 szHint.width = szHint.base_width + width;
800 } 836 }
801 837
802 if (height && height - szHint.base_height < max_height) 838 if (newheight && newheight - szHint.base_height < max_height)
803 { 839 {
804 szHint.height = height; 840 szHint.height = newheight;
805 TermWin.height = height - szHint.base_height; 841 height = newheight - szHint.base_height;
806 } 842 }
807 else 843 else
808 { 844 {
809 MIN_IT (TermWin.height, max_height); 845 min_it (height, max_height);
810 szHint.height = szHint.base_height + TermWin.height; 846 szHint.height = szHint.base_height + height;
811 } 847 }
812 848
813 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 849 if (scrollbar_visible () && OPTION (Opt_scrollBar_right))
814 window_sb_x = szHint.width - sb_w; 850 window_sb_x = szHint.width - sb_w;
815 851
816 if (recalc_x) 852 if (recalc_x)
817 szHint.x += (DisplayWidth (disp, display->screen) 853 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
818 - szHint.width - 2 * TermWin.ext_bwidth);
819 if (recalc_y) 854 if (recalc_y)
820 szHint.y += (DisplayHeight (disp, display->screen) 855 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
821 - szHint.height - 2 * TermWin.ext_bwidth);
822 856
823 TermWin.ncol = TermWin.width / TermWin.fwidth; 857 ncol = width / fwidth;
824 TermWin.nrow = TermWin.height / TermWin.fheight; 858 nrow = height / fheight;
825 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 859 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
826 TermWin.ncol, TermWin.nrow, szHint.width, 860 ncol, nrow, szHint.width,
827 szHint.height)); 861 szHint.height));
828 return; 862 return;
829} 863}
830 864
831/*----------------------------------------------------------------------*/ 865/*----------------------------------------------------------------------*/
… …
839 if (pty.pty < 0) 873 if (pty.pty < 0)
840 return; 874 return;
841 875
842 struct winsize ws; 876 struct winsize ws;
843 877
844 ws.ws_col = TermWin.ncol; 878 ws.ws_col = ncol;
845 ws.ws_row = TermWin.nrow; 879 ws.ws_row = nrow;
846 ws.ws_xpixel = TermWin.width; 880 ws.ws_xpixel = width;
847 ws.ws_ypixel = TermWin.height; 881 ws.ws_ypixel = height;
848 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 882 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
849 883
850#if 0 884#if 0
851 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 885 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
852 if (cmd_pid) /* force through to the command */ 886 if (cmd_pid) /* force through to the command */
853 kill (cmd_pid, SIGWINCH); 887 kill (-cmd_pid, SIGWINCH);
854#endif 888#endif
855} 889}
856 890
857/*----------------------------------------------------------------------*/ 891/*----------------------------------------------------------------------*/
858/* set_fonts () - load and set the various fonts 892/* set_fonts () - load and set the various fonts
859/* 893 *
860 * init = 1 - initialize 894 * init = 1 - initialize
861 * 895 *
862 * fontname == FONT_UP - switch to bigger font 896 * fontname == FONT_UP - switch to bigger font
863 * fontname == FONT_DN - switch to smaller font 897 * fontname == FONT_DN - switch to smaller font
864 */ 898 */
… …
876 return false; 910 return false;
877 } 911 }
878 912
879#if ENABLE_STYLES 913#if ENABLE_STYLES
880 for (int i = RS_styleCount; --i; ) 914 for (int i = RS_styleCount; --i; )
881 if (TermWin.fontset[i] != TermWin.fontset[0]) 915 if (fontset[i] != fontset[0])
882 delete TermWin.fontset[i]; 916 delete fontset[i];
883#endif 917#endif
884 918
885 delete TermWin.fontset[0]; 919 delete fontset[0];
886 TermWin.fontset[0] = fs; 920 fontset[0] = fs;
887 921
888 prop = (*fs)[1]->properties (); 922 prop = (*fs)[1]->properties ();
889 prop.height += TermWin.lineSpace; 923 prop.height += lineSpace;
890 fs->set_prop (prop); 924 fs->set_prop (prop);
891 925
892 TermWin.fwidth = prop.width; 926 fwidth = prop.width;
893 TermWin.fheight = prop.height; 927 fheight = prop.height;
894 TermWin.fweight = prop.weight; 928 fbase = prop.ascent;
895 TermWin.fslant = prop.slant;
896 TermWin.fbase = (*fs)[1]->ascent;
897 929
898 for (int style = 1; style < 4; style++) 930 for (int style = 1; style < 4; style++)
899 { 931 {
900#if ENABLE_STYLES 932#if ENABLE_STYLES
901 const char *res = rs[Rs_font + style]; 933 const char *res = rs[Rs_font + style];
902 934
903 if (res && !*res) 935 if (res && !*res)
904 TermWin.fontset[style] = TermWin.fontset[0]; 936 fontset[style] = fontset[0];
905 else 937 else
906 { 938 {
907 TermWin.fontset[style] = fs = new rxvt_fontset (this); 939 fontset[style] = fs = new rxvt_fontset (this);
908 rxvt_fontprop prop2 = prop; 940 rxvt_fontprop prop2 = prop;
909 941
910 if (res) 942 if (res)
911 prop2.weight = prop2.slant = rxvt_fontprop::unset; 943 prop2.weight = prop2.slant = rxvt_fontprop::unset;
912 else 944 else
913 { 945 {
914 res = TermWin.fontset[0]->fontdesc; 946 res = fontset[0]->fontdesc;
915 947
916 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 948 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; 949 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
918 } 950 }
919 951
920 fs->populate (res); 952 fs->populate (res);
921 fs->set_prop (prop2); 953 fs->set_prop (prop2);
922 } 954 }
923#else 955#else
924 TermWin.fontset[style] = TermWin.fontset[0]; 956 fontset[style] = fontset[0];
925#endif 957#endif
926 } 958 }
927 959
928 if (TermWin.parent[0]) 960 if (parent[0])
929 { 961 {
930 resize_all_windows (0, 0, 0); 962 resize_all_windows (0, 0, 0);
931 scr_remap_chars (); 963 scr_remap_chars ();
932 scr_touch (true); 964 scr_touch (true);
933 } 965 }
… …
935 return true; 967 return true;
936} 968}
937 969
938void rxvt_term::set_string_property (Atom prop, const char *str, int len) 970void rxvt_term::set_string_property (Atom prop, const char *str, int len)
939{ 971{
940 // TODO: SMART_WINDOW_TITLE
941 XChangeProperty (display->display, TermWin.parent[0], 972 XChangeProperty (display->display, parent[0],
942 prop, XA_STRING, 8, PropModeReplace, 973 prop, XA_STRING, 8, PropModeReplace,
943 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 974 (const unsigned char *)str, len >= 0 ? len : strlen (str));
944} 975}
945 976
946void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 977void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
947{ 978{
948 // TODO: SMART_WINDOW_TITLE
949 wchar_t *ws = rxvt_mbstowcs (str, len); 979 wchar_t *ws = rxvt_mbstowcs (str, len);
950 char *s = rxvt_wcstoutf8 (ws); 980 char *s = rxvt_wcstoutf8 (ws);
951 981
952 XChangeProperty (display->display, TermWin.parent[0], 982 XChangeProperty (display->display, parent[0],
953 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 983 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
954 (const unsigned char *)s, strlen (s)); 984 (const unsigned char *)s, strlen (s));
955 985
956 free (s); 986 free (s);
957 free (ws); 987 free (ws);
… …
962/* xterm sequences - title, iconName, color (exptl) */ 992/* xterm sequences - title, iconName, color (exptl) */
963void 993void
964rxvt_term::set_title (const char *str) 994rxvt_term::set_title (const char *str)
965{ 995{
966 set_string_property (XA_WM_NAME, str); 996 set_string_property (XA_WM_NAME, str);
967#if ENABLE_FRILLS 997#if ENABLE_EWMH
968 set_utf8_property (xa[XA_NET_WM_NAME], str); 998 set_utf8_property (xa[XA_NET_WM_NAME], str);
969#endif 999#endif
970} 1000}
971 1001
972void 1002void
973rxvt_term::set_icon_name (const char *str) 1003rxvt_term::set_icon_name (const char *str)
974{ 1004{
975 set_string_property (XA_WM_ICON_NAME, str); 1005 set_string_property (XA_WM_ICON_NAME, str);
976#if ENABLE_FRILLS 1006#if ENABLE_EWMH
977 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 1007 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
978#endif 1008#endif
979} 1009}
980 1010
981#ifdef XTERM_COLOR_CHANGE 1011#ifdef XTERM_COLOR_CHANGE
… …
997 { /* bright colors */ 1027 { /* bright colors */
998 i -= 8; 1028 i -= 8;
999# ifndef NO_BRIGHTCOLOR 1029# ifndef NO_BRIGHTCOLOR
1000 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1030 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1001 SET_PIXCOLOR (idx); 1031 SET_PIXCOLOR (idx);
1002 goto Done; 1032 goto done;
1003# endif 1033# endif
1004 } 1034 }
1005 1035
1006 if (i >= 0 && i <= 7) 1036 if (i >= 0 && i <= 7)
1007 { /* normal colors */ 1037 { /* normal colors */
1008 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1038 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1009 SET_PIXCOLOR (idx); 1039 SET_PIXCOLOR (idx);
1010 goto Done; 1040 goto done;
1011 } 1041 }
1012 } 1042 }
1013 1043
1014 if (!rXParseAllocColor (&xcol, color)) 1044 if (!rXParseAllocColor (&xcol, color))
1015 return; 1045 return;
… …
1035 pix_colors_focused[idx] = xcol; 1065 pix_colors_focused[idx] = xcol;
1036 SET_PIXCOLOR (idx); 1066 SET_PIXCOLOR (idx);
1037 1067
1038 /* XSetWindowAttributes attr; */ 1068 /* XSetWindowAttributes attr; */
1039 /* Cursor cursor; */ 1069 /* Cursor cursor; */
1040Done: 1070done:
1071
1041#ifdef OFF_FOCUS_FADING 1072#if OFF_FOCUS_FADING
1042 if (rs[Rs_fade]) 1073 if (rs[Rs_fade])
1043 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 1074 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1044#endif 1075#endif
1045 1076
1046 /*TODO: handle Color_BD, scrollbar background, etc. */ 1077 /*TODO: handle Color_BD, scrollbar background, etc. */
1047 1078
1048 recolour_cursor (); 1079 recolour_cursor ();
… …
1119 1150
1120/* -------------------------------------------------------------------- * 1151/* -------------------------------------------------------------------- *
1121 * - WINDOW RESIZING - * 1152 * - WINDOW RESIZING - *
1122 * -------------------------------------------------------------------- */ 1153 * -------------------------------------------------------------------- */
1123void 1154void
1124rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1155rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1125{ 1156{
1126 int fix_screen; 1157 int fix_screen;
1127#ifdef SMART_RESIZE
1128 int old_width = szHint.width, old_height = szHint.height; 1158 int old_width = szHint.width, old_height = szHint.height;
1129#endif
1130 dDisp; 1159 dDisp;
1131 1160
1132 window_calc (width, height); 1161 window_calc (newwidth, newheight);
1133 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 1162 XSetWMNormalHints (disp, parent[0], &szHint);
1134 1163
1135 if (!ignoreparent) 1164 if (!ignoreparent)
1136 { 1165 {
1137#ifdef SMART_RESIZE 1166#ifdef SMART_RESIZE
1138 /* 1167 /*
… …
1142 int x, y, x1, y1; 1171 int x, y, x1, y1;
1143 int dx, dy; 1172 int dx, dy;
1144 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1173 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1145 Window unused_cr; 1174 Window unused_cr;
1146 1175
1147 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 1176 XTranslateCoordinates (disp, parent[0], display->root,
1148 0, 0, &x, &y, &unused_cr); 1177 0, 0, &x, &y, &unused_cr);
1149 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 1178 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1150 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1179 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1151 /* 1180 /*
1152 * if display->root isn't the parent window, a WM will probably have offset 1181 * if display->root isn't the parent window, a WM will probably have offset
1153 * our position for handles and decorations. Counter it 1182 * our position for handles and decorations. Counter it
1154 */ 1183 */
… …
1171 if (y < y1) /* top half */ 1200 if (y < y1) /* top half */
1172 dy = 0; 1201 dy = 0;
1173 else if (y == y1) /* exact center */ 1202 else if (y == y1) /* exact center */
1174 dy /= 2; 1203 dy /= 2;
1175 1204
1176 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 1205 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1177 szHint.width, szHint.height); 1206 szHint.width, szHint.height);
1178#else 1207#else
1179 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 1208 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1180#endif 1209#endif
1181 } 1210 }
1182 1211
1183 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1212 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1184 1213
1185 if (fix_screen || width != old_width || height != old_height) 1214 if (fix_screen || newwidth != old_width || newheight != old_height)
1186 { 1215 {
1187 if (scrollbar_visible ()) 1216 if (scrollbar_visible ())
1188 { 1217 {
1189 XMoveResizeWindow (disp, scrollBar.win, 1218 XMoveResizeWindow (disp, scrollBar.win,
1190 window_sb_x, 0, 1219 window_sb_x, 0,
… …
1195 if (menubar_visible ()) 1224 if (menubar_visible ())
1196 XMoveResizeWindow (disp, menuBar.win, 1225 XMoveResizeWindow (disp, menuBar.win,
1197 window_vt_x, 0, 1226 window_vt_x, 0,
1198 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1227 TermWin_TotalWidth (), menuBar_TotalHeight ());
1199 1228
1200 XMoveResizeWindow (disp, TermWin.vt, 1229 XMoveResizeWindow (disp, vt,
1201 window_vt_x, window_vt_y, 1230 window_vt_x, window_vt_y,
1202 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1231 TermWin_TotalWidth (), TermWin_TotalHeight ());
1203 1232
1204 scr_clear (); 1233 scr_clear ();
1205#ifdef XPM_BACKGROUND 1234#ifdef XPM_BACKGROUND
… …
1213 int old_ncol = prev_ncol; 1242 int old_ncol = prev_ncol;
1214 1243
1215 /* scr_reset only works on the primary screen */ 1244 /* scr_reset only works on the primary screen */
1216 if (old_height) /* this is not the first time through */ 1245 if (old_height) /* this is not the first time through */
1217 { 1246 {
1218 unsigned int ncol = TermWin.ncol; 1247 unsigned int ocol = ncol;
1219 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1248 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1220 curr_screen = scr_change_screen (PRIMARY); 1249 curr_screen = scr_change_screen (PRIMARY);
1221 TermWin.ncol = ncol; 1250 ncol = ocol;
1222 } 1251 }
1223 1252
1224 scr_reset (); 1253 scr_reset ();
1225 1254
1226 if (curr_screen >= 0) /* this is not the first time through */ 1255 if (curr_screen >= 0) /* this is not the first time through */
1227 { 1256 {
1228 scr_change_screen (curr_screen); 1257 scr_change_screen (curr_screen);
1229 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1258 selection_check (old_ncol != ncol ? 4 : 0);
1230 } 1259 }
1231 } 1260 }
1232 1261
1233 old_width = szHint.width; 1262 old_width = szHint.width;
1234 old_height = szHint.height; 1263 old_height = szHint.height;
1235 1264
1236#ifdef XPM_BACKGROUND 1265#ifdef XPM_BACKGROUND
1237 if (TermWin.pixmap) 1266 if (pixmap)
1238 scr_touch (false); 1267 scr_touch (false);
1239#endif 1268#endif
1240 1269
1241#ifdef USE_XIM 1270#ifdef USE_XIM
1242 IMSetStatusPosition (); 1271 IMSetStatusPosition ();
… …
1246/* 1275/*
1247 * Set the width/height of the vt window in characters. Units are pixels. 1276 * Set the width/height of the vt window in characters. Units are pixels.
1248 * good for toggling 80/132 columns 1277 * good for toggling 80/132 columns
1249 */ 1278 */
1250void 1279void
1251rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1280rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1252{ 1281{
1253 XWindowAttributes wattr; 1282 XWindowAttributes wattr;
1254 1283
1255 if (width == 0 || height == 0) 1284 if (newwidth == 0 || newheight == 0)
1256 { 1285 {
1257 XGetWindowAttributes (display->display, display->root, &wattr); 1286 XGetWindowAttributes (display->display, display->root, &wattr);
1287
1258 if (width == 0) 1288 if (newwidth == 0)
1259 width = wattr.width - szHint.base_width; 1289 newwidth = wattr.width - szHint.base_width;
1260 if (height == 0) 1290 if (newheight == 0)
1261 height = wattr.height - szHint.base_height; 1291 newheight = wattr.height - szHint.base_height;
1262 }
1263
1264 if (width != TermWin.width || height != TermWin.height)
1265 { 1292 }
1293
1294 if (newwidth != width || newheight != height)
1295 {
1266 width += szHint.base_width; 1296 newwidth += szHint.base_width;
1267 height += szHint.base_height; 1297 newheight += szHint.base_height;
1268 resize_all_windows (width, height, 0); 1298 resize_all_windows (newwidth, newheight, 0);
1269 } 1299 }
1270} 1300}
1271 1301
1272/* -------------------------------------------------------------------- * 1302/* -------------------------------------------------------------------- *
1273 * - X INPUT METHOD ROUTINES - * 1303 * - X INPUT METHOD ROUTINES - *
… …
1283 1313
1284void 1314void
1285rxvt_term::im_set_size (XRectangle &size) 1315rxvt_term::im_set_size (XRectangle &size)
1286{ 1316{
1287 // the int_bwidth terms make no sense to me 1317 // the int_bwidth terms make no sense to me
1288 size.x = TermWin.int_bwidth; 1318 size.x = int_bwidth;
1289 size.y = TermWin.int_bwidth; 1319 size.y = int_bwidth;
1290 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1320 size.width = Width2Pixel (ncol) + int_bwidth;
1291 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1321 size.height = Height2Pixel (nrow) + int_bwidth;
1292} 1322}
1293 1323
1294void 1324void
1295rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1325rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1296 XRectangle &status_rect, 1326 XRectangle &status_rect,
1297 const XRectangle &needed_rect) 1327 const XRectangle &needed_rect)
1298{ 1328{
1299 preedit_rect.x = needed_rect.width; 1329 preedit_rect.x = needed_rect.width;
1300 preedit_rect.y = 0; 1330 preedit_rect.y = 0;
1301 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1331 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1302 preedit_rect.height = TermWin.fheight; 1332 preedit_rect.height = fheight;
1303 1333
1304 status_rect.x = 0; 1334 status_rect.x = 0;
1305 status_rect.y = 0; 1335 status_rect.y = 0;
1306 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1336 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1307 status_rect.height = TermWin.fheight; 1337 status_rect.height = fheight;
1308} 1338}
1309 1339
1310/* Checking whether input method is running. */ 1340/* Checking whether input method is running. */
1311bool 1341bool
1312rxvt_term::IMisRunning () 1342rxvt_term::IMisRunning ()
… …
1340{ 1370{
1341 XPoint nspot; 1371 XPoint nspot;
1342 XVaNestedList preedit_attr; 1372 XVaNestedList preedit_attr;
1343 1373
1344 if (!Input_Context 1374 if (!Input_Context
1345 || !TermWin.focus 1375 || !focus
1346 || !(input_style & XIMPreeditPosition)) 1376 || !(input_style & XIMPreeditPosition))
1347 return; 1377 return;
1348 1378
1349 im_set_position (nspot); 1379 im_set_position (nspot);
1350 1380
… …
1470 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1500 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1471 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1501 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1472 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1502 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1473 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1503 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1474 "*", 1504 "*",
1475 TermWin.fheight, 1505 fheight,
1476 TermWin.fheight + 1, TermWin.fheight - 1, 1506 fheight + 1, fheight - 1,
1477 TermWin.fheight - 2, TermWin.fheight + 2); 1507 fheight - 2, fheight + 2);
1478 1508
1479 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1509 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1480 &missing_charset_list, &missing_charset_count, &def_string); 1510 &missing_charset_list, &missing_charset_count, &def_string);
1481 1511
1482 if (missing_charset_list) 1512 if (missing_charset_list)
… …
1528 NULL); 1558 NULL);
1529 } 1559 }
1530 1560
1531 Input_Context = XCreateIC (xim, 1561 Input_Context = XCreateIC (xim,
1532 XNInputStyle, input_style, 1562 XNInputStyle, input_style,
1533 XNClientWindow, TermWin.vt, 1563 XNClientWindow, vt,
1534 XNFocusWindow, TermWin.parent[0], 1564 XNFocusWindow, parent[0],
1535 preedit_attr ? XNPreeditAttributes : NULL, 1565 preedit_attr ? XNPreeditAttributes : NULL,
1536 preedit_attr, 1566 preedit_attr,
1537 status_attr ? XNStatusAttributes : NULL, 1567 status_attr ? XNStatusAttributes : NULL,
1538 status_attr, NULL); 1568 status_attr, NULL);
1539 1569
… …
1556} 1586}
1557 1587
1558void 1588void
1559rxvt_term::im_cb () 1589rxvt_term::im_cb ()
1560{ 1590{
1561 int i, found, had_im; 1591 int i;
1562 const char *p; 1592 const char *p;
1563 char **s; 1593 char **s;
1564 char buf[IMBUFSIZ]; 1594 char buf[IMBUFSIZ];
1565 1595
1566 SET_R (this); 1596 SET_R (this);
… …
1623{ 1653{
1624 XRectangle preedit_rect, status_rect, *needed_rect; 1654 XRectangle preedit_rect, status_rect, *needed_rect;
1625 XVaNestedList preedit_attr, status_attr; 1655 XVaNestedList preedit_attr, status_attr;
1626 1656
1627 if (!Input_Context 1657 if (!Input_Context
1628 || !TermWin.focus 1658 || !focus
1629 || !(input_style & XIMPreeditArea) 1659 || !(input_style & XIMPreeditArea)
1630 || !IMisRunning ()) 1660 || !IMisRunning ())
1631 return; 1661 return;
1632 1662
1633 /* Getting the necessary width of preedit area */ 1663 /* Getting the necessary width of preedit area */

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines