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.168 by root, Sun Jan 8 08:49:20 2006 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
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 51#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
49# include "keyboard.h" 52static uid_t saved_euid;
53static gid_t saved_egid;
50#endif 54#endif
55
56bool
57rxvt_tainted ()
58{
59#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
60 return getuid () != saved_euid || getgid () != saved_egid;
61#else
62 return false;
63#endif
64}
51 65
52vector<rxvt_term *> rxvt_term::termlist; 66vector<rxvt_term *> rxvt_term::termlist;
53 67
54static char curlocale[128]; 68static char curlocale[128], savelocale[128];
55 69
56bool 70bool
57rxvt_set_locale (const char *locale) 71rxvt_set_locale (const char *locale)
58{ 72{
59 if (!locale || !strncmp (locale, curlocale, 128)) 73 if (!locale || !strncmp (locale, curlocale, 128))
60 return false; 74 return false;
61 75
62 strncpy (curlocale, locale, 128); 76 strncpy (curlocale, locale, 128);
63 setlocale (LC_CTYPE, curlocale); 77 setlocale (LC_CTYPE, curlocale);
64 return true; 78 return true;
79}
80
81bool
82rxvt_push_locale (const char *locale)
83{
84 strcpy (savelocale, curlocale);
85 rxvt_set_locale (locale);
86}
87
88void
89rxvt_pop_locale ()
90{
91 rxvt_set_locale (savelocale);
65} 92}
66 93
67#if ENABLE_COMBINING 94#if ENABLE_COMBINING
68class rxvt_composite_vec rxvt_composite; 95class rxvt_composite_vec rxvt_composite;
69 96
… …
158 pointer_ev (this, &rxvt_term::pointer_cb), 185 pointer_ev (this, &rxvt_term::pointer_cb),
159#endif 186#endif
160#ifdef USE_XIM 187#ifdef USE_XIM
161 im_ev (this, &rxvt_term::im_cb), 188 im_ev (this, &rxvt_term::im_cb),
162#endif 189#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), 190 termwin_ev (this, &rxvt_term::x_cb),
167 vt_ev (this, &rxvt_term::x_cb), 191 vt_ev (this, &rxvt_term::x_cb),
168 check_ev (this, &rxvt_term::check_cb), 192 check_ev (this, &rxvt_term::check_cb),
169 flush_ev (this, &rxvt_term::flush_cb), 193 flush_ev (this, &rxvt_term::flush_cb),
170 destroy_ev (this, &rxvt_term::destroy_cb), 194 destroy_ev (this, &rxvt_term::destroy_cb),
… …
197 pty.put (); 221 pty.put ();
198} 222}
199 223
200rxvt_term::~rxvt_term () 224rxvt_term::~rxvt_term ()
201{ 225{
226 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
227
202 termlist.erase (find (termlist.begin (), termlist.end(), this)); 228 termlist.erase (find (termlist.begin (), termlist.end(), this));
203 229
204 emergency_cleanup (); 230 emergency_cleanup ();
205 231
206#if ENABLE_STYLES 232#if ENABLE_STYLES
207 for (int i = RS_styleCount; --i; ) 233 for (int i = RS_styleCount; --i; )
208 if (TermWin.fontset[i] != TermWin.fontset[0]) 234 if (fontset[i] != fontset[0])
209 delete TermWin.fontset[i]; 235 delete fontset[i];
210#endif 236#endif
211 delete TermWin.fontset[0]; 237 delete fontset[0];
212 238
213 if (display) 239 if (display)
214 { 240 {
215 dDisp; 241 dDisp;
216 242
… …
244#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 270#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
245 if (topShadowGC) XFreeGC (disp, topShadowGC); 271 if (topShadowGC) XFreeGC (disp, topShadowGC);
246 if (botShadowGC) XFreeGC (disp, botShadowGC); 272 if (botShadowGC) XFreeGC (disp, botShadowGC);
247 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 273 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
248#endif 274#endif
249 if (TermWin.gc) XFreeGC (disp, TermWin.gc); 275 if (gc) XFreeGC (disp, gc);
250 276
251#if defined(MENUBAR) && (MENUBAR_MAX > 1) 277#if defined(MENUBAR) && (MENUBAR_MAX > 1)
252 delete menuBar.drawable; 278 delete menuBar.drawable;
253 //if (menuBar.win) 279 //if (menuBar.win)
254 // XDestroyWindow (disp, menuBar.win); 280 // XDestroyWindow (disp, menuBar.win);
255#endif 281#endif
256 delete TermWin.drawable; 282 delete drawable;
257 // destroy all windows 283 // destroy all windows
258 if (TermWin.parent[0]) 284 if (parent[0])
259 XDestroyWindow (disp, TermWin.parent[0]); 285 XDestroyWindow (disp, parent[0]);
260 } 286 }
261 287
262 // TODO: free pixcolours, colours should become part of rxvt_display 288 // TODO: free pixcolours, colours should become part of rxvt_display
263 289
264 delete pix_colors_focused; 290 delete pix_colors_focused;
265#ifdef OFF_FOCUS_FADING 291#if OFF_FOCUS_FADING
266 delete pix_colors_unfocused; 292 delete pix_colors_unfocused;
293#endif
294#if USE_XGETDEFAULT
295 XrmDestroyDatabase (xrmdatabase);
267#endif 296#endif
268 297
269 displays.put (display); 298 displays.put (display);
270 299
271 scr_release (); 300 scr_release ();
… …
288 delete argv; 317 delete argv;
289 318
290#ifdef KEYSYM_RESOURCE 319#ifdef KEYSYM_RESOURCE
291 delete keyboard; 320 delete keyboard;
292#endif 321#endif
322}
323
324void
325rxvt_term::child_exit ()
326{
327 cmd_pid = 0;
328
329 if (!OPTION (Opt_hold))
330 destroy ();
293} 331}
294 332
295void 333void
296rxvt_term::destroy () 334rxvt_term::destroy ()
297{ 335{
… …
418{ 456{
419 if (GET_R->allowedxerror == -1) 457 if (GET_R->allowedxerror == -1)
420 GET_R->allowedxerror = event->error_code; 458 GET_R->allowedxerror = event->error_code;
421 else 459 else
422 { 460 {
423 //TODO: GET_R is most likely not the terminal which caused the error 461 // GET_R is most likely not the terminal which caused the error,
424 //TODO: maybe just output the error and continue? 462 // so just output the error and continue
425#if ENABLE_FRILLS 463#if ENABLE_FRILLS
426 print_x_error (display, event); 464 print_x_error (display, event);
427#else 465#else
428 old_xerror_handler (display, event); 466 old_xerror_handler (display, event);
429#endif 467#endif
… …
439 DisplayString (display)); 477 DisplayString (display));
440 rxvt_emergency_cleanup (); 478 rxvt_emergency_cleanup ();
441 _exit (EXIT_FAILURE); 479 _exit (EXIT_FAILURE);
442} 480}
443 481
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/*----------------------------------------------------------------------*/ 482/*----------------------------------------------------------------------*/
459/* rxvt_init () */
460bool 483bool
461rxvt_term::init (int argc, const char *const *argv) 484rxvt_term::init (int argc, const char *const *argv)
462{ 485{
463 SET_R (this); 486 SET_R (this);
464 487
… …
477 500
478#if MENUBAR_MAX 501#if MENUBAR_MAX
479 menubar_read (rs[Rs_menu]); 502 menubar_read (rs[Rs_menu]);
480#endif 503#endif
481#ifdef HAVE_SCROLLBARS 504#ifdef HAVE_SCROLLBARS
482 if (options & Opt_scrollBar) 505 if (OPTION (Opt_scrollBar))
483 scrollBar.setIdle (); /* set existence for size calculations */ 506 scrollBar.setIdle (); /* set existence for size calculations */
507#endif
508
509#if ENABLE_PERL
510 if (!rs[Rs_perl_ext_1])
511 rs[Rs_perl_ext_1] = "default";
512
513 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
514 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
515 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
516 {
517#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
518 // ignore some perl-related arguments if some bozo installed us set[ug]id
519 if (rxvt_tainted ())
520 {
521 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
522 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
523 {
524 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
525 rs[Rs_perl_lib] = 0;
526 rs[Rs_perl_eval] = 0;
527 }
528 }
529#endif
530 rxvt_perl.init ();
531 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
532 }
484#endif 533#endif
485 534
486 create_windows (argc, argv); 535 create_windows (argc, argv);
487 536
488 dDisp; 537 dDisp;
… …
494#if 0 543#if 0
495 XSynchronize (disp, True); 544 XSynchronize (disp, True);
496#endif 545#endif
497 546
498#ifdef HAVE_SCROLLBARS 547#ifdef HAVE_SCROLLBARS
499 if (options & Opt_scrollBar) 548 if (OPTION (Opt_scrollBar))
500 resize_scrollbar (); /* create and map scrollbar */ 549 resize_scrollbar (); /* create and map scrollbar */
501#endif 550#endif
502#if (MENUBAR_MAX) 551#if (MENUBAR_MAX)
503 if (menubar_visible ()) 552 if (menubar_visible ())
504 XMapWindow (disp, menuBar.win); 553 XMapWindow (disp, menuBar.win);
505#endif 554#endif
506#ifdef TRANSPARENT 555#ifdef TRANSPARENT
507 if (options & Opt_transparent) 556 if (OPTION (Opt_transparent))
508 { 557 {
509 XSelectInput (disp, display->root, PropertyChangeMask); 558 XSelectInput (disp, display->root, PropertyChangeMask);
510 check_our_parents (); 559 check_our_parents ();
511 rootwin_ev.start (display, display->root); 560 rootwin_ev.start (display, display->root);
512 } 561 }
513#endif 562#endif
514 563
515 XMapWindow (disp, TermWin.vt); 564 XMapWindow (disp, vt);
516 XMapWindow (disp, TermWin.parent[0]); 565 XMapWindow (disp, parent[0]);
517 566
518 set_colorfgbg (); 567 set_colorfgbg ();
519 568
520 init_command (cmd_argv); 569 init_command (cmd_argv);
521 570
522 free (cmd_argv); 571 free (cmd_argv);
523 572
573 if (pty.pty >= 0)
524 pty_ev.start (pty.pty, EVENT_READ); 574 pty_ev.start (pty.pty, EVENT_READ);
525 575
526 check_ev.start (); 576 check_ev.start ();
527 577
578 HOOK_INVOKE ((this, HOOK_START, DT_END));
579
528 return true; 580 return true;
529} 581}
582
583static struct sig_handlers
584{
585 sig_watcher sw_chld, sw_term, sw_int;
586
587 void sig_chld (sig_watcher &w)
588 {
589 // we are being called for every SIGCHLD, find the corresponding term
590 int pid;
591
592 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
593 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
594 if (pid == (*t)->cmd_pid)
595 {
596 (*t)->child_exit ();
597 break;
598 }
599 }
600
601 /*
602 * Catch a fatal signal and tidy up before quitting
603 */
604 void
605 sig_term (sig_watcher &w)
606 {
607#ifdef DEBUG_CMD
608 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
609#endif
610 rxvt_emergency_cleanup ();
611 signal (w.signum, SIG_DFL);
612 kill (getpid (), w.signum);
613 }
614
615 sig_handlers ()
616 : sw_chld (this, &sig_handlers::sig_chld),
617 sw_term (this, &sig_handlers::sig_term),
618 sw_int (this, &sig_handlers::sig_term)
619 {
620 }
621} sig_handlers;
530 622
531void 623void
532rxvt_init () 624rxvt_init ()
533{ 625{
534 /* 626 /*
… …
542 rxvt_privileges (IGNORE); 634 rxvt_privileges (IGNORE);
543 635
544 signal (SIGHUP, SIG_IGN); 636 signal (SIGHUP, SIG_IGN);
545 signal (SIGPIPE, SIG_IGN); 637 signal (SIGPIPE, SIG_IGN);
546 638
639 sig_handlers.sw_chld.start (SIGCHLD);
640 sig_handlers.sw_term.start (SIGTERM);
641 sig_handlers.sw_int.start (SIGINT);
642
547 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 643 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
548 /* signal (SIGURG, SIG_DFL); */ 644 /* signal (SIGURG, SIG_DFL); */
549 645
550 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 646 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
551 // TODO: handle this with exceptions and tolerate the memory loss 647 // TODO: handle this with exceptions and tolerate the memory loss
552 XSetIOErrorHandler (rxvt_xioerror_handler); 648 XSetIOErrorHandler (rxvt_xioerror_handler);
553}
554 649
555/* ------------------------------------------------------------------------- * 650#ifdef USE_XGETDEFAULT
556 * SIGNAL HANDLING & EXIT HANDLER * 651 XrmInitialize ();
557 * ------------------------------------------------------------------------- */ 652#endif
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} 653}
576 654
577/* ------------------------------------------------------------------------- * 655/* ------------------------------------------------------------------------- *
578 * MEMORY ALLOCATION WRAPPERS * 656 * MEMORY ALLOCATION WRAPPERS *
579 * ------------------------------------------------------------------------- */ 657 * ------------------------------------------------------------------------- */
… …
586 rxvt_fatal ("memory allocation failure. aborting.\n"); 664 rxvt_fatal ("memory allocation failure. aborting.\n");
587 665
588 return p; 666 return p;
589} 667}
590 668
591/* INTPROTO */ 669void *
592void *
593rxvt_calloc (size_t number, size_t size) 670rxvt_calloc (size_t number, size_t size)
594{ 671{
595 void *p = calloc (number, size); 672 void *p = calloc (number, size);
596 673
597 if (!p) 674 if (!p)
598 rxvt_fatal ("memory allocation failure. aborting.\n"); 675 rxvt_fatal ("memory allocation failure. aborting.\n");
599 676
600 return p; 677 return p;
601} 678}
602 679
603/* INTPROTO */
604void * 680void *
605rxvt_realloc (void *ptr, size_t size) 681rxvt_realloc (void *ptr, size_t size)
606{ 682{
607 void *p = realloc (ptr, size); 683 void *p = realloc (ptr, size);
608 684
… …
617 * ------------------------------------------------------------------------- */ 693 * ------------------------------------------------------------------------- */
618/* take care of suid/sgid super-user (root) privileges */ 694/* take care of suid/sgid super-user (root) privileges */
619void 695void
620rxvt_privileges (rxvt_privaction action) 696rxvt_privileges (rxvt_privaction action)
621{ 697{
622#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
623 static uid_t euid;
624 static gid_t egid;
625#endif
626
627#if ! defined(__CYGWIN32__) 698#if ! defined(__CYGWIN32__)
628# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 699# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
629 /* setreuid () is the poor man's setuid (), seteuid () */ 700 /* setreuid () is the poor man's setuid (), seteuid () */
630# define seteuid(a) setreuid(-1, (a)) 701# define seteuid(a) setreuid(-1, (a))
631# define setegid(a) setregid(-1, (a)) 702# define setegid(a) setregid(-1, (a))
… …
641 */ 712 */
642 seteuid (getuid ()); 713 seteuid (getuid ());
643 setegid (getgid ()); 714 setegid (getgid ());
644 break; 715 break;
645 case SAVE: 716 case SAVE:
646 euid = geteuid (); 717 saved_euid = geteuid ();
647 egid = getegid (); 718 saved_egid = getegid ();
648 break; 719 break;
649 case RESTORE: 720 case RESTORE:
650 seteuid (euid); 721 seteuid (saved_euid);
651 setegid (egid); 722 setegid (saved_egid);
652 break; 723 break;
653 } 724 }
654# else 725# else
655 switch (action) 726 switch (action)
656 { 727 {
… …
669 740
670#ifdef UTMP_SUPPORT 741#ifdef UTMP_SUPPORT
671void 742void
672rxvt_term::privileged_utmp (rxvt_privaction action) 743rxvt_term::privileged_utmp (rxvt_privaction action)
673{ 744{
674 if ((options & Opt_utmpInhibit) 745 if (OPTION (Opt_utmpInhibit)
675 || !pty.name || !*pty.name) 746 || !pty.name || !*pty.name)
676 return; 747 return;
677 748
678 rxvt_privileges (RESTORE); 749 rxvt_privileges (RESTORE);
679 750
… …
690/* 761/*
691 * window size/position calculcations for XSizeHint and other storage. 762 * window size/position calculcations for XSizeHint and other storage.
692 * if width/height are non-zero then override calculated width/height 763 * if width/height are non-zero then override calculated width/height
693 */ 764 */
694void 765void
695rxvt_term::window_calc (unsigned int width, unsigned int height) 766rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
696{ 767{
697 short recalc_x, recalc_y; 768 short recalc_x, recalc_y;
698 int x, y, sb_w, mb_h, flags; 769 int x, y, sb_w, mb_h, flags;
699 unsigned int w, h; 770 unsigned int w, h;
700 unsigned int max_width, max_height; 771 unsigned int max_width, max_height;
701 dDisp; 772 dDisp;
702 773
703 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 774 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
704 TermWin.ncol, TermWin.nrow, szHint.width, 775 ncol, nrow, szHint.width, szHint.height));
705 szHint.height)); 776
706 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 777 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
707 szHint.win_gravity = NorthWestGravity; 778 szHint.win_gravity = NorthWestGravity;
708 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 779 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
709 780
710 recalc_x = recalc_y = 0; 781 recalc_x = recalc_y = 0;
711 flags = 0; 782 flags = 0;
783
712 if (!parsed_geometry) 784 if (!parsed_geometry)
713 { 785 {
714 parsed_geometry = 1; 786 parsed_geometry = 1;
787
715 if (rs[Rs_geometry]) 788 if (rs[Rs_geometry])
716 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 789 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
790
717 if (flags & WidthValue) 791 if (flags & WidthValue)
718 { 792 {
719 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 793 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
720 szHint.flags |= USSize; 794 szHint.flags |= USSize;
721 } 795 }
796
722 if (flags & HeightValue) 797 if (flags & HeightValue)
723 { 798 {
724 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 799 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
725 szHint.flags |= USSize; 800 szHint.flags |= USSize;
726 } 801 }
802
727 if (flags & XValue) 803 if (flags & XValue)
728 { 804 {
729 szHint.x = x; 805 szHint.x = x;
730 szHint.flags |= USPosition; 806 szHint.flags |= USPosition;
807
731 if (flags & XNegative) 808 if (flags & XNegative)
732 { 809 {
733 recalc_x = 1; 810 recalc_x = 1;
734 szHint.win_gravity = NorthEastGravity; 811 szHint.win_gravity = NorthEastGravity;
735 } 812 }
736 } 813 }
814
737 if (flags & YValue) 815 if (flags & YValue)
738 { 816 {
739 szHint.y = y; 817 szHint.y = y;
740 szHint.flags |= USPosition; 818 szHint.flags |= USPosition;
819
741 if (flags & YNegative) 820 if (flags & YNegative)
742 { 821 {
743 recalc_y = 1; 822 recalc_y = 1;
823
744 if (szHint.win_gravity == NorthEastGravity) 824 if (szHint.win_gravity == NorthEastGravity)
745 szHint.win_gravity = SouthEastGravity; 825 szHint.win_gravity = SouthEastGravity;
746 else 826 else
747 szHint.win_gravity = SouthWestGravity; 827 szHint.win_gravity = SouthWestGravity;
748 } 828 }
749 } 829 }
750 } 830 }
751 831
752 /* TODO: BOUNDS */ 832 /* TODO: BOUNDS */
753 TermWin.width = TermWin.ncol * TermWin.fwidth; 833 width = ncol * fwidth;
754 TermWin.height = TermWin.nrow * TermWin.fheight; 834 height = nrow * fheight;
755 max_width = MAX_COLS * TermWin.fwidth; 835 max_width = MAX_COLS * fwidth;
756 max_height = MAX_ROWS * TermWin.fheight; 836 max_height = MAX_ROWS * fheight;
757 837
758 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 838 szHint.base_width = szHint.base_height = 2 * int_bwidth;
759 839
760 sb_w = mb_h = 0; 840 sb_w = mb_h = 0;
761 window_vt_x = window_vt_y = TermWin.int_bwidth; 841 window_vt_x = window_vt_y = int_bwidth;
762 842
763 if (scrollbar_visible ()) 843 if (scrollbar_visible ())
764 { 844 {
765 sb_w = scrollbar_TotalWidth (); 845 sb_w = scrollbar_TotalWidth ();
766 szHint.base_width += sb_w; 846 szHint.base_width += sb_w;
767 if (!(options & Opt_scrollBar_right)) 847 if (!OPTION (Opt_scrollBar_right))
768 window_vt_x += sb_w; 848 window_vt_x += sb_w;
769 } 849 }
770 850
771 if (menubar_visible ()) 851 if (menubar_visible ())
772 { 852 {
773 mb_h = menuBar_TotalHeight (); 853 mb_h = menuBar_TotalHeight ();
774 szHint.base_height += mb_h; 854 szHint.base_height += mb_h;
775 window_vt_y += mb_h; 855 window_vt_y += mb_h;
776 } 856 }
777 857
778 szHint.width_inc = TermWin.fwidth; 858 szHint.width_inc = fwidth;
779 szHint.height_inc = TermWin.fheight; 859 szHint.height_inc = fheight;
780 szHint.min_width = szHint.base_width + szHint.width_inc; 860 szHint.min_width = szHint.base_width + szHint.width_inc;
781 szHint.min_height = szHint.base_height + szHint.height_inc; 861 szHint.min_height = szHint.base_height + szHint.height_inc;
782 862
783 if (width && width - szHint.base_width < max_width) 863 if (newwidth && newwidth - szHint.base_width < max_width)
784 { 864 {
785 szHint.width = width; 865 szHint.width = newwidth;
786 TermWin.width = width - szHint.base_width; 866 width = newwidth - szHint.base_width;
787 } 867 }
788 else 868 else
789 { 869 {
790 MIN_IT (TermWin.width, max_width); 870 min_it (width, max_width);
791 szHint.width = szHint.base_width + TermWin.width; 871 szHint.width = szHint.base_width + width;
792 } 872 }
793 873
794 if (height && height - szHint.base_height < max_height) 874 if (newheight && newheight - szHint.base_height < max_height)
795 { 875 {
796 szHint.height = height; 876 szHint.height = newheight;
797 TermWin.height = height - szHint.base_height; 877 height = newheight - szHint.base_height;
798 } 878 }
799 else 879 else
800 { 880 {
801 MIN_IT (TermWin.height, max_height); 881 min_it (height, max_height);
802 szHint.height = szHint.base_height + TermWin.height; 882 szHint.height = szHint.base_height + height;
803 } 883 }
804 884
805 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 885 if (scrollbar_visible () && OPTION (Opt_scrollBar_right))
806 window_sb_x = szHint.width - sb_w; 886 window_sb_x = szHint.width - sb_w;
807 887
808 if (recalc_x) 888 if (recalc_x)
809 szHint.x += (DisplayWidth (disp, display->screen) 889 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
810 - szHint.width - 2 * TermWin.ext_bwidth);
811 if (recalc_y) 890 if (recalc_y)
812 szHint.y += (DisplayHeight (disp, display->screen) 891 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
813 - szHint.height - 2 * TermWin.ext_bwidth);
814 892
815 TermWin.ncol = TermWin.width / TermWin.fwidth; 893 ncol = width / fwidth;
816 TermWin.nrow = TermWin.height / TermWin.fheight; 894 nrow = height / fheight;
817 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 895 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
818 TermWin.ncol, TermWin.nrow, szHint.width, 896 ncol, nrow, szHint.width,
819 szHint.height)); 897 szHint.height));
820 return; 898 return;
821} 899}
822 900
823/*----------------------------------------------------------------------*/ 901/*----------------------------------------------------------------------*/
… …
831 if (pty.pty < 0) 909 if (pty.pty < 0)
832 return; 910 return;
833 911
834 struct winsize ws; 912 struct winsize ws;
835 913
836 ws.ws_col = TermWin.ncol; 914 ws.ws_col = ncol;
837 ws.ws_row = TermWin.nrow; 915 ws.ws_row = nrow;
838 ws.ws_xpixel = TermWin.width; 916 ws.ws_xpixel = width;
839 ws.ws_ypixel = TermWin.height; 917 ws.ws_ypixel = height;
840 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 918 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
841 919
842#if 0 920#if 0
843 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 921 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
844 if (cmd_pid) /* force through to the command */ 922 if (cmd_pid) /* force through to the command */
845 kill (cmd_pid, SIGWINCH); 923 kill (-cmd_pid, SIGWINCH);
846#endif 924#endif
847} 925}
848 926
849/*----------------------------------------------------------------------*/ 927/*----------------------------------------------------------------------*/
850/* set_fonts () - load and set the various fonts 928/* set_fonts () - load and set the various fonts
851/* 929 *
852 * init = 1 - initialize 930 * init = 1 - initialize
853 * 931 *
854 * fontname == FONT_UP - switch to bigger font 932 * fontname == FONT_UP - switch to bigger font
855 * fontname == FONT_DN - switch to smaller font 933 * fontname == FONT_DN - switch to smaller font
856 */ 934 */
… …
868 return false; 946 return false;
869 } 947 }
870 948
871#if ENABLE_STYLES 949#if ENABLE_STYLES
872 for (int i = RS_styleCount; --i; ) 950 for (int i = RS_styleCount; --i; )
873 if (TermWin.fontset[i] != TermWin.fontset[0]) 951 if (fontset[i] != fontset[0])
874 delete TermWin.fontset[i]; 952 delete fontset[i];
875#endif 953#endif
876 954
877 delete TermWin.fontset[0]; 955 delete fontset[0];
878 TermWin.fontset[0] = fs; 956 fontset[0] = fs;
879 957
880 prop = (*fs)[1]->properties (); 958 prop = (*fs)[1]->properties ();
881 prop.height += TermWin.lineSpace; 959 prop.height += lineSpace;
882 fs->set_prop (prop); 960 fs->set_prop (prop);
883 961
884 TermWin.fwidth = prop.width; 962 fwidth = prop.width;
885 TermWin.fheight = prop.height; 963 fheight = prop.height;
886 TermWin.fweight = prop.weight; 964 fbase = prop.ascent;
887 TermWin.fslant = prop.slant;
888 TermWin.fbase = (*fs)[1]->ascent;
889 965
890 for (int style = 1; style < 4; style++) 966 for (int style = 1; style < 4; style++)
891 { 967 {
892#if ENABLE_STYLES 968#if ENABLE_STYLES
893 const char *res = rs[Rs_font + style]; 969 const char *res = rs[Rs_font + style];
894 970
895 if (res && !*res) 971 if (res && !*res)
896 TermWin.fontset[style] = TermWin.fontset[0]; 972 fontset[style] = fontset[0];
897 else 973 else
898 { 974 {
899 TermWin.fontset[style] = fs = new rxvt_fontset (this); 975 fontset[style] = fs = new rxvt_fontset (this);
900 rxvt_fontprop prop2 = prop; 976 rxvt_fontprop prop2 = prop;
901 977
902 if (res) 978 if (res)
903 prop2.weight = prop2.slant = rxvt_fontprop::unset; 979 prop2.weight = prop2.slant = rxvt_fontprop::unset;
904 else 980 else
905 { 981 {
906 res = TermWin.fontset[0]->fontdesc; 982 res = fontset[0]->fontdesc;
907 983
908 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 984 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; 985 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
910 } 986 }
911 987
912 fs->populate (res); 988 fs->populate (res);
913 fs->set_prop (prop2); 989 fs->set_prop (prop2);
914 } 990 }
915#else 991#else
916 TermWin.fontset[style] = TermWin.fontset[0]; 992 fontset[style] = fontset[0];
917#endif 993#endif
918 } 994 }
919 995
920 if (TermWin.parent[0]) 996 if (parent[0])
921 { 997 {
922 resize_all_windows (0, 0, 0); 998 resize_all_windows (0, 0, 0);
923 scr_remap_chars (); 999 scr_remap_chars ();
924 scr_touch (true); 1000 scr_touch (true);
925 } 1001 }
… …
927 return true; 1003 return true;
928} 1004}
929 1005
930void rxvt_term::set_string_property (Atom prop, const char *str, int len) 1006void rxvt_term::set_string_property (Atom prop, const char *str, int len)
931{ 1007{
932 // TODO: SMART_WINDOW_TITLE
933 XChangeProperty (display->display, TermWin.parent[0], 1008 XChangeProperty (display->display, parent[0],
934 prop, XA_STRING, 8, PropModeReplace, 1009 prop, XA_STRING, 8, PropModeReplace,
935 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 1010 (const unsigned char *)str, len >= 0 ? len : strlen (str));
936} 1011}
937 1012
938void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 1013void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
939{ 1014{
940 // TODO: SMART_WINDOW_TITLE
941 wchar_t *ws = rxvt_mbstowcs (str, len); 1015 wchar_t *ws = rxvt_mbstowcs (str, len);
942 char *s = rxvt_wcstoutf8 (ws); 1016 char *s = rxvt_wcstoutf8 (ws);
943 1017
944 XChangeProperty (display->display, TermWin.parent[0], 1018 XChangeProperty (display->display, parent[0],
945 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 1019 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
946 (const unsigned char *)s, strlen (s)); 1020 (const unsigned char *)s, strlen (s));
947 1021
948 free (s); 1022 free (s);
949 free (ws); 1023 free (ws);
… …
954/* xterm sequences - title, iconName, color (exptl) */ 1028/* xterm sequences - title, iconName, color (exptl) */
955void 1029void
956rxvt_term::set_title (const char *str) 1030rxvt_term::set_title (const char *str)
957{ 1031{
958 set_string_property (XA_WM_NAME, str); 1032 set_string_property (XA_WM_NAME, str);
959#if ENABLE_FRILLS 1033#if ENABLE_EWMH
960 set_utf8_property (xa[XA_NET_WM_NAME], str); 1034 set_utf8_property (xa[XA_NET_WM_NAME], str);
961#endif 1035#endif
962} 1036}
963 1037
964void 1038void
965rxvt_term::set_icon_name (const char *str) 1039rxvt_term::set_icon_name (const char *str)
966{ 1040{
967 set_string_property (XA_WM_ICON_NAME, str); 1041 set_string_property (XA_WM_ICON_NAME, str);
968#if ENABLE_FRILLS 1042#if ENABLE_EWMH
969 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 1043 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
970#endif 1044#endif
971} 1045}
972 1046
973#ifdef XTERM_COLOR_CHANGE 1047#ifdef XTERM_COLOR_CHANGE
… …
986 i = atoi (color); 1060 i = atoi (color);
987 1061
988 if (i >= 8 && i <= 15) 1062 if (i >= 8 && i <= 15)
989 { /* bright colors */ 1063 { /* bright colors */
990 i -= 8; 1064 i -= 8;
991# ifndef NO_BRIGHTCOLOR
992 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1065 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
993 SET_PIXCOLOR (idx); 1066 SET_PIXCOLOR (idx);
994 goto Done; 1067 goto done;
995# endif
996 } 1068 }
997 1069
998 if (i >= 0 && i <= 7) 1070 if (i >= 0 && i <= 7)
999 { /* normal colors */ 1071 { /* normal colors */
1000 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1072 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1001 SET_PIXCOLOR (idx); 1073 SET_PIXCOLOR (idx);
1002 goto Done; 1074 goto done;
1003 } 1075 }
1004 } 1076 }
1005 1077
1006 if (!rXParseAllocColor (&xcol, color)) 1078 if (!rXParseAllocColor (&xcol, color))
1007 return; 1079 return;
… …
1027 pix_colors_focused[idx] = xcol; 1099 pix_colors_focused[idx] = xcol;
1028 SET_PIXCOLOR (idx); 1100 SET_PIXCOLOR (idx);
1029 1101
1030 /* XSetWindowAttributes attr; */ 1102 /* XSetWindowAttributes attr; */
1031 /* Cursor cursor; */ 1103 /* Cursor cursor; */
1032Done: 1104done:
1105
1033#ifdef OFF_FOCUS_FADING 1106#if OFF_FOCUS_FADING
1034 if (rs[Rs_fade]) 1107 if (rs[Rs_fade])
1035 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 1108 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1036#endif 1109#endif
1037 1110
1038 /*TODO: handle Color_BD, scrollbar background, etc. */ 1111 /*TODO: handle Color_BD, scrollbar background, etc. */
1039 1112
1040 recolour_cursor (); 1113 recolour_cursor ();
… …
1111 1184
1112/* -------------------------------------------------------------------- * 1185/* -------------------------------------------------------------------- *
1113 * - WINDOW RESIZING - * 1186 * - WINDOW RESIZING - *
1114 * -------------------------------------------------------------------- */ 1187 * -------------------------------------------------------------------- */
1115void 1188void
1116rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1189rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1117{ 1190{
1118 int fix_screen; 1191 int fix_screen;
1119#ifdef SMART_RESIZE
1120 int old_width = szHint.width, old_height = szHint.height; 1192 int old_width = szHint.width, old_height = szHint.height;
1121#endif
1122 dDisp; 1193 dDisp;
1123 1194
1124 window_calc (width, height); 1195 window_calc (newwidth, newheight);
1125 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 1196 XSetWMNormalHints (disp, parent[0], &szHint);
1126 1197
1127 if (!ignoreparent) 1198 if (!ignoreparent)
1128 { 1199 {
1129#ifdef SMART_RESIZE 1200#ifdef SMART_RESIZE
1130 /* 1201 /*
… …
1134 int x, y, x1, y1; 1205 int x, y, x1, y1;
1135 int dx, dy; 1206 int dx, dy;
1136 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1207 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1137 Window unused_cr; 1208 Window unused_cr;
1138 1209
1139 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 1210 XTranslateCoordinates (disp, parent[0], display->root,
1140 0, 0, &x, &y, &unused_cr); 1211 0, 0, &x, &y, &unused_cr);
1141 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 1212 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1142 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1213 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1143 /* 1214 /*
1144 * if display->root isn't the parent window, a WM will probably have offset 1215 * if display->root isn't the parent window, a WM will probably have offset
1145 * our position for handles and decorations. Counter it 1216 * our position for handles and decorations. Counter it
1146 */ 1217 */
… …
1163 if (y < y1) /* top half */ 1234 if (y < y1) /* top half */
1164 dy = 0; 1235 dy = 0;
1165 else if (y == y1) /* exact center */ 1236 else if (y == y1) /* exact center */
1166 dy /= 2; 1237 dy /= 2;
1167 1238
1168 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 1239 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1169 szHint.width, szHint.height); 1240 szHint.width, szHint.height);
1170#else 1241#else
1171 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 1242 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1172#endif 1243#endif
1173 } 1244 }
1174 1245
1175 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1246 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1176 1247
1177 if (fix_screen || width != old_width || height != old_height) 1248 if (fix_screen || newwidth != old_width || newheight != old_height)
1178 { 1249 {
1179 if (scrollbar_visible ()) 1250 if (scrollbar_visible ())
1180 { 1251 {
1181 XMoveResizeWindow (disp, scrollBar.win, 1252 XMoveResizeWindow (disp, scrollBar.win,
1182 window_sb_x, 0, 1253 window_sb_x, 0,
… …
1185 } 1256 }
1186 1257
1187 if (menubar_visible ()) 1258 if (menubar_visible ())
1188 XMoveResizeWindow (disp, menuBar.win, 1259 XMoveResizeWindow (disp, menuBar.win,
1189 window_vt_x, 0, 1260 window_vt_x, 0,
1190 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1261 width, menuBar_TotalHeight ());
1191 1262
1192 XMoveResizeWindow (disp, TermWin.vt, 1263 XMoveResizeWindow (disp, vt,
1193 window_vt_x, window_vt_y, 1264 window_vt_x, window_vt_y,
1194 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1265 width, height);
1195 1266
1196 scr_clear (); 1267 scr_clear ();
1197#ifdef XPM_BACKGROUND 1268#ifdef XPM_BACKGROUND
1198 resize_pixmap (); 1269 resize_pixmap ();
1199#endif 1270#endif
… …
1205 int old_ncol = prev_ncol; 1276 int old_ncol = prev_ncol;
1206 1277
1207 /* scr_reset only works on the primary screen */ 1278 /* scr_reset only works on the primary screen */
1208 if (old_height) /* this is not the first time through */ 1279 if (old_height) /* this is not the first time through */
1209 { 1280 {
1210 unsigned int ncol = TermWin.ncol; 1281 unsigned int ocol = ncol;
1211 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1282 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1212 curr_screen = scr_change_screen (PRIMARY); 1283 curr_screen = scr_change_screen (PRIMARY);
1213 TermWin.ncol = ncol; 1284 ncol = ocol;
1214 } 1285 }
1215 1286
1216 scr_reset (); 1287 scr_reset ();
1217 1288
1218 if (curr_screen >= 0) /* this is not the first time through */ 1289 if (curr_screen >= 0) /* this is not the first time through */
1219 { 1290 {
1220 scr_change_screen (curr_screen); 1291 scr_change_screen (curr_screen);
1221 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1292 selection_check (old_ncol != ncol ? 4 : 0);
1222 } 1293 }
1223 } 1294 }
1224 1295
1225 old_width = szHint.width; 1296 old_width = szHint.width;
1226 old_height = szHint.height; 1297 old_height = szHint.height;
1227 1298
1228#ifdef XPM_BACKGROUND 1299#ifdef XPM_BACKGROUND
1229 if (TermWin.pixmap) 1300 if (pixmap)
1230 scr_touch (false); 1301 scr_touch (false);
1231#endif 1302#endif
1232 1303
1233#ifdef USE_XIM 1304#ifdef USE_XIM
1234 IMSetStatusPosition (); 1305 IMSetStatusPosition ();
… …
1238/* 1309/*
1239 * Set the width/height of the vt window in characters. Units are pixels. 1310 * Set the width/height of the vt window in characters. Units are pixels.
1240 * good for toggling 80/132 columns 1311 * good for toggling 80/132 columns
1241 */ 1312 */
1242void 1313void
1243rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1314rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1244{ 1315{
1245 XWindowAttributes wattr; 1316 XWindowAttributes wattr;
1246 1317
1247 if (width == 0 || height == 0) 1318 if (newwidth == 0 || newheight == 0)
1248 { 1319 {
1249 XGetWindowAttributes (display->display, display->root, &wattr); 1320 XGetWindowAttributes (display->display, display->root, &wattr);
1321
1250 if (width == 0) 1322 if (newwidth == 0)
1251 width = wattr.width - szHint.base_width; 1323 newwidth = wattr.width - szHint.base_width;
1252 if (height == 0) 1324 if (newheight == 0)
1253 height = wattr.height - szHint.base_height; 1325 newheight = wattr.height - szHint.base_height;
1254 }
1255
1256 if (width != TermWin.width || height != TermWin.height)
1257 { 1326 }
1327
1328 if (newwidth != width || newheight != height)
1329 {
1258 width += szHint.base_width; 1330 newwidth += szHint.base_width;
1259 height += szHint.base_height; 1331 newheight += szHint.base_height;
1260 resize_all_windows (width, height, 0); 1332 resize_all_windows (newwidth, newheight, 0);
1261 } 1333 }
1262} 1334}
1263 1335
1264/* -------------------------------------------------------------------- * 1336/* -------------------------------------------------------------------- *
1265 * - X INPUT METHOD ROUTINES - * 1337 * - X INPUT METHOD ROUTINES - *
… …
1275 1347
1276void 1348void
1277rxvt_term::im_set_size (XRectangle &size) 1349rxvt_term::im_set_size (XRectangle &size)
1278{ 1350{
1279 // the int_bwidth terms make no sense to me 1351 // the int_bwidth terms make no sense to me
1280 size.x = TermWin.int_bwidth; 1352 size.x = int_bwidth;
1281 size.y = TermWin.int_bwidth; 1353 size.y = int_bwidth;
1282 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1354 size.width = Width2Pixel (ncol) + int_bwidth;
1283 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1355 size.height = Height2Pixel (nrow) + int_bwidth;
1284} 1356}
1285 1357
1286void 1358void
1287rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1359rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1288 XRectangle &status_rect, 1360 XRectangle &status_rect,
1289 const XRectangle &needed_rect) 1361 const XRectangle &needed_rect)
1290{ 1362{
1291 preedit_rect.x = needed_rect.width; 1363 preedit_rect.x = needed_rect.width;
1292 preedit_rect.y = 0; 1364 preedit_rect.y = 0;
1293 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1365 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1294 preedit_rect.height = TermWin.fheight; 1366 preedit_rect.height = fheight;
1295 1367
1296 status_rect.x = 0; 1368 status_rect.x = 0;
1297 status_rect.y = 0; 1369 status_rect.y = 0;
1298 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1370 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1299 status_rect.height = TermWin.fheight; 1371 status_rect.height = fheight;
1300} 1372}
1301 1373
1302/* Checking whether input method is running. */ 1374/* Checking whether input method is running. */
1303bool 1375bool
1304rxvt_term::IMisRunning () 1376rxvt_term::IMisRunning ()
… …
1332{ 1404{
1333 XPoint nspot; 1405 XPoint nspot;
1334 XVaNestedList preedit_attr; 1406 XVaNestedList preedit_attr;
1335 1407
1336 if (!Input_Context 1408 if (!Input_Context
1337 || !TermWin.focus 1409 || !focus
1338 || !(input_style & XIMPreeditPosition)) 1410 || !(input_style & XIMPreeditPosition))
1339 return; 1411 return;
1340 1412
1341 im_set_position (nspot); 1413 im_set_position (nspot);
1342 1414
… …
1462 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1534 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1463 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1535 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1464 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1536 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1465 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1537 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1466 "*", 1538 "*",
1467 TermWin.fheight, 1539 fheight,
1468 TermWin.fheight + 1, TermWin.fheight - 1, 1540 fheight + 1, fheight - 1,
1469 TermWin.fheight - 2, TermWin.fheight + 2); 1541 fheight - 2, fheight + 2);
1470 1542
1471 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1543 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1472 &missing_charset_list, &missing_charset_count, &def_string); 1544 &missing_charset_list, &missing_charset_count, &def_string);
1473 1545
1474 if (missing_charset_list) 1546 if (missing_charset_list)
… …
1520 NULL); 1592 NULL);
1521 } 1593 }
1522 1594
1523 Input_Context = XCreateIC (xim, 1595 Input_Context = XCreateIC (xim,
1524 XNInputStyle, input_style, 1596 XNInputStyle, input_style,
1525 XNClientWindow, TermWin.vt, 1597 XNClientWindow, vt,
1526 XNFocusWindow, TermWin.parent[0], 1598 XNFocusWindow, parent[0],
1527 preedit_attr ? XNPreeditAttributes : NULL, 1599 preedit_attr ? XNPreeditAttributes : NULL,
1528 preedit_attr, 1600 preedit_attr,
1529 status_attr ? XNStatusAttributes : NULL, 1601 status_attr ? XNStatusAttributes : NULL,
1530 status_attr, NULL); 1602 status_attr, NULL);
1531 1603
… …
1548} 1620}
1549 1621
1550void 1622void
1551rxvt_term::im_cb () 1623rxvt_term::im_cb ()
1552{ 1624{
1553 int i, found, had_im; 1625 int i;
1554 const char *p; 1626 const char *p;
1555 char **s; 1627 char **s;
1556 char buf[IMBUFSIZ]; 1628 char buf[IMBUFSIZ];
1557 1629
1558 SET_R (this); 1630 SET_R (this);
… …
1615{ 1687{
1616 XRectangle preedit_rect, status_rect, *needed_rect; 1688 XRectangle preedit_rect, status_rect, *needed_rect;
1617 XVaNestedList preedit_attr, status_attr; 1689 XVaNestedList preedit_attr, status_attr;
1618 1690
1619 if (!Input_Context 1691 if (!Input_Context
1620 || !TermWin.focus 1692 || !focus
1621 || !(input_style & XIMPreeditArea) 1693 || !(input_style & XIMPreeditArea)
1622 || !IMisRunning ()) 1694 || !IMisRunning ())
1623 return; 1695 return;
1624 1696
1625 /* Getting the necessary width of preedit area */ 1697 /* Getting the necessary width of preedit area */

Diff Legend

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