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

Diff Legend

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