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.137 by root, Tue Feb 15 16:04:45 2005 UTC vs.
Revision 1.199 by root, Tue Jan 24 19:40:12 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
49# include "keyboard.h"
50#endif
51
52vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
53 52
53// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term;
55
54static char curlocale[128]; 56static char curlocale[128], savelocale[128];
55 57
56bool 58bool
57rxvt_set_locale (const char *locale) 59rxvt_set_locale (const char *locale) NOTHROW
58{ 60{
59 if (!locale || !strncmp (locale, curlocale, 128)) 61 if (!locale || !strncmp (locale, curlocale, 128))
60 return false; 62 return false;
61 63
62 strncpy (curlocale, locale, 128); 64 strncpy (curlocale, locale, 128);
63 setlocale (LC_CTYPE, curlocale); 65 setlocale (LC_CTYPE, curlocale);
64 return true; 66 return true;
67}
68
69void
70rxvt_push_locale (const char *locale) NOTHROW
71{
72 strcpy (savelocale, curlocale);
73 rxvt_set_locale (locale);
74}
75
76void
77rxvt_pop_locale () NOTHROW
78{
79 rxvt_set_locale (savelocale);
65} 80}
66 81
67#if ENABLE_COMBINING 82#if ENABLE_COMBINING
68class rxvt_composite_vec rxvt_composite; 83class rxvt_composite_vec rxvt_composite;
69 84
… …
134 rootwin_ev (this, &rxvt_term::rootwin_cb), 149 rootwin_ev (this, &rxvt_term::rootwin_cb),
135#endif 150#endif
136#ifdef HAVE_SCROLLBARS 151#ifdef HAVE_SCROLLBARS
137 scrollbar_ev (this, &rxvt_term::x_cb), 152 scrollbar_ev (this, &rxvt_term::x_cb),
138#endif 153#endif
139#ifdef MENUBAR
140 menubar_ev (this, &rxvt_term::x_cb),
141#endif
142#ifdef CURSOR_BLINK 154#ifdef CURSOR_BLINK
143 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
144#endif 156#endif
145#ifdef TEXT_BLINK 157#ifdef TEXT_BLINK
146 text_blink_ev (this, &rxvt_term::text_blink_cb), 158 text_blink_ev (this, &rxvt_term::text_blink_cb),
… …
158 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
159#endif 171#endif
160#ifdef USE_XIM 172#ifdef USE_XIM
161 im_ev (this, &rxvt_term::im_cb), 173 im_ev (this, &rxvt_term::im_cb),
162#endif 174#endif
163 sw_term (this, &rxvt_term::sig_term), 175#ifndef NO_BELL
164 sw_int (this, &rxvt_term::sig_term), 176 bell_ev (this, &rxvt_term::bell_cb),
165 sw_chld (this, &rxvt_term::sig_chld), 177#endif
166 termwin_ev (this, &rxvt_term::x_cb), 178 termwin_ev (this, &rxvt_term::x_cb),
167 vt_ev (this, &rxvt_term::x_cb), 179 vt_ev (this, &rxvt_term::x_cb),
180 child_ev (this, &rxvt_term::child_cb),
168 check_ev (this, &rxvt_term::check_cb), 181 check_ev (this, &rxvt_term::check_cb),
169 flush_ev (this, &rxvt_term::flush_cb), 182 flush_ev (this, &rxvt_term::flush_cb),
170 destroy_ev (this, &rxvt_term::destroy_cb), 183 destroy_ev (this, &rxvt_term::destroy_cb),
171 pty_ev (this, &rxvt_term::pty_cb), 184 pty_ev (this, &rxvt_term::pty_cb),
172 incr_ev (this, &rxvt_term::incr_cb) 185 incr_ev (this, &rxvt_term::incr_cb)
… …
175 188
176 termlist.push_back (this); 189 termlist.push_back (this);
177 190
178#ifdef KEYSYM_RESOURCE 191#ifdef KEYSYM_RESOURCE
179 keyboard = new keyboard_manager; 192 keyboard = new keyboard_manager;
180
181 if (!keyboard)
182 rxvt_fatal ("out of memory, aborting.\n");
183#endif 193#endif
184} 194}
185 195
186// clean up the most important stuff, do *not* call x or free mem etc. 196// clean up the most important stuff, do *not* call x or free mem etc.
187// for use before an emergency exit 197// for use before an emergency exit
188void rxvt_term::emergency_cleanup () 198void rxvt_term::emergency_cleanup ()
189{ 199{
190 if (cmd_pid) 200 if (cmd_pid)
191 kill (-cmd_pid, SIGHUP); 201 kill (-cmd_pid, SIGHUP);
192 202
193#ifdef UTMP_SUPPORT 203 delete pty; pty = 0;
194 privileged_utmp (RESTORE);
195#endif
196
197 pty.put ();
198} 204}
199 205
200rxvt_term::~rxvt_term () 206rxvt_term::~rxvt_term ()
201{ 207{
202 termlist.erase (find (termlist.begin (), termlist.end(), this)); 208 termlist.erase (find (termlist.begin (), termlist.end(), this));
203 209
204 emergency_cleanup (); 210 emergency_cleanup ();
205 211
206#if ENABLE_STYLES 212#if ENABLE_STYLES
207 for (int i = RS_styleCount; --i; ) 213 for (int i = RS_styleCount; --i; )
208 if (TermWin.fontset[i] != TermWin.fontset[0]) 214 if (fontset[i] != fontset[0])
209 delete TermWin.fontset[i]; 215 delete fontset[i];
210#endif 216#endif
211 delete TermWin.fontset[0]; 217 delete fontset[0];
212 218
213 if (display) 219 if (display)
214 { 220 {
215 dDisp; 221 dDisp;
216 222
217 selection_clear (); 223 selection_clear ();
218 224
219#ifdef USE_XIM 225#ifdef USE_XIM
220 im_destroy (); 226 im_destroy ();
221#endif
222#ifdef MENUBAR
223 if (menubarGC) XFreeGC (disp, menubarGC);
224#endif 227#endif
225#ifdef XTERM_SCROLLBAR 228#ifdef XTERM_SCROLLBAR
226 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
227 if (ShadowGC) XFreeGC (disp, ShadowGC); 230 if (ShadowGC) XFreeGC (disp, ShadowGC);
228#endif 231#endif
… …
239 if (upArrow) XFreePixmap (disp, upArrow); 242 if (upArrow) XFreePixmap (disp, upArrow);
240 if (downArrow) XFreePixmap (disp, downArrow); 243 if (downArrow) XFreePixmap (disp, downArrow);
241 if (upArrowHi) XFreePixmap (disp, upArrowHi); 244 if (upArrowHi) XFreePixmap (disp, upArrowHi);
242 if (downArrowHi) XFreePixmap (disp, downArrowHi); 245 if (downArrowHi) XFreePixmap (disp, downArrowHi);
243#endif 246#endif
244#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 247#ifdef RXVT_SCROLLBAR
245 if (topShadowGC) XFreeGC (disp, topShadowGC); 248 if (topShadowGC) XFreeGC (disp, topShadowGC);
246 if (botShadowGC) XFreeGC (disp, botShadowGC); 249 if (botShadowGC) XFreeGC (disp, botShadowGC);
247 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 250 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
248#endif 251#endif
249 if (TermWin.gc) XFreeGC (disp, TermWin.gc); 252 if (gc) XFreeGC (disp, gc);
250 253
251#if defined(MENUBAR) && (MENUBAR_MAX > 1)
252 delete menuBar.drawable; 254 delete drawable;
253 //if (menuBar.win)
254 // XDestroyWindow (disp, menuBar.win);
255#endif
256 delete TermWin.drawable;
257 // destroy all windows 255 // destroy all windows
258 if (TermWin.parent[0] 256 if (parent[0])
259#if ENABLE_FRILLS
260 && !rs[Rs_embed]
261#endif
262 )
263 XDestroyWindow (disp, TermWin.parent[0]); 257 XDestroyWindow (disp, parent[0]);
264 } 258 }
265 259
266 // TODO: free pixcolours, colours should become part of rxvt_display 260 // TODO: free pixcolours, colours should become part of rxvt_display
267
268 delete pix_colors_focused; 261 delete pix_colors_focused;
269#ifdef OFF_FOCUS_FADING 262#if OFF_FOCUS_FADING
270 delete pix_colors_unfocused; 263 delete pix_colors_unfocused;
271#endif 264#endif
272 265
273 displays.put (display); 266 displays.put (display);
274 267
… …
294#ifdef KEYSYM_RESOURCE 287#ifdef KEYSYM_RESOURCE
295 delete keyboard; 288 delete keyboard;
296#endif 289#endif
297} 290}
298 291
292// child has exited, usually destroys
293void
294rxvt_term::child_cb (child_watcher &w, int status)
295{
296 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
297
298 cmd_pid = 0;
299
300 if (!OPTION (Opt_hold))
301 destroy ();
302}
303
299void 304void
300rxvt_term::destroy () 305rxvt_term::destroy ()
301{ 306{
302 if (destroy_ev.active) 307 if (destroy_ev.active)
303 return; 308 return;
304 309
310 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)))
311 return;
312
305#if ENABLE_OVERLAY 313#if ENABLE_OVERLAY
306 scr_overlay_off (); 314 scr_overlay_off ();
307#endif 315#endif
308 316
309 if (display) 317 if (display)
… …
311#if USE_XIM 319#if USE_XIM
312 im_ev.stop (display); 320 im_ev.stop (display);
313#endif 321#endif
314#if HAVE_SCROLLBARS 322#if HAVE_SCROLLBARS
315 scrollbar_ev.stop (display); 323 scrollbar_ev.stop (display);
316#endif
317#if MENUBAR
318 menubar_ev.stop (display);
319#endif 324#endif
320#if TRANSPARENT 325#if TRANSPARENT
321 rootwin_ev.stop (display); 326 rootwin_ev.stop (display);
322#endif 327#endif
323 incr_ev.stop (); 328 incr_ev.stop ();
… …
347} 352}
348 353
349void 354void
350rxvt_term::destroy_cb (time_watcher &w) 355rxvt_term::destroy_cb (time_watcher &w)
351{ 356{
352 SET_R (this); 357 make_current ();
353 358
354 delete this; 359 delete this;
355} 360}
356 361
357/*----------------------------------------------------------------------*/ 362/*----------------------------------------------------------------------*/
… …
422{ 427{
423 if (GET_R->allowedxerror == -1) 428 if (GET_R->allowedxerror == -1)
424 GET_R->allowedxerror = event->error_code; 429 GET_R->allowedxerror = event->error_code;
425 else 430 else
426 { 431 {
427 //TODO: GET_R is most likely not the terminal which caused the error 432 // GET_R is most likely not the terminal which caused the error,
428 //TODO: maybe just output the error and continue? 433 // so just output the error and continue
429#if ENABLE_FRILLS 434#if ENABLE_FRILLS
430 print_x_error (display, event); 435 print_x_error (display, event);
431#else 436#else
432 old_xerror_handler (display, event); 437 old_xerror_handler (display, event);
433#endif 438#endif
… …
443 DisplayString (display)); 448 DisplayString (display));
444 rxvt_emergency_cleanup (); 449 rxvt_emergency_cleanup ();
445 _exit (EXIT_FAILURE); 450 _exit (EXIT_FAILURE);
446} 451}
447 452
448/*
449 * Catch a fatal signal and tidy up before quitting
450 */
451void
452rxvt_term::sig_term (sig_watcher &w)
453{
454#ifdef DEBUG_CMD
455 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
456#endif
457 rxvt_emergency_cleanup ();
458 signal (w.signum, SIG_DFL);
459 kill (getpid (), w.signum);
460}
461
462/*----------------------------------------------------------------------*/ 453/*----------------------------------------------------------------------*/
463/* rxvt_init () */
464bool 454bool
465rxvt_term::init (int argc, const char *const *argv) 455rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
466{ 456{
457 this->envv = envv;
458
467 SET_R (this); 459 SET_R (this);
468
469 set_locale (""); 460 set_locale ("");
461 set_environ (envv); // few things in X do not call setlocale :(
470 462
471 if (!init_vars ()) 463 if (!init_vars ())
472 return false; 464 return false;
473 465
474 init_secondary (); 466 init_secondary ();
… …
477 469
478#ifdef KEYSYM_RESOURCE 470#ifdef KEYSYM_RESOURCE
479 keyboard->register_done (); 471 keyboard->register_done ();
480#endif 472#endif
481 473
482#if MENUBAR_MAX
483 menubar_read (rs[Rs_menu]);
484#endif
485#ifdef HAVE_SCROLLBARS 474#ifdef HAVE_SCROLLBARS
486 if (options & Opt_scrollBar) 475 if (OPTION (Opt_scrollBar))
487 scrollBar.setIdle (); /* set existence for size calculations */ 476 scrollBar.setIdle (); /* set existence for size calculations */
488#endif 477#endif
489 478
479 pty = ptytty::create ();
480
490 create_windows (argc, argv); 481 create_windows (argc, argv);
491 482
492 dDisp; 483 dDisp;
493 484
494 init_xlocale (); 485 init_xlocale ();
495 486
496 scr_reset (); /* initialize screen */ 487 scr_reset (); // initialize screen
497 488
498#if 0 489#if 0
499 XSynchronize (disp, True); 490 XSynchronize (disp, True);
500#endif 491#endif
501 492
502#ifdef HAVE_SCROLLBARS 493#ifdef HAVE_SCROLLBARS
503 if (options & Opt_scrollBar) 494 if (OPTION (Opt_scrollBar))
504 resize_scrollbar (); /* create and map scrollbar */ 495 resize_scrollbar (); /* create and map scrollbar */
505#endif 496#endif
506#if (MENUBAR_MAX)
507 if (menubar_visible ())
508 XMapWindow (disp, menuBar.win);
509#endif
510#ifdef TRANSPARENT 497#ifdef TRANSPARENT
511 if (options & Opt_transparent) 498 if (OPTION (Opt_transparent))
512 { 499 {
513 XSelectInput (disp, display->root, PropertyChangeMask); 500 XSelectInput (disp, display->root, PropertyChangeMask);
514 check_our_parents (); 501 check_our_parents ();
515 rootwin_ev.start (display, display->root); 502 rootwin_ev.start (display, display->root);
516 } 503 }
517#endif 504#endif
518 505
519 XMapWindow (disp, TermWin.vt);
520 XMapWindow (disp, TermWin.parent[0]);
521
522 set_colorfgbg (); 506 set_colorfgbg ();
523 507
524 init_command (cmd_argv); 508 init_command (cmd_argv);
525 509
526 free (cmd_argv); 510 free (cmd_argv);
527 511
512 if (pty->pty >= 0)
528 pty_ev.start (pty.pty, EVENT_READ); 513 pty_ev.start (pty->pty, EVENT_READ);
529 514
530 check_ev.start (); 515 check_ev.start ();
531 516
517 HOOK_INVOKE ((this, HOOK_START, DT_END));
518
519 XMapWindow (disp, vt);
520 XMapWindow (disp, parent[0]);
521
532 return true; 522 return true;
533} 523}
534 524
525static struct sig_handlers
526{
527 sig_watcher sw_term, sw_int;
528
529 /*
530 * Catch a fatal signal and tidy up before quitting
531 */
532 void
533 sig_term (sig_watcher &w)
534 {
535 rxvt_emergency_cleanup ();
536 signal (w.signum, SIG_DFL);
537 kill (getpid (), w.signum);
538 }
539
540 sig_handlers ()
541 : sw_term (this, &sig_handlers::sig_term),
542 sw_int (this, &sig_handlers::sig_term)
543 {
544 }
545} sig_handlers;
546
547char **rxvt_environ; // startup environment
548
535void 549void
536rxvt_init () 550rxvt_init ()
537{ 551{
538 /* 552 ptytty::init ();
539 * Save and then give up any super-user privileges 553
540 * If we need privileges in any area then we must specifically request it. 554 rxvt_environ = environ;
541 * We should only need to be root in these cases:
542 * 1. write utmp entries on some systems
543 * 2. chown tty on some systems
544 */
545 rxvt_privileges (SAVE);
546 rxvt_privileges (IGNORE);
547 555
548 signal (SIGHUP, SIG_IGN); 556 signal (SIGHUP, SIG_IGN);
549 signal (SIGPIPE, SIG_IGN); 557 signal (SIGPIPE, SIG_IGN);
558
559 sig_handlers.sw_term.start (SIGTERM);
560 sig_handlers.sw_int.start (SIGINT);
550 561
551 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 562 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
552 /* signal (SIGURG, SIG_DFL); */ 563 /* signal (SIGURG, SIG_DFL); */
553 564
554 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 565 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
555 // TODO: handle this with exceptions and tolerate the memory loss 566 // TODO: handle this with exceptions and tolerate the memory loss
556 XSetIOErrorHandler (rxvt_xioerror_handler); 567 XSetIOErrorHandler (rxvt_xioerror_handler);
557}
558 568
559/* ------------------------------------------------------------------------- * 569 XrmInitialize ();
560 * SIGNAL HANDLING & EXIT HANDLER *
561 * ------------------------------------------------------------------------- */
562/*
563 * Catch a SIGCHLD signal and exit if the direct child has died
564 */
565
566void
567rxvt_term::sig_chld (sig_watcher &w)
568{
569 // we are being called for every SIGCHLD, not just ours
570 int pid;
571
572 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
573 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
574 if (pid == (*t)->cmd_pid)
575 {
576 (*t)->destroy ();
577 break;
578 }
579} 570}
580 571
581/* ------------------------------------------------------------------------- * 572/* ------------------------------------------------------------------------- *
582 * MEMORY ALLOCATION WRAPPERS * 573 * MEMORY ALLOCATION WRAPPERS *
583 * ------------------------------------------------------------------------- */ 574 * ------------------------------------------------------------------------- */
… …
590 rxvt_fatal ("memory allocation failure. aborting.\n"); 581 rxvt_fatal ("memory allocation failure. aborting.\n");
591 582
592 return p; 583 return p;
593} 584}
594 585
595/* INTPROTO */ 586void *
596void *
597rxvt_calloc (size_t number, size_t size) 587rxvt_calloc (size_t number, size_t size)
598{ 588{
599 void *p = calloc (number, size); 589 void *p = calloc (number, size);
600 590
601 if (!p) 591 if (!p)
602 rxvt_fatal ("memory allocation failure. aborting.\n"); 592 rxvt_fatal ("memory allocation failure. aborting.\n");
603 593
604 return p; 594 return p;
605} 595}
606 596
607/* INTPROTO */ 597void *
608void *
609rxvt_realloc (void *ptr, size_t size) 598rxvt_realloc (void *ptr, size_t size)
610{ 599{
611 void *p = realloc (ptr, size); 600 void *p = realloc (ptr, size);
612 601
613 if (!p) 602 if (!p)
614 rxvt_fatal ("memory allocation failure. aborting.\n"); 603 rxvt_fatal ("memory allocation failure. aborting.\n");
615 604
616 return p; 605 return p;
617} 606}
618
619/* ------------------------------------------------------------------------- *
620 * PRIVILEGED OPERATIONS *
621 * ------------------------------------------------------------------------- */
622/* take care of suid/sgid super-user (root) privileges */
623void
624rxvt_privileges (rxvt_privaction action)
625{
626#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
627 static uid_t euid;
628 static gid_t egid;
629#endif
630
631#if ! defined(__CYGWIN32__)
632# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
633 /* setreuid () is the poor man's setuid (), seteuid () */
634# define seteuid(a) setreuid(-1, (a))
635# define setegid(a) setregid(-1, (a))
636# define HAVE_SETEUID
637# endif
638# ifdef HAVE_SETEUID
639 switch (action)
640 {
641 case IGNORE:
642 /*
643 * change effective uid/gid - not real uid/gid - so we can switch
644 * back to root later, as required
645 */
646 seteuid (getuid ());
647 setegid (getgid ());
648 break;
649 case SAVE:
650 euid = geteuid ();
651 egid = getegid ();
652 break;
653 case RESTORE:
654 seteuid (euid);
655 setegid (egid);
656 break;
657 }
658# else
659 switch (action)
660 {
661 case IGNORE:
662 setuid (getuid ());
663 setgid (getgid ());
664 /* FALLTHROUGH */
665 case SAVE:
666 /* FALLTHROUGH */
667 case RESTORE:
668 break;
669 }
670# endif
671#endif
672}
673
674#ifdef UTMP_SUPPORT
675void
676rxvt_term::privileged_utmp (rxvt_privaction action)
677{
678 if ((options & Opt_utmpInhibit)
679 || !pty.name || !*pty.name)
680 return;
681
682 rxvt_privileges (RESTORE);
683
684 if (action == SAVE)
685 makeutent (pty.name, rs[Rs_display_name]);
686 else
687 cleanutent ();
688
689 rxvt_privileges (IGNORE);
690}
691#endif
692 607
693/*----------------------------------------------------------------------*/ 608/*----------------------------------------------------------------------*/
694/* 609/*
695 * window size/position calculcations for XSizeHint and other storage. 610 * window size/position calculcations for XSizeHint and other storage.
696 * if width/height are non-zero then override calculated width/height 611 * if width/height are non-zero then override calculated width/height
697 */ 612 */
698void 613void
699rxvt_term::window_calc (unsigned int width, unsigned int height) 614rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
700{ 615{
701 short recalc_x, recalc_y; 616 short recalc_x, recalc_y;
702 int x, y, sb_w, mb_h, flags; 617 int x, y, sb_w, flags;
703 unsigned int w, h; 618 unsigned int w, h;
704 unsigned int max_width, max_height; 619 unsigned int max_width, max_height;
705 dDisp; 620 dDisp;
706 621
707 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
708 TermWin.ncol, TermWin.nrow, szHint.width,
709 szHint.height));
710 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 622 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
711 szHint.win_gravity = NorthWestGravity; 623 szHint.win_gravity = NorthWestGravity;
712 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 624 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
713 625
714 recalc_x = recalc_y = 0; 626 recalc_x = recalc_y = 0;
715 flags = 0; 627 flags = 0;
628
716 if (!parsed_geometry) 629 if (!parsed_geometry)
717 { 630 {
718 parsed_geometry = 1; 631 parsed_geometry = 1;
632
719 if (rs[Rs_geometry]) 633 if (rs[Rs_geometry])
720 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 634 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
721 635
722 if (flags & WidthValue) 636 if (flags & WidthValue)
723 { 637 {
724 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 638 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
725 szHint.flags |= USSize; 639 szHint.flags |= USSize;
726 } 640 }
727 641
728 if (flags & HeightValue) 642 if (flags & HeightValue)
729 { 643 {
730 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 644 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
731 szHint.flags |= USSize; 645 szHint.flags |= USSize;
732 } 646 }
733 647
734 if (flags & XValue) 648 if (flags & XValue)
735 { 649 {
736 szHint.x = x; 650 szHint.x = x;
737 szHint.flags |= USPosition; 651 szHint.flags |= USPosition;
652
738 if (flags & XNegative) 653 if (flags & XNegative)
739 { 654 {
740 recalc_x = 1; 655 recalc_x = 1;
741 szHint.win_gravity = NorthEastGravity; 656 szHint.win_gravity = NorthEastGravity;
742 } 657 }
… …
744 659
745 if (flags & YValue) 660 if (flags & YValue)
746 { 661 {
747 szHint.y = y; 662 szHint.y = y;
748 szHint.flags |= USPosition; 663 szHint.flags |= USPosition;
664
749 if (flags & YNegative) 665 if (flags & YNegative)
750 { 666 {
751 recalc_y = 1; 667 recalc_y = 1;
668
752 if (szHint.win_gravity == NorthEastGravity) 669 if (szHint.win_gravity == NorthEastGravity)
753 szHint.win_gravity = SouthEastGravity; 670 szHint.win_gravity = SouthEastGravity;
754 else 671 else
755 szHint.win_gravity = SouthWestGravity; 672 szHint.win_gravity = SouthWestGravity;
756 } 673 }
757 } 674 }
758 } 675 }
759 676
760 /* TODO: BOUNDS */ 677 /* TODO: BOUNDS */
761 TermWin.width = TermWin.ncol * TermWin.fwidth; 678 width = ncol * fwidth;
762 TermWin.height = TermWin.nrow * TermWin.fheight; 679 height = nrow * fheight;
763 max_width = MAX_COLS * TermWin.fwidth; 680 max_width = MAX_COLS * fwidth;
764 max_height = MAX_ROWS * TermWin.fheight; 681 max_height = MAX_ROWS * fheight;
765 682
766 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 683 szHint.base_width = szHint.base_height = 2 * int_bwidth;
767 684
768 sb_w = mb_h = 0; 685 sb_w = 0;
769 window_vt_x = window_vt_y = TermWin.int_bwidth; 686 window_vt_x = window_vt_y = int_bwidth;
770 687
771 if (scrollbar_visible ()) 688 if (scrollBar.state)
772 { 689 {
773 sb_w = scrollbar_TotalWidth (); 690 sb_w = scrollbar_TotalWidth ();
774 szHint.base_width += sb_w; 691 szHint.base_width += sb_w;
775 if (!(options & Opt_scrollBar_right)) 692 if (!OPTION (Opt_scrollBar_right))
776 window_vt_x += sb_w; 693 window_vt_x += sb_w;
777 } 694 }
778 695
779 if (menubar_visible ())
780 {
781 mb_h = menuBar_TotalHeight ();
782 szHint.base_height += mb_h;
783 window_vt_y += mb_h;
784 }
785
786 szHint.width_inc = TermWin.fwidth; 696 szHint.width_inc = fwidth;
787 szHint.height_inc = TermWin.fheight; 697 szHint.height_inc = fheight;
788 szHint.min_width = szHint.base_width + szHint.width_inc; 698 szHint.min_width = szHint.base_width + szHint.width_inc;
789 szHint.min_height = szHint.base_height + szHint.height_inc; 699 szHint.min_height = szHint.base_height + szHint.height_inc;
790 700
791 if (width && width - szHint.base_width < max_width) 701 if (newwidth && newwidth - szHint.base_width < max_width)
792 { 702 {
793 szHint.width = width; 703 szHint.width = newwidth;
794 TermWin.width = width - szHint.base_width; 704 width = newwidth - szHint.base_width;
795 } 705 }
796 else 706 else
797 { 707 {
798 MIN_IT (TermWin.width, max_width); 708 min_it (width, max_width);
799 szHint.width = szHint.base_width + TermWin.width; 709 szHint.width = szHint.base_width + width;
800 } 710 }
801 711
802 if (height && height - szHint.base_height < max_height) 712 if (newheight && newheight - szHint.base_height < max_height)
803 { 713 {
804 szHint.height = height; 714 szHint.height = newheight;
805 TermWin.height = height - szHint.base_height; 715 height = newheight - szHint.base_height;
806 } 716 }
807 else 717 else
808 { 718 {
809 MIN_IT (TermWin.height, max_height); 719 min_it (height, max_height);
810 szHint.height = szHint.base_height + TermWin.height; 720 szHint.height = szHint.base_height + height;
811 } 721 }
812 722
813 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 723 if (scrollBar.state && OPTION (Opt_scrollBar_right))
814 window_sb_x = szHint.width - sb_w; 724 window_sb_x = szHint.width - sb_w;
815 725
816 if (recalc_x) 726 if (recalc_x)
817 szHint.x += (DisplayWidth (disp, display->screen) 727 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
818 - szHint.width - 2 * TermWin.ext_bwidth);
819 if (recalc_y) 728 if (recalc_y)
820 szHint.y += (DisplayHeight (disp, display->screen) 729 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
821 - szHint.height - 2 * TermWin.ext_bwidth);
822 730
823 TermWin.ncol = TermWin.width / TermWin.fwidth; 731 ncol = width / fwidth;
824 TermWin.nrow = TermWin.height / TermWin.fheight; 732 nrow = height / fheight;
825 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
826 TermWin.ncol, TermWin.nrow, szHint.width,
827 szHint.height));
828 return;
829} 733}
830 734
831/*----------------------------------------------------------------------*/ 735/*----------------------------------------------------------------------*/
832/* 736/*
833 * Tell the teletype handler what size the window is. 737 * Tell the teletype handler what size the window is.
834 * Called after a window size change. 738 * Called after a window size change.
835 */ 739 */
836void 740void
837rxvt_term::tt_winch () 741rxvt_term::tt_winch ()
838{ 742{
839 if (pty.pty < 0) 743 if (pty->pty < 0)
840 return; 744 return;
841 745
842 struct winsize ws; 746 struct winsize ws;
843 747
844 ws.ws_col = TermWin.ncol; 748 ws.ws_col = ncol;
845 ws.ws_row = TermWin.nrow; 749 ws.ws_row = nrow;
846 ws.ws_xpixel = TermWin.width; 750 ws.ws_xpixel = width;
847 ws.ws_ypixel = TermWin.height; 751 ws.ws_ypixel = height;
848 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 752 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
849 753
850#if 0 754#if 0
851 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 755 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
852 if (cmd_pid) /* force through to the command */ 756 if (cmd_pid) /* force through to the command */
853 kill (cmd_pid, SIGWINCH); 757 kill (-cmd_pid, SIGWINCH);
854#endif 758#endif
855} 759}
856 760
857/*----------------------------------------------------------------------*/ 761/*----------------------------------------------------------------------*/
858/* set_fonts () - load and set the various fonts 762/* set_fonts () - load and set the various fonts
859/* 763 *
860 * init = 1 - initialize 764 * init = 1 - initialize
861 * 765 *
862 * fontname == FONT_UP - switch to bigger font 766 * fontname == FONT_UP - switch to bigger font
863 * fontname == FONT_DN - switch to smaller font 767 * fontname == FONT_DN - switch to smaller font
864 */ 768 */
… …
876 return false; 780 return false;
877 } 781 }
878 782
879#if ENABLE_STYLES 783#if ENABLE_STYLES
880 for (int i = RS_styleCount; --i; ) 784 for (int i = RS_styleCount; --i; )
881 if (TermWin.fontset[i] != TermWin.fontset[0]) 785 if (fontset[i] != fontset[0])
882 delete TermWin.fontset[i]; 786 delete fontset[i];
883#endif 787#endif
884 788
885 delete TermWin.fontset[0]; 789 delete fontset[0];
886 TermWin.fontset[0] = fs; 790 fontset[0] = fs;
887 791
888 prop = (*fs)[1]->properties (); 792 prop = (*fs)[1]->properties ();
889 prop.height += TermWin.lineSpace; 793 prop.height += lineSpace;
890 fs->set_prop (prop); 794 fs->set_prop (prop);
891 795
892 TermWin.fwidth = prop.width; 796 fwidth = prop.width;
893 TermWin.fheight = prop.height; 797 fheight = prop.height;
894 TermWin.fweight = prop.weight; 798 fbase = prop.ascent;
895 TermWin.fslant = prop.slant;
896 TermWin.fbase = (*fs)[1]->ascent;
897 799
898 for (int style = 1; style < 4; style++) 800 for (int style = 1; style < 4; style++)
899 { 801 {
900#if ENABLE_STYLES 802#if ENABLE_STYLES
901 const char *res = rs[Rs_font + style]; 803 const char *res = rs[Rs_font + style];
902 804
903 if (res && !*res) 805 if (res && !*res)
904 TermWin.fontset[style] = TermWin.fontset[0]; 806 fontset[style] = fontset[0];
905 else 807 else
906 { 808 {
907 TermWin.fontset[style] = fs = new rxvt_fontset (this); 809 fontset[style] = fs = new rxvt_fontset (this);
908 rxvt_fontprop prop2 = prop; 810 rxvt_fontprop prop2 = prop;
909 811
910 if (res) 812 if (res)
911 prop2.weight = prop2.slant = rxvt_fontprop::unset; 813 prop2.weight = prop2.slant = rxvt_fontprop::unset;
912 else 814 else
913 { 815 {
914 res = TermWin.fontset[0]->fontdesc; 816 res = fontset[0]->fontdesc;
915 817
916 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 818 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
917 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 819 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
918 } 820 }
919 821
920 fs->populate (res); 822 fs->populate (res);
921 fs->set_prop (prop2); 823 fs->set_prop (prop2);
922 } 824 }
923#else 825#else
924 TermWin.fontset[style] = TermWin.fontset[0]; 826 fontset[style] = fontset[0];
925#endif 827#endif
926 } 828 }
927 829
928 if (TermWin.parent[0]) 830 if (parent[0])
929 { 831 {
930 resize_all_windows (0, 0, 0); 832 resize_all_windows (0, 0, 0);
931 scr_remap_chars (); 833 scr_remap_chars ();
932 scr_touch (true); 834 scr_touch (true);
933 } 835 }
… …
935 return true; 837 return true;
936} 838}
937 839
938void rxvt_term::set_string_property (Atom prop, const char *str, int len) 840void rxvt_term::set_string_property (Atom prop, const char *str, int len)
939{ 841{
940 // TODO: SMART_WINDOW_TITLE
941 XChangeProperty (display->display, TermWin.parent[0], 842 XChangeProperty (display->display, parent[0],
942 prop, XA_STRING, 8, PropModeReplace, 843 prop, XA_STRING, 8, PropModeReplace,
943 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 844 (const unsigned char *)str, len >= 0 ? len : strlen (str));
944} 845}
945 846
946void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 847void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
947{ 848{
948 // TODO: SMART_WINDOW_TITLE
949 wchar_t *ws = rxvt_mbstowcs (str, len); 849 wchar_t *ws = rxvt_mbstowcs (str, len);
950 char *s = rxvt_wcstoutf8 (ws); 850 char *s = rxvt_wcstoutf8 (ws);
951 851
952 XChangeProperty (display->display, TermWin.parent[0], 852 XChangeProperty (display->display, parent[0],
953 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 853 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
954 (const unsigned char *)s, strlen (s)); 854 (const unsigned char *)s, strlen (s));
955 855
956 free (s); 856 free (s);
957 free (ws); 857 free (ws);
… …
962/* xterm sequences - title, iconName, color (exptl) */ 862/* xterm sequences - title, iconName, color (exptl) */
963void 863void
964rxvt_term::set_title (const char *str) 864rxvt_term::set_title (const char *str)
965{ 865{
966 set_string_property (XA_WM_NAME, str); 866 set_string_property (XA_WM_NAME, str);
967#if ENABLE_FRILLS 867#if ENABLE_EWMH
968 set_utf8_property (xa[XA_NET_WM_NAME], str); 868 set_utf8_property (xa[XA_NET_WM_NAME], str);
969#endif 869#endif
970} 870}
971 871
972void 872void
973rxvt_term::set_icon_name (const char *str) 873rxvt_term::set_icon_name (const char *str)
974{ 874{
975 set_string_property (XA_WM_ICON_NAME, str); 875 set_string_property (XA_WM_ICON_NAME, str);
976#if ENABLE_FRILLS 876#if ENABLE_EWMH
977 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 877 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
978#endif 878#endif
979} 879}
980 880
981#ifdef XTERM_COLOR_CHANGE 881#ifdef XTERM_COLOR_CHANGE
… …
994 i = atoi (color); 894 i = atoi (color);
995 895
996 if (i >= 8 && i <= 15) 896 if (i >= 8 && i <= 15)
997 { /* bright colors */ 897 { /* bright colors */
998 i -= 8; 898 i -= 8;
999# ifndef NO_BRIGHTCOLOR
1000 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 899 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1001 SET_PIXCOLOR (idx); 900 SET_PIXCOLOR (idx);
1002 goto Done; 901 goto done;
1003# endif
1004 } 902 }
1005 903
1006 if (i >= 0 && i <= 7) 904 if (i >= 0 && i <= 7)
1007 { /* normal colors */ 905 { /* normal colors */
1008 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 906 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1009 SET_PIXCOLOR (idx); 907 SET_PIXCOLOR (idx);
1010 goto Done; 908 goto done;
1011 } 909 }
1012 } 910 }
1013 911
1014 if (!rXParseAllocColor (&xcol, color)) 912 if (!rXParseAllocColor (&xcol, color))
1015 return; 913 return;
… …
1035 pix_colors_focused[idx] = xcol; 933 pix_colors_focused[idx] = xcol;
1036 SET_PIXCOLOR (idx); 934 SET_PIXCOLOR (idx);
1037 935
1038 /* XSetWindowAttributes attr; */ 936 /* XSetWindowAttributes attr; */
1039 /* Cursor cursor; */ 937 /* Cursor cursor; */
1040Done: 938done:
939
1041#ifdef OFF_FOCUS_FADING 940#if OFF_FOCUS_FADING
1042 if (rs[Rs_fade]) 941 if (rs[Rs_fade])
1043 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 942 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1044#endif 943#endif
1045 944
1046 /*TODO: handle Color_BD, scrollbar background, etc. */ 945 /*TODO: handle Color_BD, scrollbar background, etc. */
1047 946
1048 recolour_cursor (); 947 recolour_cursor ();
… …
1119 1018
1120/* -------------------------------------------------------------------- * 1019/* -------------------------------------------------------------------- *
1121 * - WINDOW RESIZING - * 1020 * - WINDOW RESIZING - *
1122 * -------------------------------------------------------------------- */ 1021 * -------------------------------------------------------------------- */
1123void 1022void
1124rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1023rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1125{ 1024{
1126 int fix_screen; 1025 int fix_screen;
1127#ifdef SMART_RESIZE 1026 int old_width = szHint.width;
1128 int old_width = szHint.width, old_height = szHint.height; 1027 int old_height = szHint.height;
1129#endif
1130 dDisp; 1028 dDisp;
1131 1029
1132 window_calc (width, height); 1030 window_calc (newwidth, newheight);
1133 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 1031 XSetWMNormalHints (disp, parent[0], &szHint);
1134 1032
1135 if (!ignoreparent) 1033 if (!ignoreparent)
1136 { 1034 {
1137#ifdef SMART_RESIZE 1035#ifdef SMART_RESIZE
1138 /* 1036 /*
… …
1142 int x, y, x1, y1; 1040 int x, y, x1, y1;
1143 int dx, dy; 1041 int dx, dy;
1144 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1042 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1145 Window unused_cr; 1043 Window unused_cr;
1146 1044
1147 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 1045 XTranslateCoordinates (disp, parent[0], display->root,
1148 0, 0, &x, &y, &unused_cr); 1046 0, 0, &x, &y, &unused_cr);
1149 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 1047 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1150 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1048 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1151 /* 1049 /*
1152 * if display->root isn't the parent window, a WM will probably have offset 1050 * if display->root isn't the parent window, a WM will probably have offset
1153 * our position for handles and decorations. Counter it 1051 * our position for handles and decorations. Counter it
1154 */ 1052 */
… …
1156 { 1054 {
1157 x -= x1; 1055 x -= x1;
1158 y -= y1; 1056 y -= y1;
1159 } 1057 }
1160 1058
1161 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1059 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;
1162 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1060 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1163 dx = old_width - szHint.width; 1061 dx = old_width - szHint.width;
1164 dy = old_height - szHint.height; 1062 dy = old_height - szHint.height;
1165 1063
1166 /* Check position of the center of the window */ 1064 /* Check position of the center of the window */
1167 if (x < x1) /* left half */ 1065 if (x < x1) /* left half */
1168 dx = 0; 1066 dx = 0;
… …
1171 if (y < y1) /* top half */ 1069 if (y < y1) /* top half */
1172 dy = 0; 1070 dy = 0;
1173 else if (y == y1) /* exact center */ 1071 else if (y == y1) /* exact center */
1174 dy /= 2; 1072 dy /= 2;
1175 1073
1176 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 1074 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1177 szHint.width, szHint.height); 1075 szHint.width, szHint.height);
1178#else 1076#else
1179 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 1077 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1180#endif 1078#endif
1181 } 1079 }
1182 1080
1183 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1081 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1184 1082
1185 if (fix_screen || width != old_width || height != old_height) 1083 if (fix_screen || newwidth != old_width || newheight != old_height)
1186 { 1084 {
1187 if (scrollbar_visible ()) 1085 if (scrollBar.state)
1188 { 1086 {
1189 XMoveResizeWindow (disp, scrollBar.win, 1087 XMoveResizeWindow (disp, scrollBar.win,
1190 window_sb_x, 0, 1088 window_sb_x, 0,
1191 scrollbar_TotalWidth (), szHint.height); 1089 scrollbar_TotalWidth (), szHint.height);
1192 resize_scrollbar (); 1090 resize_scrollbar ();
1193 } 1091 }
1194 1092
1195 if (menubar_visible ())
1196 XMoveResizeWindow (disp, menuBar.win,
1197 window_vt_x, 0,
1198 TermWin_TotalWidth (), menuBar_TotalHeight ());
1199
1200 XMoveResizeWindow (disp, TermWin.vt, 1093 XMoveResizeWindow (disp, vt,
1201 window_vt_x, window_vt_y, 1094 window_vt_x, window_vt_y,
1202 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1095 width, height);
1203 1096
1204 scr_clear (); 1097 scr_clear ();
1205#ifdef XPM_BACKGROUND 1098#ifdef XPM_BACKGROUND
1206 resize_pixmap (); 1099 resize_pixmap ();
1207#endif 1100#endif
1208 } 1101 }
1209 1102
1210 if (fix_screen || old_height == 0) 1103 if (fix_screen || old_height == 0)
1211 {
1212 int curr_screen = -1;
1213 int old_ncol = prev_ncol;
1214
1215 /* scr_reset only works on the primary screen */
1216 if (old_height) /* this is not the first time through */
1217 {
1218 unsigned int ncol = TermWin.ncol;
1219 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1220 curr_screen = scr_change_screen (PRIMARY);
1221 TermWin.ncol = ncol;
1222 }
1223
1224 scr_reset (); 1104 scr_reset ();
1225
1226 if (curr_screen >= 0) /* this is not the first time through */
1227 {
1228 scr_change_screen (curr_screen);
1229 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
1230 }
1231 }
1232
1233 old_width = szHint.width;
1234 old_height = szHint.height;
1235 1105
1236#ifdef XPM_BACKGROUND 1106#ifdef XPM_BACKGROUND
1237 if (TermWin.pixmap) 1107 if (pixmap)
1238 scr_touch (false); 1108 scr_touch (false);
1239#endif 1109#endif
1240 1110
1241#ifdef USE_XIM 1111#ifdef USE_XIM
1242 IMSetStatusPosition (); 1112 IMSetStatusPosition ();
… …
1246/* 1116/*
1247 * Set the width/height of the vt window in characters. Units are pixels. 1117 * Set the width/height of the vt window in characters. Units are pixels.
1248 * good for toggling 80/132 columns 1118 * good for toggling 80/132 columns
1249 */ 1119 */
1250void 1120void
1251rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1121rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1252{ 1122{
1253 XWindowAttributes wattr; 1123 XWindowAttributes wattr;
1254 1124
1255 if (width == 0 || height == 0) 1125 if (newwidth == 0 || newheight == 0)
1256 { 1126 {
1257 XGetWindowAttributes (display->display, display->root, &wattr); 1127 XGetWindowAttributes (display->display, display->root, &wattr);
1128
1258 if (width == 0) 1129 if (newwidth == 0)
1259 width = wattr.width - szHint.base_width; 1130 newwidth = wattr.width - szHint.base_width;
1260 if (height == 0) 1131 if (newheight == 0)
1261 height = wattr.height - szHint.base_height; 1132 newheight = wattr.height - szHint.base_height;
1262 }
1263
1264 if (width != TermWin.width || height != TermWin.height)
1265 { 1133 }
1134
1135 if (newwidth != width || newheight != height)
1136 {
1266 width += szHint.base_width; 1137 newwidth += szHint.base_width;
1267 height += szHint.base_height; 1138 newheight += szHint.base_height;
1268 resize_all_windows (width, height, 0); 1139 resize_all_windows (newwidth, newheight, 0);
1269 } 1140 }
1270} 1141}
1271 1142
1272/* -------------------------------------------------------------------- * 1143/* -------------------------------------------------------------------- *
1273 * - X INPUT METHOD ROUTINES - * 1144 * - X INPUT METHOD ROUTINES - *
… …
1283 1154
1284void 1155void
1285rxvt_term::im_set_size (XRectangle &size) 1156rxvt_term::im_set_size (XRectangle &size)
1286{ 1157{
1287 // the int_bwidth terms make no sense to me 1158 // the int_bwidth terms make no sense to me
1288 size.x = TermWin.int_bwidth; 1159 size.x = int_bwidth;
1289 size.y = TermWin.int_bwidth; 1160 size.y = int_bwidth;
1290 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1161 size.width = Width2Pixel (ncol) + int_bwidth;
1291 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1162 size.height = Height2Pixel (nrow) + int_bwidth;
1292} 1163}
1293 1164
1294void 1165void
1295rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1166rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1296 XRectangle &status_rect, 1167 XRectangle &status_rect,
1297 const XRectangle &needed_rect) 1168 const XRectangle &needed_rect)
1298{ 1169{
1299 preedit_rect.x = needed_rect.width; 1170 preedit_rect.x = needed_rect.width;
1300 preedit_rect.y = 0; 1171 preedit_rect.y = 0;
1301 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1172 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1302 preedit_rect.height = TermWin.fheight; 1173 preedit_rect.height = fheight;
1303 1174
1304 status_rect.x = 0; 1175 status_rect.x = 0;
1305 status_rect.y = 0; 1176 status_rect.y = 0;
1306 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1177 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1307 status_rect.height = TermWin.fheight; 1178 status_rect.height = fheight;
1308} 1179}
1309 1180
1310/* Checking whether input method is running. */ 1181/* Checking whether input method is running. */
1311bool 1182bool
1312rxvt_term::IMisRunning () 1183rxvt_term::IMisRunning ()
… …
1340{ 1211{
1341 XPoint nspot; 1212 XPoint nspot;
1342 XVaNestedList preedit_attr; 1213 XVaNestedList preedit_attr;
1343 1214
1344 if (!Input_Context 1215 if (!Input_Context
1345 || !TermWin.focus 1216 || !focus
1346 || !(input_style & XIMPreeditPosition)) 1217 || !(input_style & XIMPreeditPosition))
1347 return; 1218 return;
1348 1219
1349 im_set_position (nspot); 1220 im_set_position (nspot);
1350 1221
… …
1387 unsigned long fg, bg; 1258 unsigned long fg, bg;
1388 const char *p; 1259 const char *p;
1389 char **s; 1260 char **s;
1390 XIMStyles *xim_styles; 1261 XIMStyles *xim_styles;
1391 1262
1263 set_environ (envv);
1264
1392 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1265 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1393 return false; 1266 return false;
1394 1267
1395 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1396 input_method = display->get_xim (locale, modifiers); 1268 input_method = display->get_xim (locale, modifiers);
1397 if (input_method == NULL) 1269 if (input_method == NULL)
1398 return false; 1270 return false;
1399 1271
1400 xim = input_method->xim; 1272 xim = input_method->xim;
… …
1470 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1342 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1471 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1343 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1472 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1344 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1473 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1345 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1474 "*", 1346 "*",
1475 TermWin.fheight, 1347 fheight,
1476 TermWin.fheight + 1, TermWin.fheight - 1, 1348 fheight + 1, fheight - 1,
1477 TermWin.fheight - 2, TermWin.fheight + 2); 1349 fheight - 2, fheight + 2);
1478 1350
1479 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1351 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1480 &missing_charset_list, &missing_charset_count, &def_string); 1352 &missing_charset_list, &missing_charset_count, &def_string);
1481 1353
1482 if (missing_charset_list) 1354 if (missing_charset_list)
… …
1528 NULL); 1400 NULL);
1529 } 1401 }
1530 1402
1531 Input_Context = XCreateIC (xim, 1403 Input_Context = XCreateIC (xim,
1532 XNInputStyle, input_style, 1404 XNInputStyle, input_style,
1533 XNClientWindow, TermWin.vt, 1405 XNClientWindow, vt,
1534 XNFocusWindow, TermWin.parent[0], 1406 XNFocusWindow, parent[0],
1535 preedit_attr ? XNPreeditAttributes : NULL, 1407 preedit_attr ? XNPreeditAttributes : NULL,
1536 preedit_attr, 1408 preedit_attr,
1537 status_attr ? XNStatusAttributes : NULL, 1409 status_attr ? XNStatusAttributes : NULL,
1538 status_attr, NULL); 1410 status_attr, NULL);
1539 1411
… …
1546 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1418 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1547 im_destroy (); 1419 im_destroy ();
1548 return false; 1420 return false;
1549 } 1421 }
1550 1422
1423 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1424 vt_select_input ();
1425
1551 if (input_style & XIMPreeditArea) 1426 if (input_style & XIMPreeditArea)
1552 IMSetStatusPosition (); 1427 IMSetStatusPosition ();
1553 1428
1554 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1555 return true; 1429 return true;
1556} 1430}
1557 1431
1558void 1432void
1559rxvt_term::im_cb () 1433rxvt_term::im_cb ()
1560{ 1434{
1561 int i, found, had_im; 1435 int i;
1562 const char *p; 1436 const char *p;
1563 char **s; 1437 char **s;
1564 char buf[IMBUFSIZ]; 1438 char buf[IMBUFSIZ];
1565 1439
1566 SET_R (this); 1440 make_current ();
1567 1441
1568 im_destroy (); 1442 im_destroy ();
1569 1443
1570 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1571 if (Input_Context) 1444 if (Input_Context)
1572 return; 1445 return;
1573 1446
1574#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1447#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1575 if (rs[Rs_imLocale]) 1448 if (rs[Rs_imLocale])
… …
1623{ 1496{
1624 XRectangle preedit_rect, status_rect, *needed_rect; 1497 XRectangle preedit_rect, status_rect, *needed_rect;
1625 XVaNestedList preedit_attr, status_attr; 1498 XVaNestedList preedit_attr, status_attr;
1626 1499
1627 if (!Input_Context 1500 if (!Input_Context
1628 || !TermWin.focus 1501 || !focus
1629 || !(input_style & XIMPreeditArea) 1502 || !(input_style & XIMPreeditArea)
1630 || !IMisRunning ()) 1503 || !IMisRunning ())
1631 return; 1504 return;
1632 1505
1633 /* Getting the necessary width of preedit area */ 1506 /* Getting the necessary width of preedit area */
… …
1648 XFree (preedit_attr); 1521 XFree (preedit_attr);
1649 XFree (status_attr); 1522 XFree (status_attr);
1650} 1523}
1651#endif /* USE_XIM */ 1524#endif /* USE_XIM */
1652 1525
1653/*----------------------------------------------------------------------*/
1654rxvt_t rxvt_current_term;
1655
1656/*----------------------- end-of-file (C source) -----------------------*/ 1526/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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