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.178 by root, Mon Jan 16 08:29:57 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
81void
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
264 delete pix_colors_focused; 289 delete pix_colors_focused;
265#ifdef OFF_FOCUS_FADING 290#if OFF_FOCUS_FADING
266 delete pix_colors_unfocused; 291 delete pix_colors_unfocused;
267#endif 292#endif
268 293
269 displays.put (display); 294 displays.put (display);
270 295
… …
291 delete keyboard; 316 delete keyboard;
292#endif 317#endif
293} 318}
294 319
295void 320void
321rxvt_term::child_exit ()
322{
323 cmd_pid = 0;
324
325 if (!OPTION (Opt_hold))
326 destroy ();
327}
328
329void
296rxvt_term::destroy () 330rxvt_term::destroy ()
297{ 331{
298 if (destroy_ev.active) 332 if (destroy_ev.active)
299 return; 333 return;
300 334
… …
343} 377}
344 378
345void 379void
346rxvt_term::destroy_cb (time_watcher &w) 380rxvt_term::destroy_cb (time_watcher &w)
347{ 381{
348 SET_R (this); 382 make_current ();
349 383
350 delete this; 384 delete this;
351} 385}
352 386
353/*----------------------------------------------------------------------*/ 387/*----------------------------------------------------------------------*/
… …
418{ 452{
419 if (GET_R->allowedxerror == -1) 453 if (GET_R->allowedxerror == -1)
420 GET_R->allowedxerror = event->error_code; 454 GET_R->allowedxerror = event->error_code;
421 else 455 else
422 { 456 {
423 //TODO: GET_R is most likely not the terminal which caused the error 457 // GET_R is most likely not the terminal which caused the error,
424 //TODO: maybe just output the error and continue? 458 // so just output the error and continue
425#if ENABLE_FRILLS 459#if ENABLE_FRILLS
426 print_x_error (display, event); 460 print_x_error (display, event);
427#else 461#else
428 old_xerror_handler (display, event); 462 old_xerror_handler (display, event);
429#endif 463#endif
… …
439 DisplayString (display)); 473 DisplayString (display));
440 rxvt_emergency_cleanup (); 474 rxvt_emergency_cleanup ();
441 _exit (EXIT_FAILURE); 475 _exit (EXIT_FAILURE);
442} 476}
443 477
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/*----------------------------------------------------------------------*/ 478/*----------------------------------------------------------------------*/
459/* rxvt_init () */
460bool 479bool
461rxvt_term::init (int argc, const char *const *argv) 480rxvt_term::init (int argc, const char *const *argv)
462{ 481{
463 SET_R (this); 482 SET_R (this);
464
465 set_locale (""); 483 set_locale ("");
484 set_environ (envv); // few things in X do not call setlocale :(
466 485
467 if (!init_vars ()) 486 if (!init_vars ())
468 return false; 487 return false;
469 488
470 init_secondary (); 489 init_secondary ();
… …
477 496
478#if MENUBAR_MAX 497#if MENUBAR_MAX
479 menubar_read (rs[Rs_menu]); 498 menubar_read (rs[Rs_menu]);
480#endif 499#endif
481#ifdef HAVE_SCROLLBARS 500#ifdef HAVE_SCROLLBARS
482 if (options & Opt_scrollBar) 501 if (OPTION (Opt_scrollBar))
483 scrollBar.setIdle (); /* set existence for size calculations */ 502 scrollBar.setIdle (); /* set existence for size calculations */
484#endif 503#endif
485 504
505#if ENABLE_PERL
506 if (!rs[Rs_perl_ext_1])
507 rs[Rs_perl_ext_1] = "default";
508
509 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
510 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
511 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
512 {
513#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
514 // ignore some perl-related arguments if some bozo installed us set[ug]id
515 if (rxvt_tainted ())
516 {
517 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
518 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
519 {
520 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
521 rs[Rs_perl_lib] = 0;
522 rs[Rs_perl_eval] = 0;
523 }
524 }
525#endif
526 rxvt_perl.init ();
527 setlocale (LC_CTYPE, curlocale); // perl init destroys current locale
528 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
529 }
530#endif
531
486 create_windows (argc, argv); 532 create_windows (argc, argv);
487 533
488 dDisp; 534 dDisp;
489 535
490 init_xlocale (); 536 init_xlocale ();
491 537
492 scr_reset (); /* initialize screen */ 538 scr_reset (); // initialize screen
493 539
494#if 0 540#if 0
495 XSynchronize (disp, True); 541 XSynchronize (disp, True);
496#endif 542#endif
497 543
498#ifdef HAVE_SCROLLBARS 544#ifdef HAVE_SCROLLBARS
499 if (options & Opt_scrollBar) 545 if (OPTION (Opt_scrollBar))
500 resize_scrollbar (); /* create and map scrollbar */ 546 resize_scrollbar (); /* create and map scrollbar */
501#endif 547#endif
502#if (MENUBAR_MAX) 548#if (MENUBAR_MAX)
503 if (menubar_visible ()) 549 if (menubar_visible ())
504 XMapWindow (disp, menuBar.win); 550 XMapWindow (disp, menuBar.win);
505#endif 551#endif
506#ifdef TRANSPARENT 552#ifdef TRANSPARENT
507 if (options & Opt_transparent) 553 if (OPTION (Opt_transparent))
508 { 554 {
509 XSelectInput (disp, display->root, PropertyChangeMask); 555 XSelectInput (disp, display->root, PropertyChangeMask);
510 check_our_parents (); 556 check_our_parents ();
511 rootwin_ev.start (display, display->root); 557 rootwin_ev.start (display, display->root);
512 } 558 }
513#endif 559#endif
514 560
515 XMapWindow (disp, TermWin.vt); 561 XMapWindow (disp, vt);
516 XMapWindow (disp, TermWin.parent[0]); 562 XMapWindow (disp, parent[0]);
517 563
518 set_colorfgbg (); 564 set_colorfgbg ();
519 565
520 init_command (cmd_argv); 566 init_command (cmd_argv);
521 567
522 free (cmd_argv); 568 free (cmd_argv);
523 569
570 if (pty.pty >= 0)
524 pty_ev.start (pty.pty, EVENT_READ); 571 pty_ev.start (pty.pty, EVENT_READ);
525 572
526 check_ev.start (); 573 check_ev.start ();
527 574
575 HOOK_INVOKE ((this, HOOK_START, DT_END));
576
528 return true; 577 return true;
529} 578}
530 579
580static struct sig_handlers
581{
582 sig_watcher sw_chld, sw_term, sw_int;
583
584 void sig_chld (sig_watcher &w)
585 {
586 // we are being called for every SIGCHLD, find the corresponding term
587 int pid;
588
589 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
590 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
591 if (pid == (*t)->cmd_pid)
592 {
593 (*t)->child_exit ();
594 break;
595 }
596 }
597
598 /*
599 * Catch a fatal signal and tidy up before quitting
600 */
601 void
602 sig_term (sig_watcher &w)
603 {
604#ifdef DEBUG_CMD
605 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
606#endif
607 rxvt_emergency_cleanup ();
608 signal (w.signum, SIG_DFL);
609 kill (getpid (), w.signum);
610 }
611
612 sig_handlers ()
613 : sw_chld (this, &sig_handlers::sig_chld),
614 sw_term (this, &sig_handlers::sig_term),
615 sw_int (this, &sig_handlers::sig_term)
616 {
617 }
618} sig_handlers;
619
620char **rxvt_environ; // startup environment
621
531void 622void
532rxvt_init () 623rxvt_init ()
533{ 624{
625 rxvt_environ = environ;
626
534 /* 627 /*
535 * Save and then give up any super-user privileges 628 * Save and then give up any super-user privileges
536 * If we need privileges in any area then we must specifically request it. 629 * If we need privileges in any area then we must specifically request it.
537 * We should only need to be root in these cases: 630 * We should only need to be root in these cases:
538 * 1. write utmp entries on some systems 631 * 1. write utmp entries on some systems
… …
542 rxvt_privileges (IGNORE); 635 rxvt_privileges (IGNORE);
543 636
544 signal (SIGHUP, SIG_IGN); 637 signal (SIGHUP, SIG_IGN);
545 signal (SIGPIPE, SIG_IGN); 638 signal (SIGPIPE, SIG_IGN);
546 639
640 sig_handlers.sw_chld.start (SIGCHLD);
641 sig_handlers.sw_term.start (SIGTERM);
642 sig_handlers.sw_int.start (SIGINT);
643
547 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 644 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
548 /* signal (SIGURG, SIG_DFL); */ 645 /* signal (SIGURG, SIG_DFL); */
549 646
550 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 647 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
551 // TODO: handle this with exceptions and tolerate the memory loss 648 // TODO: handle this with exceptions and tolerate the memory loss
552 XSetIOErrorHandler (rxvt_xioerror_handler); 649 XSetIOErrorHandler (rxvt_xioerror_handler);
553}
554 650
555/* ------------------------------------------------------------------------- * 651 XrmInitialize ();
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} 652}
576 653
577/* ------------------------------------------------------------------------- * 654/* ------------------------------------------------------------------------- *
578 * MEMORY ALLOCATION WRAPPERS * 655 * MEMORY ALLOCATION WRAPPERS *
579 * ------------------------------------------------------------------------- */ 656 * ------------------------------------------------------------------------- */
… …
586 rxvt_fatal ("memory allocation failure. aborting.\n"); 663 rxvt_fatal ("memory allocation failure. aborting.\n");
587 664
588 return p; 665 return p;
589} 666}
590 667
591/* INTPROTO */ 668void *
592void *
593rxvt_calloc (size_t number, size_t size) 669rxvt_calloc (size_t number, size_t size)
594{ 670{
595 void *p = calloc (number, size); 671 void *p = calloc (number, size);
596 672
597 if (!p) 673 if (!p)
598 rxvt_fatal ("memory allocation failure. aborting.\n"); 674 rxvt_fatal ("memory allocation failure. aborting.\n");
599 675
600 return p; 676 return p;
601} 677}
602 678
603/* INTPROTO */
604void * 679void *
605rxvt_realloc (void *ptr, size_t size) 680rxvt_realloc (void *ptr, size_t size)
606{ 681{
607 void *p = realloc (ptr, size); 682 void *p = realloc (ptr, size);
608 683
… …
617 * ------------------------------------------------------------------------- */ 692 * ------------------------------------------------------------------------- */
618/* take care of suid/sgid super-user (root) privileges */ 693/* take care of suid/sgid super-user (root) privileges */
619void 694void
620rxvt_privileges (rxvt_privaction action) 695rxvt_privileges (rxvt_privaction action)
621{ 696{
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__) 697#if ! defined(__CYGWIN32__)
628# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 698# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
629 /* setreuid () is the poor man's setuid (), seteuid () */ 699 /* setreuid () is the poor man's setuid (), seteuid () */
630# define seteuid(a) setreuid(-1, (a)) 700# define seteuid(a) setreuid(-1, (a))
631# define setegid(a) setregid(-1, (a)) 701# define setegid(a) setregid(-1, (a))
… …
637 case IGNORE: 707 case IGNORE:
638 /* 708 /*
639 * change effective uid/gid - not real uid/gid - so we can switch 709 * change effective uid/gid - not real uid/gid - so we can switch
640 * back to root later, as required 710 * back to root later, as required
641 */ 711 */
712 setegid (getgid ());
642 seteuid (getuid ()); 713 seteuid (getuid ());
643 setegid (getgid ());
644 break; 714 break;
645 case SAVE: 715 case SAVE:
646 euid = geteuid ();
647 egid = getegid (); 716 saved_egid = getegid ();
717 saved_euid = geteuid ();
648 break; 718 break;
649 case RESTORE: 719 case RESTORE:
650 seteuid (euid);
651 setegid (egid); 720 setegid (saved_egid);
721 seteuid (saved_euid);
652 break; 722 break;
653 } 723 }
654# else 724# else
655 switch (action) 725 switch (action)
656 { 726 {
657 case IGNORE: 727 case IGNORE:
728 setgid (getgid ());
658 setuid (getuid ()); 729 setuid (getuid ());
659 setgid (getgid ());
660 /* FALLTHROUGH */ 730 /* FALLTHROUGH */
661 case SAVE: 731 case SAVE:
662 /* FALLTHROUGH */ 732 /* FALLTHROUGH */
663 case RESTORE: 733 case RESTORE:
664 break; 734 break;
… …
669 739
670#ifdef UTMP_SUPPORT 740#ifdef UTMP_SUPPORT
671void 741void
672rxvt_term::privileged_utmp (rxvt_privaction action) 742rxvt_term::privileged_utmp (rxvt_privaction action)
673{ 743{
674 if ((options & Opt_utmpInhibit) 744 if (OPTION (Opt_utmpInhibit)
675 || !pty.name || !*pty.name) 745 || !pty.name || !*pty.name)
676 return; 746 return;
677 747
678 rxvt_privileges (RESTORE); 748 rxvt_privileges (RESTORE);
679 749
… …
690/* 760/*
691 * window size/position calculcations for XSizeHint and other storage. 761 * window size/position calculcations for XSizeHint and other storage.
692 * if width/height are non-zero then override calculated width/height 762 * if width/height are non-zero then override calculated width/height
693 */ 763 */
694void 764void
695rxvt_term::window_calc (unsigned int width, unsigned int height) 765rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
696{ 766{
697 short recalc_x, recalc_y; 767 short recalc_x, recalc_y;
698 int x, y, sb_w, mb_h, flags; 768 int x, y, sb_w, mb_h, flags;
699 unsigned int w, h; 769 unsigned int w, h;
700 unsigned int max_width, max_height; 770 unsigned int max_width, max_height;
701 dDisp; 771 dDisp;
702 772
703 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 773 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
704 TermWin.ncol, TermWin.nrow, szHint.width, 774 ncol, nrow, szHint.width, szHint.height));
705 szHint.height)); 775
706 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 776 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
707 szHint.win_gravity = NorthWestGravity; 777 szHint.win_gravity = NorthWestGravity;
708 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 778 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
709 779
710 recalc_x = recalc_y = 0; 780 recalc_x = recalc_y = 0;
711 flags = 0; 781 flags = 0;
782
712 if (!parsed_geometry) 783 if (!parsed_geometry)
713 { 784 {
714 parsed_geometry = 1; 785 parsed_geometry = 1;
786
715 if (rs[Rs_geometry]) 787 if (rs[Rs_geometry])
716 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 788 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
789
717 if (flags & WidthValue) 790 if (flags & WidthValue)
718 { 791 {
719 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 792 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
720 szHint.flags |= USSize; 793 szHint.flags |= USSize;
721 } 794 }
795
722 if (flags & HeightValue) 796 if (flags & HeightValue)
723 { 797 {
724 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 798 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
725 szHint.flags |= USSize; 799 szHint.flags |= USSize;
726 } 800 }
801
727 if (flags & XValue) 802 if (flags & XValue)
728 { 803 {
729 szHint.x = x; 804 szHint.x = x;
730 szHint.flags |= USPosition; 805 szHint.flags |= USPosition;
806
731 if (flags & XNegative) 807 if (flags & XNegative)
732 { 808 {
733 recalc_x = 1; 809 recalc_x = 1;
734 szHint.win_gravity = NorthEastGravity; 810 szHint.win_gravity = NorthEastGravity;
735 } 811 }
736 } 812 }
813
737 if (flags & YValue) 814 if (flags & YValue)
738 { 815 {
739 szHint.y = y; 816 szHint.y = y;
740 szHint.flags |= USPosition; 817 szHint.flags |= USPosition;
818
741 if (flags & YNegative) 819 if (flags & YNegative)
742 { 820 {
743 recalc_y = 1; 821 recalc_y = 1;
822
744 if (szHint.win_gravity == NorthEastGravity) 823 if (szHint.win_gravity == NorthEastGravity)
745 szHint.win_gravity = SouthEastGravity; 824 szHint.win_gravity = SouthEastGravity;
746 else 825 else
747 szHint.win_gravity = SouthWestGravity; 826 szHint.win_gravity = SouthWestGravity;
748 } 827 }
749 } 828 }
750 } 829 }
751 830
752 /* TODO: BOUNDS */ 831 /* TODO: BOUNDS */
753 TermWin.width = TermWin.ncol * TermWin.fwidth; 832 width = ncol * fwidth;
754 TermWin.height = TermWin.nrow * TermWin.fheight; 833 height = nrow * fheight;
755 max_width = MAX_COLS * TermWin.fwidth; 834 max_width = MAX_COLS * fwidth;
756 max_height = MAX_ROWS * TermWin.fheight; 835 max_height = MAX_ROWS * fheight;
757 836
758 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 837 szHint.base_width = szHint.base_height = 2 * int_bwidth;
759 838
760 sb_w = mb_h = 0; 839 sb_w = mb_h = 0;
761 window_vt_x = window_vt_y = TermWin.int_bwidth; 840 window_vt_x = window_vt_y = int_bwidth;
762 841
763 if (scrollbar_visible ()) 842 if (scrollbar_visible ())
764 { 843 {
765 sb_w = scrollbar_TotalWidth (); 844 sb_w = scrollbar_TotalWidth ();
766 szHint.base_width += sb_w; 845 szHint.base_width += sb_w;
767 if (!(options & Opt_scrollBar_right)) 846 if (!OPTION (Opt_scrollBar_right))
768 window_vt_x += sb_w; 847 window_vt_x += sb_w;
769 } 848 }
770 849
771 if (menubar_visible ()) 850 if (menubar_visible ())
772 { 851 {
773 mb_h = menuBar_TotalHeight (); 852 mb_h = menuBar_TotalHeight ();
774 szHint.base_height += mb_h; 853 szHint.base_height += mb_h;
775 window_vt_y += mb_h; 854 window_vt_y += mb_h;
776 } 855 }
777 856
778 szHint.width_inc = TermWin.fwidth; 857 szHint.width_inc = fwidth;
779 szHint.height_inc = TermWin.fheight; 858 szHint.height_inc = fheight;
780 szHint.min_width = szHint.base_width + szHint.width_inc; 859 szHint.min_width = szHint.base_width + szHint.width_inc;
781 szHint.min_height = szHint.base_height + szHint.height_inc; 860 szHint.min_height = szHint.base_height + szHint.height_inc;
782 861
783 if (width && width - szHint.base_width < max_width) 862 if (newwidth && newwidth - szHint.base_width < max_width)
784 { 863 {
785 szHint.width = width; 864 szHint.width = newwidth;
786 TermWin.width = width - szHint.base_width; 865 width = newwidth - szHint.base_width;
787 } 866 }
788 else 867 else
789 { 868 {
790 MIN_IT (TermWin.width, max_width); 869 min_it (width, max_width);
791 szHint.width = szHint.base_width + TermWin.width; 870 szHint.width = szHint.base_width + width;
792 } 871 }
793 872
794 if (height && height - szHint.base_height < max_height) 873 if (newheight && newheight - szHint.base_height < max_height)
795 { 874 {
796 szHint.height = height; 875 szHint.height = newheight;
797 TermWin.height = height - szHint.base_height; 876 height = newheight - szHint.base_height;
798 } 877 }
799 else 878 else
800 { 879 {
801 MIN_IT (TermWin.height, max_height); 880 min_it (height, max_height);
802 szHint.height = szHint.base_height + TermWin.height; 881 szHint.height = szHint.base_height + height;
803 } 882 }
804 883
805 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 884 if (scrollbar_visible () && OPTION (Opt_scrollBar_right))
806 window_sb_x = szHint.width - sb_w; 885 window_sb_x = szHint.width - sb_w;
807 886
808 if (recalc_x) 887 if (recalc_x)
809 szHint.x += (DisplayWidth (disp, display->screen) 888 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
810 - szHint.width - 2 * TermWin.ext_bwidth);
811 if (recalc_y) 889 if (recalc_y)
812 szHint.y += (DisplayHeight (disp, display->screen) 890 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
813 - szHint.height - 2 * TermWin.ext_bwidth);
814 891
815 TermWin.ncol = TermWin.width / TermWin.fwidth; 892 ncol = width / fwidth;
816 TermWin.nrow = TermWin.height / TermWin.fheight; 893 nrow = height / fheight;
817 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 894 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
818 TermWin.ncol, TermWin.nrow, szHint.width, 895 ncol, nrow, szHint.width,
819 szHint.height)); 896 szHint.height));
820 return; 897 return;
821} 898}
822 899
823/*----------------------------------------------------------------------*/ 900/*----------------------------------------------------------------------*/
… …
831 if (pty.pty < 0) 908 if (pty.pty < 0)
832 return; 909 return;
833 910
834 struct winsize ws; 911 struct winsize ws;
835 912
836 ws.ws_col = TermWin.ncol; 913 ws.ws_col = ncol;
837 ws.ws_row = TermWin.nrow; 914 ws.ws_row = nrow;
838 ws.ws_xpixel = TermWin.width; 915 ws.ws_xpixel = width;
839 ws.ws_ypixel = TermWin.height; 916 ws.ws_ypixel = height;
840 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 917 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
841 918
842#if 0 919#if 0
843 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 920 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
844 if (cmd_pid) /* force through to the command */ 921 if (cmd_pid) /* force through to the command */
845 kill (cmd_pid, SIGWINCH); 922 kill (-cmd_pid, SIGWINCH);
846#endif 923#endif
847} 924}
848 925
849/*----------------------------------------------------------------------*/ 926/*----------------------------------------------------------------------*/
850/* set_fonts () - load and set the various fonts 927/* set_fonts () - load and set the various fonts
851/* 928 *
852 * init = 1 - initialize 929 * init = 1 - initialize
853 * 930 *
854 * fontname == FONT_UP - switch to bigger font 931 * fontname == FONT_UP - switch to bigger font
855 * fontname == FONT_DN - switch to smaller font 932 * fontname == FONT_DN - switch to smaller font
856 */ 933 */
… …
868 return false; 945 return false;
869 } 946 }
870 947
871#if ENABLE_STYLES 948#if ENABLE_STYLES
872 for (int i = RS_styleCount; --i; ) 949 for (int i = RS_styleCount; --i; )
873 if (TermWin.fontset[i] != TermWin.fontset[0]) 950 if (fontset[i] != fontset[0])
874 delete TermWin.fontset[i]; 951 delete fontset[i];
875#endif 952#endif
876 953
877 delete TermWin.fontset[0]; 954 delete fontset[0];
878 TermWin.fontset[0] = fs; 955 fontset[0] = fs;
879 956
880 prop = (*fs)[1]->properties (); 957 prop = (*fs)[1]->properties ();
881 prop.height += TermWin.lineSpace; 958 prop.height += lineSpace;
882 fs->set_prop (prop); 959 fs->set_prop (prop);
883 960
884 TermWin.fwidth = prop.width; 961 fwidth = prop.width;
885 TermWin.fheight = prop.height; 962 fheight = prop.height;
886 TermWin.fweight = prop.weight; 963 fbase = prop.ascent;
887 TermWin.fslant = prop.slant;
888 TermWin.fbase = (*fs)[1]->ascent;
889 964
890 for (int style = 1; style < 4; style++) 965 for (int style = 1; style < 4; style++)
891 { 966 {
892#if ENABLE_STYLES 967#if ENABLE_STYLES
893 const char *res = rs[Rs_font + style]; 968 const char *res = rs[Rs_font + style];
894 969
895 if (res && !*res) 970 if (res && !*res)
896 TermWin.fontset[style] = TermWin.fontset[0]; 971 fontset[style] = fontset[0];
897 else 972 else
898 { 973 {
899 TermWin.fontset[style] = fs = new rxvt_fontset (this); 974 fontset[style] = fs = new rxvt_fontset (this);
900 rxvt_fontprop prop2 = prop; 975 rxvt_fontprop prop2 = prop;
901 976
902 if (res) 977 if (res)
903 prop2.weight = prop2.slant = rxvt_fontprop::unset; 978 prop2.weight = prop2.slant = rxvt_fontprop::unset;
904 else 979 else
905 { 980 {
906 res = TermWin.fontset[0]->fontdesc; 981 res = fontset[0]->fontdesc;
907 982
908 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 983 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; 984 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
910 } 985 }
911 986
912 fs->populate (res); 987 fs->populate (res);
913 fs->set_prop (prop2); 988 fs->set_prop (prop2);
914 } 989 }
915#else 990#else
916 TermWin.fontset[style] = TermWin.fontset[0]; 991 fontset[style] = fontset[0];
917#endif 992#endif
918 } 993 }
919 994
920 if (TermWin.parent[0]) 995 if (parent[0])
921 { 996 {
922 resize_all_windows (0, 0, 0); 997 resize_all_windows (0, 0, 0);
923 scr_remap_chars (); 998 scr_remap_chars ();
924 scr_touch (true); 999 scr_touch (true);
925 } 1000 }
… …
927 return true; 1002 return true;
928} 1003}
929 1004
930void rxvt_term::set_string_property (Atom prop, const char *str, int len) 1005void rxvt_term::set_string_property (Atom prop, const char *str, int len)
931{ 1006{
932 // TODO: SMART_WINDOW_TITLE
933 XChangeProperty (display->display, TermWin.parent[0], 1007 XChangeProperty (display->display, parent[0],
934 prop, XA_STRING, 8, PropModeReplace, 1008 prop, XA_STRING, 8, PropModeReplace,
935 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 1009 (const unsigned char *)str, len >= 0 ? len : strlen (str));
936} 1010}
937 1011
938void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 1012void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
939{ 1013{
940 // TODO: SMART_WINDOW_TITLE
941 wchar_t *ws = rxvt_mbstowcs (str, len); 1014 wchar_t *ws = rxvt_mbstowcs (str, len);
942 char *s = rxvt_wcstoutf8 (ws); 1015 char *s = rxvt_wcstoutf8 (ws);
943 1016
944 XChangeProperty (display->display, TermWin.parent[0], 1017 XChangeProperty (display->display, parent[0],
945 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 1018 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
946 (const unsigned char *)s, strlen (s)); 1019 (const unsigned char *)s, strlen (s));
947 1020
948 free (s); 1021 free (s);
949 free (ws); 1022 free (ws);
… …
954/* xterm sequences - title, iconName, color (exptl) */ 1027/* xterm sequences - title, iconName, color (exptl) */
955void 1028void
956rxvt_term::set_title (const char *str) 1029rxvt_term::set_title (const char *str)
957{ 1030{
958 set_string_property (XA_WM_NAME, str); 1031 set_string_property (XA_WM_NAME, str);
959#if ENABLE_FRILLS 1032#if ENABLE_EWMH
960 set_utf8_property (xa[XA_NET_WM_NAME], str); 1033 set_utf8_property (xa[XA_NET_WM_NAME], str);
961#endif 1034#endif
962} 1035}
963 1036
964void 1037void
965rxvt_term::set_icon_name (const char *str) 1038rxvt_term::set_icon_name (const char *str)
966{ 1039{
967 set_string_property (XA_WM_ICON_NAME, str); 1040 set_string_property (XA_WM_ICON_NAME, str);
968#if ENABLE_FRILLS 1041#if ENABLE_EWMH
969 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 1042 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
970#endif 1043#endif
971} 1044}
972 1045
973#ifdef XTERM_COLOR_CHANGE 1046#ifdef XTERM_COLOR_CHANGE
… …
986 i = atoi (color); 1059 i = atoi (color);
987 1060
988 if (i >= 8 && i <= 15) 1061 if (i >= 8 && i <= 15)
989 { /* bright colors */ 1062 { /* bright colors */
990 i -= 8; 1063 i -= 8;
991# ifndef NO_BRIGHTCOLOR
992 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1064 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
993 SET_PIXCOLOR (idx); 1065 SET_PIXCOLOR (idx);
994 goto Done; 1066 goto done;
995# endif
996 } 1067 }
997 1068
998 if (i >= 0 && i <= 7) 1069 if (i >= 0 && i <= 7)
999 { /* normal colors */ 1070 { /* normal colors */
1000 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1071 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1001 SET_PIXCOLOR (idx); 1072 SET_PIXCOLOR (idx);
1002 goto Done; 1073 goto done;
1003 } 1074 }
1004 } 1075 }
1005 1076
1006 if (!rXParseAllocColor (&xcol, color)) 1077 if (!rXParseAllocColor (&xcol, color))
1007 return; 1078 return;
… …
1027 pix_colors_focused[idx] = xcol; 1098 pix_colors_focused[idx] = xcol;
1028 SET_PIXCOLOR (idx); 1099 SET_PIXCOLOR (idx);
1029 1100
1030 /* XSetWindowAttributes attr; */ 1101 /* XSetWindowAttributes attr; */
1031 /* Cursor cursor; */ 1102 /* Cursor cursor; */
1032Done: 1103done:
1104
1033#ifdef OFF_FOCUS_FADING 1105#if OFF_FOCUS_FADING
1034 if (rs[Rs_fade]) 1106 if (rs[Rs_fade])
1035 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 1107 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1036#endif 1108#endif
1037 1109
1038 /*TODO: handle Color_BD, scrollbar background, etc. */ 1110 /*TODO: handle Color_BD, scrollbar background, etc. */
1039 1111
1040 recolour_cursor (); 1112 recolour_cursor ();
… …
1111 1183
1112/* -------------------------------------------------------------------- * 1184/* -------------------------------------------------------------------- *
1113 * - WINDOW RESIZING - * 1185 * - WINDOW RESIZING - *
1114 * -------------------------------------------------------------------- */ 1186 * -------------------------------------------------------------------- */
1115void 1187void
1116rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1188rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1117{ 1189{
1118 int fix_screen; 1190 int fix_screen;
1119#ifdef SMART_RESIZE
1120 int old_width = szHint.width, old_height = szHint.height; 1191 int old_width = szHint.width, old_height = szHint.height;
1121#endif
1122 dDisp; 1192 dDisp;
1123 1193
1124 window_calc (width, height); 1194 window_calc (newwidth, newheight);
1125 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 1195 XSetWMNormalHints (disp, parent[0], &szHint);
1126 1196
1127 if (!ignoreparent) 1197 if (!ignoreparent)
1128 { 1198 {
1129#ifdef SMART_RESIZE 1199#ifdef SMART_RESIZE
1130 /* 1200 /*
… …
1134 int x, y, x1, y1; 1204 int x, y, x1, y1;
1135 int dx, dy; 1205 int dx, dy;
1136 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1206 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1137 Window unused_cr; 1207 Window unused_cr;
1138 1208
1139 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 1209 XTranslateCoordinates (disp, parent[0], display->root,
1140 0, 0, &x, &y, &unused_cr); 1210 0, 0, &x, &y, &unused_cr);
1141 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 1211 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1142 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1212 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1143 /* 1213 /*
1144 * if display->root isn't the parent window, a WM will probably have offset 1214 * if display->root isn't the parent window, a WM will probably have offset
1145 * our position for handles and decorations. Counter it 1215 * our position for handles and decorations. Counter it
1146 */ 1216 */
… …
1163 if (y < y1) /* top half */ 1233 if (y < y1) /* top half */
1164 dy = 0; 1234 dy = 0;
1165 else if (y == y1) /* exact center */ 1235 else if (y == y1) /* exact center */
1166 dy /= 2; 1236 dy /= 2;
1167 1237
1168 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 1238 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1169 szHint.width, szHint.height); 1239 szHint.width, szHint.height);
1170#else 1240#else
1171 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 1241 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1172#endif 1242#endif
1173 } 1243 }
1174 1244
1175 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1245 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1176 1246
1177 if (fix_screen || width != old_width || height != old_height) 1247 if (fix_screen || newwidth != old_width || newheight != old_height)
1178 { 1248 {
1179 if (scrollbar_visible ()) 1249 if (scrollbar_visible ())
1180 { 1250 {
1181 XMoveResizeWindow (disp, scrollBar.win, 1251 XMoveResizeWindow (disp, scrollBar.win,
1182 window_sb_x, 0, 1252 window_sb_x, 0,
… …
1185 } 1255 }
1186 1256
1187 if (menubar_visible ()) 1257 if (menubar_visible ())
1188 XMoveResizeWindow (disp, menuBar.win, 1258 XMoveResizeWindow (disp, menuBar.win,
1189 window_vt_x, 0, 1259 window_vt_x, 0,
1190 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1260 width, menuBar_TotalHeight ());
1191 1261
1192 XMoveResizeWindow (disp, TermWin.vt, 1262 XMoveResizeWindow (disp, vt,
1193 window_vt_x, window_vt_y, 1263 window_vt_x, window_vt_y,
1194 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1264 width, height);
1195 1265
1196 scr_clear (); 1266 scr_clear ();
1197#ifdef XPM_BACKGROUND 1267#ifdef XPM_BACKGROUND
1198 resize_pixmap (); 1268 resize_pixmap ();
1199#endif 1269#endif
… …
1205 int old_ncol = prev_ncol; 1275 int old_ncol = prev_ncol;
1206 1276
1207 /* scr_reset only works on the primary screen */ 1277 /* scr_reset only works on the primary screen */
1208 if (old_height) /* this is not the first time through */ 1278 if (old_height) /* this is not the first time through */
1209 { 1279 {
1210 unsigned int ncol = TermWin.ncol; 1280 unsigned int ocol = ncol;
1211 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1281 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1212 curr_screen = scr_change_screen (PRIMARY); 1282 curr_screen = scr_change_screen (PRIMARY);
1213 TermWin.ncol = ncol; 1283 ncol = ocol;
1214 } 1284 }
1215 1285
1216 scr_reset (); 1286 scr_reset ();
1217 1287
1218 if (curr_screen >= 0) /* this is not the first time through */ 1288 if (curr_screen >= 0) /* this is not the first time through */
1219 { 1289 {
1220 scr_change_screen (curr_screen); 1290 scr_change_screen (curr_screen);
1221 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1291 selection_check (old_ncol != ncol ? 4 : 0);
1222 } 1292 }
1223 } 1293 }
1224 1294
1225 old_width = szHint.width; 1295 old_width = szHint.width;
1226 old_height = szHint.height; 1296 old_height = szHint.height;
1227 1297
1228#ifdef XPM_BACKGROUND 1298#ifdef XPM_BACKGROUND
1229 if (TermWin.pixmap) 1299 if (pixmap)
1230 scr_touch (false); 1300 scr_touch (false);
1231#endif 1301#endif
1232 1302
1233#ifdef USE_XIM 1303#ifdef USE_XIM
1234 IMSetStatusPosition (); 1304 IMSetStatusPosition ();
… …
1238/* 1308/*
1239 * Set the width/height of the vt window in characters. Units are pixels. 1309 * Set the width/height of the vt window in characters. Units are pixels.
1240 * good for toggling 80/132 columns 1310 * good for toggling 80/132 columns
1241 */ 1311 */
1242void 1312void
1243rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1313rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1244{ 1314{
1245 XWindowAttributes wattr; 1315 XWindowAttributes wattr;
1246 1316
1247 if (width == 0 || height == 0) 1317 if (newwidth == 0 || newheight == 0)
1248 { 1318 {
1249 XGetWindowAttributes (display->display, display->root, &wattr); 1319 XGetWindowAttributes (display->display, display->root, &wattr);
1320
1250 if (width == 0) 1321 if (newwidth == 0)
1251 width = wattr.width - szHint.base_width; 1322 newwidth = wattr.width - szHint.base_width;
1252 if (height == 0) 1323 if (newheight == 0)
1253 height = wattr.height - szHint.base_height; 1324 newheight = wattr.height - szHint.base_height;
1254 }
1255
1256 if (width != TermWin.width || height != TermWin.height)
1257 { 1325 }
1326
1327 if (newwidth != width || newheight != height)
1328 {
1258 width += szHint.base_width; 1329 newwidth += szHint.base_width;
1259 height += szHint.base_height; 1330 newheight += szHint.base_height;
1260 resize_all_windows (width, height, 0); 1331 resize_all_windows (newwidth, newheight, 0);
1261 } 1332 }
1262} 1333}
1263 1334
1264/* -------------------------------------------------------------------- * 1335/* -------------------------------------------------------------------- *
1265 * - X INPUT METHOD ROUTINES - * 1336 * - X INPUT METHOD ROUTINES - *
… …
1275 1346
1276void 1347void
1277rxvt_term::im_set_size (XRectangle &size) 1348rxvt_term::im_set_size (XRectangle &size)
1278{ 1349{
1279 // the int_bwidth terms make no sense to me 1350 // the int_bwidth terms make no sense to me
1280 size.x = TermWin.int_bwidth; 1351 size.x = int_bwidth;
1281 size.y = TermWin.int_bwidth; 1352 size.y = int_bwidth;
1282 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1353 size.width = Width2Pixel (ncol) + int_bwidth;
1283 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1354 size.height = Height2Pixel (nrow) + int_bwidth;
1284} 1355}
1285 1356
1286void 1357void
1287rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1358rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1288 XRectangle &status_rect, 1359 XRectangle &status_rect,
1289 const XRectangle &needed_rect) 1360 const XRectangle &needed_rect)
1290{ 1361{
1291 preedit_rect.x = needed_rect.width; 1362 preedit_rect.x = needed_rect.width;
1292 preedit_rect.y = 0; 1363 preedit_rect.y = 0;
1293 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1364 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1294 preedit_rect.height = TermWin.fheight; 1365 preedit_rect.height = fheight;
1295 1366
1296 status_rect.x = 0; 1367 status_rect.x = 0;
1297 status_rect.y = 0; 1368 status_rect.y = 0;
1298 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1369 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1299 status_rect.height = TermWin.fheight; 1370 status_rect.height = fheight;
1300} 1371}
1301 1372
1302/* Checking whether input method is running. */ 1373/* Checking whether input method is running. */
1303bool 1374bool
1304rxvt_term::IMisRunning () 1375rxvt_term::IMisRunning ()
… …
1332{ 1403{
1333 XPoint nspot; 1404 XPoint nspot;
1334 XVaNestedList preedit_attr; 1405 XVaNestedList preedit_attr;
1335 1406
1336 if (!Input_Context 1407 if (!Input_Context
1337 || !TermWin.focus 1408 || !focus
1338 || !(input_style & XIMPreeditPosition)) 1409 || !(input_style & XIMPreeditPosition))
1339 return; 1410 return;
1340 1411
1341 im_set_position (nspot); 1412 im_set_position (nspot);
1342 1413
… …
1378 XRectangle rect, status_rect, needed_rect; 1449 XRectangle rect, status_rect, needed_rect;
1379 unsigned long fg, bg; 1450 unsigned long fg, bg;
1380 const char *p; 1451 const char *p;
1381 char **s; 1452 char **s;
1382 XIMStyles *xim_styles; 1453 XIMStyles *xim_styles;
1454
1455 set_environ (envv);
1383 1456
1384 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1457 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1385 return false; 1458 return false;
1386 1459
1387 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1460 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1462 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1535 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1463 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1536 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1464 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1537 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1465 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1538 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1466 "*", 1539 "*",
1467 TermWin.fheight, 1540 fheight,
1468 TermWin.fheight + 1, TermWin.fheight - 1, 1541 fheight + 1, fheight - 1,
1469 TermWin.fheight - 2, TermWin.fheight + 2); 1542 fheight - 2, fheight + 2);
1470 1543
1471 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1544 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1472 &missing_charset_list, &missing_charset_count, &def_string); 1545 &missing_charset_list, &missing_charset_count, &def_string);
1473 1546
1474 if (missing_charset_list) 1547 if (missing_charset_list)
… …
1520 NULL); 1593 NULL);
1521 } 1594 }
1522 1595
1523 Input_Context = XCreateIC (xim, 1596 Input_Context = XCreateIC (xim,
1524 XNInputStyle, input_style, 1597 XNInputStyle, input_style,
1525 XNClientWindow, TermWin.vt, 1598 XNClientWindow, vt,
1526 XNFocusWindow, TermWin.parent[0], 1599 XNFocusWindow, parent[0],
1527 preedit_attr ? XNPreeditAttributes : NULL, 1600 preedit_attr ? XNPreeditAttributes : NULL,
1528 preedit_attr, 1601 preedit_attr,
1529 status_attr ? XNStatusAttributes : NULL, 1602 status_attr ? XNStatusAttributes : NULL,
1530 status_attr, NULL); 1603 status_attr, NULL);
1531 1604
… …
1548} 1621}
1549 1622
1550void 1623void
1551rxvt_term::im_cb () 1624rxvt_term::im_cb ()
1552{ 1625{
1553 int i, found, had_im; 1626 int i;
1554 const char *p; 1627 const char *p;
1555 char **s; 1628 char **s;
1556 char buf[IMBUFSIZ]; 1629 char buf[IMBUFSIZ];
1557 1630
1558 SET_R (this); 1631 make_current ();
1559 1632
1560 im_destroy (); 1633 im_destroy ();
1561 1634
1562 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1635 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1563 if (Input_Context) 1636 if (Input_Context)
… …
1615{ 1688{
1616 XRectangle preedit_rect, status_rect, *needed_rect; 1689 XRectangle preedit_rect, status_rect, *needed_rect;
1617 XVaNestedList preedit_attr, status_attr; 1690 XVaNestedList preedit_attr, status_attr;
1618 1691
1619 if (!Input_Context 1692 if (!Input_Context
1620 || !TermWin.focus 1693 || !focus
1621 || !(input_style & XIMPreeditArea) 1694 || !(input_style & XIMPreeditArea)
1622 || !IMisRunning ()) 1695 || !IMisRunning ())
1623 return; 1696 return;
1624 1697
1625 /* Getting the necessary width of preedit area */ 1698 /* Getting the necessary width of preedit area */

Diff Legend

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