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