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.202 by root, Wed Jan 25 01:08:38 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 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
311
305#if ENABLE_OVERLAY 312#if ENABLE_OVERLAY
306 scr_overlay_off (); 313 scr_overlay_off ();
307#endif 314#endif
308 315
309 if (display) 316 if (display)
… …
311#if USE_XIM 318#if USE_XIM
312 im_ev.stop (display); 319 im_ev.stop (display);
313#endif 320#endif
314#if HAVE_SCROLLBARS 321#if HAVE_SCROLLBARS
315 scrollbar_ev.stop (display); 322 scrollbar_ev.stop (display);
316#endif
317#if MENUBAR
318 menubar_ev.stop (display);
319#endif 323#endif
320#if TRANSPARENT 324#if TRANSPARENT
321 rootwin_ev.stop (display); 325 rootwin_ev.stop (display);
322#endif 326#endif
323 incr_ev.stop (); 327 incr_ev.stop ();
… …
347} 351}
348 352
349void 353void
350rxvt_term::destroy_cb (time_watcher &w) 354rxvt_term::destroy_cb (time_watcher &w)
351{ 355{
352 SET_R (this); 356 make_current ();
353 357
354 delete this; 358 delete this;
355} 359}
356 360
357/*----------------------------------------------------------------------*/ 361/*----------------------------------------------------------------------*/
… …
422{ 426{
423 if (GET_R->allowedxerror == -1) 427 if (GET_R->allowedxerror == -1)
424 GET_R->allowedxerror = event->error_code; 428 GET_R->allowedxerror = event->error_code;
425 else 429 else
426 { 430 {
427 //TODO: GET_R is most likely not the terminal which caused the error 431 // GET_R is most likely not the terminal which caused the error,
428 //TODO: maybe just output the error and continue? 432 // so just output the error and continue
429#if ENABLE_FRILLS 433#if ENABLE_FRILLS
430 print_x_error (display, event); 434 print_x_error (display, event);
431#else 435#else
432 old_xerror_handler (display, event); 436 old_xerror_handler (display, event);
433#endif 437#endif
… …
443 DisplayString (display)); 447 DisplayString (display));
444 rxvt_emergency_cleanup (); 448 rxvt_emergency_cleanup ();
445 _exit (EXIT_FAILURE); 449 _exit (EXIT_FAILURE);
446} 450}
447 451
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/*----------------------------------------------------------------------*/ 452/*----------------------------------------------------------------------*/
463/* rxvt_init () */
464bool 453bool
465rxvt_term::init (int argc, const char *const *argv) 454rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
466{ 455{
456 this->envv = envv;
457
467 SET_R (this); 458 SET_R (this);
468
469 set_locale (""); 459 set_locale ("");
460 set_environ (envv); // few things in X do not call setlocale :(
470 461
471 if (!init_vars ()) 462 if (!init_vars ())
472 return false; 463 return false;
473 464
474 init_secondary (); 465 init_secondary ();
… …
477 468
478#ifdef KEYSYM_RESOURCE 469#ifdef KEYSYM_RESOURCE
479 keyboard->register_done (); 470 keyboard->register_done ();
480#endif 471#endif
481 472
482#if MENUBAR_MAX
483 menubar_read (rs[Rs_menu]);
484#endif
485#ifdef HAVE_SCROLLBARS 473#ifdef HAVE_SCROLLBARS
486 if (options & Opt_scrollBar) 474 if (OPTION (Opt_scrollBar))
487 scrollBar.setIdle (); /* set existence for size calculations */ 475 scrollBar.setIdle (); /* set existence for size calculations */
488#endif 476#endif
489 477
478 pty = ptytty::create ();
479
490 create_windows (argc, argv); 480 create_windows (argc, argv);
491 481
492 dDisp; 482 dDisp;
493 483
494 init_xlocale (); 484 init_xlocale ();
495 485
496 scr_reset (); /* initialize screen */ 486 scr_reset (); // initialize screen
497 487
498#if 0 488#if 0
499 XSynchronize (disp, True); 489 XSynchronize (disp, True);
500#endif 490#endif
501 491
502#ifdef HAVE_SCROLLBARS 492#ifdef HAVE_SCROLLBARS
503 if (options & Opt_scrollBar) 493 if (OPTION (Opt_scrollBar))
504 resize_scrollbar (); /* create and map scrollbar */ 494 resize_scrollbar (); /* create and map scrollbar */
505#endif 495#endif
506#if (MENUBAR_MAX)
507 if (menubar_visible ())
508 XMapWindow (disp, menuBar.win);
509#endif
510#ifdef TRANSPARENT 496#ifdef TRANSPARENT
511 if (options & Opt_transparent) 497 if (OPTION (Opt_transparent))
512 { 498 {
513 XSelectInput (disp, display->root, PropertyChangeMask); 499 XSelectInput (disp, display->root, PropertyChangeMask);
514 check_our_parents (); 500 check_our_parents ();
515 rootwin_ev.start (display, display->root); 501 rootwin_ev.start (display, display->root);
516 } 502 }
517#endif 503#endif
518 504
519 XMapWindow (disp, TermWin.vt);
520 XMapWindow (disp, TermWin.parent[0]);
521
522 set_colorfgbg (); 505 set_colorfgbg ();
523 506
524 init_command (cmd_argv); 507 init_command (cmd_argv);
525 508
526 free (cmd_argv); 509 free (cmd_argv);
527 510
511 if (pty->pty >= 0)
528 pty_ev.start (pty.pty, EVENT_READ); 512 pty_ev.start (pty->pty, EVENT_READ);
529 513
530 check_ev.start (); 514 check_ev.start ();
531 515
516 HOOK_INVOKE ((this, HOOK_START, DT_END));
517
518 XMapWindow (disp, vt);
519 XMapWindow (disp, parent[0]);
520
532 return true; 521 return true;
533} 522}
534 523
524static struct sig_handlers
525{
526 sig_watcher sw_term, sw_int;
527
528 /*
529 * Catch a fatal signal and tidy up before quitting
530 */
531 void
532 sig_term (sig_watcher &w)
533 {
534 rxvt_emergency_cleanup ();
535 signal (w.signum, SIG_DFL);
536 kill (getpid (), w.signum);
537 }
538
539 sig_handlers ()
540 : sw_term (this, &sig_handlers::sig_term),
541 sw_int (this, &sig_handlers::sig_term)
542 {
543 }
544} sig_handlers;
545
546char **rxvt_environ; // startup environment
547
535void 548void
536rxvt_init () 549rxvt_init ()
537{ 550{
538 /* 551 ptytty::init ();
539 * Save and then give up any super-user privileges 552
540 * If we need privileges in any area then we must specifically request it. 553 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 554
548 signal (SIGHUP, SIG_IGN); 555 signal (SIGHUP, SIG_IGN);
549 signal (SIGPIPE, SIG_IGN); 556 signal (SIGPIPE, SIG_IGN);
557
558 sig_handlers.sw_term.start (SIGTERM);
559 sig_handlers.sw_int.start (SIGINT);
550 560
551 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 561 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
552 /* signal (SIGURG, SIG_DFL); */ 562 /* signal (SIGURG, SIG_DFL); */
553 563
554 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 564 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
555 // TODO: handle this with exceptions and tolerate the memory loss 565 // TODO: handle this with exceptions and tolerate the memory loss
556 XSetIOErrorHandler (rxvt_xioerror_handler); 566 XSetIOErrorHandler (rxvt_xioerror_handler);
557}
558 567
559/* ------------------------------------------------------------------------- * 568 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} 569}
580 570
581/* ------------------------------------------------------------------------- * 571/* ------------------------------------------------------------------------- *
582 * MEMORY ALLOCATION WRAPPERS * 572 * MEMORY ALLOCATION WRAPPERS *
583 * ------------------------------------------------------------------------- */ 573 * ------------------------------------------------------------------------- */
… …
590 rxvt_fatal ("memory allocation failure. aborting.\n"); 580 rxvt_fatal ("memory allocation failure. aborting.\n");
591 581
592 return p; 582 return p;
593} 583}
594 584
595/* INTPROTO */ 585void *
596void *
597rxvt_calloc (size_t number, size_t size) 586rxvt_calloc (size_t number, size_t size)
598{ 587{
599 void *p = calloc (number, size); 588 void *p = calloc (number, size);
600 589
601 if (!p) 590 if (!p)
602 rxvt_fatal ("memory allocation failure. aborting.\n"); 591 rxvt_fatal ("memory allocation failure. aborting.\n");
603 592
604 return p; 593 return p;
605} 594}
606 595
607/* INTPROTO */ 596void *
608void *
609rxvt_realloc (void *ptr, size_t size) 597rxvt_realloc (void *ptr, size_t size)
610{ 598{
611 void *p = realloc (ptr, size); 599 void *p = realloc (ptr, size);
612 600
613 if (!p) 601 if (!p)
614 rxvt_fatal ("memory allocation failure. aborting.\n"); 602 rxvt_fatal ("memory allocation failure. aborting.\n");
615 603
616 return p; 604 return p;
617} 605}
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 606
693/*----------------------------------------------------------------------*/ 607/*----------------------------------------------------------------------*/
694/* 608/*
695 * window size/position calculcations for XSizeHint and other storage. 609 * window size/position calculcations for XSizeHint and other storage.
696 * if width/height are non-zero then override calculated width/height 610 * if width/height are non-zero then override calculated width/height
697 */ 611 */
698void 612void
699rxvt_term::window_calc (unsigned int width, unsigned int height) 613rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
700{ 614{
701 short recalc_x, recalc_y; 615 short recalc_x, recalc_y;
702 int x, y, sb_w, mb_h, flags; 616 int x, y, sb_w, flags;
703 unsigned int w, h; 617 unsigned int w, h;
704 unsigned int max_width, max_height; 618 unsigned int max_width, max_height;
705 dDisp; 619 dDisp;
706 620
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; 621 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
711 szHint.win_gravity = NorthWestGravity; 622 szHint.win_gravity = NorthWestGravity;
712 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 623 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
713 624
714 recalc_x = recalc_y = 0; 625 recalc_x = recalc_y = 0;
715 flags = 0; 626 flags = 0;
627
716 if (!parsed_geometry) 628 if (!parsed_geometry)
717 { 629 {
718 parsed_geometry = 1; 630 parsed_geometry = 1;
631
719 if (rs[Rs_geometry]) 632 if (rs[Rs_geometry])
720 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 633 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
721 634
722 if (flags & WidthValue) 635 if (flags & WidthValue)
723 { 636 {
724 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 637 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
725 szHint.flags |= USSize; 638 szHint.flags |= USSize;
726 } 639 }
727 640
728 if (flags & HeightValue) 641 if (flags & HeightValue)
729 { 642 {
730 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 643 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
731 szHint.flags |= USSize; 644 szHint.flags |= USSize;
732 } 645 }
733 646
734 if (flags & XValue) 647 if (flags & XValue)
735 { 648 {
736 szHint.x = x; 649 szHint.x = x;
737 szHint.flags |= USPosition; 650 szHint.flags |= USPosition;
651
738 if (flags & XNegative) 652 if (flags & XNegative)
739 { 653 {
740 recalc_x = 1; 654 recalc_x = 1;
741 szHint.win_gravity = NorthEastGravity; 655 szHint.win_gravity = NorthEastGravity;
742 } 656 }
… …
744 658
745 if (flags & YValue) 659 if (flags & YValue)
746 { 660 {
747 szHint.y = y; 661 szHint.y = y;
748 szHint.flags |= USPosition; 662 szHint.flags |= USPosition;
663
749 if (flags & YNegative) 664 if (flags & YNegative)
750 { 665 {
751 recalc_y = 1; 666 recalc_y = 1;
667
752 if (szHint.win_gravity == NorthEastGravity) 668 if (szHint.win_gravity == NorthEastGravity)
753 szHint.win_gravity = SouthEastGravity; 669 szHint.win_gravity = SouthEastGravity;
754 else 670 else
755 szHint.win_gravity = SouthWestGravity; 671 szHint.win_gravity = SouthWestGravity;
756 } 672 }
757 } 673 }
758 } 674 }
759 675
760 /* TODO: BOUNDS */ 676 /* TODO: BOUNDS */
761 TermWin.width = TermWin.ncol * TermWin.fwidth; 677 width = ncol * fwidth;
762 TermWin.height = TermWin.nrow * TermWin.fheight; 678 height = nrow * fheight;
763 max_width = MAX_COLS * TermWin.fwidth; 679 max_width = MAX_COLS * fwidth;
764 max_height = MAX_ROWS * TermWin.fheight; 680 max_height = MAX_ROWS * fheight;
765 681
766 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 682 szHint.base_width = szHint.base_height = 2 * int_bwidth;
767 683
768 sb_w = mb_h = 0; 684 sb_w = 0;
769 window_vt_x = window_vt_y = TermWin.int_bwidth; 685 window_vt_x = window_vt_y = int_bwidth;
770 686
771 if (scrollbar_visible ()) 687 if (scrollBar.state)
772 { 688 {
773 sb_w = scrollbar_TotalWidth (); 689 sb_w = scrollbar_TotalWidth ();
774 szHint.base_width += sb_w; 690 szHint.base_width += sb_w;
775 if (!(options & Opt_scrollBar_right)) 691 if (!OPTION (Opt_scrollBar_right))
776 window_vt_x += sb_w; 692 window_vt_x += sb_w;
777 } 693 }
778 694
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; 695 szHint.width_inc = fwidth;
787 szHint.height_inc = TermWin.fheight; 696 szHint.height_inc = fheight;
788 szHint.min_width = szHint.base_width + szHint.width_inc; 697 szHint.min_width = szHint.base_width + szHint.width_inc;
789 szHint.min_height = szHint.base_height + szHint.height_inc; 698 szHint.min_height = szHint.base_height + szHint.height_inc;
790 699
791 if (width && width - szHint.base_width < max_width) 700 if (newwidth && newwidth - szHint.base_width < max_width)
792 { 701 {
793 szHint.width = width; 702 szHint.width = newwidth;
794 TermWin.width = width - szHint.base_width; 703 width = newwidth - szHint.base_width;
795 } 704 }
796 else 705 else
797 { 706 {
798 MIN_IT (TermWin.width, max_width); 707 min_it (width, max_width);
799 szHint.width = szHint.base_width + TermWin.width; 708 szHint.width = szHint.base_width + width;
800 } 709 }
801 710
802 if (height && height - szHint.base_height < max_height) 711 if (newheight && newheight - szHint.base_height < max_height)
803 { 712 {
804 szHint.height = height; 713 szHint.height = newheight;
805 TermWin.height = height - szHint.base_height; 714 height = newheight - szHint.base_height;
806 } 715 }
807 else 716 else
808 { 717 {
809 MIN_IT (TermWin.height, max_height); 718 min_it (height, max_height);
810 szHint.height = szHint.base_height + TermWin.height; 719 szHint.height = szHint.base_height + height;
811 } 720 }
812 721
813 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 722 if (scrollBar.state && OPTION (Opt_scrollBar_right))
814 window_sb_x = szHint.width - sb_w; 723 window_sb_x = szHint.width - sb_w;
815 724
816 if (recalc_x) 725 if (recalc_x)
817 szHint.x += (DisplayWidth (disp, display->screen) 726 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
818 - szHint.width - 2 * TermWin.ext_bwidth);
819 if (recalc_y) 727 if (recalc_y)
820 szHint.y += (DisplayHeight (disp, display->screen) 728 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
821 - szHint.height - 2 * TermWin.ext_bwidth);
822 729
823 TermWin.ncol = TermWin.width / TermWin.fwidth; 730 ncol = width / fwidth;
824 TermWin.nrow = TermWin.height / TermWin.fheight; 731 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} 732}
830 733
831/*----------------------------------------------------------------------*/ 734/*----------------------------------------------------------------------*/
832/* 735/*
833 * Tell the teletype handler what size the window is. 736 * Tell the teletype handler what size the window is.
834 * Called after a window size change. 737 * Called after a window size change.
835 */ 738 */
836void 739void
837rxvt_term::tt_winch () 740rxvt_term::tt_winch ()
838{ 741{
839 if (pty.pty < 0) 742 if (pty->pty < 0)
840 return; 743 return;
841 744
842 struct winsize ws; 745 struct winsize ws;
843 746
844 ws.ws_col = TermWin.ncol; 747 ws.ws_col = ncol;
845 ws.ws_row = TermWin.nrow; 748 ws.ws_row = nrow;
846 ws.ws_xpixel = TermWin.width; 749 ws.ws_xpixel = width;
847 ws.ws_ypixel = TermWin.height; 750 ws.ws_ypixel = height;
848 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 751 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
849 752
850#if 0 753#if 0
851 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 754 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
852 if (cmd_pid) /* force through to the command */ 755 if (cmd_pid) /* force through to the command */
853 kill (cmd_pid, SIGWINCH); 756 kill (-cmd_pid, SIGWINCH);
854#endif 757#endif
855} 758}
856 759
857/*----------------------------------------------------------------------*/ 760/*----------------------------------------------------------------------*/
858/* set_fonts () - load and set the various fonts 761/* set_fonts () - load and set the various fonts
859/* 762 *
860 * init = 1 - initialize 763 * init = 1 - initialize
861 * 764 *
862 * fontname == FONT_UP - switch to bigger font 765 * fontname == FONT_UP - switch to bigger font
863 * fontname == FONT_DN - switch to smaller font 766 * fontname == FONT_DN - switch to smaller font
864 */ 767 */
… …
876 return false; 779 return false;
877 } 780 }
878 781
879#if ENABLE_STYLES 782#if ENABLE_STYLES
880 for (int i = RS_styleCount; --i; ) 783 for (int i = RS_styleCount; --i; )
881 if (TermWin.fontset[i] != TermWin.fontset[0]) 784 if (fontset[i] != fontset[0])
882 delete TermWin.fontset[i]; 785 delete fontset[i];
883#endif 786#endif
884 787
885 delete TermWin.fontset[0]; 788 delete fontset[0];
886 TermWin.fontset[0] = fs; 789 fontset[0] = fs;
887 790
888 prop = (*fs)[1]->properties (); 791 prop = (*fs)[1]->properties ();
889 prop.height += TermWin.lineSpace; 792 prop.height += lineSpace;
890 fs->set_prop (prop); 793 fs->set_prop (prop);
891 794
892 TermWin.fwidth = prop.width; 795 fwidth = prop.width;
893 TermWin.fheight = prop.height; 796 fheight = prop.height;
894 TermWin.fweight = prop.weight; 797 fbase = prop.ascent;
895 TermWin.fslant = prop.slant;
896 TermWin.fbase = (*fs)[1]->ascent;
897 798
898 for (int style = 1; style < 4; style++) 799 for (int style = 1; style < 4; style++)
899 { 800 {
900#if ENABLE_STYLES 801#if ENABLE_STYLES
901 const char *res = rs[Rs_font + style]; 802 const char *res = rs[Rs_font + style];
902 803
903 if (res && !*res) 804 if (res && !*res)
904 TermWin.fontset[style] = TermWin.fontset[0]; 805 fontset[style] = fontset[0];
905 else 806 else
906 { 807 {
907 TermWin.fontset[style] = fs = new rxvt_fontset (this); 808 fontset[style] = fs = new rxvt_fontset (this);
908 rxvt_fontprop prop2 = prop; 809 rxvt_fontprop prop2 = prop;
909 810
910 if (res) 811 if (res)
911 prop2.weight = prop2.slant = rxvt_fontprop::unset; 812 prop2.weight = prop2.slant = rxvt_fontprop::unset;
912 else 813 else
913 { 814 {
914 res = TermWin.fontset[0]->fontdesc; 815 res = fontset[0]->fontdesc;
915 816
916 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 817 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; 818 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
918 } 819 }
919 820
920 fs->populate (res); 821 fs->populate (res);
921 fs->set_prop (prop2); 822 fs->set_prop (prop2);
922 } 823 }
923#else 824#else
924 TermWin.fontset[style] = TermWin.fontset[0]; 825 fontset[style] = fontset[0];
925#endif 826#endif
926 } 827 }
927 828
928 if (TermWin.parent[0]) 829 if (parent[0])
929 { 830 {
930 resize_all_windows (0, 0, 0); 831 resize_all_windows (0, 0, 0);
931 scr_remap_chars (); 832 scr_remap_chars ();
932 scr_touch (true); 833 scr_touch (true);
933 } 834 }
… …
935 return true; 836 return true;
936} 837}
937 838
938void rxvt_term::set_string_property (Atom prop, const char *str, int len) 839void rxvt_term::set_string_property (Atom prop, const char *str, int len)
939{ 840{
940 // TODO: SMART_WINDOW_TITLE
941 XChangeProperty (display->display, TermWin.parent[0], 841 XChangeProperty (display->display, parent[0],
942 prop, XA_STRING, 8, PropModeReplace, 842 prop, XA_STRING, 8, PropModeReplace,
943 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 843 (const unsigned char *)str, len >= 0 ? len : strlen (str));
944} 844}
945 845
946void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 846void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
947{ 847{
948 // TODO: SMART_WINDOW_TITLE
949 wchar_t *ws = rxvt_mbstowcs (str, len); 848 wchar_t *ws = rxvt_mbstowcs (str, len);
950 char *s = rxvt_wcstoutf8 (ws); 849 char *s = rxvt_wcstoutf8 (ws);
951 850
952 XChangeProperty (display->display, TermWin.parent[0], 851 XChangeProperty (display->display, parent[0],
953 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 852 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
954 (const unsigned char *)s, strlen (s)); 853 (const unsigned char *)s, strlen (s));
955 854
956 free (s); 855 free (s);
957 free (ws); 856 free (ws);
… …
962/* xterm sequences - title, iconName, color (exptl) */ 861/* xterm sequences - title, iconName, color (exptl) */
963void 862void
964rxvt_term::set_title (const char *str) 863rxvt_term::set_title (const char *str)
965{ 864{
966 set_string_property (XA_WM_NAME, str); 865 set_string_property (XA_WM_NAME, str);
967#if ENABLE_FRILLS 866#if ENABLE_EWMH
968 set_utf8_property (xa[XA_NET_WM_NAME], str); 867 set_utf8_property (xa[XA_NET_WM_NAME], str);
969#endif 868#endif
970} 869}
971 870
972void 871void
973rxvt_term::set_icon_name (const char *str) 872rxvt_term::set_icon_name (const char *str)
974{ 873{
975 set_string_property (XA_WM_ICON_NAME, str); 874 set_string_property (XA_WM_ICON_NAME, str);
976#if ENABLE_FRILLS 875#if ENABLE_EWMH
977 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 876 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
978#endif 877#endif
979} 878}
980 879
981#ifdef XTERM_COLOR_CHANGE 880#ifdef XTERM_COLOR_CHANGE
… …
994 i = atoi (color); 893 i = atoi (color);
995 894
996 if (i >= 8 && i <= 15) 895 if (i >= 8 && i <= 15)
997 { /* bright colors */ 896 { /* bright colors */
998 i -= 8; 897 i -= 8;
999# ifndef NO_BRIGHTCOLOR
1000 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 898 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1001 SET_PIXCOLOR (idx); 899 SET_PIXCOLOR (idx);
1002 goto Done; 900 goto done;
1003# endif
1004 } 901 }
1005 902
1006 if (i >= 0 && i <= 7) 903 if (i >= 0 && i <= 7)
1007 { /* normal colors */ 904 { /* normal colors */
1008 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 905 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1009 SET_PIXCOLOR (idx); 906 SET_PIXCOLOR (idx);
1010 goto Done; 907 goto done;
1011 } 908 }
1012 } 909 }
1013 910
1014 if (!rXParseAllocColor (&xcol, color)) 911 if (!rXParseAllocColor (&xcol, color))
1015 return; 912 return;
… …
1035 pix_colors_focused[idx] = xcol; 932 pix_colors_focused[idx] = xcol;
1036 SET_PIXCOLOR (idx); 933 SET_PIXCOLOR (idx);
1037 934
1038 /* XSetWindowAttributes attr; */ 935 /* XSetWindowAttributes attr; */
1039 /* Cursor cursor; */ 936 /* Cursor cursor; */
1040Done: 937done:
938
1041#ifdef OFF_FOCUS_FADING 939#if OFF_FOCUS_FADING
1042 if (rs[Rs_fade]) 940 if (rs[Rs_fade])
1043 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 941 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1044#endif 942#endif
1045 943
1046 /*TODO: handle Color_BD, scrollbar background, etc. */ 944 /*TODO: handle Color_BD, scrollbar background, etc. */
1047 945
1048 recolour_cursor (); 946 recolour_cursor ();
… …
1119 1017
1120/* -------------------------------------------------------------------- * 1018/* -------------------------------------------------------------------- *
1121 * - WINDOW RESIZING - * 1019 * - WINDOW RESIZING - *
1122 * -------------------------------------------------------------------- */ 1020 * -------------------------------------------------------------------- */
1123void 1021void
1124rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1022rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1125{ 1023{
1126 int fix_screen; 1024 int fix_screen;
1127#ifdef SMART_RESIZE 1025 int old_width = szHint.width;
1128 int old_width = szHint.width, old_height = szHint.height; 1026 int old_height = szHint.height;
1129#endif
1130 dDisp; 1027 dDisp;
1131 1028
1132 window_calc (width, height); 1029 window_calc (newwidth, newheight);
1133 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 1030 XSetWMNormalHints (disp, parent[0], &szHint);
1134 1031
1135 if (!ignoreparent) 1032 if (!ignoreparent)
1136 { 1033 {
1137#ifdef SMART_RESIZE 1034#ifdef SMART_RESIZE
1138 /* 1035 /*
… …
1142 int x, y, x1, y1; 1039 int x, y, x1, y1;
1143 int dx, dy; 1040 int dx, dy;
1144 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1041 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1145 Window unused_cr; 1042 Window unused_cr;
1146 1043
1147 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 1044 XTranslateCoordinates (disp, parent[0], display->root,
1148 0, 0, &x, &y, &unused_cr); 1045 0, 0, &x, &y, &unused_cr);
1149 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 1046 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1150 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1047 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1151 /* 1048 /*
1152 * if display->root isn't the parent window, a WM will probably have offset 1049 * if display->root isn't the parent window, a WM will probably have offset
1153 * our position for handles and decorations. Counter it 1050 * our position for handles and decorations. Counter it
1154 */ 1051 */
… …
1156 { 1053 {
1157 x -= x1; 1054 x -= x1;
1158 y -= y1; 1055 y -= y1;
1159 } 1056 }
1160 1057
1161 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1058 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;
1162 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1059 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1163 dx = old_width - szHint.width; 1060 dx = old_width - szHint.width;
1164 dy = old_height - szHint.height; 1061 dy = old_height - szHint.height;
1165 1062
1166 /* Check position of the center of the window */ 1063 /* Check position of the center of the window */
1167 if (x < x1) /* left half */ 1064 if (x < x1) /* left half */
1168 dx = 0; 1065 dx = 0;
… …
1171 if (y < y1) /* top half */ 1068 if (y < y1) /* top half */
1172 dy = 0; 1069 dy = 0;
1173 else if (y == y1) /* exact center */ 1070 else if (y == y1) /* exact center */
1174 dy /= 2; 1071 dy /= 2;
1175 1072
1176 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 1073 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1177 szHint.width, szHint.height); 1074 szHint.width, szHint.height);
1178#else 1075#else
1179 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 1076 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1180#endif 1077#endif
1181 } 1078 }
1182 1079
1183 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1080 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1184 1081
1185 if (fix_screen || width != old_width || height != old_height) 1082 if (fix_screen || newwidth != old_width || newheight != old_height)
1186 { 1083 {
1187 if (scrollbar_visible ()) 1084 if (scrollBar.state)
1188 { 1085 {
1189 XMoveResizeWindow (disp, scrollBar.win, 1086 XMoveResizeWindow (disp, scrollBar.win,
1190 window_sb_x, 0, 1087 window_sb_x, 0,
1191 scrollbar_TotalWidth (), szHint.height); 1088 scrollbar_TotalWidth (), szHint.height);
1192 resize_scrollbar (); 1089 resize_scrollbar ();
1193 } 1090 }
1194 1091
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, 1092 XMoveResizeWindow (disp, vt,
1201 window_vt_x, window_vt_y, 1093 window_vt_x, window_vt_y,
1202 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1094 width, height);
1203 1095
1204 scr_clear (); 1096 scr_clear ();
1205#ifdef XPM_BACKGROUND 1097#ifdef XPM_BACKGROUND
1206 resize_pixmap (); 1098 resize_pixmap ();
1207#endif 1099#endif
1208 } 1100 }
1209 1101
1210 if (fix_screen || old_height == 0) 1102 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 (); 1103 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 1104
1236#ifdef XPM_BACKGROUND 1105#ifdef XPM_BACKGROUND
1237 if (TermWin.pixmap) 1106 if (pixmap)
1238 scr_touch (false); 1107 scr_touch (false);
1239#endif 1108#endif
1240 1109
1241#ifdef USE_XIM 1110#ifdef USE_XIM
1242 IMSetStatusPosition (); 1111 IMSetStatusPosition ();
… …
1246/* 1115/*
1247 * Set the width/height of the vt window in characters. Units are pixels. 1116 * Set the width/height of the vt window in characters. Units are pixels.
1248 * good for toggling 80/132 columns 1117 * good for toggling 80/132 columns
1249 */ 1118 */
1250void 1119void
1251rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1120rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1252{ 1121{
1253 XWindowAttributes wattr; 1122 XWindowAttributes wattr;
1254 1123
1255 if (width == 0 || height == 0) 1124 if (newwidth == 0 || newheight == 0)
1256 { 1125 {
1257 XGetWindowAttributes (display->display, display->root, &wattr); 1126 XGetWindowAttributes (display->display, display->root, &wattr);
1127
1258 if (width == 0) 1128 if (newwidth == 0)
1259 width = wattr.width - szHint.base_width; 1129 newwidth = wattr.width - szHint.base_width;
1260 if (height == 0) 1130 if (newheight == 0)
1261 height = wattr.height - szHint.base_height; 1131 newheight = wattr.height - szHint.base_height;
1262 }
1263
1264 if (width != TermWin.width || height != TermWin.height)
1265 { 1132 }
1133
1134 if (newwidth != width || newheight != height)
1135 {
1266 width += szHint.base_width; 1136 newwidth += szHint.base_width;
1267 height += szHint.base_height; 1137 newheight += szHint.base_height;
1268 resize_all_windows (width, height, 0); 1138 resize_all_windows (newwidth, newheight, 0);
1269 } 1139 }
1270} 1140}
1271 1141
1272/* -------------------------------------------------------------------- * 1142/* -------------------------------------------------------------------- *
1273 * - X INPUT METHOD ROUTINES - * 1143 * - X INPUT METHOD ROUTINES - *
… …
1283 1153
1284void 1154void
1285rxvt_term::im_set_size (XRectangle &size) 1155rxvt_term::im_set_size (XRectangle &size)
1286{ 1156{
1287 // the int_bwidth terms make no sense to me 1157 // the int_bwidth terms make no sense to me
1288 size.x = TermWin.int_bwidth; 1158 size.x = int_bwidth;
1289 size.y = TermWin.int_bwidth; 1159 size.y = int_bwidth;
1290 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1160 size.width = Width2Pixel (ncol) + int_bwidth;
1291 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1161 size.height = Height2Pixel (nrow) + int_bwidth;
1292} 1162}
1293 1163
1294void 1164void
1295rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1165rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1296 XRectangle &status_rect, 1166 XRectangle &status_rect,
1297 const XRectangle &needed_rect) 1167 const XRectangle &needed_rect)
1298{ 1168{
1299 preedit_rect.x = needed_rect.width; 1169 preedit_rect.x = needed_rect.width;
1300 preedit_rect.y = 0; 1170 preedit_rect.y = 0;
1301 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1171 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1302 preedit_rect.height = TermWin.fheight; 1172 preedit_rect.height = fheight;
1303 1173
1304 status_rect.x = 0; 1174 status_rect.x = 0;
1305 status_rect.y = 0; 1175 status_rect.y = 0;
1306 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1176 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1307 status_rect.height = TermWin.fheight; 1177 status_rect.height = fheight;
1308} 1178}
1309 1179
1310/* Checking whether input method is running. */ 1180/* Checking whether input method is running. */
1311bool 1181bool
1312rxvt_term::IMisRunning () 1182rxvt_term::IMisRunning ()
… …
1340{ 1210{
1341 XPoint nspot; 1211 XPoint nspot;
1342 XVaNestedList preedit_attr; 1212 XVaNestedList preedit_attr;
1343 1213
1344 if (!Input_Context 1214 if (!Input_Context
1345 || !TermWin.focus 1215 || !focus
1346 || !(input_style & XIMPreeditPosition)) 1216 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1347 return; 1217 return;
1348 1218
1349 im_set_position (nspot); 1219 im_set_position (nspot);
1350 1220
1351 if (nspot.x == spot.x && nspot.y == spot.y) 1221 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1370 input_method = 0; 1240 input_method = 0;
1371 } 1241 }
1372 1242
1373 Input_Context = 0; 1243 Input_Context = 0;
1374} 1244}
1245
1246#ifdef ENABLE_XIM_ONTHESPOT
1247
1248static void
1249xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1250{
1251 ((rxvt_term *)client_data)->make_current ();
1252 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1253}
1254
1255static void
1256xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1257{
1258 ((rxvt_term *)client_data)->make_current ();
1259 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1260}
1261
1262static void
1263xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1264{
1265 rxvt_term *term = (rxvt_term *)client_data;
1266 XIMText *text = call_data->text;
1267
1268 term->make_current ();
1269
1270 if (text)
1271 {
1272 void *str;
1273
1274 if (!text->encoding_is_wchar && text->string.multi_byte)
1275 {
1276 // of course, X makes it ugly again
1277 if (term->rs[Rs_imLocale])
1278 SET_LOCALE (term->rs[Rs_imLocale]);
1279
1280 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1281 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1282
1283 if (term->rs[Rs_imLocale])
1284 SET_LOCALE (term->locale);
1285 }
1286 else
1287 str = (void *)text->string.wide_char;
1288
1289 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1290 DT_INT, call_data->caret,
1291 DT_INT, call_data->chg_first,
1292 DT_INT, call_data->chg_length,
1293 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1294 DT_WCS_LEN, str, str ? (int)text->length : 0,
1295 DT_END));
1296 }
1297 else
1298 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1299 DT_INT, call_data->caret,
1300 DT_INT, call_data->chg_first,
1301 DT_INT, call_data->chg_length,
1302 DT_END));
1303}
1304
1305#if 0
1306static void
1307xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1308{
1309 ((rxvt_term *)client_data)->make_current ();
1310 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1311 DT_INT, call_data->position,
1312 DT_INT, call_data->direction,
1313 DT_INT, call_data->style,
1314 DT_END));
1315}
1316#endif
1317
1318#endif
1375 1319
1376/* 1320/*
1377 * Try to open a XIM with the current modifiers, then see if we can 1321 * Try to open a XIM with the current modifiers, then see if we can
1378 * open a suitable preedit type 1322 * open a suitable preedit type
1379 */ 1323 */
… …
1386 XRectangle rect, status_rect, needed_rect; 1330 XRectangle rect, status_rect, needed_rect;
1387 unsigned long fg, bg; 1331 unsigned long fg, bg;
1388 const char *p; 1332 const char *p;
1389 char **s; 1333 char **s;
1390 XIMStyles *xim_styles; 1334 XIMStyles *xim_styles;
1335#ifdef ENABLE_XIM_ONTHESPOT
1336 XIMCallback xcb[4];
1337#endif
1338
1339 set_environ (envv);
1391 1340
1392 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1341 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1393 return false; 1342 return false;
1394 1343
1395 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1396 input_method = display->get_xim (locale, modifiers); 1344 input_method = display->get_xim (locale, modifiers);
1397 if (input_method == NULL) 1345 if (input_method == NULL)
1398 return false; 1346 return false;
1399 1347
1400 xim = input_method->xim; 1348 xim = input_method->xim;
… …
1420 s = rxvt_splitcommastring (p); 1368 s = rxvt_splitcommastring (p);
1421 1369
1422 for (i = found = 0; !found && s[i]; i++) 1370 for (i = found = 0; !found && s[i]; i++)
1423 { 1371 {
1424 if (!strcmp (s[i], "OverTheSpot")) 1372 if (!strcmp (s[i], "OverTheSpot"))
1425 input_style = (XIMPreeditPosition | XIMStatusNothing); 1373 input_style = XIMPreeditPosition | XIMStatusNothing;
1426 else if (!strcmp (s[i], "OffTheSpot")) 1374 else if (!strcmp (s[i], "OffTheSpot"))
1427 input_style = (XIMPreeditArea | XIMStatusArea); 1375 input_style = XIMPreeditArea | XIMStatusArea;
1428 else if (!strcmp (s[i], "Root")) 1376 else if (!strcmp (s[i], "Root"))
1429 input_style = (XIMPreeditNothing | XIMStatusNothing); 1377 input_style = XIMPreeditNothing | XIMStatusNothing;
1430 else if (!strcmp (s[i], "None")) 1378 else if (!strcmp (s[i], "None"))
1431 input_style = (XIMPreeditNone | XIMStatusNone); 1379 input_style = XIMPreeditNone | XIMStatusNone;
1380#ifdef ENABLE_XIM_ONTHESPOT
1381 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1382 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1383#endif
1384 else
1385 input_style = XIMPreeditNothing | XIMStatusNothing;
1432 1386
1433 for (j = 0; j < xim_styles->count_styles; j++) 1387 for (j = 0; j < xim_styles->count_styles; j++)
1434 if (input_style == xim_styles->supported_styles[j]) 1388 if (input_style == xim_styles->supported_styles[j])
1435 { 1389 {
1436 rxvt_freecommastring (s); 1390 rxvt_freecommastring (s);
… …
1470 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1424 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1471 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1425 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1472 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1426 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1473 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1427 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1474 "*", 1428 "*",
1475 TermWin.fheight, 1429 fheight,
1476 TermWin.fheight + 1, TermWin.fheight - 1, 1430 fheight + 1, fheight - 1,
1477 TermWin.fheight - 2, TermWin.fheight + 2); 1431 fheight - 2, fheight + 2);
1478 1432
1479 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1433 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1480 &missing_charset_list, &missing_charset_count, &def_string); 1434 &missing_charset_list, &missing_charset_count, &def_string);
1481 1435
1482 if (missing_charset_list) 1436 if (missing_charset_list)
… …
1525 XNBackground, bg, 1479 XNBackground, bg,
1526 XNArea, &status_rect, 1480 XNArea, &status_rect,
1527 XNFontSet, fs, 1481 XNFontSet, fs,
1528 NULL); 1482 NULL);
1529 } 1483 }
1484 else if (input_style & XIMPreeditCallbacks)
1485 {
1486 im_set_position (spot);
1487
1488 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1489 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1490 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1491#if 0
1492 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1493#endif
1494
1495 preedit_attr = XVaCreateNestedList (0,
1496 XNSpotLocation, &spot,
1497 XNPreeditStartCallback, &xcb[0],
1498 XNPreeditDoneCallback , &xcb[1],
1499 XNPreeditDrawCallback , &xcb[2],
1500#if 0
1501 XNPreeditCaretCallback, &xcb[3],
1502#endif
1503 NULL);
1504 }
1530 1505
1531 Input_Context = XCreateIC (xim, 1506 Input_Context = XCreateIC (xim,
1532 XNInputStyle, input_style, 1507 XNInputStyle, input_style,
1533 XNClientWindow, TermWin.vt, 1508 XNClientWindow, vt,
1534 XNFocusWindow, TermWin.parent[0], 1509 XNFocusWindow, parent[0],
1535 preedit_attr ? XNPreeditAttributes : NULL, 1510 preedit_attr ? XNPreeditAttributes : NULL,
1536 preedit_attr, 1511 preedit_attr,
1537 status_attr ? XNStatusAttributes : NULL, 1512 status_attr ? XNStatusAttributes : NULL,
1538 status_attr, NULL); 1513 status_attr, NULL);
1539 1514
… …
1546 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1521 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1547 im_destroy (); 1522 im_destroy ();
1548 return false; 1523 return false;
1549 } 1524 }
1550 1525
1526#if 0
1527 // unfortunately, only the focus window is used by XIM, hard to fix
1528 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1529 vt_select_input ();
1530#endif
1531
1551 if (input_style & XIMPreeditArea) 1532 if (input_style & XIMPreeditArea)
1552 IMSetStatusPosition (); 1533 IMSetStatusPosition ();
1553 1534
1554 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1555 return true; 1535 return true;
1556} 1536}
1557 1537
1558void 1538void
1559rxvt_term::im_cb () 1539rxvt_term::im_cb ()
1560{ 1540{
1561 int i, found, had_im; 1541 int i;
1562 const char *p; 1542 const char *p;
1563 char **s; 1543 char **s;
1564 char buf[IMBUFSIZ]; 1544 char buf[IMBUFSIZ];
1565 1545
1566 SET_R (this); 1546 make_current ();
1567 1547
1568 im_destroy (); 1548 im_destroy ();
1569 1549
1570 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1571 if (Input_Context) 1550 if (Input_Context)
1572 return; 1551 return;
1573 1552
1574#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1553#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1575 if (rs[Rs_imLocale]) 1554 if (rs[Rs_imLocale])
… …
1623{ 1602{
1624 XRectangle preedit_rect, status_rect, *needed_rect; 1603 XRectangle preedit_rect, status_rect, *needed_rect;
1625 XVaNestedList preedit_attr, status_attr; 1604 XVaNestedList preedit_attr, status_attr;
1626 1605
1627 if (!Input_Context 1606 if (!Input_Context
1628 || !TermWin.focus 1607 || !focus
1629 || !(input_style & XIMPreeditArea) 1608 || !(input_style & XIMPreeditArea)
1630 || !IMisRunning ()) 1609 || !IMisRunning ())
1631 return; 1610 return;
1632 1611
1633 /* Getting the necessary width of preedit area */ 1612 /* Getting the necessary width of preedit area */
… …
1648 XFree (preedit_attr); 1627 XFree (preedit_attr);
1649 XFree (status_attr); 1628 XFree (status_attr);
1650} 1629}
1651#endif /* USE_XIM */ 1630#endif /* USE_XIM */
1652 1631
1653/*----------------------------------------------------------------------*/
1654rxvt_t rxvt_current_term;
1655
1656/*----------------------- end-of-file (C source) -----------------------*/ 1632/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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