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