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.328 by sf-exg, Mon Jul 19 16:43:21 2010 UTC vs.
Revision 1.380 by root, Tue Jun 5 11:35:58 2012 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-2008 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de>
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 "init.h"
35#include "keyboard.h" 36#include "keyboard.h"
36#include "rxvtperl.h" 37#include "rxvtperl.h"
37 38
38#include <limits> 39#include <limits>
39 40
40#include <cassert> 41#include <assert.h>
41#include <csignal> 42#include <signal.h>
42#include <cstring> 43#include <string.h>
43 44
44#include <termios.h> 45#include <termios.h>
45 46
46#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
47# define X_LOCALE 48# define X_LOCALE
48# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
49#else 50#else
50# ifdef HAVE_SETLOCALE
51# include <clocale> 51# include <locale.h>
52# endif 52#endif
53#endif
54 53
54struct termios rxvt_term::def_tio;
55vector<rxvt_term *> rxvt_term::termlist; 55vector<rxvt_term *> rxvt_term::termlist;
56 56
57// used to tell global functions which terminal instance is "active" 57// used to tell global functions which terminal instance is "active"
58rxvt_t rxvt_current_term; 58rxvt_t rxvt_current_term;
59 59
… …
94text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 94text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
95{ 95{
96 compose_char *cc; 96 compose_char *cc;
97 97
98 // break compose chains, as stupid readline really likes to duplicate 98 // break compose chains, as stupid readline really likes to duplicate
99 // composing characters for some reason near the end of a line. 99 // composing characters for some reason, near the end of a line.
100 cc = (*this)[c1]; 100 cc = (*this)[c1];
101 while (cc) 101 while (cc)
102 { 102 {
103 if (cc->c2 == c2) return c1; 103 if (cc->c2 == c2) return c1;
104 cc = (*this)[cc->c1]; 104 cc = (*this)[cc->c1];
105 } 105 }
106 106
107 // check to see whether this combination already exists otherwise 107 // check to see whether this combination already exists otherwise
108 for (cc = v.end (); cc-- > v.begin (); ) 108 for (cc = v.begin (); cc < v.end (); cc++)
109 {
110 if (cc->c1 == c1 && cc->c2 == c2) 109 if (cc->c1 == c1 && cc->c2 == c2)
111 return COMPOSE_LO + (cc - v.begin ()); 110 return COMPOSE_LO + (cc - v.begin ());
112 }
113 111
114 // allocate a new combination 112 // allocate a new combination
115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 113 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
116 { 114 {
117 static int seen; 115 static int seen;
118 116
119 if (!seen++) 117 if (!seen++)
120 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 118 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
121 119
122 return REPLACEMENT_CHAR; 120 return REPLACEMENT_CHAR;
123 } 121 }
124 122
125 v.push_back (compose_char (c1, c2)); 123 v.push_back (compose_char (c1, c2));
… …
174#endif 172#endif
175#if ENABLE_TRANSPARENCY || ENABLE_PERL 173#if ENABLE_TRANSPARENCY || ENABLE_PERL
176 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
177#endif 175#endif
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#ifdef USE_XIM 177#if USE_XIM
180 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
181#endif 179#endif
182#ifdef POINTER_BLANK 180#ifdef POINTER_BLANK
183 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
184#endif 182#endif
… …
187#endif 185#endif
188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 186 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 187 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 188 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 189 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
192 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
193 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 190 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
194 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 191 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
195 192
196 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 193 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
197 194
… …
226 delete fontset[i]; 223 delete fontset[i];
227#endif 224#endif
228 delete fontset[0]; 225 delete fontset[0];
229 226
230#ifdef HAVE_BG_PIXMAP 227#ifdef HAVE_BG_PIXMAP
231 bgPixmap.destroy (); 228 bg_destroy ();
232#endif
233#ifdef HAVE_AFTERIMAGE
234 if (asv)
235 destroy_asvisual (asv, 0);
236 if (asimman)
237 destroy_image_manager (asimman, 0);
238#endif 229#endif
239 230
240 if (display) 231 if (display)
241 { 232 {
242 selection_clear (); 233 selection_clear ();
243 selection_clear (true); 234 selection_clear (true);
244 235
245#ifdef USE_XIM 236#if USE_XIM
246 im_destroy (); 237 im_destroy ();
247#endif 238#endif
248 scrollBar.destroy (); 239 scrollBar.destroy ();
249 if (gc) XFreeGC (dpy, gc); 240 if (gc) XFreeGC (dpy, gc);
250 241
251 delete drawable; 242 delete drawable;
252 // destroy all windows 243 // destroy all windows
253 if (parent[0]) 244 if (parent)
254 XDestroyWindow (dpy, parent[0]); 245 XDestroyWindow (dpy, parent);
255 246
256 for (int i = 0; i < TOTAL_COLORS; i++) 247 for (int i = 0; i < TOTAL_COLORS; i++)
257 if (ISSET_PIXCOLOR (i)) 248 if (ISSET_PIXCOLOR (i))
258 { 249 {
259 pix_colors_focused [i].free (this); 250 pix_colors_focused [i].free (this);
… …
274 for (int i = 0; i < allocated.size (); i++) 265 for (int i = 0; i < allocated.size (); i++)
275 free (allocated [i]); 266 free (allocated [i]);
276 267
277 free (selection.text); 268 free (selection.text);
278 free (selection.clip_text); 269 free (selection.clip_text);
279 // TODO: manage env vars in child only(!)
280 free (env_display);
281 free (env_term);
282 free (locale); 270 free (locale);
283 free (v_buffer); 271 free (v_buffer);
284 free (incr_buf); 272
273 delete selection_req;
285 274
286 delete envv; 275 delete envv;
287 delete argv; 276 delete argv;
288 277
289#ifdef KEYSYM_RESOURCE 278#ifdef KEYSYM_RESOURCE
… …
325#endif 314#endif
326 scrollbar_ev.stop (display); 315 scrollbar_ev.stop (display);
327#if ENABLE_TRANSPARENCY || ENABLE_PERL 316#if ENABLE_TRANSPARENCY || ENABLE_PERL
328 rootwin_ev.stop (display); 317 rootwin_ev.stop (display);
329#endif 318#endif
330 incr_ev.stop ();
331 termwin_ev.stop (display); 319 termwin_ev.stop (display);
332 vt_ev.stop (display); 320 vt_ev.stop (display);
333 } 321 }
334 322
335 flush_ev.stop (); 323 flush_ev.stop ();
… …
359 make_current (); 347 make_current ();
360 348
361 delete this; 349 delete this;
362} 350}
363 351
352void
353rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
354{
355 if (!opt)
356 return;
357
358 uint8_t mask = 1 << (opt & 7);
359 uint8_t &val = options [opt >> 3];
360
361 val = val & ~mask | (set ? mask : 0);
362}
363
364/*----------------------------------------------------------------------*/ 364/*----------------------------------------------------------------------*/
365/* 365/*
366 * Exit gracefully, clearing the utmp entry and restoring tty attributes 366 * Exit gracefully, clearing the utmp entry and restoring tty attributes
367 * TODO: if debugging, this should free up any known resources if we can
368 */ 367 */
369static XErrorHandler old_xerror_handler; 368static XErrorHandler old_xerror_handler;
370 369
371static void 370static void
372rxvt_emergency_cleanup () 371rxvt_emergency_cleanup ()
… …
374 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 373 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
375 (*t)->emergency_cleanup (); 374 (*t)->emergency_cleanup ();
376} 375}
377 376
378#if !ENABLE_MINIMAL 377#if !ENABLE_MINIMAL
379static void 378static void ecb_cold
380print_x_error (Display *dpy, XErrorEvent *event) 379print_x_error (Display *dpy, XErrorEvent *event)
381{ 380{
382 char buffer[BUFSIZ]; 381 char buffer[BUFSIZ];
383 char mesg[BUFSIZ]; 382 char mesg[BUFSIZ];
384 char number[32]; 383 char number[32];
385 char *mtype = "XlibMessage"; 384
386 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
387 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
388 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 385 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
386
387 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
388 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
389
390 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
391 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
389 rxvt_warn ("%s: %s\n", mesg, buffer); 392 rxvt_warn ("+ %s: %s\n", mesg, buffer);
393
390 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 394 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
391 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 395 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
396
392 sprintf(number, "%d", event->request_code); 397 sprintf (number, "%d", event->request_code);
393 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 398 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
394 rxvt_warn ("(which is %s)\n", buffer); 399 rxvt_warn ("+ (which is %s)\n", buffer);
400
395 if (event->request_code >= 128) { 401 if (event->request_code >= 128)
402 {
396 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 403 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
397 mesg, BUFSIZ); 404 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
398 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
399 } 405 }
406
400 if ((event->error_code == BadWindow) || 407 if (event->error_code == BadWindow
401 (event->error_code == BadPixmap) || 408 || event->error_code == BadPixmap
402 (event->error_code == BadCursor) || 409 || event->error_code == BadCursor
403 (event->error_code == BadFont) || 410 || event->error_code == BadFont
404 (event->error_code == BadDrawable) || 411 || event->error_code == BadDrawable
405 (event->error_code == BadColor) || 412 || event->error_code == BadColor
406 (event->error_code == BadGC) || 413 || event->error_code == BadGC
407 (event->error_code == BadIDChoice) || 414 || event->error_code == BadIDChoice
408 (event->error_code == BadValue) || 415 || event->error_code == BadValue
409 (event->error_code == BadAtom)) { 416 || event->error_code == BadAtom)
417 {
410 if (event->error_code == BadValue) 418 if (event->error_code == BadValue)
411 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 419 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
412 mesg, BUFSIZ);
413 else if (event->error_code == BadAtom) 420 else if (event->error_code == BadAtom)
414 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 421 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
415 mesg, BUFSIZ);
416 else 422 else
417 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 423 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
418 mesg, BUFSIZ);
419 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
420 }
421 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
422 mesg, BUFSIZ);
423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
424}
425#endif
426 424
427int 425 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
426 }
427}
428#endif
429
430int ecb_cold
428rxvt_xerror_handler (Display *display, XErrorEvent *event) 431rxvt_xerror_handler (Display *display, XErrorEvent *event)
429{ 432{
430 if (GET_R->allowedxerror == -1) 433 if (GET_R->allowedxerror == -1)
431 GET_R->allowedxerror = event->error_code; 434 GET_R->allowedxerror = event->error_code;
432 else 435 else
… …
441 } 444 }
442 445
443 return 0; 446 return 0;
444} 447}
445 448
446int 449int ecb_cold
447rxvt_xioerror_handler (Display *display) 450rxvt_xioerror_handler (Display *display)
448{ 451{
449 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 452 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
450 DisplayString (display)); 453 DisplayString (display));
451 rxvt_emergency_cleanup (); 454 rxvt_emergency_cleanup ();
… …
474 rxvt_emergency_cleanup (); 477 rxvt_emergency_cleanup ();
475 w.stop (); 478 w.stop ();
476 kill (getpid (), w.signum); 479 kill (getpid (), w.signum);
477} 480}
478 481
482static void
483rxvt_get_ttymode (struct termios *tio)
484{
485 if (tcgetattr (STDIN_FILENO, tio) < 0)
486 memset (tio, 0, sizeof (struct termios));
487
488 for (int i = 0; i < NCCS; i++)
489 tio->c_cc[i] = VDISABLE;
490
491 tio->c_cc[VINTR] = CINTR;
492 tio->c_cc[VQUIT] = CQUIT;
493 tio->c_cc[VERASE] = CERASE;
494#ifdef VERASE2
495 tio->c_cc[VERASE2] = CERASE2;
496#endif
497 tio->c_cc[VKILL] = CKILL;
498 tio->c_cc[VEOF] = CEOF;
499 tio->c_cc[VSTART] = CSTART;
500 tio->c_cc[VSTOP] = CSTOP;
501 tio->c_cc[VSUSP] = CSUSP;
502# ifdef VDSUSP
503 tio->c_cc[VDSUSP] = CDSUSP;
504# endif
505# ifdef VREPRINT
506 tio->c_cc[VREPRINT] = CRPRNT;
507# endif
508# ifdef VDISCRD
509 tio->c_cc[VDISCRD] = CFLUSH;
510# endif
511# ifdef VWERSE
512 tio->c_cc[VWERSE] = CWERASE;
513# endif
514# ifdef VLNEXT
515 tio->c_cc[VLNEXT] = CLNEXT;
516# endif
517# ifdef VSTATUS
518 tio->c_cc[VSTATUS] = CSTATUS;
519# endif
520
521# if VMIN != VEOF
522 tio->c_cc[VMIN] = 1;
523# endif
524# if VTIME != VEOL
525 tio->c_cc[VTIME] = 0;
526# endif
527
528 /* input modes */
529 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
530# ifdef IMAXBEL
531 | IMAXBEL
532# endif
533 | IXON);
534
535 /* output modes */
536 tio->c_oflag = (OPOST | ONLCR);
537
538 /* control modes */
539 tio->c_cflag = (CS8 | CREAD);
540
541 /* local modes */
542 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
543# if defined (ECHOCTL) && defined (ECHOKE)
544 | ECHOCTL | ECHOKE
545# endif
546 | ECHOE | ECHOK);
547}
548
479char **rxvt_environ; // startup environment 549char **rxvt_environ; // startup environment
480 550
481void 551void
482rxvt_init () 552rxvt_init ()
483{ 553{
484 assert (("fontMask must not overlap other RS masks", 554 assert (("fontMask must not overlap other RS masks",
485 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask)))); 555 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
486 556
487 ptytty::init (); 557 rxvt_get_ttymode (&rxvt_term::def_tio);
488 558
559 // get rid of stdin/stdout as we don't need them, to free resources
560 dup2 (STDERR_FILENO, STDIN_FILENO);
561 dup2 (STDERR_FILENO, STDOUT_FILENO);
562
489 if (!ev_default_loop (0)) 563 if (!ev_default_loop ())
490 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 564 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
491 565
492 rxvt_environ = environ; 566 rxvt_environ = environ;
493 567
494 signal (SIGHUP, SIG_IGN); 568 signal (SIGHUP, SIG_IGN);
495 signal (SIGPIPE, SIG_IGN); 569 signal (SIGPIPE, SIG_IGN);
496 570
497 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 571 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
498 sig_handlers.sw_int.start (SIGINT); ev_unref (); 572 sig_handlers.sw_int.start (SIGINT); ev_unref ();
499
500 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
501 /* signal (SIGURG, SIG_DFL); */
502 573
503 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 574 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
504 // TODO: handle this with exceptions and tolerate the memory loss 575 // TODO: handle this with exceptions and tolerate the memory loss
505 XSetIOErrorHandler (rxvt_xioerror_handler); 576 XSetIOErrorHandler (rxvt_xioerror_handler);
506 577
507 XrmInitialize (); 578 XrmInitialize ();
579
580#if HAVE_PIXBUF
581 g_type_init ();
582#endif
508} 583}
509 584
510/*----------------------------------------------------------------------*/ 585/*----------------------------------------------------------------------*/
511/* 586/*
512 * window size/position calculations for XSizeHint and other storage. 587 * window size/position calculations for XSizeHint and other storage.
… …
633 if (recalc_y) 708 if (recalc_y)
634 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 709 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
635 710
636 ncol = width / fwidth; 711 ncol = width / fwidth;
637 nrow = height / fheight; 712 nrow = height / fheight;
713
714 // When the size of the vt window is not a multiple of the cell
715 // size, i.e., when the wm does not honour our size hints, there are
716 // extra areas not covered by the terminal screen. Such gaps, when a
717 // bg pixmap is set, would have to be cleared manually to properly
718 // refresh the background. We take the simpler route and shrink the
719 // vt window so as to avoid creating gaps.
720 vt_width = ncol * fwidth;
721 vt_height = nrow * fheight;
638} 722}
639 723
640/*----------------------------------------------------------------------*/ 724/*----------------------------------------------------------------------*/
641/* 725/*
642 * Tell the teletype handler what size the window is. 726 * Tell the teletype handler what size the window is.
… …
650 734
651 struct winsize ws; 735 struct winsize ws;
652 736
653 ws.ws_col = ncol; 737 ws.ws_col = ncol;
654 ws.ws_row = nrow; 738 ws.ws_row = nrow;
655 ws.ws_xpixel = width; 739 ws.ws_xpixel = vt_width;
656 ws.ws_ypixel = height; 740 ws.ws_ypixel = vt_height;
657 ioctl (pty->pty, TIOCSWINSZ, &ws); 741 ioctl (pty->pty, TIOCSWINSZ, &ws);
658 742
659#if 0 743#if 0
660 // TIOCSWINSZ is supposed to do this automatically and correctly 744 // TIOCSWINSZ is supposed to do this automatically and correctly
661 if (cmd_pid) /* force through to the command */ 745 if (cmd_pid) /* force through to the command */
662 kill (-cmd_pid, SIGWINCH); 746 kill (-cmd_pid, SIGWINCH);
663#endif 747#endif
664} 748}
665 749
666/*----------------------------------------------------------------------*/ 750/*----------------------------------------------------------------------*/
667/* set_fonts () - load and set the various fonts 751/* load and set the various fonts */
668 *
669 * init = 1 - initialize
670 *
671 * fontname == FONT_UP - switch to bigger font
672 * fontname == FONT_DN - switch to smaller font
673 */
674bool 752bool
675rxvt_term::set_fonts () 753rxvt_term::set_fonts ()
676{ 754{
677 rxvt_fontset *fs = new rxvt_fontset (this); 755 rxvt_fontset *fs = new rxvt_fontset (this);
678 rxvt_fontprop prop; 756 rxvt_fontprop prop;
… …
693 771
694 delete fontset[0]; 772 delete fontset[0];
695 fontset[0] = fs; 773 fontset[0] = fs;
696 774
697 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 775 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
698 prop.height += lineSpace;
699 prop.width += letterSpace; 776 prop.width += letterSpace;
700 777
701 fs->set_prop (prop, false); 778 fs->set_prop (prop, false);
702 779
703 fwidth = prop.width; 780 fwidth = prop.width;
704 fheight = prop.height; 781 fheight = prop.height + lineSpace;
705 fbase = prop.ascent; 782 fbase = prop.ascent;
706 783
707 for (int style = 1; style < 4; style++) 784 for (int style = 1; style < 4; style++)
708 { 785 {
709#if ENABLE_STYLES 786#if ENABLE_STYLES
… …
735#else 812#else
736 fontset[style] = fontset[0]; 813 fontset[style] = fontset[0];
737#endif 814#endif
738 } 815 }
739 816
740 if (parent[0]) 817 if (parent)
741 { 818 {
742 resize_all_windows (0, 0, 0); 819 resize_all_windows (0, 0, 0);
743 scr_remap_chars (); 820 scr_remap_chars ();
744 scr_touch (true); 821 scr_touch (true);
745 } 822 }
… …
748} 825}
749 826
750void 827void
751rxvt_term::set_string_property (Atom prop, const char *str, int len) 828rxvt_term::set_string_property (Atom prop, const char *str, int len)
752{ 829{
753 XChangeProperty (dpy, parent[0], 830 XChangeProperty (dpy, parent,
754 prop, XA_STRING, 8, PropModeReplace, 831 prop, XA_STRING, 8, PropModeReplace,
755 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 832 (const unsigned char *)str, len >= 0 ? len : strlen (str));
756} 833}
757 834
758void 835void
… …
760{ 837{
761 XTextProperty ct; 838 XTextProperty ct;
762 839
763 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) 840 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
764 { 841 {
765 XSetTextProperty (dpy, parent[0], &ct, prop); 842 XSetTextProperty (dpy, parent, &ct, prop);
766 XFree (ct.value); 843 XFree (ct.value);
767 } 844 }
768} 845}
769 846
770void 847void
771rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 848rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
772{ 849{
773 wchar_t *ws = rxvt_mbstowcs (str, len); 850 wchar_t *ws = rxvt_mbstowcs (str, len);
774 char *s = rxvt_wcstoutf8 (ws); 851 char *s = rxvt_wcstoutf8 (ws);
775 852
776 XChangeProperty (dpy, parent[0], 853 XChangeProperty (dpy, parent,
777 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 854 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
778 (const unsigned char *)s, strlen (s)); 855 (const unsigned char *)s, strlen (s));
779 856
780 free (s); 857 free (s);
781 free (ws); 858 free (ws);
… …
871 948
872/*----------------------------------------------------------------------*/ 949/*----------------------------------------------------------------------*/
873/* 950/*
874 * find if fg/bg matches any of the normal (low-intensity) colors 951 * find if fg/bg matches any of the normal (low-intensity) colors
875 */ 952 */
876void 953char *
877rxvt_term::set_colorfgbg () 954rxvt_term::get_colorfgbg ()
878{ 955{
879 unsigned int i; 956 unsigned int i;
880 const char *xpmb = ""; 957 const char *xpmb = "";
881 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 958 char fstr[] = "default";
959 char bstr[] = "default";
960 char *env_colorfgbg;
882 961
883 strcpy (fstr, "default");
884 strcpy (bstr, "default");
885 for (i = Color_Black; i <= Color_White; i++) 962 for (i = Color_Black; i <= Color_White; i++)
886 if (pix_colors[Color_fg] == pix_colors[i]) 963 if (pix_colors[Color_fg] == pix_colors[i])
887 { 964 {
888 sprintf (fstr, "%d", (i - Color_Black)); 965 sprintf (fstr, "%d", i - Color_Black);
889 break; 966 break;
890 } 967 }
891 968
892 for (i = Color_Black; i <= Color_White; i++) 969 for (i = Color_Black; i <= Color_White; i++)
893 if (pix_colors[Color_bg] == pix_colors[i]) 970 if (pix_colors[Color_bg] == pix_colors[i])
894 { 971 {
895 sprintf (bstr, "%d", (i - Color_Black)); 972 sprintf (bstr, "%d", i - Color_Black);
896#ifdef BG_IMAGE_FROM_FILE 973#if BG_IMAGE_FROM_FILE
897 xpmb = "default;"; 974 xpmb = "default;";
898#endif 975#endif
899 break; 976 break;
900 } 977 }
901 978
979 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
902 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 980 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
981 return env_colorfgbg;
903} 982}
904 983
905/*----------------------------------------------------------------------*/ 984/*----------------------------------------------------------------------*/
906 985
907bool 986bool
… …
936 1015
937 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow 1016 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
938 if (set_hint) 1017 if (set_hint)
939 { 1018 {
940 szHint.flags &= ~(PBaseSize | PResizeInc); 1019 szHint.flags &= ~(PBaseSize | PResizeInc);
941 XSetWMNormalHints (dpy, parent[0], &szHint); 1020 XSetWMNormalHints (dpy, parent, &szHint);
942 szHint.flags |= PBaseSize | PResizeInc; 1021 szHint.flags |= PBaseSize | PResizeInc;
943 } 1022 }
944 1023
945 if (!ignoreparent) 1024 if (!ignoreparent)
946 { 1025 {
… …
952 int x, y, x1, y1; 1031 int x, y, x1, y1;
953 int dx, dy; 1032 int dx, dy;
954 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1033 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
955 Window unused_cr; 1034 Window unused_cr;
956 1035
957 XTranslateCoordinates (dpy, parent[0], display->root, 1036 XTranslateCoordinates (dpy, parent, display->root,
958 0, 0, &x, &y, &unused_cr); 1037 0, 0, &x, &y, &unused_cr);
959 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1038 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
960 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1039 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
961 /* 1040 /*
962 * if display->root isn't the parent window, a WM will probably have offset 1041 * if display->root isn't the parent window, a WM will probably have offset
963 * our position for handles and decorations. Counter it 1042 * our position for handles and decorations. Counter it
964 */ 1043 */
… …
981 if (y < y1) /* top half */ 1060 if (y < y1) /* top half */
982 dy = 0; 1061 dy = 0;
983 else if (y == y1) /* exact center */ 1062 else if (y == y1) /* exact center */
984 dy /= 2; 1063 dy /= 2;
985 1064
986 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1065 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
987 szHint.width, szHint.height); 1066 szHint.width, szHint.height);
988#else 1067#else
989 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1068 XResizeWindow (dpy, parent, szHint.width, szHint.height);
990#endif 1069#endif
991 } 1070 }
992 1071
993 if (set_hint) 1072 if (set_hint)
994 XSetWMNormalHints (dpy, parent[0], &szHint); 1073 XSetWMNormalHints (dpy, parent, &szHint);
995 1074
996 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1075 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
997 1076
998 if (fix_screen || newwidth != old_width || newheight != old_height) 1077 if (fix_screen || newwidth != old_width || newheight != old_height)
999 { 1078 {
1000 if (scrollBar.state) 1079 if (scrollBar.state)
1001 scrollBar.resize (); 1080 scrollBar.resize ();
1002 1081
1003 XMoveResizeWindow (dpy, vt, 1082 XMoveResizeWindow (dpy, vt,
1004 window_vt_x, window_vt_y, 1083 window_vt_x, window_vt_y,
1005 width, height); 1084 vt_width, vt_height);
1085
1086 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1006 1087
1007#ifdef HAVE_BG_PIXMAP 1088#ifdef HAVE_BG_PIXMAP
1008 if (bgPixmap.window_size_sensitive ()) 1089 if (bg_window_size_sensitive ())
1009 update_background (); 1090 update_background ();
1010#endif 1091#endif
1011 } 1092 }
1012 1093
1013 if (fix_screen || old_height == 0) 1094 if (fix_screen || old_height == 0)
1014 scr_reset (); 1095 scr_reset ();
1015 1096
1016#ifdef HAVE_BG_PIXMAP
1017// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1018// if (bgPixmap.pixmap)
1019// scr_touch (false);
1020#endif
1021
1022#ifdef USE_XIM 1097#if USE_XIM
1023 IMSetPosition (); 1098 im_set_position ();
1024#endif 1099#endif
1025} 1100}
1026 1101
1027/* 1102/*
1028 * Set the width/height of the vt window in characters. Units are pixels. 1103 * Set the width/height of the vt window in characters. Units are pixels.
… …
1041 newwidth = wattr.width - szHint.base_width; 1116 newwidth = wattr.width - szHint.base_width;
1042 if (newheight == 0) 1117 if (newheight == 0)
1043 newheight = wattr.height - szHint.base_height; 1118 newheight = wattr.height - szHint.base_height;
1044 } 1119 }
1045 1120
1046 if (newwidth != width || newheight != height) 1121 if (newwidth != vt_width || newheight != vt_height)
1047 { 1122 {
1048 newwidth += szHint.base_width; 1123 newwidth += szHint.base_width;
1049 newheight += szHint.base_height; 1124 newheight += szHint.base_height;
1050 resize_all_windows (newwidth, newheight, 0); 1125 resize_all_windows (newwidth, newheight, 0);
1051 } 1126 }
1052} 1127}
1053 1128
1054/* -------------------------------------------------------------------- * 1129/* -------------------------------------------------------------------- *
1055 * - X INPUT METHOD ROUTINES - * 1130 * - X INPUT METHOD ROUTINES - *
1056 * -------------------------------------------------------------------- */ 1131 * -------------------------------------------------------------------- */
1057#ifdef USE_XIM 1132#if USE_XIM
1058 1133
1059void 1134void
1060rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1135rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1061{ 1136{
1062 fg = pix_colors [Color_fg]; 1137 fg = pix_colors [Color_fg];
… …
1089 status_rect.height = fheight; 1164 status_rect.height = fheight;
1090} 1165}
1091 1166
1092/* Checking whether input method is running. */ 1167/* Checking whether input method is running. */
1093bool 1168bool
1094rxvt_term::IMisRunning () 1169rxvt_term::im_is_running ()
1095{ 1170{
1096 Atom atom; 1171 Atom atom;
1097 Window win; 1172 Window win;
1098 char server[IMBUFSIZ]; 1173 char server[IMBUFSIZ];
1099 1174
… …
1108 1183
1109 atom = XInternAtom (dpy, server, False); 1184 atom = XInternAtom (dpy, server, False);
1110 win = XGetSelectionOwner (dpy, atom); 1185 win = XGetSelectionOwner (dpy, atom);
1111 1186
1112 if (win != None) 1187 if (win != None)
1113 return True; 1188 return true;
1114 } 1189 }
1115 1190
1116 return False; 1191 return false;
1117} 1192}
1118 1193
1119void 1194void
1120rxvt_term::IMSendSpot () 1195rxvt_term::im_send_spot ()
1121{ 1196{
1122 XPoint nspot; 1197 XPoint nspot;
1123 XVaNestedList preedit_attr; 1198 XVaNestedList preedit_attr;
1124 1199
1125 if (!Input_Context 1200 if (!Input_Context
… …
1231/* 1306/*
1232 * Try to open a XIM with the current modifiers, then see if we can 1307 * Try to open a XIM with the current modifiers, then see if we can
1233 * open a suitable preedit type 1308 * open a suitable preedit type
1234 */ 1309 */
1235bool 1310bool
1236rxvt_term::IM_get_IC (const char *modifiers) 1311rxvt_term::im_get_ic (const char *modifiers)
1237{ 1312{
1238 int i, j, found; 1313 int i, j, found;
1239 XIM xim; 1314 XIM xim;
1240 XPoint spot; 1315 XPoint spot;
1241 XRectangle rect, status_rect, needed_rect; 1316 XRectangle rect, status_rect, needed_rect;
1242 unsigned long fg, bg; 1317 unsigned long fg, bg;
1243 const char *p; 1318 const char *p;
1244 char **s; 1319 char **s;
1245 XIMStyles *xim_styles; 1320 XIMStyles *xim_styles;
1246#ifdef ENABLE_XIM_ONTHESPOT
1247 XIMCallback xcb[4];
1248#endif
1249 1321
1250 set_environ (envv); 1322 set_environ (envv);
1251 1323
1252 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1324 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1253 return false; 1325 return false;
… …
1274 p = pet[pi]; 1346 p = pet[pi];
1275 1347
1276 if (!p) 1348 if (!p)
1277 continue; 1349 continue;
1278 1350
1279 s = rxvt_splitcommastring (p); 1351 s = rxvt_strsplit (',', p);
1280 1352
1281 for (i = found = 0; !found && s[i]; i++) 1353 for (i = found = 0; !found && s[i]; i++)
1282 { 1354 {
1283 if (!strcmp (s[i], "OverTheSpot")) 1355 if (!strcmp (s[i], "OverTheSpot"))
1284 input_style = XIMPreeditPosition | XIMStatusNothing; 1356 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1296 input_style = XIMPreeditNothing | XIMStatusNothing; 1368 input_style = XIMPreeditNothing | XIMStatusNothing;
1297 1369
1298 for (j = 0; j < xim_styles->count_styles; j++) 1370 for (j = 0; j < xim_styles->count_styles; j++)
1299 if (input_style == xim_styles->supported_styles[j]) 1371 if (input_style == xim_styles->supported_styles[j])
1300 { 1372 {
1301 rxvt_freecommastring (s); 1373 rxvt_free_strsplit (s);
1302 1374
1303 found = 1; 1375 found = 1;
1304 goto foundpet; 1376 goto foundpet;
1305 } 1377 }
1306 1378
1307 } 1379 }
1308 1380
1309 rxvt_freecommastring (s); 1381 rxvt_free_strsplit (s);
1310 } 1382 }
1311 1383
1312foundpet: 1384foundpet:
1313 1385
1314 XFree (xim_styles); 1386 XFree (xim_styles);
… …
1393 NULL); 1465 NULL);
1394 } 1466 }
1395#if ENABLE_XIM_ONTHESPOT 1467#if ENABLE_XIM_ONTHESPOT
1396 else if (input_style & XIMPreeditCallbacks) 1468 else if (input_style & XIMPreeditCallbacks)
1397 { 1469 {
1470 XIMCallback xcb[4];
1471
1398 im_set_position (spot); 1472 im_set_position (spot);
1399 1473
1400 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1474 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1401 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1475 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1402 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1476 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1417#endif 1491#endif
1418 1492
1419 Input_Context = XCreateIC (xim, 1493 Input_Context = XCreateIC (xim,
1420 XNInputStyle, input_style, 1494 XNInputStyle, input_style,
1421 XNClientWindow, vt, 1495 XNClientWindow, vt,
1422 XNFocusWindow, parent[0], 1496 XNFocusWindow, parent,
1423 preedit_attr ? XNPreeditAttributes : NULL, 1497 preedit_attr ? XNPreeditAttributes : NULL,
1424 preedit_attr, 1498 preedit_attr,
1425 status_attr ? XNStatusAttributes : NULL, 1499 status_attr ? XNStatusAttributes : NULL,
1426 status_attr, NULL); 1500 status_attr, NULL);
1427 1501
… …
1440 // unfortunately, only the focus window is used by XIM, hard to fix 1514 // unfortunately, only the focus window is used by XIM, hard to fix
1441 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1515 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1442 vt_select_input (); 1516 vt_select_input ();
1443#endif 1517#endif
1444 1518
1445 IMSetPosition (); 1519 im_set_position ();
1446 1520
1447 return true; 1521 return true;
1448} 1522}
1449 1523
1450void 1524void
… …
1460 im_destroy (); 1534 im_destroy ();
1461 1535
1462 if (Input_Context) 1536 if (Input_Context)
1463 return; 1537 return;
1464 1538
1465#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1466 if (rs[Rs_imLocale]) 1539 if (rs[Rs_imLocale])
1467 SET_LOCALE (rs[Rs_imLocale]); 1540 SET_LOCALE (rs[Rs_imLocale]);
1468#endif
1469 1541
1470 p = rs[Rs_inputMethod]; 1542 p = rs[Rs_inputMethod];
1471 if (p && *p) 1543 if (p && *p)
1472 { 1544 {
1473 bool found = false; 1545 bool found = false;
1474 1546
1475 s = rxvt_splitcommastring (p); 1547 s = rxvt_strsplit (',', p);
1476 1548
1477 for (i = 0; s[i]; i++) 1549 for (i = 0; s[i]; i++)
1478 { 1550 {
1479 if (*s[i]) 1551 if (*s[i])
1480 { 1552 {
1481 strcpy (buf, "@im="); 1553 strcpy (buf, "@im=");
1482 strncat (buf, s[i], IMBUFSIZ - 5); 1554 strncat (buf, s[i], IMBUFSIZ - 5);
1483 if (IM_get_IC (buf)) 1555 if (im_get_ic (buf))
1484 { 1556 {
1485 found = true; 1557 found = true;
1486 break; 1558 break;
1487 } 1559 }
1488 } 1560 }
1489 } 1561 }
1490 1562
1491 rxvt_freecommastring (s); 1563 rxvt_free_strsplit (s);
1492 1564
1493 if (found) 1565 if (found)
1494 goto done; 1566 goto done;
1495 } 1567 }
1496 1568
1497 /* try with XMODIFIERS env. var. */ 1569 /* try with XMODIFIERS env. var. */
1498 if (IM_get_IC ("")) 1570 if (im_get_ic (""))
1499 goto done; 1571 goto done;
1500 1572
1501 /* try with no modifiers base IF the user didn't specify an IM */ 1573 /* try with no modifiers base IF the user didn't specify an IM */
1502 if (IM_get_IC ("@im=none")) 1574 if (im_get_ic ("@im=none"))
1503 goto done; 1575 goto done;
1504 1576
1505done: 1577done:
1506#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1507 if (rs[Rs_imLocale]) 1578 if (rs[Rs_imLocale])
1508 SET_LOCALE (locale); 1579 SET_LOCALE (locale);
1509#endif
1510} 1580}
1511 1581
1512void 1582void
1513rxvt_term::IMSetPosition () 1583rxvt_term::im_set_position ()
1514{ 1584{
1515 XRectangle preedit_rect, status_rect, *needed_rect; 1585 XRectangle preedit_rect, status_rect, *needed_rect;
1516 XVaNestedList preedit_attr, status_attr; 1586 XVaNestedList preedit_attr, status_attr;
1517 1587
1518 if (!Input_Context 1588 if (!Input_Context
1519 || !focus 1589 || !focus
1520 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1590 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1521 || !IMisRunning ()) 1591 || !im_is_running ())
1522 return; 1592 return;
1523 1593
1524 if (input_style & XIMPreeditPosition) 1594 if (input_style & XIMPreeditPosition)
1525 { 1595 {
1526 im_set_size (preedit_rect); 1596 im_set_size (preedit_rect);
… …
1556 1626
1557void 1627void
1558rxvt_term::get_window_origin (int &x, int &y) 1628rxvt_term::get_window_origin (int &x, int &y)
1559{ 1629{
1560 Window cr; 1630 Window cr;
1561 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1631 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1562/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1563}
1564
1565Pixmap
1566rxvt_term::get_pixmap_property (int prop_id)
1567{
1568 if (prop_id > 0 && prop_id < NUM_XA)
1569 if (xa[prop_id])
1570 {
1571 int aformat;
1572 unsigned long nitems, bytes_after;
1573 Atom atype;
1574 unsigned char *prop = NULL;
1575 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1576 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1577 &nitems, &bytes_after, &prop);
1578 if (result == Success && prop && atype == XA_PIXMAP)
1579 return *(Pixmap *)prop;
1580 }
1581
1582 return None;
1583} 1632}
1584 1633
1585#ifdef HAVE_BG_PIXMAP 1634#ifdef HAVE_BG_PIXMAP
1586# if TRACE_PIXMAPS
1587# undef update_background
1588void
1589rxvt_term::trace_update_background (const char *file, int line)
1590{
1591 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1592 update_background ();
1593}
1594# endif
1595 1635
1596void 1636void
1597rxvt_term::update_background () 1637rxvt_term::update_background ()
1598{ 1638{
1599 if (update_background_ev.is_active ()) 1639 if (update_background_ev.is_active ())
1600 return; 1640 return;
1601 1641
1602 bgPixmap.invalidate (); 1642 bg_invalidate ();
1603 1643
1644 if (!mapped)
1645 return;
1646
1604 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1647 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1605 1648
1606 if (to_wait <= 0.) 1649 if (to_wait <= 0.)
1607 bgPixmap.render (); 1650 bg_render ();
1608 else 1651 else
1609 update_background_ev.start (to_wait); 1652 update_background_ev.start (to_wait);
1610} 1653}
1611 1654
1612void 1655void
1613rxvt_term::update_background_cb (ev::timer &w, int revents) 1656rxvt_term::update_background_cb (ev::timer &w, int revents)
1614{ 1657{
1615 make_current (); 1658 make_current ();
1616 1659
1617 update_background_ev.stop (); 1660 update_background_ev.stop ();
1618 bgPixmap.render (); 1661 bg_render ();
1619 refresh_check (); 1662 refresh_check ();
1620} 1663}
1621 1664
1622#endif /* HAVE_BG_PIXMAP */ 1665#endif /* HAVE_BG_PIXMAP */
1623 1666

Diff Legend

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