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

Diff Legend

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