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.134 by root, Fri Feb 4 11:41:23 2005 UTC vs.
Revision 1.167 by root, Sun Jan 8 08:43:11 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
51 55
52vector<rxvt_term *> rxvt_term::termlist; 56vector<rxvt_term *> rxvt_term::termlist;
53 57
54static char curlocale[128]; 58static char curlocale[128], savelocale[128];
55 59
56bool 60bool
57rxvt_set_locale (const char *locale) 61rxvt_set_locale (const char *locale)
58{ 62{
59 if (!locale || !strncmp (locale, curlocale, 128)) 63 if (!locale || !strncmp (locale, curlocale, 128))
60 return false; 64 return false;
61 65
62 strncpy (curlocale, locale, 128); 66 strncpy (curlocale, locale, 128);
63 setlocale (LC_CTYPE, curlocale); 67 setlocale (LC_CTYPE, curlocale);
64 return true; 68 return true;
69}
70
71bool
72rxvt_push_locale (const char *locale)
73{
74 strcpy (savelocale, curlocale);
75 rxvt_set_locale (locale);
76}
77
78void
79rxvt_pop_locale ()
80{
81 rxvt_set_locale (savelocale);
65} 82}
66 83
67#if ENABLE_COMBINING 84#if ENABLE_COMBINING
68class rxvt_composite_vec rxvt_composite; 85class rxvt_composite_vec rxvt_composite;
69 86
… …
158 pointer_ev (this, &rxvt_term::pointer_cb), 175 pointer_ev (this, &rxvt_term::pointer_cb),
159#endif 176#endif
160#ifdef USE_XIM 177#ifdef USE_XIM
161 im_ev (this, &rxvt_term::im_cb), 178 im_ev (this, &rxvt_term::im_cb),
162#endif 179#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), 180 termwin_ev (this, &rxvt_term::x_cb),
167 vt_ev (this, &rxvt_term::x_cb), 181 vt_ev (this, &rxvt_term::x_cb),
168 check_ev (this, &rxvt_term::check_cb), 182 check_ev (this, &rxvt_term::check_cb),
169 flush_ev (this, &rxvt_term::flush_cb), 183 flush_ev (this, &rxvt_term::flush_cb),
170 destroy_ev (this, &rxvt_term::destroy_cb), 184 destroy_ev (this, &rxvt_term::destroy_cb),
… …
197 pty.put (); 211 pty.put ();
198} 212}
199 213
200rxvt_term::~rxvt_term () 214rxvt_term::~rxvt_term ()
201{ 215{
216 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
217
202 termlist.erase (find (termlist.begin (), termlist.end(), this)); 218 termlist.erase (find (termlist.begin (), termlist.end(), this));
203 219
204 emergency_cleanup (); 220 emergency_cleanup ();
205 221
206#if ENABLE_STYLES 222#if ENABLE_STYLES
207 for (int i = RS_styleCount; --i; ) 223 for (int i = RS_styleCount; --i; )
208 if (TermWin.fontset[i] != TermWin.fontset[0]) 224 if (fontset[i] != fontset[0])
209 delete TermWin.fontset[i]; 225 delete fontset[i];
210#endif 226#endif
211 delete TermWin.fontset[0]; 227 delete fontset[0];
212 228
213 if (display) 229 if (display)
214 { 230 {
215 dDisp; 231 dDisp;
216 232
… …
244#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 260#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
245 if (topShadowGC) XFreeGC (disp, topShadowGC); 261 if (topShadowGC) XFreeGC (disp, topShadowGC);
246 if (botShadowGC) XFreeGC (disp, botShadowGC); 262 if (botShadowGC) XFreeGC (disp, botShadowGC);
247 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 263 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
248#endif 264#endif
249 if (TermWin.gc) XFreeGC (disp, TermWin.gc); 265 if (gc) XFreeGC (disp, gc);
250 266
251#if defined(MENUBAR) && (MENUBAR_MAX > 1) 267#if defined(MENUBAR) && (MENUBAR_MAX > 1)
252 delete menuBar.drawable; 268 delete menuBar.drawable;
253 //if (menuBar.win) 269 //if (menuBar.win)
254 // XDestroyWindow (disp, menuBar.win); 270 // XDestroyWindow (disp, menuBar.win);
255#endif 271#endif
256 delete TermWin.drawable; 272 delete drawable;
257 // destroy all windows 273 // destroy all windows
258 if (TermWin.parent[0]) 274 if (parent[0])
259 XDestroyWindow (disp, TermWin.parent[0]); 275 XDestroyWindow (disp, parent[0]);
260 } 276 }
261 277
262 // TODO: free pixcolours, colours should become part of rxvt_display 278 // TODO: free pixcolours, colours should become part of rxvt_display
263 279
264 delete pix_colors_focused; 280 delete pix_colors_focused;
265#ifdef OFF_FOCUS_FADING 281#if OFF_FOCUS_FADING
266 delete pix_colors_unfocused; 282 delete pix_colors_unfocused;
283#endif
284#if USE_XGETDEFAULT
285 XrmDestroyDatabase (xrmdatabase);
267#endif 286#endif
268 287
269 displays.put (display); 288 displays.put (display);
270 289
271 scr_release (); 290 scr_release ();
… …
291 delete keyboard; 310 delete keyboard;
292#endif 311#endif
293} 312}
294 313
295void 314void
315rxvt_term::child_exit ()
316{
317 cmd_pid = 0;
318
319 if (!OPTION (Opt_hold))
320 destroy ();
321}
322
323void
296rxvt_term::destroy () 324rxvt_term::destroy ()
297{ 325{
298 if (destroy_ev.active) 326 if (destroy_ev.active)
299 return; 327 return;
300 328
… …
362{ 390{
363 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 391 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
364 (*t)->emergency_cleanup (); 392 (*t)->emergency_cleanup ();
365} 393}
366 394
395#if ENABLE_FRILLS
396static void
397print_x_error (Display *dpy, XErrorEvent *event)
398{
399 char buffer[BUFSIZ];
400 char mesg[BUFSIZ];
401 char number[32];
402 char *mtype = "XlibMessage";
403 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
404 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
405 rxvt_warn ("An X Error occured, trying to continue after report.\n");
406 rxvt_warn ("%s: %s\n", mesg, buffer);
407 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
408 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
409 sprintf(number, "%d", event->request_code);
410 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
411 rxvt_warn ("(which is %s)\n", buffer);
412 if (event->request_code >= 128) {
413 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
414 mesg, BUFSIZ);
415 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
416 }
417 if ((event->error_code == BadWindow) ||
418 (event->error_code == BadPixmap) ||
419 (event->error_code == BadCursor) ||
420 (event->error_code == BadFont) ||
421 (event->error_code == BadDrawable) ||
422 (event->error_code == BadColor) ||
423 (event->error_code == BadGC) ||
424 (event->error_code == BadIDChoice) ||
425 (event->error_code == BadValue) ||
426 (event->error_code == BadAtom)) {
427 if (event->error_code == BadValue)
428 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
429 mesg, BUFSIZ);
430 else if (event->error_code == BadAtom)
431 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
432 mesg, BUFSIZ);
433 else
434 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
435 mesg, BUFSIZ);
436 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
437 }
438 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
439 mesg, BUFSIZ);
440 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
441}
442#endif
443
367int 444int
368rxvt_xerror_handler (Display *display, XErrorEvent *event) 445rxvt_xerror_handler (Display *display, XErrorEvent *event)
369{ 446{
370 if (GET_R->allowedxerror == -1) 447 if (GET_R->allowedxerror == -1)
371 GET_R->allowedxerror = event->error_code; 448 GET_R->allowedxerror = event->error_code;
372 else 449 else
373 { 450 {
374 //TODO: GET_R is most likely not the terminal which caused the error 451 // GET_R is most likely not the terminal which caused the error,
375 //TODO: maybe just output the error and continue? 452 // so just output the error and continue
453#if ENABLE_FRILLS
454 print_x_error (display, event);
455#else
376 old_xerror_handler (display, event); 456 old_xerror_handler (display, event);
377 GET_R->destroy (); 457#endif
378 } 458 }
379 459
380 return 0; 460 return 0;
381} 461}
382 462
… …
387 DisplayString (display)); 467 DisplayString (display));
388 rxvt_emergency_cleanup (); 468 rxvt_emergency_cleanup ();
389 _exit (EXIT_FAILURE); 469 _exit (EXIT_FAILURE);
390} 470}
391 471
392/*
393 * Catch a fatal signal and tidy up before quitting
394 */
395void
396rxvt_term::sig_term (sig_watcher &w)
397{
398#ifdef DEBUG_CMD
399 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
400#endif
401 rxvt_emergency_cleanup ();
402 signal (w.signum, SIG_DFL);
403 kill (getpid (), w.signum);
404}
405
406/*----------------------------------------------------------------------*/ 472/*----------------------------------------------------------------------*/
407/* rxvt_init () */
408bool 473bool
409rxvt_term::init (int argc, const char *const *argv) 474rxvt_term::init (int argc, const char *const *argv)
410{ 475{
411 SET_R (this); 476 SET_R (this);
412 477
… …
425 490
426#if MENUBAR_MAX 491#if MENUBAR_MAX
427 menubar_read (rs[Rs_menu]); 492 menubar_read (rs[Rs_menu]);
428#endif 493#endif
429#ifdef HAVE_SCROLLBARS 494#ifdef HAVE_SCROLLBARS
430 if (options & Opt_scrollBar) 495 if (OPTION (Opt_scrollBar))
431 scrollBar.setIdle (); /* set existence for size calculations */ 496 scrollBar.setIdle (); /* set existence for size calculations */
497#endif
498
499#if ENABLE_PERL
500 if (!rs[Rs_perl_ext_1])
501 rs[Rs_perl_ext_1] = "default";
502
503 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
504 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
505 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
506 {
507 bool tainted = false;
508
509#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
510 // ignore some perl-related arguments if some bozo installed us set[ug]id
511 if (getuid () != saved_euid || getgid () != saved_egid)
512 {
513 tainted = true;
514
515 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
516 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
517 {
518 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
519 rs[Rs_perl_lib] = 0;
520 rs[Rs_perl_eval] = "our $tainted = 1";
521 }
522 }
523#endif
524 rxvt_perl.init (tainted);
525 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
526 }
432#endif 527#endif
433 528
434 create_windows (argc, argv); 529 create_windows (argc, argv);
435 530
436 dDisp; 531 dDisp;
… …
442#if 0 537#if 0
443 XSynchronize (disp, True); 538 XSynchronize (disp, True);
444#endif 539#endif
445 540
446#ifdef HAVE_SCROLLBARS 541#ifdef HAVE_SCROLLBARS
447 if (options & Opt_scrollBar) 542 if (OPTION (Opt_scrollBar))
448 resize_scrollbar (); /* create and map scrollbar */ 543 resize_scrollbar (); /* create and map scrollbar */
449#endif 544#endif
450#if (MENUBAR_MAX) 545#if (MENUBAR_MAX)
451 if (menubar_visible ()) 546 if (menubar_visible ())
452 XMapWindow (disp, menuBar.win); 547 XMapWindow (disp, menuBar.win);
453#endif 548#endif
454#ifdef TRANSPARENT 549#ifdef TRANSPARENT
455 if (options & Opt_transparent) 550 if (OPTION (Opt_transparent))
456 { 551 {
457 XSelectInput (disp, display->root, PropertyChangeMask); 552 XSelectInput (disp, display->root, PropertyChangeMask);
458 check_our_parents (); 553 check_our_parents ();
459 rootwin_ev.start (display, display->root); 554 rootwin_ev.start (display, display->root);
460 } 555 }
461#endif 556#endif
462 557
463 XMapWindow (disp, TermWin.vt); 558 XMapWindow (disp, vt);
464 XMapWindow (disp, TermWin.parent[0]); 559 XMapWindow (disp, parent[0]);
465 560
466 set_colorfgbg (); 561 set_colorfgbg ();
467 562
468 init_command (cmd_argv); 563 init_command (cmd_argv);
469 564
470 free (cmd_argv); 565 free (cmd_argv);
471 566
567 if (pty.pty >= 0)
472 pty_ev.start (pty.pty, EVENT_READ); 568 pty_ev.start (pty.pty, EVENT_READ);
473 569
474 check_ev.start (); 570 check_ev.start ();
475 571
572 HOOK_INVOKE ((this, HOOK_START, DT_END));
573
476 return true; 574 return true;
477} 575}
576
577static struct sig_handlers
578{
579 sig_watcher sw_chld, sw_term, sw_int;
580
581 void sig_chld (sig_watcher &w)
582 {
583 // we are being called for every SIGCHLD, find the corresponding term
584 int pid;
585
586 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
587 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
588 if (pid == (*t)->cmd_pid)
589 {
590 (*t)->child_exit ();
591 break;
592 }
593 }
594
595 /*
596 * Catch a fatal signal and tidy up before quitting
597 */
598 void
599 sig_term (sig_watcher &w)
600 {
601#ifdef DEBUG_CMD
602 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
603#endif
604 rxvt_emergency_cleanup ();
605 signal (w.signum, SIG_DFL);
606 kill (getpid (), w.signum);
607 }
608
609 sig_handlers ()
610 : sw_chld (this, &sig_handlers::sig_chld),
611 sw_term (this, &sig_handlers::sig_term),
612 sw_int (this, &sig_handlers::sig_term)
613 {
614 }
615} sig_handlers;
478 616
479void 617void
480rxvt_init () 618rxvt_init ()
481{ 619{
482 /* 620 /*
… …
490 rxvt_privileges (IGNORE); 628 rxvt_privileges (IGNORE);
491 629
492 signal (SIGHUP, SIG_IGN); 630 signal (SIGHUP, SIG_IGN);
493 signal (SIGPIPE, SIG_IGN); 631 signal (SIGPIPE, SIG_IGN);
494 632
633 sig_handlers.sw_chld.start (SIGCHLD);
634 sig_handlers.sw_term.start (SIGTERM);
635 sig_handlers.sw_int.start (SIGINT);
636
495 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 637 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
496 /* signal (SIGURG, SIG_DFL); */ 638 /* signal (SIGURG, SIG_DFL); */
497 639
498 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 640 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
499 // TODO: handle this with exceptions and tolerate the memory loss 641 // TODO: handle this with exceptions and tolerate the memory loss
500 XSetIOErrorHandler (rxvt_xioerror_handler); 642 XSetIOErrorHandler (rxvt_xioerror_handler);
501}
502 643
503/* ------------------------------------------------------------------------- * 644#ifdef USE_XGETDEFAULT
504 * SIGNAL HANDLING & EXIT HANDLER * 645 XrmInitialize ();
505 * ------------------------------------------------------------------------- */ 646#endif
506/*
507 * Catch a SIGCHLD signal and exit if the direct child has died
508 */
509
510void
511rxvt_term::sig_chld (sig_watcher &w)
512{
513 // we are being called for every SIGCHLD, not just ours
514 int pid;
515
516 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
517 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
518 if (pid == (*t)->cmd_pid)
519 {
520 (*t)->destroy ();
521 break;
522 }
523} 647}
524 648
525/* ------------------------------------------------------------------------- * 649/* ------------------------------------------------------------------------- *
526 * MEMORY ALLOCATION WRAPPERS * 650 * MEMORY ALLOCATION WRAPPERS *
527 * ------------------------------------------------------------------------- */ 651 * ------------------------------------------------------------------------- */
… …
534 rxvt_fatal ("memory allocation failure. aborting.\n"); 658 rxvt_fatal ("memory allocation failure. aborting.\n");
535 659
536 return p; 660 return p;
537} 661}
538 662
539/* INTPROTO */ 663void *
540void *
541rxvt_calloc (size_t number, size_t size) 664rxvt_calloc (size_t number, size_t size)
542{ 665{
543 void *p = calloc (number, size); 666 void *p = calloc (number, size);
544 667
545 if (!p) 668 if (!p)
546 rxvt_fatal ("memory allocation failure. aborting.\n"); 669 rxvt_fatal ("memory allocation failure. aborting.\n");
547 670
548 return p; 671 return p;
549} 672}
550 673
551/* INTPROTO */
552void * 674void *
553rxvt_realloc (void *ptr, size_t size) 675rxvt_realloc (void *ptr, size_t size)
554{ 676{
555 void *p = realloc (ptr, size); 677 void *p = realloc (ptr, size);
556 678
… …
565 * ------------------------------------------------------------------------- */ 687 * ------------------------------------------------------------------------- */
566/* take care of suid/sgid super-user (root) privileges */ 688/* take care of suid/sgid super-user (root) privileges */
567void 689void
568rxvt_privileges (rxvt_privaction action) 690rxvt_privileges (rxvt_privaction action)
569{ 691{
570#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
571 static uid_t euid;
572 static gid_t egid;
573#endif
574
575#if ! defined(__CYGWIN32__) 692#if ! defined(__CYGWIN32__)
576# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 693# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
577 /* setreuid () is the poor man's setuid (), seteuid () */ 694 /* setreuid () is the poor man's setuid (), seteuid () */
578# define seteuid(a) setreuid(-1, (a)) 695# define seteuid(a) setreuid(-1, (a))
579# define setegid(a) setregid(-1, (a)) 696# define setegid(a) setregid(-1, (a))
… …
589 */ 706 */
590 seteuid (getuid ()); 707 seteuid (getuid ());
591 setegid (getgid ()); 708 setegid (getgid ());
592 break; 709 break;
593 case SAVE: 710 case SAVE:
594 euid = geteuid (); 711 saved_euid = geteuid ();
595 egid = getegid (); 712 saved_egid = getegid ();
596 break; 713 break;
597 case RESTORE: 714 case RESTORE:
598 seteuid (euid); 715 seteuid (saved_euid);
599 setegid (egid); 716 setegid (saved_egid);
600 break; 717 break;
601 } 718 }
602# else 719# else
603 switch (action) 720 switch (action)
604 { 721 {
… …
617 734
618#ifdef UTMP_SUPPORT 735#ifdef UTMP_SUPPORT
619void 736void
620rxvt_term::privileged_utmp (rxvt_privaction action) 737rxvt_term::privileged_utmp (rxvt_privaction action)
621{ 738{
622 if ((options & Opt_utmpInhibit) 739 if (OPTION (Opt_utmpInhibit)
623 || !pty.name || !*pty.name) 740 || !pty.name || !*pty.name)
624 return; 741 return;
625 742
626 rxvt_privileges (RESTORE); 743 rxvt_privileges (RESTORE);
627 744
… …
638/* 755/*
639 * window size/position calculcations for XSizeHint and other storage. 756 * window size/position calculcations for XSizeHint and other storage.
640 * if width/height are non-zero then override calculated width/height 757 * if width/height are non-zero then override calculated width/height
641 */ 758 */
642void 759void
643rxvt_term::window_calc (unsigned int width, unsigned int height) 760rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
644{ 761{
645 short recalc_x, recalc_y; 762 short recalc_x, recalc_y;
646 int x, y, sb_w, mb_h, flags; 763 int x, y, sb_w, mb_h, flags;
647 unsigned int w, h; 764 unsigned int w, h;
648 unsigned int max_width, max_height; 765 unsigned int max_width, max_height;
649 dDisp; 766 dDisp;
650 767
651 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 768 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
652 TermWin.ncol, TermWin.nrow, szHint.width, 769 ncol, nrow, szHint.width, szHint.height));
653 szHint.height)); 770
654 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 771 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
655 szHint.win_gravity = NorthWestGravity; 772 szHint.win_gravity = NorthWestGravity;
656 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 773 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
657 774
658 recalc_x = recalc_y = 0; 775 recalc_x = recalc_y = 0;
659 flags = 0; 776 flags = 0;
777
660 if (!parsed_geometry) 778 if (!parsed_geometry)
661 { 779 {
662 parsed_geometry = 1; 780 parsed_geometry = 1;
781
663 if (rs[Rs_geometry]) 782 if (rs[Rs_geometry])
664 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 783 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
784
665 if (flags & WidthValue) 785 if (flags & WidthValue)
666 { 786 {
667 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 787 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
668 szHint.flags |= USSize; 788 szHint.flags |= USSize;
669 } 789 }
790
670 if (flags & HeightValue) 791 if (flags & HeightValue)
671 { 792 {
672 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 793 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
673 szHint.flags |= USSize; 794 szHint.flags |= USSize;
674 } 795 }
796
675 if (flags & XValue) 797 if (flags & XValue)
676 { 798 {
677 szHint.x = x; 799 szHint.x = x;
678 szHint.flags |= USPosition; 800 szHint.flags |= USPosition;
801
679 if (flags & XNegative) 802 if (flags & XNegative)
680 { 803 {
681 recalc_x = 1; 804 recalc_x = 1;
682 szHint.win_gravity = NorthEastGravity; 805 szHint.win_gravity = NorthEastGravity;
683 } 806 }
684 } 807 }
808
685 if (flags & YValue) 809 if (flags & YValue)
686 { 810 {
687 szHint.y = y; 811 szHint.y = y;
688 szHint.flags |= USPosition; 812 szHint.flags |= USPosition;
813
689 if (flags & YNegative) 814 if (flags & YNegative)
690 { 815 {
691 recalc_y = 1; 816 recalc_y = 1;
817
692 if (szHint.win_gravity == NorthEastGravity) 818 if (szHint.win_gravity == NorthEastGravity)
693 szHint.win_gravity = SouthEastGravity; 819 szHint.win_gravity = SouthEastGravity;
694 else 820 else
695 szHint.win_gravity = SouthWestGravity; 821 szHint.win_gravity = SouthWestGravity;
696 } 822 }
697 } 823 }
698 } 824 }
699 825
700 /* TODO: BOUNDS */ 826 /* TODO: BOUNDS */
701 TermWin.width = TermWin.ncol * TermWin.fwidth; 827 width = ncol * fwidth;
702 TermWin.height = TermWin.nrow * TermWin.fheight; 828 height = nrow * fheight;
703 max_width = MAX_COLS * TermWin.fwidth; 829 max_width = MAX_COLS * fwidth;
704 max_height = MAX_ROWS * TermWin.fheight; 830 max_height = MAX_ROWS * fheight;
705 831
706 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 832 szHint.base_width = szHint.base_height = 2 * int_bwidth;
707 833
708 sb_w = mb_h = 0; 834 sb_w = mb_h = 0;
709 window_vt_x = window_vt_y = TermWin.int_bwidth; 835 window_vt_x = window_vt_y = int_bwidth;
710 836
711 if (scrollbar_visible ()) 837 if (scrollbar_visible ())
712 { 838 {
713 sb_w = scrollbar_TotalWidth (); 839 sb_w = scrollbar_TotalWidth ();
714 szHint.base_width += sb_w; 840 szHint.base_width += sb_w;
715 if (!(options & Opt_scrollBar_right)) 841 if (!OPTION (Opt_scrollBar_right))
716 window_vt_x += sb_w; 842 window_vt_x += sb_w;
717 } 843 }
718 844
719 if (menubar_visible ()) 845 if (menubar_visible ())
720 { 846 {
721 mb_h = menuBar_TotalHeight (); 847 mb_h = menuBar_TotalHeight ();
722 szHint.base_height += mb_h; 848 szHint.base_height += mb_h;
723 window_vt_y += mb_h; 849 window_vt_y += mb_h;
724 } 850 }
725 851
726 szHint.width_inc = TermWin.fwidth; 852 szHint.width_inc = fwidth;
727 szHint.height_inc = TermWin.fheight; 853 szHint.height_inc = fheight;
728 szHint.min_width = szHint.base_width + szHint.width_inc; 854 szHint.min_width = szHint.base_width + szHint.width_inc;
729 szHint.min_height = szHint.base_height + szHint.height_inc; 855 szHint.min_height = szHint.base_height + szHint.height_inc;
730 856
731 if (width && width - szHint.base_width < max_width) 857 if (newwidth && newwidth - szHint.base_width < max_width)
732 { 858 {
733 szHint.width = width; 859 szHint.width = newwidth;
734 TermWin.width = width - szHint.base_width; 860 width = newwidth - szHint.base_width;
735 } 861 }
736 else 862 else
737 { 863 {
738 MIN_IT (TermWin.width, max_width); 864 min_it (width, max_width);
739 szHint.width = szHint.base_width + TermWin.width; 865 szHint.width = szHint.base_width + width;
740 } 866 }
741 867
742 if (height && height - szHint.base_height < max_height) 868 if (newheight && newheight - szHint.base_height < max_height)
743 { 869 {
744 szHint.height = height; 870 szHint.height = newheight;
745 TermWin.height = height - szHint.base_height; 871 height = newheight - szHint.base_height;
746 } 872 }
747 else 873 else
748 { 874 {
749 MIN_IT (TermWin.height, max_height); 875 min_it (height, max_height);
750 szHint.height = szHint.base_height + TermWin.height; 876 szHint.height = szHint.base_height + height;
751 } 877 }
752 878
753 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 879 if (scrollbar_visible () && OPTION (Opt_scrollBar_right))
754 window_sb_x = szHint.width - sb_w; 880 window_sb_x = szHint.width - sb_w;
755 881
756 if (recalc_x) 882 if (recalc_x)
757 szHint.x += (DisplayWidth (disp, display->screen) 883 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
758 - szHint.width - 2 * TermWin.ext_bwidth);
759 if (recalc_y) 884 if (recalc_y)
760 szHint.y += (DisplayHeight (disp, display->screen) 885 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
761 - szHint.height - 2 * TermWin.ext_bwidth);
762 886
763 TermWin.ncol = TermWin.width / TermWin.fwidth; 887 ncol = width / fwidth;
764 TermWin.nrow = TermWin.height / TermWin.fheight; 888 nrow = height / fheight;
765 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 889 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
766 TermWin.ncol, TermWin.nrow, szHint.width, 890 ncol, nrow, szHint.width,
767 szHint.height)); 891 szHint.height));
768 return; 892 return;
769} 893}
770 894
771/*----------------------------------------------------------------------*/ 895/*----------------------------------------------------------------------*/
… …
779 if (pty.pty < 0) 903 if (pty.pty < 0)
780 return; 904 return;
781 905
782 struct winsize ws; 906 struct winsize ws;
783 907
784 ws.ws_col = TermWin.ncol; 908 ws.ws_col = ncol;
785 ws.ws_row = TermWin.nrow; 909 ws.ws_row = nrow;
786 ws.ws_xpixel = TermWin.width; 910 ws.ws_xpixel = width;
787 ws.ws_ypixel = TermWin.height; 911 ws.ws_ypixel = height;
788 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 912 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
789 913
790#if 0 914#if 0
791 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 915 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
792 if (cmd_pid) /* force through to the command */ 916 if (cmd_pid) /* force through to the command */
793 kill (cmd_pid, SIGWINCH); 917 kill (-cmd_pid, SIGWINCH);
794#endif 918#endif
795} 919}
796 920
797/*----------------------------------------------------------------------*/ 921/*----------------------------------------------------------------------*/
798/* set_fonts () - load and set the various fonts 922/* set_fonts () - load and set the various fonts
799/* 923 *
800 * init = 1 - initialize 924 * init = 1 - initialize
801 * 925 *
802 * fontname == FONT_UP - switch to bigger font 926 * fontname == FONT_UP - switch to bigger font
803 * fontname == FONT_DN - switch to smaller font 927 * fontname == FONT_DN - switch to smaller font
804 */ 928 */
… …
816 return false; 940 return false;
817 } 941 }
818 942
819#if ENABLE_STYLES 943#if ENABLE_STYLES
820 for (int i = RS_styleCount; --i; ) 944 for (int i = RS_styleCount; --i; )
821 if (TermWin.fontset[i] != TermWin.fontset[0]) 945 if (fontset[i] != fontset[0])
822 delete TermWin.fontset[i]; 946 delete fontset[i];
823#endif 947#endif
824 948
825 delete TermWin.fontset[0]; 949 delete fontset[0];
826 TermWin.fontset[0] = fs; 950 fontset[0] = fs;
827 951
828 prop = (*fs)[1]->properties (); 952 prop = (*fs)[1]->properties ();
829 prop.height += TermWin.lineSpace; 953 prop.height += lineSpace;
830 fs->set_prop (prop); 954 fs->set_prop (prop);
831 955
832 TermWin.fwidth = prop.width; 956 fwidth = prop.width;
833 TermWin.fheight = prop.height; 957 fheight = prop.height;
834 TermWin.fweight = prop.weight; 958 fbase = prop.ascent;
835 TermWin.fslant = prop.slant;
836 TermWin.fbase = (*fs)[1]->ascent;
837 959
838 for (int style = 1; style < 4; style++) 960 for (int style = 1; style < 4; style++)
839 { 961 {
840#if ENABLE_STYLES 962#if ENABLE_STYLES
841 const char *res = rs[Rs_font + style]; 963 const char *res = rs[Rs_font + style];
842 964
843 if (res && !*res) 965 if (res && !*res)
844 TermWin.fontset[style] = TermWin.fontset[0]; 966 fontset[style] = fontset[0];
845 else 967 else
846 { 968 {
847 TermWin.fontset[style] = fs = new rxvt_fontset (this); 969 fontset[style] = fs = new rxvt_fontset (this);
848 rxvt_fontprop prop2 = prop; 970 rxvt_fontprop prop2 = prop;
849 971
850 if (res) 972 if (res)
851 prop2.weight = prop2.slant = rxvt_fontprop::unset; 973 prop2.weight = prop2.slant = rxvt_fontprop::unset;
852 else 974 else
853 { 975 {
854 res = TermWin.fontset[0]->fontdesc; 976 res = fontset[0]->fontdesc;
855 977
856 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 978 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
857 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 979 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
858 } 980 }
859 981
860 fs->populate (res); 982 fs->populate (res);
861 fs->set_prop (prop2); 983 fs->set_prop (prop2);
862 } 984 }
863#else 985#else
864 TermWin.fontset[style] = TermWin.fontset[0]; 986 fontset[style] = fontset[0];
865#endif 987#endif
866 } 988 }
867 989
868 if (TermWin.parent[0]) 990 if (parent[0])
869 { 991 {
870 resize_all_windows (0, 0, 0); 992 resize_all_windows (0, 0, 0);
871 scr_remap_chars (); 993 scr_remap_chars ();
872 scr_touch (true); 994 scr_touch (true);
873 } 995 }
… …
875 return true; 997 return true;
876} 998}
877 999
878void rxvt_term::set_string_property (Atom prop, const char *str, int len) 1000void rxvt_term::set_string_property (Atom prop, const char *str, int len)
879{ 1001{
880 // TODO: SMART_WINDOW_TITLE
881 XChangeProperty (display->display, TermWin.parent[0], 1002 XChangeProperty (display->display, parent[0],
882 prop, XA_STRING, 8, PropModeReplace, 1003 prop, XA_STRING, 8, PropModeReplace,
883 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 1004 (const unsigned char *)str, len >= 0 ? len : strlen (str));
884} 1005}
885 1006
886void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 1007void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
887{ 1008{
888 // TODO: SMART_WINDOW_TITLE
889 wchar_t *ws = rxvt_mbstowcs (str, len); 1009 wchar_t *ws = rxvt_mbstowcs (str, len);
890 char *s = rxvt_wcstoutf8 (ws); 1010 char *s = rxvt_wcstoutf8 (ws);
891 1011
892 XChangeProperty (display->display, TermWin.parent[0], 1012 XChangeProperty (display->display, parent[0],
893 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 1013 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
894 (const unsigned char *)s, strlen (s)); 1014 (const unsigned char *)s, strlen (s));
895 1015
896 free (s); 1016 free (s);
897 free (ws); 1017 free (ws);
… …
902/* xterm sequences - title, iconName, color (exptl) */ 1022/* xterm sequences - title, iconName, color (exptl) */
903void 1023void
904rxvt_term::set_title (const char *str) 1024rxvt_term::set_title (const char *str)
905{ 1025{
906 set_string_property (XA_WM_NAME, str); 1026 set_string_property (XA_WM_NAME, str);
907#if ENABLE_FRILLS 1027#if ENABLE_EWMH
908 set_utf8_property (xa[XA_NET_WM_NAME], str); 1028 set_utf8_property (xa[XA_NET_WM_NAME], str);
909#endif 1029#endif
910} 1030}
911 1031
912void 1032void
913rxvt_term::set_icon_name (const char *str) 1033rxvt_term::set_icon_name (const char *str)
914{ 1034{
915 set_string_property (XA_WM_ICON_NAME, str); 1035 set_string_property (XA_WM_ICON_NAME, str);
916#if ENABLE_FRILLS 1036#if ENABLE_EWMH
917 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 1037 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
918#endif 1038#endif
919} 1039}
920 1040
921#ifdef XTERM_COLOR_CHANGE 1041#ifdef XTERM_COLOR_CHANGE
… …
934 i = atoi (color); 1054 i = atoi (color);
935 1055
936 if (i >= 8 && i <= 15) 1056 if (i >= 8 && i <= 15)
937 { /* bright colors */ 1057 { /* bright colors */
938 i -= 8; 1058 i -= 8;
939# ifndef NO_BRIGHTCOLOR
940 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1059 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
941 SET_PIXCOLOR (idx); 1060 SET_PIXCOLOR (idx);
942 goto Done; 1061 goto done;
943# endif
944 } 1062 }
945 1063
946 if (i >= 0 && i <= 7) 1064 if (i >= 0 && i <= 7)
947 { /* normal colors */ 1065 { /* normal colors */
948 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1066 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
949 SET_PIXCOLOR (idx); 1067 SET_PIXCOLOR (idx);
950 goto Done; 1068 goto done;
951 } 1069 }
952 } 1070 }
953 1071
954 if (!rXParseAllocColor (&xcol, color)) 1072 if (!rXParseAllocColor (&xcol, color))
955 return; 1073 return;
… …
975 pix_colors_focused[idx] = xcol; 1093 pix_colors_focused[idx] = xcol;
976 SET_PIXCOLOR (idx); 1094 SET_PIXCOLOR (idx);
977 1095
978 /* XSetWindowAttributes attr; */ 1096 /* XSetWindowAttributes attr; */
979 /* Cursor cursor; */ 1097 /* Cursor cursor; */
980Done: 1098done:
1099
981#ifdef OFF_FOCUS_FADING 1100#if OFF_FOCUS_FADING
982 if (rs[Rs_fade]) 1101 if (rs[Rs_fade])
983 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 1102 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
984#endif 1103#endif
985 1104
986 /*TODO: handle Color_BD, scrollbar background, etc. */ 1105 /*TODO: handle Color_BD, scrollbar background, etc. */
987 1106
988 recolour_cursor (); 1107 recolour_cursor ();
… …
1059 1178
1060/* -------------------------------------------------------------------- * 1179/* -------------------------------------------------------------------- *
1061 * - WINDOW RESIZING - * 1180 * - WINDOW RESIZING - *
1062 * -------------------------------------------------------------------- */ 1181 * -------------------------------------------------------------------- */
1063void 1182void
1064rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1183rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1065{ 1184{
1066 int fix_screen; 1185 int fix_screen;
1067#ifdef SMART_RESIZE
1068 int old_width = szHint.width, old_height = szHint.height; 1186 int old_width = szHint.width, old_height = szHint.height;
1069#endif
1070 dDisp; 1187 dDisp;
1071 1188
1072 window_calc (width, height); 1189 window_calc (newwidth, newheight);
1073 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 1190 XSetWMNormalHints (disp, parent[0], &szHint);
1074 1191
1075 if (!ignoreparent) 1192 if (!ignoreparent)
1076 { 1193 {
1077#ifdef SMART_RESIZE 1194#ifdef SMART_RESIZE
1078 /* 1195 /*
… …
1082 int x, y, x1, y1; 1199 int x, y, x1, y1;
1083 int dx, dy; 1200 int dx, dy;
1084 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1201 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1085 Window unused_cr; 1202 Window unused_cr;
1086 1203
1087 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 1204 XTranslateCoordinates (disp, parent[0], display->root,
1088 0, 0, &x, &y, &unused_cr); 1205 0, 0, &x, &y, &unused_cr);
1089 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 1206 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1090 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1207 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1091 /* 1208 /*
1092 * if display->root isn't the parent window, a WM will probably have offset 1209 * if display->root isn't the parent window, a WM will probably have offset
1093 * our position for handles and decorations. Counter it 1210 * our position for handles and decorations. Counter it
1094 */ 1211 */
… …
1111 if (y < y1) /* top half */ 1228 if (y < y1) /* top half */
1112 dy = 0; 1229 dy = 0;
1113 else if (y == y1) /* exact center */ 1230 else if (y == y1) /* exact center */
1114 dy /= 2; 1231 dy /= 2;
1115 1232
1116 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 1233 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1117 szHint.width, szHint.height); 1234 szHint.width, szHint.height);
1118#else 1235#else
1119 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 1236 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1120#endif 1237#endif
1121 } 1238 }
1122 1239
1123 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1240 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1124 1241
1125 if (fix_screen || width != old_width || height != old_height) 1242 if (fix_screen || newwidth != old_width || newheight != old_height)
1126 { 1243 {
1127 if (scrollbar_visible ()) 1244 if (scrollbar_visible ())
1128 { 1245 {
1129 XMoveResizeWindow (disp, scrollBar.win, 1246 XMoveResizeWindow (disp, scrollBar.win,
1130 window_sb_x, 0, 1247 window_sb_x, 0,
… …
1133 } 1250 }
1134 1251
1135 if (menubar_visible ()) 1252 if (menubar_visible ())
1136 XMoveResizeWindow (disp, menuBar.win, 1253 XMoveResizeWindow (disp, menuBar.win,
1137 window_vt_x, 0, 1254 window_vt_x, 0,
1138 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1255 width, menuBar_TotalHeight ());
1139 1256
1140 XMoveResizeWindow (disp, TermWin.vt, 1257 XMoveResizeWindow (disp, vt,
1141 window_vt_x, window_vt_y, 1258 window_vt_x, window_vt_y,
1142 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1259 width, height);
1143 1260
1144 scr_clear (); 1261 scr_clear ();
1145#ifdef XPM_BACKGROUND 1262#ifdef XPM_BACKGROUND
1146 resize_pixmap (); 1263 resize_pixmap ();
1147#endif 1264#endif
… …
1153 int old_ncol = prev_ncol; 1270 int old_ncol = prev_ncol;
1154 1271
1155 /* scr_reset only works on the primary screen */ 1272 /* scr_reset only works on the primary screen */
1156 if (old_height) /* this is not the first time through */ 1273 if (old_height) /* this is not the first time through */
1157 { 1274 {
1158 unsigned int ncol = TermWin.ncol; 1275 unsigned int ocol = ncol;
1159 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1276 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1160 curr_screen = scr_change_screen (PRIMARY); 1277 curr_screen = scr_change_screen (PRIMARY);
1161 TermWin.ncol = ncol; 1278 ncol = ocol;
1162 } 1279 }
1163 1280
1164 scr_reset (); 1281 scr_reset ();
1165 1282
1166 if (curr_screen >= 0) /* this is not the first time through */ 1283 if (curr_screen >= 0) /* this is not the first time through */
1167 { 1284 {
1168 scr_change_screen (curr_screen); 1285 scr_change_screen (curr_screen);
1169 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1286 selection_check (old_ncol != ncol ? 4 : 0);
1170 } 1287 }
1171 } 1288 }
1172 1289
1173 old_width = szHint.width; 1290 old_width = szHint.width;
1174 old_height = szHint.height; 1291 old_height = szHint.height;
1175 1292
1176#ifdef XPM_BACKGROUND 1293#ifdef XPM_BACKGROUND
1177 if (TermWin.pixmap) 1294 if (pixmap)
1178 scr_touch (false); 1295 scr_touch (false);
1179#endif 1296#endif
1180 1297
1181#ifdef USE_XIM 1298#ifdef USE_XIM
1182 IMSetStatusPosition (); 1299 IMSetStatusPosition ();
… …
1186/* 1303/*
1187 * Set the width/height of the vt window in characters. Units are pixels. 1304 * Set the width/height of the vt window in characters. Units are pixels.
1188 * good for toggling 80/132 columns 1305 * good for toggling 80/132 columns
1189 */ 1306 */
1190void 1307void
1191rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1308rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1192{ 1309{
1193 XWindowAttributes wattr; 1310 XWindowAttributes wattr;
1194 1311
1195 if (width == 0 || height == 0) 1312 if (newwidth == 0 || newheight == 0)
1196 { 1313 {
1197 XGetWindowAttributes (display->display, display->root, &wattr); 1314 XGetWindowAttributes (display->display, display->root, &wattr);
1315
1198 if (width == 0) 1316 if (newwidth == 0)
1199 width = wattr.width - szHint.base_width; 1317 newwidth = wattr.width - szHint.base_width;
1200 if (height == 0) 1318 if (newheight == 0)
1201 height = wattr.height - szHint.base_height; 1319 newheight = wattr.height - szHint.base_height;
1202 }
1203
1204 if (width != TermWin.width || height != TermWin.height)
1205 { 1320 }
1321
1322 if (newwidth != width || newheight != height)
1323 {
1206 width += szHint.base_width; 1324 newwidth += szHint.base_width;
1207 height += szHint.base_height; 1325 newheight += szHint.base_height;
1208 resize_all_windows (width, height, 0); 1326 resize_all_windows (newwidth, newheight, 0);
1209 } 1327 }
1210} 1328}
1211 1329
1212/* -------------------------------------------------------------------- * 1330/* -------------------------------------------------------------------- *
1213 * - X INPUT METHOD ROUTINES - * 1331 * - X INPUT METHOD ROUTINES - *
… …
1223 1341
1224void 1342void
1225rxvt_term::im_set_size (XRectangle &size) 1343rxvt_term::im_set_size (XRectangle &size)
1226{ 1344{
1227 // the int_bwidth terms make no sense to me 1345 // the int_bwidth terms make no sense to me
1228 size.x = TermWin.int_bwidth; 1346 size.x = int_bwidth;
1229 size.y = TermWin.int_bwidth; 1347 size.y = int_bwidth;
1230 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1348 size.width = Width2Pixel (ncol) + int_bwidth;
1231 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1349 size.height = Height2Pixel (nrow) + int_bwidth;
1232} 1350}
1233 1351
1234void 1352void
1235rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1353rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1236 XRectangle &status_rect, 1354 XRectangle &status_rect,
1237 const XRectangle &needed_rect) 1355 const XRectangle &needed_rect)
1238{ 1356{
1239 preedit_rect.x = needed_rect.width; 1357 preedit_rect.x = needed_rect.width;
1240 preedit_rect.y = 0; 1358 preedit_rect.y = 0;
1241 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1359 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1242 preedit_rect.height = TermWin.fheight; 1360 preedit_rect.height = fheight;
1243 1361
1244 status_rect.x = 0; 1362 status_rect.x = 0;
1245 status_rect.y = 0; 1363 status_rect.y = 0;
1246 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1364 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1247 status_rect.height = TermWin.fheight; 1365 status_rect.height = fheight;
1248} 1366}
1249 1367
1250/* Checking whether input method is running. */ 1368/* Checking whether input method is running. */
1251bool 1369bool
1252rxvt_term::IMisRunning () 1370rxvt_term::IMisRunning ()
… …
1280{ 1398{
1281 XPoint nspot; 1399 XPoint nspot;
1282 XVaNestedList preedit_attr; 1400 XVaNestedList preedit_attr;
1283 1401
1284 if (!Input_Context 1402 if (!Input_Context
1285 || !TermWin.focus 1403 || !focus
1286 || !(input_style & XIMPreeditPosition)) 1404 || !(input_style & XIMPreeditPosition))
1287 return; 1405 return;
1288 1406
1289 im_set_position (nspot); 1407 im_set_position (nspot);
1290 1408
… …
1410 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1528 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1411 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1529 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1412 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1530 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1413 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1531 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1414 "*", 1532 "*",
1415 TermWin.fheight, 1533 fheight,
1416 TermWin.fheight + 1, TermWin.fheight - 1, 1534 fheight + 1, fheight - 1,
1417 TermWin.fheight - 2, TermWin.fheight + 2); 1535 fheight - 2, fheight + 2);
1418 1536
1419 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1537 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1420 &missing_charset_list, &missing_charset_count, &def_string); 1538 &missing_charset_list, &missing_charset_count, &def_string);
1421 1539
1422 if (missing_charset_list) 1540 if (missing_charset_list)
… …
1468 NULL); 1586 NULL);
1469 } 1587 }
1470 1588
1471 Input_Context = XCreateIC (xim, 1589 Input_Context = XCreateIC (xim,
1472 XNInputStyle, input_style, 1590 XNInputStyle, input_style,
1473 XNClientWindow, TermWin.vt, 1591 XNClientWindow, vt,
1474 XNFocusWindow, TermWin.parent[0], 1592 XNFocusWindow, parent[0],
1475 preedit_attr ? XNPreeditAttributes : NULL, 1593 preedit_attr ? XNPreeditAttributes : NULL,
1476 preedit_attr, 1594 preedit_attr,
1477 status_attr ? XNStatusAttributes : NULL, 1595 status_attr ? XNStatusAttributes : NULL,
1478 status_attr, NULL); 1596 status_attr, NULL);
1479 1597
… …
1496} 1614}
1497 1615
1498void 1616void
1499rxvt_term::im_cb () 1617rxvt_term::im_cb ()
1500{ 1618{
1501 int i, found, had_im; 1619 int i;
1502 const char *p; 1620 const char *p;
1503 char **s; 1621 char **s;
1504 char buf[IMBUFSIZ]; 1622 char buf[IMBUFSIZ];
1623
1624 SET_R (this);
1505 1625
1506 im_destroy (); 1626 im_destroy ();
1507 1627
1508 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1628 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1509 if (Input_Context) 1629 if (Input_Context)
… …
1561{ 1681{
1562 XRectangle preedit_rect, status_rect, *needed_rect; 1682 XRectangle preedit_rect, status_rect, *needed_rect;
1563 XVaNestedList preedit_attr, status_attr; 1683 XVaNestedList preedit_attr, status_attr;
1564 1684
1565 if (!Input_Context 1685 if (!Input_Context
1566 || !TermWin.focus 1686 || !focus
1567 || !(input_style & XIMPreeditArea) 1687 || !(input_style & XIMPreeditArea)
1568 || !IMisRunning ()) 1688 || !IMisRunning ())
1569 return; 1689 return;
1570 1690
1571 /* Getting the necessary width of preedit area */ 1691 /* Getting the necessary width of preedit area */

Diff Legend

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