ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.134 by root, Fri Feb 4 11:41:23 2005 UTC vs.
Revision 1.188 by root, Wed Jan 18 08:33:34 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
54static char curlocale[128]; 53static char curlocale[128], savelocale[128];
55 54
56bool 55bool
57rxvt_set_locale (const char *locale) 56rxvt_set_locale (const char *locale)
58{ 57{
59 if (!locale || !strncmp (locale, curlocale, 128)) 58 if (!locale || !strncmp (locale, curlocale, 128))
60 return false; 59 return false;
61 60
62 strncpy (curlocale, locale, 128); 61 strncpy (curlocale, locale, 128);
63 setlocale (LC_CTYPE, curlocale); 62 setlocale (LC_CTYPE, curlocale);
64 return true; 63 return true;
64}
65
66void
67rxvt_push_locale (const char *locale)
68{
69 strcpy (savelocale, curlocale);
70 rxvt_set_locale (locale);
71}
72
73void
74rxvt_pop_locale ()
75{
76 rxvt_set_locale (savelocale);
65} 77}
66 78
67#if ENABLE_COMBINING 79#if ENABLE_COMBINING
68class rxvt_composite_vec rxvt_composite; 80class rxvt_composite_vec rxvt_composite;
69 81
… …
134 rootwin_ev (this, &rxvt_term::rootwin_cb), 146 rootwin_ev (this, &rxvt_term::rootwin_cb),
135#endif 147#endif
136#ifdef HAVE_SCROLLBARS 148#ifdef HAVE_SCROLLBARS
137 scrollbar_ev (this, &rxvt_term::x_cb), 149 scrollbar_ev (this, &rxvt_term::x_cb),
138#endif 150#endif
139#ifdef MENUBAR
140 menubar_ev (this, &rxvt_term::x_cb),
141#endif
142#ifdef CURSOR_BLINK 151#ifdef CURSOR_BLINK
143 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 152 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
144#endif 153#endif
145#ifdef TEXT_BLINK 154#ifdef TEXT_BLINK
146 text_blink_ev (this, &rxvt_term::text_blink_cb), 155 text_blink_ev (this, &rxvt_term::text_blink_cb),
… …
158 pointer_ev (this, &rxvt_term::pointer_cb), 167 pointer_ev (this, &rxvt_term::pointer_cb),
159#endif 168#endif
160#ifdef USE_XIM 169#ifdef USE_XIM
161 im_ev (this, &rxvt_term::im_cb), 170 im_ev (this, &rxvt_term::im_cb),
162#endif 171#endif
163 sw_term (this, &rxvt_term::sig_term),
164 sw_int (this, &rxvt_term::sig_term),
165 sw_chld (this, &rxvt_term::sig_chld),
166 termwin_ev (this, &rxvt_term::x_cb), 172 termwin_ev (this, &rxvt_term::x_cb),
167 vt_ev (this, &rxvt_term::x_cb), 173 vt_ev (this, &rxvt_term::x_cb),
168 check_ev (this, &rxvt_term::check_cb), 174 check_ev (this, &rxvt_term::check_cb),
169 flush_ev (this, &rxvt_term::flush_cb), 175 flush_ev (this, &rxvt_term::flush_cb),
170 destroy_ev (this, &rxvt_term::destroy_cb), 176 destroy_ev (this, &rxvt_term::destroy_cb),
… …
188void rxvt_term::emergency_cleanup () 194void rxvt_term::emergency_cleanup ()
189{ 195{
190 if (cmd_pid) 196 if (cmd_pid)
191 kill (-cmd_pid, SIGHUP); 197 kill (-cmd_pid, SIGHUP);
192 198
193#ifdef UTMP_SUPPORT 199 delete pty; pty = 0;
194 privileged_utmp (RESTORE);
195#endif
196
197 pty.put ();
198} 200}
199 201
200rxvt_term::~rxvt_term () 202rxvt_term::~rxvt_term ()
201{ 203{
204 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
205
202 termlist.erase (find (termlist.begin (), termlist.end(), this)); 206 termlist.erase (find (termlist.begin (), termlist.end(), this));
203 207
204 emergency_cleanup (); 208 emergency_cleanup ();
205 209
206#if ENABLE_STYLES 210#if ENABLE_STYLES
207 for (int i = RS_styleCount; --i; ) 211 for (int i = RS_styleCount; --i; )
208 if (TermWin.fontset[i] != TermWin.fontset[0]) 212 if (fontset[i] != fontset[0])
209 delete TermWin.fontset[i]; 213 delete fontset[i];
210#endif 214#endif
211 delete TermWin.fontset[0]; 215 delete fontset[0];
212 216
213 if (display) 217 if (display)
214 { 218 {
215 dDisp; 219 dDisp;
216 220
217 selection_clear (); 221 selection_clear ();
218 222
219#ifdef USE_XIM 223#ifdef USE_XIM
220 im_destroy (); 224 im_destroy ();
221#endif
222#ifdef MENUBAR
223 if (menubarGC) XFreeGC (disp, menubarGC);
224#endif 225#endif
225#ifdef XTERM_SCROLLBAR 226#ifdef XTERM_SCROLLBAR
226 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 227 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
227 if (ShadowGC) XFreeGC (disp, ShadowGC); 228 if (ShadowGC) XFreeGC (disp, ShadowGC);
228#endif 229#endif
… …
239 if (upArrow) XFreePixmap (disp, upArrow); 240 if (upArrow) XFreePixmap (disp, upArrow);
240 if (downArrow) XFreePixmap (disp, downArrow); 241 if (downArrow) XFreePixmap (disp, downArrow);
241 if (upArrowHi) XFreePixmap (disp, upArrowHi); 242 if (upArrowHi) XFreePixmap (disp, upArrowHi);
242 if (downArrowHi) XFreePixmap (disp, downArrowHi); 243 if (downArrowHi) XFreePixmap (disp, downArrowHi);
243#endif 244#endif
244#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 245#ifdef RXVT_SCROLLBAR
245 if (topShadowGC) XFreeGC (disp, topShadowGC); 246 if (topShadowGC) XFreeGC (disp, topShadowGC);
246 if (botShadowGC) XFreeGC (disp, botShadowGC); 247 if (botShadowGC) XFreeGC (disp, botShadowGC);
247 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 248 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
248#endif 249#endif
249 if (TermWin.gc) XFreeGC (disp, TermWin.gc); 250 if (gc) XFreeGC (disp, gc);
250 251
251#if defined(MENUBAR) && (MENUBAR_MAX > 1)
252 delete menuBar.drawable; 252 delete drawable;
253 //if (menuBar.win)
254 // XDestroyWindow (disp, menuBar.win);
255#endif
256 delete TermWin.drawable;
257 // destroy all windows 253 // destroy all windows
258 if (TermWin.parent[0]) 254 if (parent[0])
259 XDestroyWindow (disp, TermWin.parent[0]); 255 XDestroyWindow (disp, parent[0]);
260 } 256 }
261 257
262 // TODO: free pixcolours, colours should become part of rxvt_display 258 // TODO: free pixcolours, colours should become part of rxvt_display
263
264 delete pix_colors_focused; 259 delete pix_colors_focused;
265#ifdef OFF_FOCUS_FADING 260#if OFF_FOCUS_FADING
266 delete pix_colors_unfocused; 261 delete pix_colors_unfocused;
267#endif 262#endif
268 263
269 displays.put (display); 264 displays.put (display);
270 265
… …
291 delete keyboard; 286 delete keyboard;
292#endif 287#endif
293} 288}
294 289
295void 290void
291rxvt_term::child_exit ()
292{
293 cmd_pid = 0;
294
295 if (!OPTION (Opt_hold))
296 destroy ();
297}
298
299void
296rxvt_term::destroy () 300rxvt_term::destroy ()
297{ 301{
298 if (destroy_ev.active) 302 if (destroy_ev.active)
299 return; 303 return;
300 304
… …
307#if USE_XIM 311#if USE_XIM
308 im_ev.stop (display); 312 im_ev.stop (display);
309#endif 313#endif
310#if HAVE_SCROLLBARS 314#if HAVE_SCROLLBARS
311 scrollbar_ev.stop (display); 315 scrollbar_ev.stop (display);
312#endif
313#if MENUBAR
314 menubar_ev.stop (display);
315#endif 316#endif
316#if TRANSPARENT 317#if TRANSPARENT
317 rootwin_ev.stop (display); 318 rootwin_ev.stop (display);
318#endif 319#endif
319 incr_ev.stop (); 320 incr_ev.stop ();
… …
343} 344}
344 345
345void 346void
346rxvt_term::destroy_cb (time_watcher &w) 347rxvt_term::destroy_cb (time_watcher &w)
347{ 348{
348 SET_R (this); 349 make_current ();
349 350
350 delete this; 351 delete this;
351} 352}
352 353
353/*----------------------------------------------------------------------*/ 354/*----------------------------------------------------------------------*/
… …
362{ 363{
363 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 364 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
364 (*t)->emergency_cleanup (); 365 (*t)->emergency_cleanup ();
365} 366}
366 367
368#if ENABLE_FRILLS
369static void
370print_x_error (Display *dpy, XErrorEvent *event)
371{
372 char buffer[BUFSIZ];
373 char mesg[BUFSIZ];
374 char number[32];
375 char *mtype = "XlibMessage";
376 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
377 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
378 rxvt_warn ("An X Error occured, trying to continue after report.\n");
379 rxvt_warn ("%s: %s\n", mesg, buffer);
380 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
381 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
382 sprintf(number, "%d", event->request_code);
383 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
384 rxvt_warn ("(which is %s)\n", buffer);
385 if (event->request_code >= 128) {
386 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
387 mesg, BUFSIZ);
388 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
389 }
390 if ((event->error_code == BadWindow) ||
391 (event->error_code == BadPixmap) ||
392 (event->error_code == BadCursor) ||
393 (event->error_code == BadFont) ||
394 (event->error_code == BadDrawable) ||
395 (event->error_code == BadColor) ||
396 (event->error_code == BadGC) ||
397 (event->error_code == BadIDChoice) ||
398 (event->error_code == BadValue) ||
399 (event->error_code == BadAtom)) {
400 if (event->error_code == BadValue)
401 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
402 mesg, BUFSIZ);
403 else if (event->error_code == BadAtom)
404 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
405 mesg, BUFSIZ);
406 else
407 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
408 mesg, BUFSIZ);
409 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
410 }
411 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
412 mesg, BUFSIZ);
413 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
414}
415#endif
416
367int 417int
368rxvt_xerror_handler (Display *display, XErrorEvent *event) 418rxvt_xerror_handler (Display *display, XErrorEvent *event)
369{ 419{
370 if (GET_R->allowedxerror == -1) 420 if (GET_R->allowedxerror == -1)
371 GET_R->allowedxerror = event->error_code; 421 GET_R->allowedxerror = event->error_code;
372 else 422 else
373 { 423 {
374 //TODO: GET_R is most likely not the terminal which caused the error 424 // GET_R is most likely not the terminal which caused the error,
375 //TODO: maybe just output the error and continue? 425 // so just output the error and continue
426#if ENABLE_FRILLS
427 print_x_error (display, event);
428#else
376 old_xerror_handler (display, event); 429 old_xerror_handler (display, event);
377 GET_R->destroy (); 430#endif
378 } 431 }
379 432
380 return 0; 433 return 0;
381} 434}
382 435
… …
387 DisplayString (display)); 440 DisplayString (display));
388 rxvt_emergency_cleanup (); 441 rxvt_emergency_cleanup ();
389 _exit (EXIT_FAILURE); 442 _exit (EXIT_FAILURE);
390} 443}
391 444
392/*
393 * Catch a fatal signal and tidy up before quitting
394 */
395void
396rxvt_term::sig_term (sig_watcher &w)
397{
398#ifdef DEBUG_CMD
399 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
400#endif
401 rxvt_emergency_cleanup ();
402 signal (w.signum, SIG_DFL);
403 kill (getpid (), w.signum);
404}
405
406/*----------------------------------------------------------------------*/ 445/*----------------------------------------------------------------------*/
407/* rxvt_init () */
408bool 446bool
409rxvt_term::init (int argc, const char *const *argv) 447rxvt_term::init (int argc, const char *const *argv)
410{ 448{
411 SET_R (this); 449 SET_R (this);
412
413 set_locale (""); 450 set_locale ("");
451 set_environ (envv); // few things in X do not call setlocale :(
414 452
415 if (!init_vars ()) 453 if (!init_vars ())
416 return false; 454 return false;
417 455
418 init_secondary (); 456 init_secondary ();
… …
421 459
422#ifdef KEYSYM_RESOURCE 460#ifdef KEYSYM_RESOURCE
423 keyboard->register_done (); 461 keyboard->register_done ();
424#endif 462#endif
425 463
426#if MENUBAR_MAX
427 menubar_read (rs[Rs_menu]);
428#endif
429#ifdef HAVE_SCROLLBARS 464#ifdef HAVE_SCROLLBARS
430 if (options & Opt_scrollBar) 465 if (OPTION (Opt_scrollBar))
431 scrollBar.setIdle (); /* set existence for size calculations */ 466 scrollBar.setIdle (); /* set existence for size calculations */
432#endif 467#endif
433 468
469#if ENABLE_PERL
470 if (!rs[Rs_perl_ext_1])
471 rs[Rs_perl_ext_1] = "default";
472
473 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
474 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
475 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
476 {
477 rxvt_perl.init (this);
478 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
479 }
480#endif
481
482 pty = rxvt_new_ptytty ();
483
434 create_windows (argc, argv); 484 create_windows (argc, argv);
435 485
436 dDisp; 486 dDisp;
437 487
438 init_xlocale (); 488 init_xlocale ();
439 489
440 scr_reset (); /* initialize screen */ 490 scr_reset (); // initialize screen
441 491
442#if 0 492#if 0
443 XSynchronize (disp, True); 493 XSynchronize (disp, True);
444#endif 494#endif
445 495
446#ifdef HAVE_SCROLLBARS 496#ifdef HAVE_SCROLLBARS
447 if (options & Opt_scrollBar) 497 if (OPTION (Opt_scrollBar))
448 resize_scrollbar (); /* create and map scrollbar */ 498 resize_scrollbar (); /* create and map scrollbar */
449#endif 499#endif
450#if (MENUBAR_MAX)
451 if (menubar_visible ())
452 XMapWindow (disp, menuBar.win);
453#endif
454#ifdef TRANSPARENT 500#ifdef TRANSPARENT
455 if (options & Opt_transparent) 501 if (OPTION (Opt_transparent))
456 { 502 {
457 XSelectInput (disp, display->root, PropertyChangeMask); 503 XSelectInput (disp, display->root, PropertyChangeMask);
458 check_our_parents (); 504 check_our_parents ();
459 rootwin_ev.start (display, display->root); 505 rootwin_ev.start (display, display->root);
460 } 506 }
461#endif 507#endif
462 508
463 XMapWindow (disp, TermWin.vt); 509 XMapWindow (disp, vt);
464 XMapWindow (disp, TermWin.parent[0]); 510 XMapWindow (disp, parent[0]);
465 511
466 set_colorfgbg (); 512 set_colorfgbg ();
467 513
468 init_command (cmd_argv); 514 init_command (cmd_argv);
469 515
470 free (cmd_argv); 516 free (cmd_argv);
471 517
518 if (pty->pty >= 0)
472 pty_ev.start (pty.pty, EVENT_READ); 519 pty_ev.start (pty->pty, EVENT_READ);
473 520
474 check_ev.start (); 521 check_ev.start ();
475 522
523 HOOK_INVOKE ((this, HOOK_START, DT_END));
524
476 return true; 525 return true;
477} 526}
478 527
528static struct sig_handlers
529{
530 sig_watcher sw_chld, sw_term, sw_int;
531
532 void sig_chld (sig_watcher &w)
533 {
534 // we are being called for every SIGCHLD, find the corresponding term
535 int pid;
536
537 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
538 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
539 if (pid == (*t)->cmd_pid)
540 {
541 (*t)->child_exit ();
542 break;
543 }
544 }
545
546 /*
547 * Catch a fatal signal and tidy up before quitting
548 */
549 void
550 sig_term (sig_watcher &w)
551 {
552#ifdef DEBUG_CMD
553 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
554#endif
555 rxvt_emergency_cleanup ();
556 signal (w.signum, SIG_DFL);
557 kill (getpid (), w.signum);
558 }
559
560 sig_handlers ()
561 : sw_chld (this, &sig_handlers::sig_chld),
562 sw_term (this, &sig_handlers::sig_term),
563 sw_int (this, &sig_handlers::sig_term)
564 {
565 }
566} sig_handlers;
567
568char **rxvt_environ; // startup environment
569
479void 570void
480rxvt_init () 571rxvt_init ()
481{ 572{
482 /* 573 uid_t uid = getuid ();
483 * Save and then give up any super-user privileges 574 gid_t gid = getgid ();
484 * If we need privileges in any area then we must specifically request it. 575
485 * We should only need to be root in these cases: 576 // before doing anything else, check for setuid/setgid operation,
486 * 1. write utmp entries on some systems 577 // start the helper process and drop privileges
487 * 2. chown tty on some systems 578 if (uid != geteuid ()
488 */ 579 || gid != getegid ())
489 rxvt_privileges (SAVE); 580 {
490 rxvt_privileges (IGNORE); 581#if PTYTTY_HELPER
582 rxvt_ptytty_server ();
583#else
584 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
585#endif
586
587 // drop privileges
588#if HAVE_SETRESUID
589 setresgid (gid, gid, gid);
590 setresuid (uid, uid, uid);
591#elif HAVE_SETREUID
592 setregid (gid, gid);
593 setreuid (uid, uid);
594#elif HAVE_SETUID
595 setgid (gid);
596 setuid (uid);
597#endif
598
599 if (uid != geteuid ()
600 || gid != getegid ())
601 rxvt_fatal ("unable to drop privileges, aborting.\n");
602 }
603
604 rxvt_environ = environ;
491 605
492 signal (SIGHUP, SIG_IGN); 606 signal (SIGHUP, SIG_IGN);
493 signal (SIGPIPE, SIG_IGN); 607 signal (SIGPIPE, SIG_IGN);
608
609 sig_handlers.sw_chld.start (SIGCHLD);
610 sig_handlers.sw_term.start (SIGTERM);
611 sig_handlers.sw_int.start (SIGINT);
494 612
495 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 613 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
496 /* signal (SIGURG, SIG_DFL); */ 614 /* signal (SIGURG, SIG_DFL); */
497 615
498 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 616 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
499 // TODO: handle this with exceptions and tolerate the memory loss 617 // TODO: handle this with exceptions and tolerate the memory loss
500 XSetIOErrorHandler (rxvt_xioerror_handler); 618 XSetIOErrorHandler (rxvt_xioerror_handler);
501}
502 619
503/* ------------------------------------------------------------------------- * 620 XrmInitialize ();
504 * SIGNAL HANDLING & EXIT HANDLER *
505 * ------------------------------------------------------------------------- */
506/*
507 * Catch a SIGCHLD signal and exit if the direct child has died
508 */
509
510void
511rxvt_term::sig_chld (sig_watcher &w)
512{
513 // we are being called for every SIGCHLD, not just ours
514 int pid;
515
516 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
517 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
518 if (pid == (*t)->cmd_pid)
519 {
520 (*t)->destroy ();
521 break;
522 }
523} 621}
524 622
525/* ------------------------------------------------------------------------- * 623/* ------------------------------------------------------------------------- *
526 * MEMORY ALLOCATION WRAPPERS * 624 * MEMORY ALLOCATION WRAPPERS *
527 * ------------------------------------------------------------------------- */ 625 * ------------------------------------------------------------------------- */
… …
534 rxvt_fatal ("memory allocation failure. aborting.\n"); 632 rxvt_fatal ("memory allocation failure. aborting.\n");
535 633
536 return p; 634 return p;
537} 635}
538 636
539/* INTPROTO */ 637void *
540void *
541rxvt_calloc (size_t number, size_t size) 638rxvt_calloc (size_t number, size_t size)
542{ 639{
543 void *p = calloc (number, size); 640 void *p = calloc (number, size);
544 641
545 if (!p) 642 if (!p)
546 rxvt_fatal ("memory allocation failure. aborting.\n"); 643 rxvt_fatal ("memory allocation failure. aborting.\n");
547 644
548 return p; 645 return p;
549} 646}
550 647
551/* INTPROTO */
552void * 648void *
553rxvt_realloc (void *ptr, size_t size) 649rxvt_realloc (void *ptr, size_t size)
554{ 650{
555 void *p = realloc (ptr, size); 651 void *p = realloc (ptr, size);
556 652
557 if (!p) 653 if (!p)
558 rxvt_fatal ("memory allocation failure. aborting.\n"); 654 rxvt_fatal ("memory allocation failure. aborting.\n");
559 655
560 return p; 656 return p;
561} 657}
562
563/* ------------------------------------------------------------------------- *
564 * PRIVILEGED OPERATIONS *
565 * ------------------------------------------------------------------------- */
566/* take care of suid/sgid super-user (root) privileges */
567void
568rxvt_privileges (rxvt_privaction action)
569{
570#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
571 static uid_t euid;
572 static gid_t egid;
573#endif
574
575#if ! defined(__CYGWIN32__)
576# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
577 /* setreuid () is the poor man's setuid (), seteuid () */
578# define seteuid(a) setreuid(-1, (a))
579# define setegid(a) setregid(-1, (a))
580# define HAVE_SETEUID
581# endif
582# ifdef HAVE_SETEUID
583 switch (action)
584 {
585 case IGNORE:
586 /*
587 * change effective uid/gid - not real uid/gid - so we can switch
588 * back to root later, as required
589 */
590 seteuid (getuid ());
591 setegid (getgid ());
592 break;
593 case SAVE:
594 euid = geteuid ();
595 egid = getegid ();
596 break;
597 case RESTORE:
598 seteuid (euid);
599 setegid (egid);
600 break;
601 }
602# else
603 switch (action)
604 {
605 case IGNORE:
606 setuid (getuid ());
607 setgid (getgid ());
608 /* FALLTHROUGH */
609 case SAVE:
610 /* FALLTHROUGH */
611 case RESTORE:
612 break;
613 }
614# endif
615#endif
616}
617
618#ifdef UTMP_SUPPORT
619void
620rxvt_term::privileged_utmp (rxvt_privaction action)
621{
622 if ((options & Opt_utmpInhibit)
623 || !pty.name || !*pty.name)
624 return;
625
626 rxvt_privileges (RESTORE);
627
628 if (action == SAVE)
629 makeutent (pty.name, rs[Rs_display_name]);
630 else
631 cleanutent ();
632
633 rxvt_privileges (IGNORE);
634}
635#endif
636 658
637/*----------------------------------------------------------------------*/ 659/*----------------------------------------------------------------------*/
638/* 660/*
639 * window size/position calculcations for XSizeHint and other storage. 661 * window size/position calculcations for XSizeHint and other storage.
640 * if width/height are non-zero then override calculated width/height 662 * if width/height are non-zero then override calculated width/height
641 */ 663 */
642void 664void
643rxvt_term::window_calc (unsigned int width, unsigned int height) 665rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
644{ 666{
645 short recalc_x, recalc_y; 667 short recalc_x, recalc_y;
646 int x, y, sb_w, mb_h, flags; 668 int x, y, sb_w, flags;
647 unsigned int w, h; 669 unsigned int w, h;
648 unsigned int max_width, max_height; 670 unsigned int max_width, max_height;
649 dDisp; 671 dDisp;
650 672
651 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 673 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
652 TermWin.ncol, TermWin.nrow, szHint.width, 674 ncol, nrow, szHint.width, szHint.height));
653 szHint.height)); 675
654 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 676 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
655 szHint.win_gravity = NorthWestGravity; 677 szHint.win_gravity = NorthWestGravity;
656 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 678 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
657 679
658 recalc_x = recalc_y = 0; 680 recalc_x = recalc_y = 0;
659 flags = 0; 681 flags = 0;
682
660 if (!parsed_geometry) 683 if (!parsed_geometry)
661 { 684 {
662 parsed_geometry = 1; 685 parsed_geometry = 1;
686
663 if (rs[Rs_geometry]) 687 if (rs[Rs_geometry])
664 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 688 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
689
665 if (flags & WidthValue) 690 if (flags & WidthValue)
666 { 691 {
667 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 692 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
668 szHint.flags |= USSize; 693 szHint.flags |= USSize;
669 } 694 }
695
670 if (flags & HeightValue) 696 if (flags & HeightValue)
671 { 697 {
672 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 698 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
673 szHint.flags |= USSize; 699 szHint.flags |= USSize;
674 } 700 }
701
675 if (flags & XValue) 702 if (flags & XValue)
676 { 703 {
677 szHint.x = x; 704 szHint.x = x;
678 szHint.flags |= USPosition; 705 szHint.flags |= USPosition;
706
679 if (flags & XNegative) 707 if (flags & XNegative)
680 { 708 {
681 recalc_x = 1; 709 recalc_x = 1;
682 szHint.win_gravity = NorthEastGravity; 710 szHint.win_gravity = NorthEastGravity;
683 } 711 }
684 } 712 }
713
685 if (flags & YValue) 714 if (flags & YValue)
686 { 715 {
687 szHint.y = y; 716 szHint.y = y;
688 szHint.flags |= USPosition; 717 szHint.flags |= USPosition;
718
689 if (flags & YNegative) 719 if (flags & YNegative)
690 { 720 {
691 recalc_y = 1; 721 recalc_y = 1;
722
692 if (szHint.win_gravity == NorthEastGravity) 723 if (szHint.win_gravity == NorthEastGravity)
693 szHint.win_gravity = SouthEastGravity; 724 szHint.win_gravity = SouthEastGravity;
694 else 725 else
695 szHint.win_gravity = SouthWestGravity; 726 szHint.win_gravity = SouthWestGravity;
696 } 727 }
697 } 728 }
698 } 729 }
699 730
700 /* TODO: BOUNDS */ 731 /* TODO: BOUNDS */
701 TermWin.width = TermWin.ncol * TermWin.fwidth; 732 width = ncol * fwidth;
702 TermWin.height = TermWin.nrow * TermWin.fheight; 733 height = nrow * fheight;
703 max_width = MAX_COLS * TermWin.fwidth; 734 max_width = MAX_COLS * fwidth;
704 max_height = MAX_ROWS * TermWin.fheight; 735 max_height = MAX_ROWS * fheight;
705 736
706 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 737 szHint.base_width = szHint.base_height = 2 * int_bwidth;
707 738
708 sb_w = mb_h = 0; 739 sb_w = 0;
709 window_vt_x = window_vt_y = TermWin.int_bwidth; 740 window_vt_x = window_vt_y = int_bwidth;
710 741
711 if (scrollbar_visible ()) 742 if (scrollBar.state)
712 { 743 {
713 sb_w = scrollbar_TotalWidth (); 744 sb_w = scrollbar_TotalWidth ();
714 szHint.base_width += sb_w; 745 szHint.base_width += sb_w;
715 if (!(options & Opt_scrollBar_right)) 746 if (!OPTION (Opt_scrollBar_right))
716 window_vt_x += sb_w; 747 window_vt_x += sb_w;
717 } 748 }
718 749
719 if (menubar_visible ())
720 {
721 mb_h = menuBar_TotalHeight ();
722 szHint.base_height += mb_h;
723 window_vt_y += mb_h;
724 }
725
726 szHint.width_inc = TermWin.fwidth; 750 szHint.width_inc = fwidth;
727 szHint.height_inc = TermWin.fheight; 751 szHint.height_inc = fheight;
728 szHint.min_width = szHint.base_width + szHint.width_inc; 752 szHint.min_width = szHint.base_width + szHint.width_inc;
729 szHint.min_height = szHint.base_height + szHint.height_inc; 753 szHint.min_height = szHint.base_height + szHint.height_inc;
730 754
731 if (width && width - szHint.base_width < max_width) 755 if (newwidth && newwidth - szHint.base_width < max_width)
732 { 756 {
733 szHint.width = width; 757 szHint.width = newwidth;
734 TermWin.width = width - szHint.base_width; 758 width = newwidth - szHint.base_width;
735 } 759 }
736 else 760 else
737 { 761 {
738 MIN_IT (TermWin.width, max_width); 762 min_it (width, max_width);
739 szHint.width = szHint.base_width + TermWin.width; 763 szHint.width = szHint.base_width + width;
740 } 764 }
741 765
742 if (height && height - szHint.base_height < max_height) 766 if (newheight && newheight - szHint.base_height < max_height)
743 { 767 {
744 szHint.height = height; 768 szHint.height = newheight;
745 TermWin.height = height - szHint.base_height; 769 height = newheight - szHint.base_height;
746 } 770 }
747 else 771 else
748 { 772 {
749 MIN_IT (TermWin.height, max_height); 773 min_it (height, max_height);
750 szHint.height = szHint.base_height + TermWin.height; 774 szHint.height = szHint.base_height + height;
751 } 775 }
752 776
753 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 777 if (scrollBar.state && OPTION (Opt_scrollBar_right))
754 window_sb_x = szHint.width - sb_w; 778 window_sb_x = szHint.width - sb_w;
755 779
756 if (recalc_x) 780 if (recalc_x)
757 szHint.x += (DisplayWidth (disp, display->screen) 781 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
758 - szHint.width - 2 * TermWin.ext_bwidth);
759 if (recalc_y) 782 if (recalc_y)
760 szHint.y += (DisplayHeight (disp, display->screen) 783 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
761 - szHint.height - 2 * TermWin.ext_bwidth);
762 784
763 TermWin.ncol = TermWin.width / TermWin.fwidth; 785 ncol = width / fwidth;
764 TermWin.nrow = TermWin.height / TermWin.fheight; 786 nrow = height / fheight;
765 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 787 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
766 TermWin.ncol, TermWin.nrow, szHint.width, 788 ncol, nrow, szHint.width,
767 szHint.height)); 789 szHint.height));
768 return; 790 return;
769} 791}
770 792
771/*----------------------------------------------------------------------*/ 793/*----------------------------------------------------------------------*/
… …
774 * Called after a window size change. 796 * Called after a window size change.
775 */ 797 */
776void 798void
777rxvt_term::tt_winch () 799rxvt_term::tt_winch ()
778{ 800{
779 if (pty.pty < 0) 801 if (pty->pty < 0)
780 return; 802 return;
781 803
782 struct winsize ws; 804 struct winsize ws;
783 805
784 ws.ws_col = TermWin.ncol; 806 ws.ws_col = ncol;
785 ws.ws_row = TermWin.nrow; 807 ws.ws_row = nrow;
786 ws.ws_xpixel = TermWin.width; 808 ws.ws_xpixel = width;
787 ws.ws_ypixel = TermWin.height; 809 ws.ws_ypixel = height;
788 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 810 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
789 811
790#if 0 812#if 0
791 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 813 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
792 if (cmd_pid) /* force through to the command */ 814 if (cmd_pid) /* force through to the command */
793 kill (cmd_pid, SIGWINCH); 815 kill (-cmd_pid, SIGWINCH);
794#endif 816#endif
795} 817}
796 818
797/*----------------------------------------------------------------------*/ 819/*----------------------------------------------------------------------*/
798/* set_fonts () - load and set the various fonts 820/* set_fonts () - load and set the various fonts
799/* 821 *
800 * init = 1 - initialize 822 * init = 1 - initialize
801 * 823 *
802 * fontname == FONT_UP - switch to bigger font 824 * fontname == FONT_UP - switch to bigger font
803 * fontname == FONT_DN - switch to smaller font 825 * fontname == FONT_DN - switch to smaller font
804 */ 826 */
… …
816 return false; 838 return false;
817 } 839 }
818 840
819#if ENABLE_STYLES 841#if ENABLE_STYLES
820 for (int i = RS_styleCount; --i; ) 842 for (int i = RS_styleCount; --i; )
821 if (TermWin.fontset[i] != TermWin.fontset[0]) 843 if (fontset[i] != fontset[0])
822 delete TermWin.fontset[i]; 844 delete fontset[i];
823#endif 845#endif
824 846
825 delete TermWin.fontset[0]; 847 delete fontset[0];
826 TermWin.fontset[0] = fs; 848 fontset[0] = fs;
827 849
828 prop = (*fs)[1]->properties (); 850 prop = (*fs)[1]->properties ();
829 prop.height += TermWin.lineSpace; 851 prop.height += lineSpace;
830 fs->set_prop (prop); 852 fs->set_prop (prop);
831 853
832 TermWin.fwidth = prop.width; 854 fwidth = prop.width;
833 TermWin.fheight = prop.height; 855 fheight = prop.height;
834 TermWin.fweight = prop.weight; 856 fbase = prop.ascent;
835 TermWin.fslant = prop.slant;
836 TermWin.fbase = (*fs)[1]->ascent;
837 857
838 for (int style = 1; style < 4; style++) 858 for (int style = 1; style < 4; style++)
839 { 859 {
840#if ENABLE_STYLES 860#if ENABLE_STYLES
841 const char *res = rs[Rs_font + style]; 861 const char *res = rs[Rs_font + style];
842 862
843 if (res && !*res) 863 if (res && !*res)
844 TermWin.fontset[style] = TermWin.fontset[0]; 864 fontset[style] = fontset[0];
845 else 865 else
846 { 866 {
847 TermWin.fontset[style] = fs = new rxvt_fontset (this); 867 fontset[style] = fs = new rxvt_fontset (this);
848 rxvt_fontprop prop2 = prop; 868 rxvt_fontprop prop2 = prop;
849 869
850 if (res) 870 if (res)
851 prop2.weight = prop2.slant = rxvt_fontprop::unset; 871 prop2.weight = prop2.slant = rxvt_fontprop::unset;
852 else 872 else
853 { 873 {
854 res = TermWin.fontset[0]->fontdesc; 874 res = fontset[0]->fontdesc;
855 875
856 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 876 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
857 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 877 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
858 } 878 }
859 879
860 fs->populate (res); 880 fs->populate (res);
861 fs->set_prop (prop2); 881 fs->set_prop (prop2);
862 } 882 }
863#else 883#else
864 TermWin.fontset[style] = TermWin.fontset[0]; 884 fontset[style] = fontset[0];
865#endif 885#endif
866 } 886 }
867 887
868 if (TermWin.parent[0]) 888 if (parent[0])
869 { 889 {
870 resize_all_windows (0, 0, 0); 890 resize_all_windows (0, 0, 0);
871 scr_remap_chars (); 891 scr_remap_chars ();
872 scr_touch (true); 892 scr_touch (true);
873 } 893 }
… …
875 return true; 895 return true;
876} 896}
877 897
878void rxvt_term::set_string_property (Atom prop, const char *str, int len) 898void rxvt_term::set_string_property (Atom prop, const char *str, int len)
879{ 899{
880 // TODO: SMART_WINDOW_TITLE
881 XChangeProperty (display->display, TermWin.parent[0], 900 XChangeProperty (display->display, parent[0],
882 prop, XA_STRING, 8, PropModeReplace, 901 prop, XA_STRING, 8, PropModeReplace,
883 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 902 (const unsigned char *)str, len >= 0 ? len : strlen (str));
884} 903}
885 904
886void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 905void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
887{ 906{
888 // TODO: SMART_WINDOW_TITLE
889 wchar_t *ws = rxvt_mbstowcs (str, len); 907 wchar_t *ws = rxvt_mbstowcs (str, len);
890 char *s = rxvt_wcstoutf8 (ws); 908 char *s = rxvt_wcstoutf8 (ws);
891 909
892 XChangeProperty (display->display, TermWin.parent[0], 910 XChangeProperty (display->display, parent[0],
893 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 911 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
894 (const unsigned char *)s, strlen (s)); 912 (const unsigned char *)s, strlen (s));
895 913
896 free (s); 914 free (s);
897 free (ws); 915 free (ws);
… …
902/* xterm sequences - title, iconName, color (exptl) */ 920/* xterm sequences - title, iconName, color (exptl) */
903void 921void
904rxvt_term::set_title (const char *str) 922rxvt_term::set_title (const char *str)
905{ 923{
906 set_string_property (XA_WM_NAME, str); 924 set_string_property (XA_WM_NAME, str);
907#if ENABLE_FRILLS 925#if ENABLE_EWMH
908 set_utf8_property (xa[XA_NET_WM_NAME], str); 926 set_utf8_property (xa[XA_NET_WM_NAME], str);
909#endif 927#endif
910} 928}
911 929
912void 930void
913rxvt_term::set_icon_name (const char *str) 931rxvt_term::set_icon_name (const char *str)
914{ 932{
915 set_string_property (XA_WM_ICON_NAME, str); 933 set_string_property (XA_WM_ICON_NAME, str);
916#if ENABLE_FRILLS 934#if ENABLE_EWMH
917 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 935 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
918#endif 936#endif
919} 937}
920 938
921#ifdef XTERM_COLOR_CHANGE 939#ifdef XTERM_COLOR_CHANGE
… …
934 i = atoi (color); 952 i = atoi (color);
935 953
936 if (i >= 8 && i <= 15) 954 if (i >= 8 && i <= 15)
937 { /* bright colors */ 955 { /* bright colors */
938 i -= 8; 956 i -= 8;
939# ifndef NO_BRIGHTCOLOR
940 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 957 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
941 SET_PIXCOLOR (idx); 958 SET_PIXCOLOR (idx);
942 goto Done; 959 goto done;
943# endif
944 } 960 }
945 961
946 if (i >= 0 && i <= 7) 962 if (i >= 0 && i <= 7)
947 { /* normal colors */ 963 { /* normal colors */
948 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 964 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
949 SET_PIXCOLOR (idx); 965 SET_PIXCOLOR (idx);
950 goto Done; 966 goto done;
951 } 967 }
952 } 968 }
953 969
954 if (!rXParseAllocColor (&xcol, color)) 970 if (!rXParseAllocColor (&xcol, color))
955 return; 971 return;
… …
975 pix_colors_focused[idx] = xcol; 991 pix_colors_focused[idx] = xcol;
976 SET_PIXCOLOR (idx); 992 SET_PIXCOLOR (idx);
977 993
978 /* XSetWindowAttributes attr; */ 994 /* XSetWindowAttributes attr; */
979 /* Cursor cursor; */ 995 /* Cursor cursor; */
980Done: 996done:
997
981#ifdef OFF_FOCUS_FADING 998#if OFF_FOCUS_FADING
982 if (rs[Rs_fade]) 999 if (rs[Rs_fade])
983 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 1000 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
984#endif 1001#endif
985 1002
986 /*TODO: handle Color_BD, scrollbar background, etc. */ 1003 /*TODO: handle Color_BD, scrollbar background, etc. */
987 1004
988 recolour_cursor (); 1005 recolour_cursor ();
… …
1059 1076
1060/* -------------------------------------------------------------------- * 1077/* -------------------------------------------------------------------- *
1061 * - WINDOW RESIZING - * 1078 * - WINDOW RESIZING - *
1062 * -------------------------------------------------------------------- */ 1079 * -------------------------------------------------------------------- */
1063void 1080void
1064rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1081rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1065{ 1082{
1066 int fix_screen; 1083 int fix_screen;
1067#ifdef SMART_RESIZE
1068 int old_width = szHint.width, old_height = szHint.height; 1084 int old_width = szHint.width, old_height = szHint.height;
1069#endif
1070 dDisp; 1085 dDisp;
1071 1086
1072 window_calc (width, height); 1087 window_calc (newwidth, newheight);
1073 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 1088 XSetWMNormalHints (disp, parent[0], &szHint);
1074 1089
1075 if (!ignoreparent) 1090 if (!ignoreparent)
1076 { 1091 {
1077#ifdef SMART_RESIZE 1092#ifdef SMART_RESIZE
1078 /* 1093 /*
… …
1082 int x, y, x1, y1; 1097 int x, y, x1, y1;
1083 int dx, dy; 1098 int dx, dy;
1084 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1099 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1085 Window unused_cr; 1100 Window unused_cr;
1086 1101
1087 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 1102 XTranslateCoordinates (disp, parent[0], display->root,
1088 0, 0, &x, &y, &unused_cr); 1103 0, 0, &x, &y, &unused_cr);
1089 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 1104 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1090 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1105 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1091 /* 1106 /*
1092 * if display->root isn't the parent window, a WM will probably have offset 1107 * if display->root isn't the parent window, a WM will probably have offset
1093 * our position for handles and decorations. Counter it 1108 * our position for handles and decorations. Counter it
1094 */ 1109 */
… …
1111 if (y < y1) /* top half */ 1126 if (y < y1) /* top half */
1112 dy = 0; 1127 dy = 0;
1113 else if (y == y1) /* exact center */ 1128 else if (y == y1) /* exact center */
1114 dy /= 2; 1129 dy /= 2;
1115 1130
1116 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 1131 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1117 szHint.width, szHint.height); 1132 szHint.width, szHint.height);
1118#else 1133#else
1119 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 1134 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1120#endif 1135#endif
1121 } 1136 }
1122 1137
1123 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1138 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1124 1139
1125 if (fix_screen || width != old_width || height != old_height) 1140 if (fix_screen || newwidth != old_width || newheight != old_height)
1126 { 1141 {
1127 if (scrollbar_visible ()) 1142 if (scrollBar.state)
1128 { 1143 {
1129 XMoveResizeWindow (disp, scrollBar.win, 1144 XMoveResizeWindow (disp, scrollBar.win,
1130 window_sb_x, 0, 1145 window_sb_x, 0,
1131 scrollbar_TotalWidth (), szHint.height); 1146 scrollbar_TotalWidth (), szHint.height);
1132 resize_scrollbar (); 1147 resize_scrollbar ();
1133 } 1148 }
1134 1149
1135 if (menubar_visible ())
1136 XMoveResizeWindow (disp, menuBar.win,
1137 window_vt_x, 0,
1138 TermWin_TotalWidth (), menuBar_TotalHeight ());
1139
1140 XMoveResizeWindow (disp, TermWin.vt, 1150 XMoveResizeWindow (disp, vt,
1141 window_vt_x, window_vt_y, 1151 window_vt_x, window_vt_y,
1142 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1152 width, height);
1143 1153
1144 scr_clear (); 1154 scr_clear ();
1145#ifdef XPM_BACKGROUND 1155#ifdef XPM_BACKGROUND
1146 resize_pixmap (); 1156 resize_pixmap ();
1147#endif 1157#endif
… …
1153 int old_ncol = prev_ncol; 1163 int old_ncol = prev_ncol;
1154 1164
1155 /* scr_reset only works on the primary screen */ 1165 /* scr_reset only works on the primary screen */
1156 if (old_height) /* this is not the first time through */ 1166 if (old_height) /* this is not the first time through */
1157 { 1167 {
1158 unsigned int ncol = TermWin.ncol; 1168 unsigned int ocol = ncol;
1159 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1169 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1160 curr_screen = scr_change_screen (PRIMARY); 1170 curr_screen = scr_change_screen (PRIMARY);
1161 TermWin.ncol = ncol; 1171 ncol = ocol;
1162 } 1172 }
1163 1173
1164 scr_reset (); 1174 scr_reset ();
1165 1175
1166 if (curr_screen >= 0) /* this is not the first time through */ 1176 if (curr_screen >= 0) /* this is not the first time through */
1167 { 1177 {
1168 scr_change_screen (curr_screen); 1178 scr_change_screen (curr_screen);
1169 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1179 selection_check (old_ncol != ncol ? 4 : 0);
1170 } 1180 }
1171 } 1181 }
1172 1182
1173 old_width = szHint.width; 1183 old_width = szHint.width;
1174 old_height = szHint.height; 1184 old_height = szHint.height;
1175 1185
1176#ifdef XPM_BACKGROUND 1186#ifdef XPM_BACKGROUND
1177 if (TermWin.pixmap) 1187 if (pixmap)
1178 scr_touch (false); 1188 scr_touch (false);
1179#endif 1189#endif
1180 1190
1181#ifdef USE_XIM 1191#ifdef USE_XIM
1182 IMSetStatusPosition (); 1192 IMSetStatusPosition ();
… …
1186/* 1196/*
1187 * Set the width/height of the vt window in characters. Units are pixels. 1197 * Set the width/height of the vt window in characters. Units are pixels.
1188 * good for toggling 80/132 columns 1198 * good for toggling 80/132 columns
1189 */ 1199 */
1190void 1200void
1191rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1201rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1192{ 1202{
1193 XWindowAttributes wattr; 1203 XWindowAttributes wattr;
1194 1204
1195 if (width == 0 || height == 0) 1205 if (newwidth == 0 || newheight == 0)
1196 { 1206 {
1197 XGetWindowAttributes (display->display, display->root, &wattr); 1207 XGetWindowAttributes (display->display, display->root, &wattr);
1208
1198 if (width == 0) 1209 if (newwidth == 0)
1199 width = wattr.width - szHint.base_width; 1210 newwidth = wattr.width - szHint.base_width;
1200 if (height == 0) 1211 if (newheight == 0)
1201 height = wattr.height - szHint.base_height; 1212 newheight = wattr.height - szHint.base_height;
1202 }
1203
1204 if (width != TermWin.width || height != TermWin.height)
1205 { 1213 }
1214
1215 if (newwidth != width || newheight != height)
1216 {
1206 width += szHint.base_width; 1217 newwidth += szHint.base_width;
1207 height += szHint.base_height; 1218 newheight += szHint.base_height;
1208 resize_all_windows (width, height, 0); 1219 resize_all_windows (newwidth, newheight, 0);
1209 } 1220 }
1210} 1221}
1211 1222
1212/* -------------------------------------------------------------------- * 1223/* -------------------------------------------------------------------- *
1213 * - X INPUT METHOD ROUTINES - * 1224 * - X INPUT METHOD ROUTINES - *
… …
1223 1234
1224void 1235void
1225rxvt_term::im_set_size (XRectangle &size) 1236rxvt_term::im_set_size (XRectangle &size)
1226{ 1237{
1227 // the int_bwidth terms make no sense to me 1238 // the int_bwidth terms make no sense to me
1228 size.x = TermWin.int_bwidth; 1239 size.x = int_bwidth;
1229 size.y = TermWin.int_bwidth; 1240 size.y = int_bwidth;
1230 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1241 size.width = Width2Pixel (ncol) + int_bwidth;
1231 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1242 size.height = Height2Pixel (nrow) + int_bwidth;
1232} 1243}
1233 1244
1234void 1245void
1235rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1246rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1236 XRectangle &status_rect, 1247 XRectangle &status_rect,
1237 const XRectangle &needed_rect) 1248 const XRectangle &needed_rect)
1238{ 1249{
1239 preedit_rect.x = needed_rect.width; 1250 preedit_rect.x = needed_rect.width;
1240 preedit_rect.y = 0; 1251 preedit_rect.y = 0;
1241 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1252 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1242 preedit_rect.height = TermWin.fheight; 1253 preedit_rect.height = fheight;
1243 1254
1244 status_rect.x = 0; 1255 status_rect.x = 0;
1245 status_rect.y = 0; 1256 status_rect.y = 0;
1246 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1257 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1247 status_rect.height = TermWin.fheight; 1258 status_rect.height = fheight;
1248} 1259}
1249 1260
1250/* Checking whether input method is running. */ 1261/* Checking whether input method is running. */
1251bool 1262bool
1252rxvt_term::IMisRunning () 1263rxvt_term::IMisRunning ()
… …
1280{ 1291{
1281 XPoint nspot; 1292 XPoint nspot;
1282 XVaNestedList preedit_attr; 1293 XVaNestedList preedit_attr;
1283 1294
1284 if (!Input_Context 1295 if (!Input_Context
1285 || !TermWin.focus 1296 || !focus
1286 || !(input_style & XIMPreeditPosition)) 1297 || !(input_style & XIMPreeditPosition))
1287 return; 1298 return;
1288 1299
1289 im_set_position (nspot); 1300 im_set_position (nspot);
1290 1301
… …
1326 XRectangle rect, status_rect, needed_rect; 1337 XRectangle rect, status_rect, needed_rect;
1327 unsigned long fg, bg; 1338 unsigned long fg, bg;
1328 const char *p; 1339 const char *p;
1329 char **s; 1340 char **s;
1330 XIMStyles *xim_styles; 1341 XIMStyles *xim_styles;
1342
1343 set_environ (envv);
1331 1344
1332 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1345 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1333 return false; 1346 return false;
1334 1347
1335 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1348 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1410 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1423 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1411 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1424 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1412 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1425 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1413 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1426 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1414 "*", 1427 "*",
1415 TermWin.fheight, 1428 fheight,
1416 TermWin.fheight + 1, TermWin.fheight - 1, 1429 fheight + 1, fheight - 1,
1417 TermWin.fheight - 2, TermWin.fheight + 2); 1430 fheight - 2, fheight + 2);
1418 1431
1419 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1432 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1420 &missing_charset_list, &missing_charset_count, &def_string); 1433 &missing_charset_list, &missing_charset_count, &def_string);
1421 1434
1422 if (missing_charset_list) 1435 if (missing_charset_list)
… …
1468 NULL); 1481 NULL);
1469 } 1482 }
1470 1483
1471 Input_Context = XCreateIC (xim, 1484 Input_Context = XCreateIC (xim,
1472 XNInputStyle, input_style, 1485 XNInputStyle, input_style,
1473 XNClientWindow, TermWin.vt, 1486 XNClientWindow, vt,
1474 XNFocusWindow, TermWin.parent[0], 1487 XNFocusWindow, parent[0],
1475 preedit_attr ? XNPreeditAttributes : NULL, 1488 preedit_attr ? XNPreeditAttributes : NULL,
1476 preedit_attr, 1489 preedit_attr,
1477 status_attr ? XNStatusAttributes : NULL, 1490 status_attr ? XNStatusAttributes : NULL,
1478 status_attr, NULL); 1491 status_attr, NULL);
1479 1492
… …
1496} 1509}
1497 1510
1498void 1511void
1499rxvt_term::im_cb () 1512rxvt_term::im_cb ()
1500{ 1513{
1501 int i, found, had_im; 1514 int i;
1502 const char *p; 1515 const char *p;
1503 char **s; 1516 char **s;
1504 char buf[IMBUFSIZ]; 1517 char buf[IMBUFSIZ];
1518
1519 make_current ();
1505 1520
1506 im_destroy (); 1521 im_destroy ();
1507 1522
1508 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1523 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1509 if (Input_Context) 1524 if (Input_Context)
… …
1561{ 1576{
1562 XRectangle preedit_rect, status_rect, *needed_rect; 1577 XRectangle preedit_rect, status_rect, *needed_rect;
1563 XVaNestedList preedit_attr, status_attr; 1578 XVaNestedList preedit_attr, status_attr;
1564 1579
1565 if (!Input_Context 1580 if (!Input_Context
1566 || !TermWin.focus 1581 || !focus
1567 || !(input_style & XIMPreeditArea) 1582 || !(input_style & XIMPreeditArea)
1568 || !IMisRunning ()) 1583 || !IMisRunning ())
1569 return; 1584 return;
1570 1585
1571 /* Getting the necessary width of preedit area */ 1586 /* Getting the necessary width of preedit area */

Diff Legend

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