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

Diff Legend

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