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.132 by root, Thu Feb 3 07:18:30 2005 UTC vs.
Revision 1.167 by root, Sun Jan 8 08:43:11 2006 UTC

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

Diff Legend

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