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.135 by root, Sun Feb 13 11:07:57 2005 UTC vs.
Revision 1.157 by root, Tue Jan 3 18:11:34 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 XDestroyWindow (disp, TermWin.parent[0]); 270 XDestroyWindow (disp, parent[0]);
260 } 271 }
261 272
262 // TODO: free pixcolours, colours should become part of rxvt_display 273 // TODO: free pixcolours, colours should become part of rxvt_display
263 274
264 delete pix_colors_focused; 275 delete pix_colors_focused;
265#ifdef OFF_FOCUS_FADING 276#if OFF_FOCUS_FADING
266 delete pix_colors_unfocused; 277 delete pix_colors_unfocused;
267#endif 278#endif
268 279
269 displays.put (display); 280 displays.put (display);
270 281
… …
288 delete argv; 299 delete argv;
289 300
290#ifdef KEYSYM_RESOURCE 301#ifdef KEYSYM_RESOURCE
291 delete keyboard; 302 delete keyboard;
292#endif 303#endif
304}
305
306void
307rxvt_term::child_exit ()
308{
309 cmd_pid = 0;
310
311 if (!OPTION (Opt_hold))
312 destroy ();
293} 313}
294 314
295void 315void
296rxvt_term::destroy () 316rxvt_term::destroy ()
297{ 317{
… …
418{ 438{
419 if (GET_R->allowedxerror == -1) 439 if (GET_R->allowedxerror == -1)
420 GET_R->allowedxerror = event->error_code; 440 GET_R->allowedxerror = event->error_code;
421 else 441 else
422 { 442 {
423 //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,
424 //TODO: maybe just output the error and continue? 444 // so just output the error and continue
425#if ENABLE_FRILLS 445#if ENABLE_FRILLS
426 print_x_error (display, event); 446 print_x_error (display, event);
427#else 447#else
428 old_xerror_handler (display, event); 448 old_xerror_handler (display, event);
429#endif 449#endif
… …
439 DisplayString (display)); 459 DisplayString (display));
440 rxvt_emergency_cleanup (); 460 rxvt_emergency_cleanup ();
441 _exit (EXIT_FAILURE); 461 _exit (EXIT_FAILURE);
442} 462}
443 463
444/*
445 * Catch a fatal signal and tidy up before quitting
446 */
447void
448rxvt_term::sig_term (sig_watcher &w)
449{
450#ifdef DEBUG_CMD
451 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
452#endif
453 rxvt_emergency_cleanup ();
454 signal (w.signum, SIG_DFL);
455 kill (getpid (), w.signum);
456}
457
458/*----------------------------------------------------------------------*/ 464/*----------------------------------------------------------------------*/
459/* rxvt_init () */
460bool 465bool
461rxvt_term::init (int argc, const char *const *argv) 466rxvt_term::init (int argc, const char *const *argv)
462{ 467{
463 SET_R (this); 468 SET_R (this);
464 469
… …
477 482
478#if MENUBAR_MAX 483#if MENUBAR_MAX
479 menubar_read (rs[Rs_menu]); 484 menubar_read (rs[Rs_menu]);
480#endif 485#endif
481#ifdef HAVE_SCROLLBARS 486#ifdef HAVE_SCROLLBARS
482 if (options & Opt_scrollBar) 487 if (OPTION (Opt_scrollBar))
483 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 }
484#endif 497#endif
485 498
486 create_windows (argc, argv); 499 create_windows (argc, argv);
487 500
488 dDisp; 501 dDisp;
… …
494#if 0 507#if 0
495 XSynchronize (disp, True); 508 XSynchronize (disp, True);
496#endif 509#endif
497 510
498#ifdef HAVE_SCROLLBARS 511#ifdef HAVE_SCROLLBARS
499 if (options & Opt_scrollBar) 512 if (OPTION (Opt_scrollBar))
500 resize_scrollbar (); /* create and map scrollbar */ 513 resize_scrollbar (); /* create and map scrollbar */
501#endif 514#endif
502#if (MENUBAR_MAX) 515#if (MENUBAR_MAX)
503 if (menubar_visible ()) 516 if (menubar_visible ())
504 XMapWindow (disp, menuBar.win); 517 XMapWindow (disp, menuBar.win);
505#endif 518#endif
506#ifdef TRANSPARENT 519#ifdef TRANSPARENT
507 if (options & Opt_transparent) 520 if (OPTION (Opt_transparent))
508 { 521 {
509 XSelectInput (disp, display->root, PropertyChangeMask); 522 XSelectInput (disp, display->root, PropertyChangeMask);
510 check_our_parents (); 523 check_our_parents ();
511 rootwin_ev.start (display, display->root); 524 rootwin_ev.start (display, display->root);
512 } 525 }
513#endif 526#endif
514 527
515 XMapWindow (disp, TermWin.vt); 528 XMapWindow (disp, vt);
516 XMapWindow (disp, TermWin.parent[0]); 529 XMapWindow (disp, parent[0]);
517 530
518 set_colorfgbg (); 531 set_colorfgbg ();
519 532
520 init_command (cmd_argv); 533 init_command (cmd_argv);
521 534
… …
523 536
524 pty_ev.start (pty.pty, EVENT_READ); 537 pty_ev.start (pty.pty, EVENT_READ);
525 538
526 check_ev.start (); 539 check_ev.start ();
527 540
541 PERL_INVOKE ((this, HOOK_START, DT_END));
542
528 return true; 543 return true;
529} 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;
530 585
531void 586void
532rxvt_init () 587rxvt_init ()
533{ 588{
534 /* 589 /*
… …
542 rxvt_privileges (IGNORE); 597 rxvt_privileges (IGNORE);
543 598
544 signal (SIGHUP, SIG_IGN); 599 signal (SIGHUP, SIG_IGN);
545 signal (SIGPIPE, SIG_IGN); 600 signal (SIGPIPE, SIG_IGN);
546 601
602 sig_handlers.sw_chld.start (SIGCHLD);
603 sig_handlers.sw_term.start (SIGTERM);
604 sig_handlers.sw_int.start (SIGINT);
605
547 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 606 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
548 /* signal (SIGURG, SIG_DFL); */ 607 /* signal (SIGURG, SIG_DFL); */
549 608
550 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 609 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
551 // TODO: handle this with exceptions and tolerate the memory loss 610 // TODO: handle this with exceptions and tolerate the memory loss
552 XSetIOErrorHandler (rxvt_xioerror_handler); 611 XSetIOErrorHandler (rxvt_xioerror_handler);
553}
554
555/* ------------------------------------------------------------------------- *
556 * SIGNAL HANDLING & EXIT HANDLER *
557 * ------------------------------------------------------------------------- */
558/*
559 * Catch a SIGCHLD signal and exit if the direct child has died
560 */
561
562void
563rxvt_term::sig_chld (sig_watcher &w)
564{
565 // we are being called for every SIGCHLD, not just ours
566 int pid;
567
568 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
569 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
570 if (pid == (*t)->cmd_pid)
571 {
572 (*t)->destroy ();
573 break;
574 }
575} 612}
576 613
577/* ------------------------------------------------------------------------- * 614/* ------------------------------------------------------------------------- *
578 * MEMORY ALLOCATION WRAPPERS * 615 * MEMORY ALLOCATION WRAPPERS *
579 * ------------------------------------------------------------------------- */ 616 * ------------------------------------------------------------------------- */
… …
586 rxvt_fatal ("memory allocation failure. aborting.\n"); 623 rxvt_fatal ("memory allocation failure. aborting.\n");
587 624
588 return p; 625 return p;
589} 626}
590 627
591/* INTPROTO */ 628void *
592void *
593rxvt_calloc (size_t number, size_t size) 629rxvt_calloc (size_t number, size_t size)
594{ 630{
595 void *p = calloc (number, size); 631 void *p = calloc (number, size);
596 632
597 if (!p) 633 if (!p)
598 rxvt_fatal ("memory allocation failure. aborting.\n"); 634 rxvt_fatal ("memory allocation failure. aborting.\n");
599 635
600 return p; 636 return p;
601} 637}
602 638
603/* INTPROTO */
604void * 639void *
605rxvt_realloc (void *ptr, size_t size) 640rxvt_realloc (void *ptr, size_t size)
606{ 641{
607 void *p = realloc (ptr, size); 642 void *p = realloc (ptr, size);
608 643
… …
669 704
670#ifdef UTMP_SUPPORT 705#ifdef UTMP_SUPPORT
671void 706void
672rxvt_term::privileged_utmp (rxvt_privaction action) 707rxvt_term::privileged_utmp (rxvt_privaction action)
673{ 708{
674 if ((options & Opt_utmpInhibit) 709 if (OPTION (Opt_utmpInhibit)
675 || !pty.name || !*pty.name) 710 || !pty.name || !*pty.name)
676 return; 711 return;
677 712
678 rxvt_privileges (RESTORE); 713 rxvt_privileges (RESTORE);
679 714
… …
690/* 725/*
691 * window size/position calculcations for XSizeHint and other storage. 726 * window size/position calculcations for XSizeHint and other storage.
692 * if width/height are non-zero then override calculated width/height 727 * if width/height are non-zero then override calculated width/height
693 */ 728 */
694void 729void
695rxvt_term::window_calc (unsigned int width, unsigned int height) 730rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
696{ 731{
697 short recalc_x, recalc_y; 732 short recalc_x, recalc_y;
698 int x, y, sb_w, mb_h, flags; 733 int x, y, sb_w, mb_h, flags;
699 unsigned int w, h; 734 unsigned int w, h;
700 unsigned int max_width, max_height; 735 unsigned int max_width, max_height;
701 dDisp; 736 dDisp;
702 737
703 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",
704 TermWin.ncol, TermWin.nrow, szHint.width, 739 ncol, nrow, szHint.width, szHint.height));
705 szHint.height)); 740
706 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 741 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
707 szHint.win_gravity = NorthWestGravity; 742 szHint.win_gravity = NorthWestGravity;
708 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 743 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
709 744
710 recalc_x = recalc_y = 0; 745 recalc_x = recalc_y = 0;
711 flags = 0; 746 flags = 0;
747
712 if (!parsed_geometry) 748 if (!parsed_geometry)
713 { 749 {
714 parsed_geometry = 1; 750 parsed_geometry = 1;
751
715 if (rs[Rs_geometry]) 752 if (rs[Rs_geometry])
716 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 753 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
754
717 if (flags & WidthValue) 755 if (flags & WidthValue)
718 { 756 {
719 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 757 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
720 szHint.flags |= USSize; 758 szHint.flags |= USSize;
721 } 759 }
760
722 if (flags & HeightValue) 761 if (flags & HeightValue)
723 { 762 {
724 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 763 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
725 szHint.flags |= USSize; 764 szHint.flags |= USSize;
726 } 765 }
766
727 if (flags & XValue) 767 if (flags & XValue)
728 { 768 {
729 szHint.x = x; 769 szHint.x = x;
730 szHint.flags |= USPosition; 770 szHint.flags |= USPosition;
771
731 if (flags & XNegative) 772 if (flags & XNegative)
732 { 773 {
733 recalc_x = 1; 774 recalc_x = 1;
734 szHint.win_gravity = NorthEastGravity; 775 szHint.win_gravity = NorthEastGravity;
735 } 776 }
736 } 777 }
778
737 if (flags & YValue) 779 if (flags & YValue)
738 { 780 {
739 szHint.y = y; 781 szHint.y = y;
740 szHint.flags |= USPosition; 782 szHint.flags |= USPosition;
783
741 if (flags & YNegative) 784 if (flags & YNegative)
742 { 785 {
743 recalc_y = 1; 786 recalc_y = 1;
787
744 if (szHint.win_gravity == NorthEastGravity) 788 if (szHint.win_gravity == NorthEastGravity)
745 szHint.win_gravity = SouthEastGravity; 789 szHint.win_gravity = SouthEastGravity;
746 else 790 else
747 szHint.win_gravity = SouthWestGravity; 791 szHint.win_gravity = SouthWestGravity;
748 } 792 }
749 } 793 }
750 } 794 }
751 795
752 /* TODO: BOUNDS */ 796 /* TODO: BOUNDS */
753 TermWin.width = TermWin.ncol * TermWin.fwidth; 797 width = ncol * fwidth;
754 TermWin.height = TermWin.nrow * TermWin.fheight; 798 height = nrow * fheight;
755 max_width = MAX_COLS * TermWin.fwidth; 799 max_width = MAX_COLS * fwidth;
756 max_height = MAX_ROWS * TermWin.fheight; 800 max_height = MAX_ROWS * fheight;
757 801
758 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 802 szHint.base_width = szHint.base_height = 2 * int_bwidth;
759 803
760 sb_w = mb_h = 0; 804 sb_w = mb_h = 0;
761 window_vt_x = window_vt_y = TermWin.int_bwidth; 805 window_vt_x = window_vt_y = int_bwidth;
762 806
763 if (scrollbar_visible ()) 807 if (scrollbar_visible ())
764 { 808 {
765 sb_w = scrollbar_TotalWidth (); 809 sb_w = scrollbar_TotalWidth ();
766 szHint.base_width += sb_w; 810 szHint.base_width += sb_w;
767 if (!(options & Opt_scrollBar_right)) 811 if (!OPTION (Opt_scrollBar_right))
768 window_vt_x += sb_w; 812 window_vt_x += sb_w;
769 } 813 }
770 814
771 if (menubar_visible ()) 815 if (menubar_visible ())
772 { 816 {
773 mb_h = menuBar_TotalHeight (); 817 mb_h = menuBar_TotalHeight ();
774 szHint.base_height += mb_h; 818 szHint.base_height += mb_h;
775 window_vt_y += mb_h; 819 window_vt_y += mb_h;
776 } 820 }
777 821
778 szHint.width_inc = TermWin.fwidth; 822 szHint.width_inc = fwidth;
779 szHint.height_inc = TermWin.fheight; 823 szHint.height_inc = fheight;
780 szHint.min_width = szHint.base_width + szHint.width_inc; 824 szHint.min_width = szHint.base_width + szHint.width_inc;
781 szHint.min_height = szHint.base_height + szHint.height_inc; 825 szHint.min_height = szHint.base_height + szHint.height_inc;
782 826
783 if (width && width - szHint.base_width < max_width) 827 if (newwidth && newwidth - szHint.base_width < max_width)
784 { 828 {
785 szHint.width = width; 829 szHint.width = newwidth;
786 TermWin.width = width - szHint.base_width; 830 width = newwidth - szHint.base_width;
787 } 831 }
788 else 832 else
789 { 833 {
790 MIN_IT (TermWin.width, max_width); 834 min_it (width, max_width);
791 szHint.width = szHint.base_width + TermWin.width; 835 szHint.width = szHint.base_width + width;
792 } 836 }
793 837
794 if (height && height - szHint.base_height < max_height) 838 if (newheight && newheight - szHint.base_height < max_height)
795 { 839 {
796 szHint.height = height; 840 szHint.height = newheight;
797 TermWin.height = height - szHint.base_height; 841 height = newheight - szHint.base_height;
798 } 842 }
799 else 843 else
800 { 844 {
801 MIN_IT (TermWin.height, max_height); 845 min_it (height, max_height);
802 szHint.height = szHint.base_height + TermWin.height; 846 szHint.height = szHint.base_height + height;
803 } 847 }
804 848
805 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 849 if (scrollbar_visible () && OPTION (Opt_scrollBar_right))
806 window_sb_x = szHint.width - sb_w; 850 window_sb_x = szHint.width - sb_w;
807 851
808 if (recalc_x) 852 if (recalc_x)
809 szHint.x += (DisplayWidth (disp, display->screen) 853 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
810 - szHint.width - 2 * TermWin.ext_bwidth);
811 if (recalc_y) 854 if (recalc_y)
812 szHint.y += (DisplayHeight (disp, display->screen) 855 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
813 - szHint.height - 2 * TermWin.ext_bwidth);
814 856
815 TermWin.ncol = TermWin.width / TermWin.fwidth; 857 ncol = width / fwidth;
816 TermWin.nrow = TermWin.height / TermWin.fheight; 858 nrow = height / fheight;
817 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",
818 TermWin.ncol, TermWin.nrow, szHint.width, 860 ncol, nrow, szHint.width,
819 szHint.height)); 861 szHint.height));
820 return; 862 return;
821} 863}
822 864
823/*----------------------------------------------------------------------*/ 865/*----------------------------------------------------------------------*/
… …
831 if (pty.pty < 0) 873 if (pty.pty < 0)
832 return; 874 return;
833 875
834 struct winsize ws; 876 struct winsize ws;
835 877
836 ws.ws_col = TermWin.ncol; 878 ws.ws_col = ncol;
837 ws.ws_row = TermWin.nrow; 879 ws.ws_row = nrow;
838 ws.ws_xpixel = TermWin.width; 880 ws.ws_xpixel = width;
839 ws.ws_ypixel = TermWin.height; 881 ws.ws_ypixel = height;
840 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 882 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
841 883
842#if 0 884#if 0
843 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 885 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
844 if (cmd_pid) /* force through to the command */ 886 if (cmd_pid) /* force through to the command */
845 kill (cmd_pid, SIGWINCH); 887 kill (-cmd_pid, SIGWINCH);
846#endif 888#endif
847} 889}
848 890
849/*----------------------------------------------------------------------*/ 891/*----------------------------------------------------------------------*/
850/* set_fonts () - load and set the various fonts 892/* set_fonts () - load and set the various fonts
851/* 893 *
852 * init = 1 - initialize 894 * init = 1 - initialize
853 * 895 *
854 * fontname == FONT_UP - switch to bigger font 896 * fontname == FONT_UP - switch to bigger font
855 * fontname == FONT_DN - switch to smaller font 897 * fontname == FONT_DN - switch to smaller font
856 */ 898 */
… …
868 return false; 910 return false;
869 } 911 }
870 912
871#if ENABLE_STYLES 913#if ENABLE_STYLES
872 for (int i = RS_styleCount; --i; ) 914 for (int i = RS_styleCount; --i; )
873 if (TermWin.fontset[i] != TermWin.fontset[0]) 915 if (fontset[i] != fontset[0])
874 delete TermWin.fontset[i]; 916 delete fontset[i];
875#endif 917#endif
876 918
877 delete TermWin.fontset[0]; 919 delete fontset[0];
878 TermWin.fontset[0] = fs; 920 fontset[0] = fs;
879 921
880 prop = (*fs)[1]->properties (); 922 prop = (*fs)[1]->properties ();
881 prop.height += TermWin.lineSpace; 923 prop.height += lineSpace;
882 fs->set_prop (prop); 924 fs->set_prop (prop);
883 925
884 TermWin.fwidth = prop.width; 926 fwidth = prop.width;
885 TermWin.fheight = prop.height; 927 fheight = prop.height;
886 TermWin.fweight = prop.weight;
887 TermWin.fslant = prop.slant;
888 TermWin.fbase = (*fs)[1]->ascent; 928 fbase = (*fs)[1]->ascent;
889 929
890 for (int style = 1; style < 4; style++) 930 for (int style = 1; style < 4; style++)
891 { 931 {
892#if ENABLE_STYLES 932#if ENABLE_STYLES
893 const char *res = rs[Rs_font + style]; 933 const char *res = rs[Rs_font + style];
894 934
895 if (res && !*res) 935 if (res && !*res)
896 TermWin.fontset[style] = TermWin.fontset[0]; 936 fontset[style] = fontset[0];
897 else 937 else
898 { 938 {
899 TermWin.fontset[style] = fs = new rxvt_fontset (this); 939 fontset[style] = fs = new rxvt_fontset (this);
900 rxvt_fontprop prop2 = prop; 940 rxvt_fontprop prop2 = prop;
901 941
902 if (res) 942 if (res)
903 prop2.weight = prop2.slant = rxvt_fontprop::unset; 943 prop2.weight = prop2.slant = rxvt_fontprop::unset;
904 else 944 else
905 { 945 {
906 res = TermWin.fontset[0]->fontdesc; 946 res = fontset[0]->fontdesc;
907 947
908 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;
909 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;
910 } 950 }
911 951
912 fs->populate (res); 952 fs->populate (res);
913 fs->set_prop (prop2); 953 fs->set_prop (prop2);
914 } 954 }
915#else 955#else
916 TermWin.fontset[style] = TermWin.fontset[0]; 956 fontset[style] = fontset[0];
917#endif 957#endif
918 } 958 }
919 959
920 if (TermWin.parent[0]) 960 if (parent[0])
921 { 961 {
922 resize_all_windows (0, 0, 0); 962 resize_all_windows (0, 0, 0);
923 scr_remap_chars (); 963 scr_remap_chars ();
924 scr_touch (true); 964 scr_touch (true);
925 } 965 }
… …
927 return true; 967 return true;
928} 968}
929 969
930void 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)
931{ 971{
932 // TODO: SMART_WINDOW_TITLE
933 XChangeProperty (display->display, TermWin.parent[0], 972 XChangeProperty (display->display, parent[0],
934 prop, XA_STRING, 8, PropModeReplace, 973 prop, XA_STRING, 8, PropModeReplace,
935 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 974 (const unsigned char *)str, len >= 0 ? len : strlen (str));
936} 975}
937 976
938void 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)
939{ 978{
940 // TODO: SMART_WINDOW_TITLE
941 wchar_t *ws = rxvt_mbstowcs (str, len); 979 wchar_t *ws = rxvt_mbstowcs (str, len);
942 char *s = rxvt_wcstoutf8 (ws); 980 char *s = rxvt_wcstoutf8 (ws);
943 981
944 XChangeProperty (display->display, TermWin.parent[0], 982 XChangeProperty (display->display, parent[0],
945 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 983 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
946 (const unsigned char *)s, strlen (s)); 984 (const unsigned char *)s, strlen (s));
947 985
948 free (s); 986 free (s);
949 free (ws); 987 free (ws);
… …
954/* xterm sequences - title, iconName, color (exptl) */ 992/* xterm sequences - title, iconName, color (exptl) */
955void 993void
956rxvt_term::set_title (const char *str) 994rxvt_term::set_title (const char *str)
957{ 995{
958 set_string_property (XA_WM_NAME, str); 996 set_string_property (XA_WM_NAME, str);
959#if ENABLE_FRILLS 997#if ENABLE_EWMH
960 set_utf8_property (xa[XA_NET_WM_NAME], str); 998 set_utf8_property (xa[XA_NET_WM_NAME], str);
961#endif 999#endif
962} 1000}
963 1001
964void 1002void
965rxvt_term::set_icon_name (const char *str) 1003rxvt_term::set_icon_name (const char *str)
966{ 1004{
967 set_string_property (XA_WM_ICON_NAME, str); 1005 set_string_property (XA_WM_ICON_NAME, str);
968#if ENABLE_FRILLS 1006#if ENABLE_EWMH
969 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 1007 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
970#endif 1008#endif
971} 1009}
972 1010
973#ifdef XTERM_COLOR_CHANGE 1011#ifdef XTERM_COLOR_CHANGE
… …
989 { /* bright colors */ 1027 { /* bright colors */
990 i -= 8; 1028 i -= 8;
991# ifndef NO_BRIGHTCOLOR 1029# ifndef NO_BRIGHTCOLOR
992 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1030 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
993 SET_PIXCOLOR (idx); 1031 SET_PIXCOLOR (idx);
994 goto Done; 1032 goto done;
995# endif 1033# endif
996 } 1034 }
997 1035
998 if (i >= 0 && i <= 7) 1036 if (i >= 0 && i <= 7)
999 { /* normal colors */ 1037 { /* normal colors */
1000 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1038 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1001 SET_PIXCOLOR (idx); 1039 SET_PIXCOLOR (idx);
1002 goto Done; 1040 goto done;
1003 } 1041 }
1004 } 1042 }
1005 1043
1006 if (!rXParseAllocColor (&xcol, color)) 1044 if (!rXParseAllocColor (&xcol, color))
1007 return; 1045 return;
… …
1027 pix_colors_focused[idx] = xcol; 1065 pix_colors_focused[idx] = xcol;
1028 SET_PIXCOLOR (idx); 1066 SET_PIXCOLOR (idx);
1029 1067
1030 /* XSetWindowAttributes attr; */ 1068 /* XSetWindowAttributes attr; */
1031 /* Cursor cursor; */ 1069 /* Cursor cursor; */
1032Done: 1070done:
1071
1033#ifdef OFF_FOCUS_FADING 1072#if OFF_FOCUS_FADING
1034 if (rs[Rs_fade]) 1073 if (rs[Rs_fade])
1035 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]);
1036#endif 1075#endif
1037 1076
1038 /*TODO: handle Color_BD, scrollbar background, etc. */ 1077 /*TODO: handle Color_BD, scrollbar background, etc. */
1039 1078
1040 recolour_cursor (); 1079 recolour_cursor ();
… …
1111 1150
1112/* -------------------------------------------------------------------- * 1151/* -------------------------------------------------------------------- *
1113 * - WINDOW RESIZING - * 1152 * - WINDOW RESIZING - *
1114 * -------------------------------------------------------------------- */ 1153 * -------------------------------------------------------------------- */
1115void 1154void
1116rxvt_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)
1117{ 1156{
1118 int fix_screen; 1157 int fix_screen;
1119#ifdef SMART_RESIZE
1120 int old_width = szHint.width, old_height = szHint.height; 1158 int old_width = szHint.width, old_height = szHint.height;
1121#endif
1122 dDisp; 1159 dDisp;
1123 1160
1124 window_calc (width, height); 1161 window_calc (newwidth, newheight);
1125 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 1162 XSetWMNormalHints (disp, parent[0], &szHint);
1126 1163
1127 if (!ignoreparent) 1164 if (!ignoreparent)
1128 { 1165 {
1129#ifdef SMART_RESIZE 1166#ifdef SMART_RESIZE
1130 /* 1167 /*
… …
1134 int x, y, x1, y1; 1171 int x, y, x1, y1;
1135 int dx, dy; 1172 int dx, dy;
1136 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1173 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1137 Window unused_cr; 1174 Window unused_cr;
1138 1175
1139 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 1176 XTranslateCoordinates (disp, parent[0], display->root,
1140 0, 0, &x, &y, &unused_cr); 1177 0, 0, &x, &y, &unused_cr);
1141 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 1178 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1142 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1179 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1143 /* 1180 /*
1144 * 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
1145 * our position for handles and decorations. Counter it 1182 * our position for handles and decorations. Counter it
1146 */ 1183 */
… …
1163 if (y < y1) /* top half */ 1200 if (y < y1) /* top half */
1164 dy = 0; 1201 dy = 0;
1165 else if (y == y1) /* exact center */ 1202 else if (y == y1) /* exact center */
1166 dy /= 2; 1203 dy /= 2;
1167 1204
1168 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 1205 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1169 szHint.width, szHint.height); 1206 szHint.width, szHint.height);
1170#else 1207#else
1171 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 1208 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1172#endif 1209#endif
1173 } 1210 }
1174 1211
1175 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1212 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1176 1213
1177 if (fix_screen || width != old_width || height != old_height) 1214 if (fix_screen || newwidth != old_width || newheight != old_height)
1178 { 1215 {
1179 if (scrollbar_visible ()) 1216 if (scrollbar_visible ())
1180 { 1217 {
1181 XMoveResizeWindow (disp, scrollBar.win, 1218 XMoveResizeWindow (disp, scrollBar.win,
1182 window_sb_x, 0, 1219 window_sb_x, 0,
… …
1187 if (menubar_visible ()) 1224 if (menubar_visible ())
1188 XMoveResizeWindow (disp, menuBar.win, 1225 XMoveResizeWindow (disp, menuBar.win,
1189 window_vt_x, 0, 1226 window_vt_x, 0,
1190 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1227 TermWin_TotalWidth (), menuBar_TotalHeight ());
1191 1228
1192 XMoveResizeWindow (disp, TermWin.vt, 1229 XMoveResizeWindow (disp, vt,
1193 window_vt_x, window_vt_y, 1230 window_vt_x, window_vt_y,
1194 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1231 TermWin_TotalWidth (), TermWin_TotalHeight ());
1195 1232
1196 scr_clear (); 1233 scr_clear ();
1197#ifdef XPM_BACKGROUND 1234#ifdef XPM_BACKGROUND
… …
1205 int old_ncol = prev_ncol; 1242 int old_ncol = prev_ncol;
1206 1243
1207 /* scr_reset only works on the primary screen */ 1244 /* scr_reset only works on the primary screen */
1208 if (old_height) /* this is not the first time through */ 1245 if (old_height) /* this is not the first time through */
1209 { 1246 {
1210 unsigned int ncol = TermWin.ncol; 1247 unsigned int ocol = ncol;
1211 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
1212 curr_screen = scr_change_screen (PRIMARY); 1249 curr_screen = scr_change_screen (PRIMARY);
1213 TermWin.ncol = ncol; 1250 ncol = ocol;
1214 } 1251 }
1215 1252
1216 scr_reset (); 1253 scr_reset ();
1217 1254
1218 if (curr_screen >= 0) /* this is not the first time through */ 1255 if (curr_screen >= 0) /* this is not the first time through */
1219 { 1256 {
1220 scr_change_screen (curr_screen); 1257 scr_change_screen (curr_screen);
1221 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1258 selection_check (old_ncol != ncol ? 4 : 0);
1222 } 1259 }
1223 } 1260 }
1224 1261
1225 old_width = szHint.width; 1262 old_width = szHint.width;
1226 old_height = szHint.height; 1263 old_height = szHint.height;
1227 1264
1228#ifdef XPM_BACKGROUND 1265#ifdef XPM_BACKGROUND
1229 if (TermWin.pixmap) 1266 if (pixmap)
1230 scr_touch (false); 1267 scr_touch (false);
1231#endif 1268#endif
1232 1269
1233#ifdef USE_XIM 1270#ifdef USE_XIM
1234 IMSetStatusPosition (); 1271 IMSetStatusPosition ();
… …
1238/* 1275/*
1239 * 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.
1240 * good for toggling 80/132 columns 1277 * good for toggling 80/132 columns
1241 */ 1278 */
1242void 1279void
1243rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1280rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1244{ 1281{
1245 XWindowAttributes wattr; 1282 XWindowAttributes wattr;
1246 1283
1247 if (width == 0 || height == 0) 1284 if (newwidth == 0 || newheight == 0)
1248 { 1285 {
1249 XGetWindowAttributes (display->display, display->root, &wattr); 1286 XGetWindowAttributes (display->display, display->root, &wattr);
1287
1250 if (width == 0) 1288 if (newwidth == 0)
1251 width = wattr.width - szHint.base_width; 1289 newwidth = wattr.width - szHint.base_width;
1252 if (height == 0) 1290 if (newheight == 0)
1253 height = wattr.height - szHint.base_height; 1291 newheight = wattr.height - szHint.base_height;
1254 }
1255
1256 if (width != TermWin.width || height != TermWin.height)
1257 { 1292 }
1293
1294 if (newwidth != width || newheight != height)
1295 {
1258 width += szHint.base_width; 1296 newwidth += szHint.base_width;
1259 height += szHint.base_height; 1297 newheight += szHint.base_height;
1260 resize_all_windows (width, height, 0); 1298 resize_all_windows (newwidth, newheight, 0);
1261 } 1299 }
1262} 1300}
1263 1301
1264/* -------------------------------------------------------------------- * 1302/* -------------------------------------------------------------------- *
1265 * - X INPUT METHOD ROUTINES - * 1303 * - X INPUT METHOD ROUTINES - *
… …
1275 1313
1276void 1314void
1277rxvt_term::im_set_size (XRectangle &size) 1315rxvt_term::im_set_size (XRectangle &size)
1278{ 1316{
1279 // the int_bwidth terms make no sense to me 1317 // the int_bwidth terms make no sense to me
1280 size.x = TermWin.int_bwidth; 1318 size.x = int_bwidth;
1281 size.y = TermWin.int_bwidth; 1319 size.y = int_bwidth;
1282 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1320 size.width = Width2Pixel (ncol) + int_bwidth;
1283 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1321 size.height = Height2Pixel (nrow) + int_bwidth;
1284} 1322}
1285 1323
1286void 1324void
1287rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1325rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1288 XRectangle &status_rect, 1326 XRectangle &status_rect,
1289 const XRectangle &needed_rect) 1327 const XRectangle &needed_rect)
1290{ 1328{
1291 preedit_rect.x = needed_rect.width; 1329 preedit_rect.x = needed_rect.width;
1292 preedit_rect.y = 0; 1330 preedit_rect.y = 0;
1293 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1331 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1294 preedit_rect.height = TermWin.fheight; 1332 preedit_rect.height = fheight;
1295 1333
1296 status_rect.x = 0; 1334 status_rect.x = 0;
1297 status_rect.y = 0; 1335 status_rect.y = 0;
1298 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;
1299 status_rect.height = TermWin.fheight; 1337 status_rect.height = fheight;
1300} 1338}
1301 1339
1302/* Checking whether input method is running. */ 1340/* Checking whether input method is running. */
1303bool 1341bool
1304rxvt_term::IMisRunning () 1342rxvt_term::IMisRunning ()
… …
1332{ 1370{
1333 XPoint nspot; 1371 XPoint nspot;
1334 XVaNestedList preedit_attr; 1372 XVaNestedList preedit_attr;
1335 1373
1336 if (!Input_Context 1374 if (!Input_Context
1337 || !TermWin.focus 1375 || !focus
1338 || !(input_style & XIMPreeditPosition)) 1376 || !(input_style & XIMPreeditPosition))
1339 return; 1377 return;
1340 1378
1341 im_set_position (nspot); 1379 im_set_position (nspot);
1342 1380
… …
1462 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1500 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1463 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1501 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1464 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1502 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1465 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1503 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1466 "*", 1504 "*",
1467 TermWin.fheight, 1505 fheight,
1468 TermWin.fheight + 1, TermWin.fheight - 1, 1506 fheight + 1, fheight - 1,
1469 TermWin.fheight - 2, TermWin.fheight + 2); 1507 fheight - 2, fheight + 2);
1470 1508
1471 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1509 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1472 &missing_charset_list, &missing_charset_count, &def_string); 1510 &missing_charset_list, &missing_charset_count, &def_string);
1473 1511
1474 if (missing_charset_list) 1512 if (missing_charset_list)
… …
1520 NULL); 1558 NULL);
1521 } 1559 }
1522 1560
1523 Input_Context = XCreateIC (xim, 1561 Input_Context = XCreateIC (xim,
1524 XNInputStyle, input_style, 1562 XNInputStyle, input_style,
1525 XNClientWindow, TermWin.vt, 1563 XNClientWindow, vt,
1526 XNFocusWindow, TermWin.parent[0], 1564 XNFocusWindow, parent[0],
1527 preedit_attr ? XNPreeditAttributes : NULL, 1565 preedit_attr ? XNPreeditAttributes : NULL,
1528 preedit_attr, 1566 preedit_attr,
1529 status_attr ? XNStatusAttributes : NULL, 1567 status_attr ? XNStatusAttributes : NULL,
1530 status_attr, NULL); 1568 status_attr, NULL);
1531 1569
… …
1548} 1586}
1549 1587
1550void 1588void
1551rxvt_term::im_cb () 1589rxvt_term::im_cb ()
1552{ 1590{
1553 int i, found, had_im; 1591 int i;
1554 const char *p; 1592 const char *p;
1555 char **s; 1593 char **s;
1556 char buf[IMBUFSIZ]; 1594 char buf[IMBUFSIZ];
1557 1595
1558 SET_R (this); 1596 SET_R (this);
… …
1615{ 1653{
1616 XRectangle preedit_rect, status_rect, *needed_rect; 1654 XRectangle preedit_rect, status_rect, *needed_rect;
1617 XVaNestedList preedit_attr, status_attr; 1655 XVaNestedList preedit_attr, status_attr;
1618 1656
1619 if (!Input_Context 1657 if (!Input_Context
1620 || !TermWin.focus 1658 || !focus
1621 || !(input_style & XIMPreeditArea) 1659 || !(input_style & XIMPreeditArea)
1622 || !IMisRunning ()) 1660 || !IMisRunning ())
1623 return; 1661 return;
1624 1662
1625 /* 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