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.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 "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 51#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
48# include "keyboard.h" 52static uid_t saved_euid;
53static gid_t saved_egid;
49#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}
50 65
51vector<rxvt_term *> rxvt_term::termlist; 66vector<rxvt_term *> rxvt_term::termlist;
52 67
53static char curlocale[128]; 68static char curlocale[128], savelocale[128];
54 69
55bool 70bool
56rxvt_set_locale (const char *locale) 71rxvt_set_locale (const char *locale)
57{ 72{
58 if (!locale || !strncmp (locale, curlocale, 128)) 73 if (!locale || !strncmp (locale, curlocale, 128))
59 return false; 74 return false;
60 75
61 strncpy (curlocale, locale, 128); 76 strncpy (curlocale, locale, 128);
62 setlocale (LC_CTYPE, curlocale); 77 setlocale (LC_CTYPE, curlocale);
63 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);
64} 92}
65 93
66#if ENABLE_COMBINING 94#if ENABLE_COMBINING
67class rxvt_composite_vec rxvt_composite; 95class rxvt_composite_vec rxvt_composite;
68 96
… …
157 pointer_ev (this, &rxvt_term::pointer_cb), 185 pointer_ev (this, &rxvt_term::pointer_cb),
158#endif 186#endif
159#ifdef USE_XIM 187#ifdef USE_XIM
160 im_ev (this, &rxvt_term::im_cb), 188 im_ev (this, &rxvt_term::im_cb),
161#endif 189#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), 190 termwin_ev (this, &rxvt_term::x_cb),
166 vt_ev (this, &rxvt_term::x_cb), 191 vt_ev (this, &rxvt_term::x_cb),
167 check_ev (this, &rxvt_term::check_cb), 192 check_ev (this, &rxvt_term::check_cb),
168 flush_ev (this, &rxvt_term::flush_cb), 193 flush_ev (this, &rxvt_term::flush_cb),
169 destroy_ev (this, &rxvt_term::destroy_cb), 194 destroy_ev (this, &rxvt_term::destroy_cb),
… …
196 pty.put (); 221 pty.put ();
197} 222}
198 223
199rxvt_term::~rxvt_term () 224rxvt_term::~rxvt_term ()
200{ 225{
226 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
227
201 termlist.erase (find (termlist.begin (), termlist.end(), this)); 228 termlist.erase (find (termlist.begin (), termlist.end(), this));
202 229
203 emergency_cleanup (); 230 emergency_cleanup ();
204 231
205#if ENABLE_STYLES 232#if ENABLE_STYLES
206 for (int i = RS_styleCount; --i; ) 233 for (int i = RS_styleCount; --i; )
207 if (TermWin.fontset[i] != TermWin.fontset[0]) 234 if (fontset[i] != fontset[0])
208 delete TermWin.fontset[i]; 235 delete fontset[i];
209#endif 236#endif
210 delete TermWin.fontset[0]; 237 delete fontset[0];
211 238
212 if (display) 239 if (display)
213 { 240 {
214 dDisp; 241 dDisp;
215 242
… …
243#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 270#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
244 if (topShadowGC) XFreeGC (disp, topShadowGC); 271 if (topShadowGC) XFreeGC (disp, topShadowGC);
245 if (botShadowGC) XFreeGC (disp, botShadowGC); 272 if (botShadowGC) XFreeGC (disp, botShadowGC);
246 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 273 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
247#endif 274#endif
248 if (TermWin.gc) XFreeGC (disp, TermWin.gc); 275 if (gc) XFreeGC (disp, gc);
249 276
250#if defined(MENUBAR) && (MENUBAR_MAX > 1) 277#if defined(MENUBAR) && (MENUBAR_MAX > 1)
251 delete menuBar.drawable; 278 delete menuBar.drawable;
252 //if (menuBar.win) 279 //if (menuBar.win)
253 // XDestroyWindow (disp, menuBar.win); 280 // XDestroyWindow (disp, menuBar.win);
254#endif 281#endif
255 delete TermWin.drawable; 282 delete drawable;
256 // destroy all windows 283 // destroy all windows
257 if (TermWin.parent[0] 284 if (parent[0])
258#if ENABLE_FRILLS
259 && !rs[Rs_embed]
260#endif
261 )
262 XDestroyWindow (disp, TermWin.parent[0]); 285 XDestroyWindow (disp, parent[0]);
263 } 286 }
264 287
265 // TODO: free pixcolours, colours should become part of rxvt_display 288 // TODO: free pixcolours, colours should become part of rxvt_display
266
267 delete pix_colors_focused; 289 delete pix_colors_focused;
268#ifdef OFF_FOCUS_FADING 290#if OFF_FOCUS_FADING
269 delete pix_colors_unfocused; 291 delete pix_colors_unfocused;
270#endif 292#endif
271 293
272 displays.put (display); 294 displays.put (display);
273 295
… …
294 delete keyboard; 316 delete keyboard;
295#endif 317#endif
296} 318}
297 319
298void 320void
321rxvt_term::child_exit ()
322{
323 cmd_pid = 0;
324
325 if (!OPTION (Opt_hold))
326 destroy ();
327}
328
329void
299rxvt_term::destroy () 330rxvt_term::destroy ()
300{ 331{
301 if (destroy_ev.active) 332 if (destroy_ev.active)
302 return; 333 return;
303 334
… …
346} 377}
347 378
348void 379void
349rxvt_term::destroy_cb (time_watcher &w) 380rxvt_term::destroy_cb (time_watcher &w)
350{ 381{
351 SET_R (this); 382 make_current ();
352 383
353 delete this; 384 delete this;
354} 385}
355 386
356/*----------------------------------------------------------------------*/ 387/*----------------------------------------------------------------------*/
… …
421{ 452{
422 if (GET_R->allowedxerror == -1) 453 if (GET_R->allowedxerror == -1)
423 GET_R->allowedxerror = event->error_code; 454 GET_R->allowedxerror = event->error_code;
424 else 455 else
425 { 456 {
426 //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,
427 //TODO: maybe just output the error and continue? 458 // so just output the error and continue
428#if ENABLE_FRILLS 459#if ENABLE_FRILLS
429 print_x_error (display, event); 460 print_x_error (display, event);
430#else 461#else
431 old_xerror_handler (display, event); 462 old_xerror_handler (display, event);
432#endif 463#endif
… …
442 DisplayString (display)); 473 DisplayString (display));
443 rxvt_emergency_cleanup (); 474 rxvt_emergency_cleanup ();
444 _exit (EXIT_FAILURE); 475 _exit (EXIT_FAILURE);
445} 476}
446 477
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/*----------------------------------------------------------------------*/ 478/*----------------------------------------------------------------------*/
462/* rxvt_init () */
463bool 479bool
464rxvt_term::init (int argc, const char *const *argv) 480rxvt_term::init (int argc, const char *const *argv)
465{ 481{
466 SET_R (this); 482 SET_R (this);
467
468 set_locale (""); 483 set_locale ("");
484 set_environ (envv); // few things in X do not call setlocale :(
469 485
470 if (!init_vars ()) 486 if (!init_vars ())
471 return false; 487 return false;
472 488
473 init_secondary (); 489 init_secondary ();
… …
480 496
481#if MENUBAR_MAX 497#if MENUBAR_MAX
482 menubar_read (rs[Rs_menu]); 498 menubar_read (rs[Rs_menu]);
483#endif 499#endif
484#ifdef HAVE_SCROLLBARS 500#ifdef HAVE_SCROLLBARS
485 if (options & Opt_scrollBar) 501 if (OPTION (Opt_scrollBar))
486 scrollBar.setIdle (); /* set existence for size calculations */ 502 scrollBar.setIdle (); /* set existence for size calculations */
487#endif 503#endif
488 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
489 create_windows (argc, argv); 532 create_windows (argc, argv);
490 533
491 dDisp; 534 dDisp;
492 535
493 init_xlocale (); 536 init_xlocale ();
494 537
495 scr_reset (); /* initialize screen */ 538 scr_reset (); // initialize screen
496 539
497#if 0 540#if 0
498 XSynchronize (disp, True); 541 XSynchronize (disp, True);
499#endif 542#endif
500 543
501#ifdef HAVE_SCROLLBARS 544#ifdef HAVE_SCROLLBARS
502 if (options & Opt_scrollBar) 545 if (OPTION (Opt_scrollBar))
503 resize_scrollbar (); /* create and map scrollbar */ 546 resize_scrollbar (); /* create and map scrollbar */
504#endif 547#endif
505#if (MENUBAR_MAX) 548#if (MENUBAR_MAX)
506 if (menubar_visible ()) 549 if (menubar_visible ())
507 XMapWindow (disp, menuBar.win); 550 XMapWindow (disp, menuBar.win);
508#endif 551#endif
509#ifdef TRANSPARENT 552#ifdef TRANSPARENT
510 if (options & Opt_transparent) 553 if (OPTION (Opt_transparent))
511 { 554 {
512 XSelectInput (disp, display->root, PropertyChangeMask); 555 XSelectInput (disp, display->root, PropertyChangeMask);
513 check_our_parents (); 556 check_our_parents ();
514 rootwin_ev.start (display, display->root); 557 rootwin_ev.start (display, display->root);
515 } 558 }
516#endif 559#endif
517 560
518 XMapWindow (disp, TermWin.vt); 561 XMapWindow (disp, vt);
519 XMapWindow (disp, TermWin.parent[0]); 562 XMapWindow (disp, parent[0]);
520 563
521 set_colorfgbg (); 564 set_colorfgbg ();
522 565
523 init_command (cmd_argv); 566 init_command (cmd_argv);
524 567
525 free (cmd_argv); 568 free (cmd_argv);
526 569
570 if (pty.pty >= 0)
527 pty_ev.start (pty.pty, EVENT_READ); 571 pty_ev.start (pty.pty, EVENT_READ);
528 572
529 check_ev.start (); 573 check_ev.start ();
530 574
575 HOOK_INVOKE ((this, HOOK_START, DT_END));
576
531 return true; 577 return true;
532} 578}
533 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
534void 622void
535rxvt_init () 623rxvt_init ()
536{ 624{
625 rxvt_environ = environ;
626
537 /* 627 /*
538 * Save and then give up any super-user privileges 628 * Save and then give up any super-user privileges
539 * 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.
540 * We should only need to be root in these cases: 630 * We should only need to be root in these cases:
541 * 1. write utmp entries on some systems 631 * 1. write utmp entries on some systems
… …
545 rxvt_privileges (IGNORE); 635 rxvt_privileges (IGNORE);
546 636
547 signal (SIGHUP, SIG_IGN); 637 signal (SIGHUP, SIG_IGN);
548 signal (SIGPIPE, SIG_IGN); 638 signal (SIGPIPE, SIG_IGN);
549 639
640 sig_handlers.sw_chld.start (SIGCHLD);
641 sig_handlers.sw_term.start (SIGTERM);
642 sig_handlers.sw_int.start (SIGINT);
643
550 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 644 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
551 /* signal (SIGURG, SIG_DFL); */ 645 /* signal (SIGURG, SIG_DFL); */
552 646
553 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 647 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
554 // TODO: handle this with exceptions and tolerate the memory loss 648 // TODO: handle this with exceptions and tolerate the memory loss
555 XSetIOErrorHandler (rxvt_xioerror_handler); 649 XSetIOErrorHandler (rxvt_xioerror_handler);
556}
557 650
558/* ------------------------------------------------------------------------- * 651 XrmInitialize ();
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} 652}
579 653
580/* ------------------------------------------------------------------------- * 654/* ------------------------------------------------------------------------- *
581 * MEMORY ALLOCATION WRAPPERS * 655 * MEMORY ALLOCATION WRAPPERS *
582 * ------------------------------------------------------------------------- */ 656 * ------------------------------------------------------------------------- */
… …
589 rxvt_fatal ("memory allocation failure. aborting.\n"); 663 rxvt_fatal ("memory allocation failure. aborting.\n");
590 664
591 return p; 665 return p;
592} 666}
593 667
594/* INTPROTO */ 668void *
595void *
596rxvt_calloc (size_t number, size_t size) 669rxvt_calloc (size_t number, size_t size)
597{ 670{
598 void *p = calloc (number, size); 671 void *p = calloc (number, size);
599 672
600 if (!p) 673 if (!p)
601 rxvt_fatal ("memory allocation failure. aborting.\n"); 674 rxvt_fatal ("memory allocation failure. aborting.\n");
602 675
603 return p; 676 return p;
604} 677}
605 678
606/* INTPROTO */
607void * 679void *
608rxvt_realloc (void *ptr, size_t size) 680rxvt_realloc (void *ptr, size_t size)
609{ 681{
610 void *p = realloc (ptr, size); 682 void *p = realloc (ptr, size);
611 683
… …
620 * ------------------------------------------------------------------------- */ 692 * ------------------------------------------------------------------------- */
621/* take care of suid/sgid super-user (root) privileges */ 693/* take care of suid/sgid super-user (root) privileges */
622void 694void
623rxvt_privileges (rxvt_privaction action) 695rxvt_privileges (rxvt_privaction action)
624{ 696{
625#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
626 static uid_t euid;
627 static gid_t egid;
628#endif
629
630#if ! defined(__CYGWIN32__) 697#if ! defined(__CYGWIN32__)
631# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 698# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
632 /* setreuid () is the poor man's setuid (), seteuid () */ 699 /* setreuid () is the poor man's setuid (), seteuid () */
633# define seteuid(a) setreuid(-1, (a)) 700# define seteuid(a) setreuid(-1, (a))
634# define setegid(a) setregid(-1, (a)) 701# define setegid(a) setregid(-1, (a))
… …
640 case IGNORE: 707 case IGNORE:
641 /* 708 /*
642 * 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
643 * back to root later, as required 710 * back to root later, as required
644 */ 711 */
712 setegid (getgid ());
645 seteuid (getuid ()); 713 seteuid (getuid ());
646 setegid (getgid ());
647 break; 714 break;
648 case SAVE: 715 case SAVE:
649 euid = geteuid ();
650 egid = getegid (); 716 saved_egid = getegid ();
717 saved_euid = geteuid ();
651 break; 718 break;
652 case RESTORE: 719 case RESTORE:
653 seteuid (euid);
654 setegid (egid); 720 setegid (saved_egid);
721 seteuid (saved_euid);
655 break; 722 break;
656 } 723 }
657# else 724# else
658 switch (action) 725 switch (action)
659 { 726 {
660 case IGNORE: 727 case IGNORE:
728 setgid (getgid ());
661 setuid (getuid ()); 729 setuid (getuid ());
662 setgid (getgid ());
663 /* FALLTHROUGH */ 730 /* FALLTHROUGH */
664 case SAVE: 731 case SAVE:
665 /* FALLTHROUGH */ 732 /* FALLTHROUGH */
666 case RESTORE: 733 case RESTORE:
667 break; 734 break;
… …
672 739
673#ifdef UTMP_SUPPORT 740#ifdef UTMP_SUPPORT
674void 741void
675rxvt_term::privileged_utmp (rxvt_privaction action) 742rxvt_term::privileged_utmp (rxvt_privaction action)
676{ 743{
677 if ((options & Opt_utmpInhibit) 744 if (OPTION (Opt_utmpInhibit)
678 || !pty.name || !*pty.name) 745 || !pty.name || !*pty.name)
679 return; 746 return;
680 747
681 rxvt_privileges (RESTORE); 748 rxvt_privileges (RESTORE);
682 749
… …
693/* 760/*
694 * window size/position calculcations for XSizeHint and other storage. 761 * window size/position calculcations for XSizeHint and other storage.
695 * if width/height are non-zero then override calculated width/height 762 * if width/height are non-zero then override calculated width/height
696 */ 763 */
697void 764void
698rxvt_term::window_calc (unsigned int width, unsigned int height) 765rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
699{ 766{
700 short recalc_x, recalc_y; 767 short recalc_x, recalc_y;
701 int x, y, sb_w, mb_h, flags; 768 int x, y, sb_w, mb_h, flags;
702 unsigned int w, h; 769 unsigned int w, h;
703 unsigned int max_width, max_height; 770 unsigned int max_width, max_height;
704 dDisp; 771 dDisp;
705 772
706 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",
707 TermWin.ncol, TermWin.nrow, szHint.width, 774 ncol, nrow, szHint.width, szHint.height));
708 szHint.height)); 775
709 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 776 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
710 szHint.win_gravity = NorthWestGravity; 777 szHint.win_gravity = NorthWestGravity;
711 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 778 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
712 779
713 recalc_x = recalc_y = 0; 780 recalc_x = recalc_y = 0;
714 flags = 0; 781 flags = 0;
782
715 if (!parsed_geometry) 783 if (!parsed_geometry)
716 { 784 {
717 parsed_geometry = 1; 785 parsed_geometry = 1;
786
718 if (rs[Rs_geometry]) 787 if (rs[Rs_geometry])
719 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 788 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
720 789
721 if (flags & WidthValue) 790 if (flags & WidthValue)
722 { 791 {
723 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 792 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
724 szHint.flags |= USSize; 793 szHint.flags |= USSize;
725 } 794 }
726 795
727 if (flags & HeightValue) 796 if (flags & HeightValue)
728 { 797 {
729 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 798 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
730 szHint.flags |= USSize; 799 szHint.flags |= USSize;
731 } 800 }
732 801
733 if (flags & XValue) 802 if (flags & XValue)
734 { 803 {
735 szHint.x = x; 804 szHint.x = x;
736 szHint.flags |= USPosition; 805 szHint.flags |= USPosition;
806
737 if (flags & XNegative) 807 if (flags & XNegative)
738 { 808 {
739 recalc_x = 1; 809 recalc_x = 1;
740 szHint.win_gravity = NorthEastGravity; 810 szHint.win_gravity = NorthEastGravity;
741 } 811 }
… …
743 813
744 if (flags & YValue) 814 if (flags & YValue)
745 { 815 {
746 szHint.y = y; 816 szHint.y = y;
747 szHint.flags |= USPosition; 817 szHint.flags |= USPosition;
818
748 if (flags & YNegative) 819 if (flags & YNegative)
749 { 820 {
750 recalc_y = 1; 821 recalc_y = 1;
822
751 if (szHint.win_gravity == NorthEastGravity) 823 if (szHint.win_gravity == NorthEastGravity)
752 szHint.win_gravity = SouthEastGravity; 824 szHint.win_gravity = SouthEastGravity;
753 else 825 else
754 szHint.win_gravity = SouthWestGravity; 826 szHint.win_gravity = SouthWestGravity;
755 } 827 }
756 } 828 }
757 } 829 }
758 830
759 /* TODO: BOUNDS */ 831 /* TODO: BOUNDS */
760 TermWin.width = TermWin.ncol * TermWin.fwidth; 832 width = ncol * fwidth;
761 TermWin.height = TermWin.nrow * TermWin.fheight; 833 height = nrow * fheight;
762 max_width = MAX_COLS * TermWin.fwidth; 834 max_width = MAX_COLS * fwidth;
763 max_height = MAX_ROWS * TermWin.fheight; 835 max_height = MAX_ROWS * fheight;
764 836
765 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 837 szHint.base_width = szHint.base_height = 2 * int_bwidth;
766 838
767 sb_w = mb_h = 0; 839 sb_w = mb_h = 0;
768 window_vt_x = window_vt_y = TermWin.int_bwidth; 840 window_vt_x = window_vt_y = int_bwidth;
769 841
770 if (scrollbar_visible ()) 842 if (scrollbar_visible ())
771 { 843 {
772 sb_w = scrollbar_TotalWidth (); 844 sb_w = scrollbar_TotalWidth ();
773 szHint.base_width += sb_w; 845 szHint.base_width += sb_w;
774 if (!(options & Opt_scrollBar_right)) 846 if (!OPTION (Opt_scrollBar_right))
775 window_vt_x += sb_w; 847 window_vt_x += sb_w;
776 } 848 }
777 849
778 if (menubar_visible ()) 850 if (menubar_visible ())
779 { 851 {
780 mb_h = menuBar_TotalHeight (); 852 mb_h = menuBar_TotalHeight ();
781 szHint.base_height += mb_h; 853 szHint.base_height += mb_h;
782 window_vt_y += mb_h; 854 window_vt_y += mb_h;
783 } 855 }
784 856
785 szHint.width_inc = TermWin.fwidth; 857 szHint.width_inc = fwidth;
786 szHint.height_inc = TermWin.fheight; 858 szHint.height_inc = fheight;
787 szHint.min_width = szHint.base_width + szHint.width_inc; 859 szHint.min_width = szHint.base_width + szHint.width_inc;
788 szHint.min_height = szHint.base_height + szHint.height_inc; 860 szHint.min_height = szHint.base_height + szHint.height_inc;
789 861
790 if (width && width - szHint.base_width < max_width) 862 if (newwidth && newwidth - szHint.base_width < max_width)
791 { 863 {
792 szHint.width = width; 864 szHint.width = newwidth;
793 TermWin.width = width - szHint.base_width; 865 width = newwidth - szHint.base_width;
794 } 866 }
795 else 867 else
796 { 868 {
797 MIN_IT (TermWin.width, max_width); 869 min_it (width, max_width);
798 szHint.width = szHint.base_width + TermWin.width; 870 szHint.width = szHint.base_width + width;
799 } 871 }
800 872
801 if (height && height - szHint.base_height < max_height) 873 if (newheight && newheight - szHint.base_height < max_height)
802 { 874 {
803 szHint.height = height; 875 szHint.height = newheight;
804 TermWin.height = height - szHint.base_height; 876 height = newheight - szHint.base_height;
805 } 877 }
806 else 878 else
807 { 879 {
808 MIN_IT (TermWin.height, max_height); 880 min_it (height, max_height);
809 szHint.height = szHint.base_height + TermWin.height; 881 szHint.height = szHint.base_height + height;
810 } 882 }
811 883
812 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 884 if (scrollbar_visible () && OPTION (Opt_scrollBar_right))
813 window_sb_x = szHint.width - sb_w; 885 window_sb_x = szHint.width - sb_w;
814 886
815 if (recalc_x) 887 if (recalc_x)
816 szHint.x += (DisplayWidth (disp, display->screen) 888 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
817 - szHint.width - 2 * TermWin.ext_bwidth);
818 if (recalc_y) 889 if (recalc_y)
819 szHint.y += (DisplayHeight (disp, display->screen) 890 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
820 - szHint.height - 2 * TermWin.ext_bwidth);
821 891
822 TermWin.ncol = TermWin.width / TermWin.fwidth; 892 ncol = width / fwidth;
823 TermWin.nrow = TermWin.height / TermWin.fheight; 893 nrow = height / fheight;
824 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",
825 TermWin.ncol, TermWin.nrow, szHint.width, 895 ncol, nrow, szHint.width,
826 szHint.height)); 896 szHint.height));
827 return; 897 return;
828} 898}
829 899
830/*----------------------------------------------------------------------*/ 900/*----------------------------------------------------------------------*/
… …
838 if (pty.pty < 0) 908 if (pty.pty < 0)
839 return; 909 return;
840 910
841 struct winsize ws; 911 struct winsize ws;
842 912
843 ws.ws_col = TermWin.ncol; 913 ws.ws_col = ncol;
844 ws.ws_row = TermWin.nrow; 914 ws.ws_row = nrow;
845 ws.ws_xpixel = TermWin.width; 915 ws.ws_xpixel = width;
846 ws.ws_ypixel = TermWin.height; 916 ws.ws_ypixel = height;
847 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 917 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
848 918
849#if 0 919#if 0
850 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 920 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
851 if (cmd_pid) /* force through to the command */ 921 if (cmd_pid) /* force through to the command */
852 kill (cmd_pid, SIGWINCH); 922 kill (-cmd_pid, SIGWINCH);
853#endif 923#endif
854} 924}
855 925
856/*----------------------------------------------------------------------*/ 926/*----------------------------------------------------------------------*/
857/* set_fonts () - load and set the various fonts 927/* set_fonts () - load and set the various fonts
858/* 928 *
859 * init = 1 - initialize 929 * init = 1 - initialize
860 * 930 *
861 * fontname == FONT_UP - switch to bigger font 931 * fontname == FONT_UP - switch to bigger font
862 * fontname == FONT_DN - switch to smaller font 932 * fontname == FONT_DN - switch to smaller font
863 */ 933 */
… …
875 return false; 945 return false;
876 } 946 }
877 947
878#if ENABLE_STYLES 948#if ENABLE_STYLES
879 for (int i = RS_styleCount; --i; ) 949 for (int i = RS_styleCount; --i; )
880 if (TermWin.fontset[i] != TermWin.fontset[0]) 950 if (fontset[i] != fontset[0])
881 delete TermWin.fontset[i]; 951 delete fontset[i];
882#endif 952#endif
883 953
884 delete TermWin.fontset[0]; 954 delete fontset[0];
885 TermWin.fontset[0] = fs; 955 fontset[0] = fs;
886 956
887 prop = (*fs)[1]->properties (); 957 prop = (*fs)[1]->properties ();
888 prop.height += TermWin.lineSpace; 958 prop.height += lineSpace;
889 fs->set_prop (prop); 959 fs->set_prop (prop);
890 960
891 TermWin.fwidth = prop.width; 961 fwidth = prop.width;
892 TermWin.fheight = prop.height; 962 fheight = prop.height;
893 TermWin.fweight = prop.weight; 963 fbase = prop.ascent;
894 TermWin.fslant = prop.slant;
895 TermWin.fbase = (*fs)[1]->ascent;
896 964
897 for (int style = 1; style < 4; style++) 965 for (int style = 1; style < 4; style++)
898 { 966 {
899#if ENABLE_STYLES 967#if ENABLE_STYLES
900 const char *res = rs[Rs_font + style]; 968 const char *res = rs[Rs_font + style];
901 969
902 if (res && !*res) 970 if (res && !*res)
903 TermWin.fontset[style] = TermWin.fontset[0]; 971 fontset[style] = fontset[0];
904 else 972 else
905 { 973 {
906 TermWin.fontset[style] = fs = new rxvt_fontset (this); 974 fontset[style] = fs = new rxvt_fontset (this);
907 rxvt_fontprop prop2 = prop; 975 rxvt_fontprop prop2 = prop;
908 976
909 if (res) 977 if (res)
910 prop2.weight = prop2.slant = rxvt_fontprop::unset; 978 prop2.weight = prop2.slant = rxvt_fontprop::unset;
911 else 979 else
912 { 980 {
913 res = TermWin.fontset[0]->fontdesc; 981 res = fontset[0]->fontdesc;
914 982
915 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;
916 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;
917 } 985 }
918 986
919 fs->populate (res); 987 fs->populate (res);
920 fs->set_prop (prop2); 988 fs->set_prop (prop2);
921 } 989 }
922#else 990#else
923 TermWin.fontset[style] = TermWin.fontset[0]; 991 fontset[style] = fontset[0];
924#endif 992#endif
925 } 993 }
926 994
927 if (TermWin.parent[0]) 995 if (parent[0])
928 { 996 {
929 resize_all_windows (0, 0, 0); 997 resize_all_windows (0, 0, 0);
930 scr_remap_chars (); 998 scr_remap_chars ();
931 scr_touch (true); 999 scr_touch (true);
932 } 1000 }
… …
934 return true; 1002 return true;
935} 1003}
936 1004
937void 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)
938{ 1006{
939 // TODO: SMART_WINDOW_TITLE
940 XChangeProperty (display->display, TermWin.parent[0], 1007 XChangeProperty (display->display, parent[0],
941 prop, XA_STRING, 8, PropModeReplace, 1008 prop, XA_STRING, 8, PropModeReplace,
942 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 1009 (const unsigned char *)str, len >= 0 ? len : strlen (str));
943} 1010}
944 1011
945void 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)
946{ 1013{
947 // TODO: SMART_WINDOW_TITLE
948 wchar_t *ws = rxvt_mbstowcs (str, len); 1014 wchar_t *ws = rxvt_mbstowcs (str, len);
949 char *s = rxvt_wcstoutf8 (ws); 1015 char *s = rxvt_wcstoutf8 (ws);
950 1016
951 XChangeProperty (display->display, TermWin.parent[0], 1017 XChangeProperty (display->display, parent[0],
952 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 1018 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
953 (const unsigned char *)s, strlen (s)); 1019 (const unsigned char *)s, strlen (s));
954 1020
955 free (s); 1021 free (s);
956 free (ws); 1022 free (ws);
… …
961/* xterm sequences - title, iconName, color (exptl) */ 1027/* xterm sequences - title, iconName, color (exptl) */
962void 1028void
963rxvt_term::set_title (const char *str) 1029rxvt_term::set_title (const char *str)
964{ 1030{
965 set_string_property (XA_WM_NAME, str); 1031 set_string_property (XA_WM_NAME, str);
966#if ENABLE_FRILLS 1032#if ENABLE_EWMH
967 set_utf8_property (xa[XA_NET_WM_NAME], str); 1033 set_utf8_property (xa[XA_NET_WM_NAME], str);
968#endif 1034#endif
969} 1035}
970 1036
971void 1037void
972rxvt_term::set_icon_name (const char *str) 1038rxvt_term::set_icon_name (const char *str)
973{ 1039{
974 set_string_property (XA_WM_ICON_NAME, str); 1040 set_string_property (XA_WM_ICON_NAME, str);
975#if ENABLE_FRILLS 1041#if ENABLE_EWMH
976 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 1042 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
977#endif 1043#endif
978} 1044}
979 1045
980#ifdef XTERM_COLOR_CHANGE 1046#ifdef XTERM_COLOR_CHANGE
… …
993 i = atoi (color); 1059 i = atoi (color);
994 1060
995 if (i >= 8 && i <= 15) 1061 if (i >= 8 && i <= 15)
996 { /* bright colors */ 1062 { /* bright colors */
997 i -= 8; 1063 i -= 8;
998# ifndef NO_BRIGHTCOLOR
999 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1064 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1000 SET_PIXCOLOR (idx); 1065 SET_PIXCOLOR (idx);
1001 goto Done; 1066 goto done;
1002# endif
1003 } 1067 }
1004 1068
1005 if (i >= 0 && i <= 7) 1069 if (i >= 0 && i <= 7)
1006 { /* normal colors */ 1070 { /* normal colors */
1007 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1071 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1008 SET_PIXCOLOR (idx); 1072 SET_PIXCOLOR (idx);
1009 goto Done; 1073 goto done;
1010 } 1074 }
1011 } 1075 }
1012 1076
1013 if (!rXParseAllocColor (&xcol, color)) 1077 if (!rXParseAllocColor (&xcol, color))
1014 return; 1078 return;
… …
1034 pix_colors_focused[idx] = xcol; 1098 pix_colors_focused[idx] = xcol;
1035 SET_PIXCOLOR (idx); 1099 SET_PIXCOLOR (idx);
1036 1100
1037 /* XSetWindowAttributes attr; */ 1101 /* XSetWindowAttributes attr; */
1038 /* Cursor cursor; */ 1102 /* Cursor cursor; */
1039Done: 1103done:
1104
1040#ifdef OFF_FOCUS_FADING 1105#if OFF_FOCUS_FADING
1041 if (rs[Rs_fade]) 1106 if (rs[Rs_fade])
1042 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]);
1043#endif 1108#endif
1044 1109
1045 /*TODO: handle Color_BD, scrollbar background, etc. */ 1110 /*TODO: handle Color_BD, scrollbar background, etc. */
1046 1111
1047 recolour_cursor (); 1112 recolour_cursor ();
… …
1118 1183
1119/* -------------------------------------------------------------------- * 1184/* -------------------------------------------------------------------- *
1120 * - WINDOW RESIZING - * 1185 * - WINDOW RESIZING - *
1121 * -------------------------------------------------------------------- */ 1186 * -------------------------------------------------------------------- */
1122void 1187void
1123rxvt_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)
1124{ 1189{
1125 int fix_screen; 1190 int fix_screen;
1126#ifdef SMART_RESIZE
1127 int old_width = szHint.width, old_height = szHint.height; 1191 int old_width = szHint.width, old_height = szHint.height;
1128#endif
1129 dDisp; 1192 dDisp;
1130 1193
1131 window_calc (width, height); 1194 window_calc (newwidth, newheight);
1132 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 1195 XSetWMNormalHints (disp, parent[0], &szHint);
1133 1196
1134 if (!ignoreparent) 1197 if (!ignoreparent)
1135 { 1198 {
1136#ifdef SMART_RESIZE 1199#ifdef SMART_RESIZE
1137 /* 1200 /*
… …
1141 int x, y, x1, y1; 1204 int x, y, x1, y1;
1142 int dx, dy; 1205 int dx, dy;
1143 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1206 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1144 Window unused_cr; 1207 Window unused_cr;
1145 1208
1146 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 1209 XTranslateCoordinates (disp, parent[0], display->root,
1147 0, 0, &x, &y, &unused_cr); 1210 0, 0, &x, &y, &unused_cr);
1148 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 1211 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1149 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1212 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1150 /* 1213 /*
1151 * 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
1152 * our position for handles and decorations. Counter it 1215 * our position for handles and decorations. Counter it
1153 */ 1216 */
… …
1170 if (y < y1) /* top half */ 1233 if (y < y1) /* top half */
1171 dy = 0; 1234 dy = 0;
1172 else if (y == y1) /* exact center */ 1235 else if (y == y1) /* exact center */
1173 dy /= 2; 1236 dy /= 2;
1174 1237
1175 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 1238 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1176 szHint.width, szHint.height); 1239 szHint.width, szHint.height);
1177#else 1240#else
1178 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 1241 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1179#endif 1242#endif
1180 } 1243 }
1181 1244
1182 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1245 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1183 1246
1184 if (fix_screen || width != old_width || height != old_height) 1247 if (fix_screen || newwidth != old_width || newheight != old_height)
1185 { 1248 {
1186 if (scrollbar_visible ()) 1249 if (scrollbar_visible ())
1187 { 1250 {
1188 XMoveResizeWindow (disp, scrollBar.win, 1251 XMoveResizeWindow (disp, scrollBar.win,
1189 window_sb_x, 0, 1252 window_sb_x, 0,
… …
1192 } 1255 }
1193 1256
1194 if (menubar_visible ()) 1257 if (menubar_visible ())
1195 XMoveResizeWindow (disp, menuBar.win, 1258 XMoveResizeWindow (disp, menuBar.win,
1196 window_vt_x, 0, 1259 window_vt_x, 0,
1197 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1260 width, menuBar_TotalHeight ());
1198 1261
1199 XMoveResizeWindow (disp, TermWin.vt, 1262 XMoveResizeWindow (disp, vt,
1200 window_vt_x, window_vt_y, 1263 window_vt_x, window_vt_y,
1201 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1264 width, height);
1202 1265
1203 scr_clear (); 1266 scr_clear ();
1204#ifdef XPM_BACKGROUND 1267#ifdef XPM_BACKGROUND
1205 resize_pixmap (); 1268 resize_pixmap ();
1206#endif 1269#endif
… …
1212 int old_ncol = prev_ncol; 1275 int old_ncol = prev_ncol;
1213 1276
1214 /* scr_reset only works on the primary screen */ 1277 /* scr_reset only works on the primary screen */
1215 if (old_height) /* this is not the first time through */ 1278 if (old_height) /* this is not the first time through */
1216 { 1279 {
1217 unsigned int ncol = TermWin.ncol; 1280 unsigned int ocol = ncol;
1218 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
1219 curr_screen = scr_change_screen (PRIMARY); 1282 curr_screen = scr_change_screen (PRIMARY);
1220 TermWin.ncol = ncol; 1283 ncol = ocol;
1221 } 1284 }
1222 1285
1223 scr_reset (); 1286 scr_reset ();
1224 1287
1225 if (curr_screen >= 0) /* this is not the first time through */ 1288 if (curr_screen >= 0) /* this is not the first time through */
1226 { 1289 {
1227 scr_change_screen (curr_screen); 1290 scr_change_screen (curr_screen);
1228 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1291 selection_check (old_ncol != ncol ? 4 : 0);
1229 } 1292 }
1230 } 1293 }
1231 1294
1232 old_width = szHint.width; 1295 old_width = szHint.width;
1233 old_height = szHint.height; 1296 old_height = szHint.height;
1234 1297
1235#ifdef XPM_BACKGROUND 1298#ifdef XPM_BACKGROUND
1236 if (TermWin.pixmap) 1299 if (pixmap)
1237 scr_touch (false); 1300 scr_touch (false);
1238#endif 1301#endif
1239 1302
1240#ifdef USE_XIM 1303#ifdef USE_XIM
1241 IMSetStatusPosition (); 1304 IMSetStatusPosition ();
… …
1245/* 1308/*
1246 * 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.
1247 * good for toggling 80/132 columns 1310 * good for toggling 80/132 columns
1248 */ 1311 */
1249void 1312void
1250rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1313rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1251{ 1314{
1252 XWindowAttributes wattr; 1315 XWindowAttributes wattr;
1253 1316
1254 if (width == 0 || height == 0) 1317 if (newwidth == 0 || newheight == 0)
1255 { 1318 {
1256 XGetWindowAttributes (display->display, display->root, &wattr); 1319 XGetWindowAttributes (display->display, display->root, &wattr);
1320
1257 if (width == 0) 1321 if (newwidth == 0)
1258 width = wattr.width - szHint.base_width; 1322 newwidth = wattr.width - szHint.base_width;
1259 if (height == 0) 1323 if (newheight == 0)
1260 height = wattr.height - szHint.base_height; 1324 newheight = wattr.height - szHint.base_height;
1261 }
1262
1263 if (width != TermWin.width || height != TermWin.height)
1264 { 1325 }
1326
1327 if (newwidth != width || newheight != height)
1328 {
1265 width += szHint.base_width; 1329 newwidth += szHint.base_width;
1266 height += szHint.base_height; 1330 newheight += szHint.base_height;
1267 resize_all_windows (width, height, 0); 1331 resize_all_windows (newwidth, newheight, 0);
1268 } 1332 }
1269} 1333}
1270 1334
1271/* -------------------------------------------------------------------- * 1335/* -------------------------------------------------------------------- *
1272 * - X INPUT METHOD ROUTINES - * 1336 * - X INPUT METHOD ROUTINES - *
… …
1282 1346
1283void 1347void
1284rxvt_term::im_set_size (XRectangle &size) 1348rxvt_term::im_set_size (XRectangle &size)
1285{ 1349{
1286 // the int_bwidth terms make no sense to me 1350 // the int_bwidth terms make no sense to me
1287 size.x = TermWin.int_bwidth; 1351 size.x = int_bwidth;
1288 size.y = TermWin.int_bwidth; 1352 size.y = int_bwidth;
1289 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1353 size.width = Width2Pixel (ncol) + int_bwidth;
1290 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1354 size.height = Height2Pixel (nrow) + int_bwidth;
1291} 1355}
1292 1356
1293void 1357void
1294rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1358rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1295 XRectangle &status_rect, 1359 XRectangle &status_rect,
1296 const XRectangle &needed_rect) 1360 const XRectangle &needed_rect)
1297{ 1361{
1298 preedit_rect.x = needed_rect.width; 1362 preedit_rect.x = needed_rect.width;
1299 preedit_rect.y = 0; 1363 preedit_rect.y = 0;
1300 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1364 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1301 preedit_rect.height = TermWin.fheight; 1365 preedit_rect.height = fheight;
1302 1366
1303 status_rect.x = 0; 1367 status_rect.x = 0;
1304 status_rect.y = 0; 1368 status_rect.y = 0;
1305 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;
1306 status_rect.height = TermWin.fheight; 1370 status_rect.height = fheight;
1307} 1371}
1308 1372
1309/* Checking whether input method is running. */ 1373/* Checking whether input method is running. */
1310bool 1374bool
1311rxvt_term::IMisRunning () 1375rxvt_term::IMisRunning ()
… …
1339{ 1403{
1340 XPoint nspot; 1404 XPoint nspot;
1341 XVaNestedList preedit_attr; 1405 XVaNestedList preedit_attr;
1342 1406
1343 if (!Input_Context 1407 if (!Input_Context
1344 || !TermWin.focus 1408 || !focus
1345 || !(input_style & XIMPreeditPosition)) 1409 || !(input_style & XIMPreeditPosition))
1346 return; 1410 return;
1347 1411
1348 im_set_position (nspot); 1412 im_set_position (nspot);
1349 1413
… …
1385 XRectangle rect, status_rect, needed_rect; 1449 XRectangle rect, status_rect, needed_rect;
1386 unsigned long fg, bg; 1450 unsigned long fg, bg;
1387 const char *p; 1451 const char *p;
1388 char **s; 1452 char **s;
1389 XIMStyles *xim_styles; 1453 XIMStyles *xim_styles;
1454
1455 set_environ (envv);
1390 1456
1391 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1457 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1392 return false; 1458 return false;
1393 1459
1394 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1460 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1469 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1535 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1470 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1536 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1471 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1537 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1472 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1538 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1473 "*", 1539 "*",
1474 TermWin.fheight, 1540 fheight,
1475 TermWin.fheight + 1, TermWin.fheight - 1, 1541 fheight + 1, fheight - 1,
1476 TermWin.fheight - 2, TermWin.fheight + 2); 1542 fheight - 2, fheight + 2);
1477 1543
1478 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1544 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1479 &missing_charset_list, &missing_charset_count, &def_string); 1545 &missing_charset_list, &missing_charset_count, &def_string);
1480 1546
1481 if (missing_charset_list) 1547 if (missing_charset_list)
… …
1527 NULL); 1593 NULL);
1528 } 1594 }
1529 1595
1530 Input_Context = XCreateIC (xim, 1596 Input_Context = XCreateIC (xim,
1531 XNInputStyle, input_style, 1597 XNInputStyle, input_style,
1532 XNClientWindow, TermWin.vt, 1598 XNClientWindow, vt,
1533 XNFocusWindow, TermWin.parent[0], 1599 XNFocusWindow, parent[0],
1534 preedit_attr ? XNPreeditAttributes : NULL, 1600 preedit_attr ? XNPreeditAttributes : NULL,
1535 preedit_attr, 1601 preedit_attr,
1536 status_attr ? XNStatusAttributes : NULL, 1602 status_attr ? XNStatusAttributes : NULL,
1537 status_attr, NULL); 1603 status_attr, NULL);
1538 1604
… …
1555} 1621}
1556 1622
1557void 1623void
1558rxvt_term::im_cb () 1624rxvt_term::im_cb ()
1559{ 1625{
1560 int i, found, had_im; 1626 int i;
1561 const char *p; 1627 const char *p;
1562 char **s; 1628 char **s;
1563 char buf[IMBUFSIZ]; 1629 char buf[IMBUFSIZ];
1564 1630
1565 SET_R (this); 1631 make_current ();
1566 1632
1567 im_destroy (); 1633 im_destroy ();
1568 1634
1569 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1635 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1570 if (Input_Context) 1636 if (Input_Context)
… …
1622{ 1688{
1623 XRectangle preedit_rect, status_rect, *needed_rect; 1689 XRectangle preedit_rect, status_rect, *needed_rect;
1624 XVaNestedList preedit_attr, status_attr; 1690 XVaNestedList preedit_attr, status_attr;
1625 1691
1626 if (!Input_Context 1692 if (!Input_Context
1627 || !TermWin.focus 1693 || !focus
1628 || !(input_style & XIMPreeditArea) 1694 || !(input_style & XIMPreeditArea)
1629 || !IMisRunning ()) 1695 || !IMisRunning ())
1630 return; 1696 return;
1631 1697
1632 /* 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