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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.134 by root, Fri Feb 4 11:41:23 2005 UTC vs.
Revision 1.191 by root, Fri Jan 20 10:27:08 2006 UTC

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

Diff Legend

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