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

Diff Legend

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