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.313 by root, Tue Nov 4 16:43:50 2008 UTC vs.
Revision 1.370 by sf-exg, Thu Jan 19 15:08:55 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
41#include <assert.h>
40#include <csignal> 42#include <signal.h>
41#include <cstring> 43#include <string.h>
42 44
43#include <termios.h> 45#include <termios.h>
44 46
45#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
46# define X_LOCALE 48# define X_LOCALE
47# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
48#else 50#else
49# ifdef HAVE_SETLOCALE
50# include <clocale> 51# include <locale.h>
51# endif 52#endif
52#endif
53 53
54struct termios rxvt_term::def_tio;
54vector<rxvt_term *> rxvt_term::termlist; 55vector<rxvt_term *> rxvt_term::termlist;
55 56
56// used to tell global functions which terminal instance is "active" 57// used to tell global functions which terminal instance is "active"
57rxvt_t rxvt_current_term; 58rxvt_t rxvt_current_term;
58 59
… …
93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 94text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
94{ 95{
95 compose_char *cc; 96 compose_char *cc;
96 97
97 // break compose chains, as stupid readline really likes to duplicate 98 // break compose chains, as stupid readline really likes to duplicate
98 // composing characters for some reason near the end of a line. 99 // composing characters for some reason, near the end of a line.
99 cc = (*this)[c1]; 100 cc = (*this)[c1];
100 while (cc) 101 while (cc)
101 { 102 {
102 if (cc->c2 == c2) return c1; 103 if (cc->c2 == c2) return c1;
103 cc = (*this)[cc->c1]; 104 cc = (*this)[cc->c1];
104 } 105 }
105 106
106 // check to see wether this combination already exists otherwise 107 // check to see whether this combination already exists otherwise
107 for (cc = v.end (); cc-- > v.begin (); ) 108 for (cc = v.begin (); cc < v.end (); cc++)
108 {
109 if (cc->c1 == c1 && cc->c2 == c2) 109 if (cc->c1 == c1 && cc->c2 == c2)
110 return COMPOSE_LO + (cc - v.begin ()); 110 return COMPOSE_LO + (cc - v.begin ());
111 }
112 111
113 // allocate a new combination 112 // allocate a new combination
114 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 113 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
115 { 114 {
116 static int seen; 115 static int seen;
117 116
118 if (!seen++) 117 if (!seen++)
119 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 118 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
120 119
121 return REPLACEMENT_CHAR; 120 return REPLACEMENT_CHAR;
122 } 121 }
123 122
124 v.push_back (compose_char (c1, c2)); 123 v.push_back (compose_char (c1, c2));
… …
186#endif 185#endif
187 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 186 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
188 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 187 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
189 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 188 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
190 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 189 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
191 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 190 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 191 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
194 192
195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 193 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196 194
… …
225 delete fontset[i]; 223 delete fontset[i];
226#endif 224#endif
227 delete fontset[0]; 225 delete fontset[0];
228 226
229#ifdef HAVE_BG_PIXMAP 227#ifdef HAVE_BG_PIXMAP
230 bgPixmap.destroy (); 228 bg_destroy ();
231#endif
232#ifdef HAVE_AFTERIMAGE
233 if (asv)
234 destroy_asvisual (asv, 0);
235 if (asimman)
236 destroy_image_manager (asimman, 0);
237#endif 229#endif
238 230
239 if (display) 231 if (display)
240 { 232 {
241 selection_clear (); 233 selection_clear ();
234 selection_clear (true);
242 235
243#ifdef USE_XIM 236#ifdef USE_XIM
244 im_destroy (); 237 im_destroy ();
245#endif 238#endif
246 scrollBar.destroy (); 239 scrollBar.destroy ();
247 if (gc) XFreeGC (dpy, gc); 240 if (gc) XFreeGC (dpy, gc);
248 241
249 delete drawable; 242 delete drawable;
250 // destroy all windows 243 // destroy all windows
251 if (parent[0]) 244 if (parent)
252 XDestroyWindow (dpy, parent[0]); 245 XDestroyWindow (dpy, parent);
253 246
254 for (int i = 0; i < TOTAL_COLORS; i++) 247 for (int i = 0; i < TOTAL_COLORS; i++)
255 if (ISSET_PIXCOLOR (i)) 248 if (ISSET_PIXCOLOR (i))
256 { 249 {
257 pix_colors_focused [i].free (this); 250 pix_colors_focused [i].free (this);
… …
271 /* clear all resources */ 264 /* clear all resources */
272 for (int i = 0; i < allocated.size (); i++) 265 for (int i = 0; i < allocated.size (); i++)
273 free (allocated [i]); 266 free (allocated [i]);
274 267
275 free (selection.text); 268 free (selection.text);
276 // TODO: manage env vars in child only(!) 269 free (selection.clip_text);
277 free (env_display);
278 free (env_term);
279 free (locale); 270 free (locale);
280 free (v_buffer); 271 free (v_buffer);
281 free (incr_buf); 272
273 delete selection_req;
282 274
283 delete envv; 275 delete envv;
284 delete argv; 276 delete argv;
285 277
286#ifdef KEYSYM_RESOURCE 278#ifdef KEYSYM_RESOURCE
… …
322#endif 314#endif
323 scrollbar_ev.stop (display); 315 scrollbar_ev.stop (display);
324#if ENABLE_TRANSPARENCY || ENABLE_PERL 316#if ENABLE_TRANSPARENCY || ENABLE_PERL
325 rootwin_ev.stop (display); 317 rootwin_ev.stop (display);
326#endif 318#endif
327 incr_ev.stop ();
328 termwin_ev.stop (display); 319 termwin_ev.stop (display);
329 vt_ev.stop (display); 320 vt_ev.stop (display);
330 } 321 }
331 322
332 flush_ev.stop (); 323 flush_ev.stop ();
… …
354rxvt_term::destroy_cb (ev::idle &w, int revents) 345rxvt_term::destroy_cb (ev::idle &w, int revents)
355{ 346{
356 make_current (); 347 make_current ();
357 348
358 delete this; 349 delete this;
350}
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);
359} 362}
360 363
361/*----------------------------------------------------------------------*/ 364/*----------------------------------------------------------------------*/
362/* 365/*
363 * Exit gracefully, clearing the utmp entry and restoring tty attributes 366 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
377print_x_error (Display *dpy, XErrorEvent *event) 380print_x_error (Display *dpy, XErrorEvent *event)
378{ 381{
379 char buffer[BUFSIZ]; 382 char buffer[BUFSIZ];
380 char mesg[BUFSIZ]; 383 char mesg[BUFSIZ];
381 char number[32]; 384 char number[32];
382 char *mtype = "XlibMessage"; 385 const char mtype[] = "XlibMessage";
383 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 386 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
384 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 387 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
385 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 388 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
386 rxvt_warn ("%s: %s\n", mesg, buffer); 389 rxvt_warn ("%s: %s\n", mesg, buffer);
387 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 390 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
388 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 391 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
389 sprintf(number, "%d", event->request_code); 392 sprintf(number, "%d", event->request_code);
390 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 393 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
391 rxvt_warn ("(which is %s)\n", buffer); 394 rxvt_warn ("(which is %s)\n", buffer);
392 if (event->request_code >= 128) { 395 if (event->request_code >= 128) {
393 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 396 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
394 mesg, BUFSIZ); 397 mesg, BUFSIZ);
395 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 398 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
396 } 399 }
397 if ((event->error_code == BadWindow) || 400 if ((event->error_code == BadWindow) ||
398 (event->error_code == BadPixmap) || 401 (event->error_code == BadPixmap) ||
399 (event->error_code == BadCursor) || 402 (event->error_code == BadCursor) ||
400 (event->error_code == BadFont) || 403 (event->error_code == BadFont) ||
401 (event->error_code == BadDrawable) || 404 (event->error_code == BadDrawable) ||
402 (event->error_code == BadColor) || 405 (event->error_code == BadColor) ||
403 (event->error_code == BadGC) || 406 (event->error_code == BadGC) ||
404 (event->error_code == BadIDChoice) || 407 (event->error_code == BadIDChoice) ||
405 (event->error_code == BadValue) || 408 (event->error_code == BadValue) ||
406 (event->error_code == BadAtom)) { 409 (event->error_code == BadAtom)) {
407 if (event->error_code == BadValue) 410 if (event->error_code == BadValue)
408 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 411 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
409 mesg, BUFSIZ); 412 mesg, BUFSIZ);
410 else if (event->error_code == BadAtom) 413 else if (event->error_code == BadAtom)
411 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 414 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
412 mesg, BUFSIZ); 415 mesg, BUFSIZ);
413 else 416 else
414 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 417 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
415 mesg, BUFSIZ); 418 mesg, BUFSIZ);
416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 419 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
417 } 420 }
418 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 421 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
419 mesg, BUFSIZ); 422 mesg, BUFSIZ);
420 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
421} 424}
422#endif 425#endif
423 426
424int 427int
… …
471 rxvt_emergency_cleanup (); 474 rxvt_emergency_cleanup ();
472 w.stop (); 475 w.stop ();
473 kill (getpid (), w.signum); 476 kill (getpid (), w.signum);
474} 477}
475 478
479static void
480rxvt_get_ttymode (struct termios *tio)
481{
482 if (tcgetattr (STDIN_FILENO, tio) < 0)
483 memset (tio, 0, sizeof (struct termios));
484
485 for (int i = 0; i < NCCS; i++)
486 tio->c_cc[i] = VDISABLE;
487
488 tio->c_cc[VINTR] = CINTR;
489 tio->c_cc[VQUIT] = CQUIT;
490 tio->c_cc[VERASE] = CERASE;
491#ifdef VERASE2
492 tio->c_cc[VERASE2] = CERASE2;
493#endif
494 tio->c_cc[VKILL] = CKILL;
495 tio->c_cc[VEOF] = CEOF;
496 tio->c_cc[VSTART] = CSTART;
497 tio->c_cc[VSTOP] = CSTOP;
498 tio->c_cc[VSUSP] = CSUSP;
499# ifdef VDSUSP
500 tio->c_cc[VDSUSP] = CDSUSP;
501# endif
502# ifdef VREPRINT
503 tio->c_cc[VREPRINT] = CRPRNT;
504# endif
505# ifdef VDISCRD
506 tio->c_cc[VDISCRD] = CFLUSH;
507# endif
508# ifdef VWERSE
509 tio->c_cc[VWERSE] = CWERASE;
510# endif
511# ifdef VLNEXT
512 tio->c_cc[VLNEXT] = CLNEXT;
513# endif
514# ifdef VSTATUS
515 tio->c_cc[VSTATUS] = CSTATUS;
516# endif
517
518# if VMIN != VEOF
519 tio->c_cc[VMIN] = 1;
520# endif
521# if VTIME != VEOL
522 tio->c_cc[VTIME] = 0;
523# endif
524
525 /* input modes */
526 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
527# ifdef IMAXBEL
528 | IMAXBEL
529# endif
530 | IXON);
531
532 /* output modes */
533 tio->c_oflag = (OPOST | ONLCR);
534
535 /* control modes */
536 tio->c_cflag = (CS8 | CREAD);
537
538 /* local modes */
539 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
540# if defined (ECHOCTL) && defined (ECHOKE)
541 | ECHOCTL | ECHOKE
542# endif
543 | ECHOE | ECHOK);
544}
545
476char **rxvt_environ; // startup environment 546char **rxvt_environ; // startup environment
477 547
478void 548void
479rxvt_init () 549rxvt_init ()
480{ 550{
481 ptytty::init (); 551 assert (("fontMask must not overlap other RS masks",
552 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
482 553
554 rxvt_get_ttymode (&rxvt_term::def_tio);
555
556 // get rid of stdin/stdout as we don't need them, to free resources
557 dup2 (STDERR_FILENO, STDIN_FILENO);
558 dup2 (STDERR_FILENO, STDOUT_FILENO);
559
483 if (!ev_default_loop (0)) 560 if (!ev_default_loop ())
484 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 561 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
485 562
486 rxvt_environ = environ; 563 rxvt_environ = environ;
487 564
488 signal (SIGHUP, SIG_IGN); 565 signal (SIGHUP, SIG_IGN);
489 signal (SIGPIPE, SIG_IGN); 566 signal (SIGPIPE, SIG_IGN);
490 567
491 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 568 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
492 sig_handlers.sw_int.start (SIGINT); ev_unref (); 569 sig_handlers.sw_int.start (SIGINT); ev_unref ();
493
494 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
495 /* signal (SIGURG, SIG_DFL); */
496 570
497 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 571 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
498 // TODO: handle this with exceptions and tolerate the memory loss 572 // TODO: handle this with exceptions and tolerate the memory loss
499 XSetIOErrorHandler (rxvt_xioerror_handler); 573 XSetIOErrorHandler (rxvt_xioerror_handler);
500 574
… …
627 if (recalc_y) 701 if (recalc_y)
628 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 702 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
629 703
630 ncol = width / fwidth; 704 ncol = width / fwidth;
631 nrow = height / fheight; 705 nrow = height / fheight;
706
707 // When the size of the vt window is not a multiple of the cell
708 // size, i.e., when the wm does not honour our size hints, there are
709 // extra areas not covered by the terminal screen. Such gaps, when a
710 // bg pixmap is set, would have to be cleared manually to properly
711 // refresh the background. We take the simpler route and shrink the
712 // vt window so as to avoid creating gaps.
713 vt_width = ncol * fwidth;
714 vt_height = nrow * fheight;
632} 715}
633 716
634/*----------------------------------------------------------------------*/ 717/*----------------------------------------------------------------------*/
635/* 718/*
636 * Tell the teletype handler what size the window is. 719 * Tell the teletype handler what size the window is.
… …
644 727
645 struct winsize ws; 728 struct winsize ws;
646 729
647 ws.ws_col = ncol; 730 ws.ws_col = ncol;
648 ws.ws_row = nrow; 731 ws.ws_row = nrow;
649 ws.ws_xpixel = width; 732 ws.ws_xpixel = vt_width;
650 ws.ws_ypixel = height; 733 ws.ws_ypixel = vt_height;
651 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 734 ioctl (pty->pty, TIOCSWINSZ, &ws);
652 735
653#if 0 736#if 0
654 // TIOCSWINSZ is supposed to do this automatically and correctly 737 // TIOCSWINSZ is supposed to do this automatically and correctly
655 if (cmd_pid) /* force through to the command */ 738 if (cmd_pid) /* force through to the command */
656 kill (-cmd_pid, SIGWINCH); 739 kill (-cmd_pid, SIGWINCH);
657#endif 740#endif
658} 741}
659 742
660/*----------------------------------------------------------------------*/ 743/*----------------------------------------------------------------------*/
661/* set_fonts () - load and set the various fonts 744/* load and set the various fonts */
662 *
663 * init = 1 - initialize
664 *
665 * fontname == FONT_UP - switch to bigger font
666 * fontname == FONT_DN - switch to smaller font
667 */
668bool 745bool
669rxvt_term::set_fonts () 746rxvt_term::set_fonts ()
670{ 747{
671 rxvt_fontset *fs = new rxvt_fontset (this); 748 rxvt_fontset *fs = new rxvt_fontset (this);
672 rxvt_fontprop prop; 749 rxvt_fontprop prop;
… …
686#endif 763#endif
687 764
688 delete fontset[0]; 765 delete fontset[0];
689 fontset[0] = fs; 766 fontset[0] = fs;
690 767
691 prop = (*fs)[1]->properties (); 768 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
692 prop.height += lineSpace; 769 prop.height += lineSpace;
770 prop.width += letterSpace;
693 771
694 fs->set_prop (prop, false); 772 fs->set_prop (prop, false);
695 773
696 fwidth = prop.width; 774 fwidth = prop.width;
697 fheight = prop.height; 775 fheight = prop.height;
… …
728#else 806#else
729 fontset[style] = fontset[0]; 807 fontset[style] = fontset[0];
730#endif 808#endif
731 } 809 }
732 810
733 if (parent[0]) 811 if (parent)
734 { 812 {
735 resize_all_windows (0, 0, 0); 813 resize_all_windows (0, 0, 0);
736 scr_remap_chars (); 814 scr_remap_chars ();
737 scr_touch (true); 815 scr_touch (true);
738 } 816 }
… …
741} 819}
742 820
743void 821void
744rxvt_term::set_string_property (Atom prop, const char *str, int len) 822rxvt_term::set_string_property (Atom prop, const char *str, int len)
745{ 823{
746 XChangeProperty (dpy, parent[0], 824 XChangeProperty (dpy, parent,
747 prop, XA_STRING, 8, PropModeReplace, 825 prop, XA_STRING, 8, PropModeReplace,
748 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 826 (const unsigned char *)str, len >= 0 ? len : strlen (str));
749} 827}
750 828
751void 829void
830rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
831{
832 XTextProperty ct;
833
834 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
835 {
836 XSetTextProperty (dpy, parent, &ct, prop);
837 XFree (ct.value);
838 }
839}
840
841void
752rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 842rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
753{ 843{
754 wchar_t *ws = rxvt_mbstowcs (str, len); 844 wchar_t *ws = rxvt_mbstowcs (str, len);
755 char *s = rxvt_wcstoutf8 (ws); 845 char *s = rxvt_wcstoutf8 (ws);
756 846
757 XChangeProperty (dpy, parent[0], 847 XChangeProperty (dpy, parent,
758 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 848 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
759 (const unsigned char *)s, strlen (s)); 849 (const unsigned char *)s, strlen (s));
760 850
761 free (s); 851 free (s);
762 free (ws); 852 free (ws);
… …
766/*----------------------------------------------------------------------*/ 856/*----------------------------------------------------------------------*/
767/* xterm sequences - title, iconName, color (exptl) */ 857/* xterm sequences - title, iconName, color (exptl) */
768void 858void
769rxvt_term::set_title (const char *str) 859rxvt_term::set_title (const char *str)
770{ 860{
771 set_string_property (XA_WM_NAME, str); 861 set_mbstring_property (XA_WM_NAME, str);
772#if ENABLE_EWMH 862#if ENABLE_EWMH
773 set_utf8_property (xa[XA_NET_WM_NAME], str); 863 set_utf8_property (xa[XA_NET_WM_NAME], str);
774#endif 864#endif
775} 865}
776 866
777void 867void
778rxvt_term::set_icon_name (const char *str) 868rxvt_term::set_icon_name (const char *str)
779{ 869{
780 set_string_property (XA_WM_ICON_NAME, str); 870 set_mbstring_property (XA_WM_ICON_NAME, str);
781#if ENABLE_EWMH 871#if ENABLE_EWMH
782 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 872 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
783#endif 873#endif
784} 874}
785 875
… …
852 942
853/*----------------------------------------------------------------------*/ 943/*----------------------------------------------------------------------*/
854/* 944/*
855 * find if fg/bg matches any of the normal (low-intensity) colors 945 * find if fg/bg matches any of the normal (low-intensity) colors
856 */ 946 */
857void 947char *
858rxvt_term::set_colorfgbg () 948rxvt_term::get_colorfgbg ()
859{ 949{
860 unsigned int i; 950 unsigned int i;
861 const char *xpmb = ""; 951 const char *xpmb = "";
862 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 952 char fstr[] = "default";
953 char bstr[] = "default";
954 char *env_colorfgbg;
863 955
864 strcpy (fstr, "default");
865 strcpy (bstr, "default");
866 for (i = Color_Black; i <= Color_White; i++) 956 for (i = Color_Black; i <= Color_White; i++)
867 if (pix_colors[Color_fg] == pix_colors[i]) 957 if (pix_colors[Color_fg] == pix_colors[i])
868 { 958 {
869 sprintf (fstr, "%d", (i - Color_Black)); 959 sprintf (fstr, "%d", i - Color_Black);
870 break; 960 break;
871 } 961 }
872 962
873 for (i = Color_Black; i <= Color_White; i++) 963 for (i = Color_Black; i <= Color_White; i++)
874 if (pix_colors[Color_bg] == pix_colors[i]) 964 if (pix_colors[Color_bg] == pix_colors[i])
875 { 965 {
876 sprintf (bstr, "%d", (i - Color_Black)); 966 sprintf (bstr, "%d", i - Color_Black);
877#ifdef BG_IMAGE_FROM_FILE 967#ifdef BG_IMAGE_FROM_FILE
878 xpmb = "default;"; 968 xpmb = "default;";
879#endif 969#endif
880 break; 970 break;
881 } 971 }
882 972
973 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
883 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 974 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
975 return env_colorfgbg;
884} 976}
885 977
886/*----------------------------------------------------------------------*/ 978/*----------------------------------------------------------------------*/
887 979
888bool 980bool
… …
917 1009
918 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow 1010 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
919 if (set_hint) 1011 if (set_hint)
920 { 1012 {
921 szHint.flags &= ~(PBaseSize | PResizeInc); 1013 szHint.flags &= ~(PBaseSize | PResizeInc);
922 XSetWMNormalHints (dpy, parent[0], &szHint); 1014 XSetWMNormalHints (dpy, parent, &szHint);
923 szHint.flags |= PBaseSize | PResizeInc; 1015 szHint.flags |= PBaseSize | PResizeInc;
924 } 1016 }
925 1017
926 if (!ignoreparent) 1018 if (!ignoreparent)
927 { 1019 {
… …
933 int x, y, x1, y1; 1025 int x, y, x1, y1;
934 int dx, dy; 1026 int dx, dy;
935 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1027 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
936 Window unused_cr; 1028 Window unused_cr;
937 1029
938 XTranslateCoordinates (dpy, parent[0], display->root, 1030 XTranslateCoordinates (dpy, parent, display->root,
939 0, 0, &x, &y, &unused_cr); 1031 0, 0, &x, &y, &unused_cr);
940 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1032 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
941 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1033 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
942 /* 1034 /*
943 * if display->root isn't the parent window, a WM will probably have offset 1035 * if display->root isn't the parent window, a WM will probably have offset
944 * our position for handles and decorations. Counter it 1036 * our position for handles and decorations. Counter it
945 */ 1037 */
… …
962 if (y < y1) /* top half */ 1054 if (y < y1) /* top half */
963 dy = 0; 1055 dy = 0;
964 else if (y == y1) /* exact center */ 1056 else if (y == y1) /* exact center */
965 dy /= 2; 1057 dy /= 2;
966 1058
967 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1059 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
968 szHint.width, szHint.height); 1060 szHint.width, szHint.height);
969#else 1061#else
970 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1062 XResizeWindow (dpy, parent, szHint.width, szHint.height);
971#endif 1063#endif
972 } 1064 }
1065
1066 if (set_hint)
1067 XSetWMNormalHints (dpy, parent, &szHint);
973 1068
974 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1069 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
975 1070
976 if (fix_screen || newwidth != old_width || newheight != old_height) 1071 if (fix_screen || newwidth != old_width || newheight != old_height)
977 { 1072 {
978 if (scrollBar.state) 1073 if (scrollBar.state)
979 scrollBar.resize (); 1074 scrollBar.resize ();
980 1075
981 XMoveResizeWindow (dpy, vt, 1076 XMoveResizeWindow (dpy, vt,
982 window_vt_x, window_vt_y, 1077 window_vt_x, window_vt_y,
983 width, height); 1078 vt_width, vt_height);
984 1079
985#ifdef HAVE_BG_PIXMAP 1080#ifdef HAVE_BG_PIXMAP
986 if (bgPixmap.window_size_sensitive ()) 1081 if (bg_window_size_sensitive ())
987 update_background (); 1082 update_background ();
988#endif 1083#endif
989
990 scr_clear ();
991 } 1084 }
992
993 if (set_hint)
994 XSetWMNormalHints (dpy, parent[0], &szHint);
995 1085
996 if (fix_screen || old_height == 0) 1086 if (fix_screen || old_height == 0)
997 scr_reset (); 1087 scr_reset ();
998 1088
999 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1000 //scr_touch (false);
1001
1002#ifdef HAVE_BG_PIXMAP
1003// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1004// if (bgPixmap.pixmap)
1005// scr_touch (false);
1006#endif
1007
1008#ifdef USE_XIM 1089#ifdef USE_XIM
1009 IMSetPosition (); 1090 im_set_position ();
1010#endif 1091#endif
1011} 1092}
1012 1093
1013/* 1094/*
1014 * Set the width/height of the vt window in characters. Units are pixels. 1095 * Set the width/height of the vt window in characters. Units are pixels.
… …
1027 newwidth = wattr.width - szHint.base_width; 1108 newwidth = wattr.width - szHint.base_width;
1028 if (newheight == 0) 1109 if (newheight == 0)
1029 newheight = wattr.height - szHint.base_height; 1110 newheight = wattr.height - szHint.base_height;
1030 } 1111 }
1031 1112
1032 if (newwidth != width || newheight != height) 1113 if (newwidth != vt_width || newheight != vt_height)
1033 { 1114 {
1034 newwidth += szHint.base_width; 1115 newwidth += szHint.base_width;
1035 newheight += szHint.base_height; 1116 newheight += szHint.base_height;
1036 resize_all_windows (newwidth, newheight, 0); 1117 resize_all_windows (newwidth, newheight, 0);
1037 } 1118 }
… …
1075 status_rect.height = fheight; 1156 status_rect.height = fheight;
1076} 1157}
1077 1158
1078/* Checking whether input method is running. */ 1159/* Checking whether input method is running. */
1079bool 1160bool
1080rxvt_term::IMisRunning () 1161rxvt_term::im_is_running ()
1081{ 1162{
1082 char *p;
1083 Atom atom; 1163 Atom atom;
1084 Window win; 1164 Window win;
1085 char server[IMBUFSIZ]; 1165 char server[IMBUFSIZ];
1086 1166
1087 /* get current locale modifier */ 1167 /* get current locale modifier */
1088 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1168 if (char *p = XSetLocaleModifiers (0))
1089 { 1169 {
1090 strcpy (server, "@server="); 1170 strcpy (server, "@server=");
1091 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1171 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1092 1172
1093 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1173 if (p = strchr (server + 1, '@')) /* first one only */
1094 *p = '\0'; 1174 *p = '\0';
1095 1175
1096 atom = XInternAtom (dpy, server, False); 1176 atom = XInternAtom (dpy, server, False);
1097 win = XGetSelectionOwner (dpy, atom); 1177 win = XGetSelectionOwner (dpy, atom);
1098 1178
1099 if (win != None) 1179 if (win != None)
1100 return True; 1180 return true;
1101 } 1181 }
1102 1182
1103 return False; 1183 return false;
1104} 1184}
1105 1185
1106void 1186void
1107rxvt_term::IMSendSpot () 1187rxvt_term::im_send_spot ()
1108{ 1188{
1109 XPoint nspot; 1189 XPoint nspot;
1110 XVaNestedList preedit_attr; 1190 XVaNestedList preedit_attr;
1111 1191
1112 if (!Input_Context 1192 if (!Input_Context
… …
1165 1245
1166 term->make_current (); 1246 term->make_current ();
1167 1247
1168 if (text) 1248 if (text)
1169 { 1249 {
1170 void *str; 1250 wchar_t *str;
1171 1251
1172 if (!text->encoding_is_wchar && text->string.multi_byte) 1252 if (!text->encoding_is_wchar && text->string.multi_byte)
1173 { 1253 {
1174 // of course, X makes it ugly again 1254 // of course, X makes it ugly again
1175 if (term->rs[Rs_imLocale]) 1255 if (term->rs[Rs_imLocale])
1176 SET_LOCALE (term->rs[Rs_imLocale]); 1256 SET_LOCALE (term->rs[Rs_imLocale]);
1177 1257
1178 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1258 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1179 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1259 mbstowcs (str, text->string.multi_byte, text->length + 1);
1180 1260
1181 if (term->rs[Rs_imLocale]) 1261 if (term->rs[Rs_imLocale])
1182 SET_LOCALE (term->locale); 1262 SET_LOCALE (term->locale);
1183 } 1263 }
1184 else 1264 else
1185 str = (void *)text->string.wide_char; 1265 str = text->string.wide_char;
1186 1266
1187 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1267 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1188 DT_INT, call_data->caret, 1268 DT_INT, call_data->caret,
1189 DT_INT, call_data->chg_first, 1269 DT_INT, call_data->chg_first,
1190 DT_INT, call_data->chg_length, 1270 DT_INT, call_data->chg_length,
… …
1218/* 1298/*
1219 * Try to open a XIM with the current modifiers, then see if we can 1299 * Try to open a XIM with the current modifiers, then see if we can
1220 * open a suitable preedit type 1300 * open a suitable preedit type
1221 */ 1301 */
1222bool 1302bool
1223rxvt_term::IM_get_IC (const char *modifiers) 1303rxvt_term::im_get_ic (const char *modifiers)
1224{ 1304{
1225 int i, j, found; 1305 int i, j, found;
1226 XIM xim; 1306 XIM xim;
1227 XPoint spot; 1307 XPoint spot;
1228 XRectangle rect, status_rect, needed_rect; 1308 XRectangle rect, status_rect, needed_rect;
1229 unsigned long fg, bg; 1309 unsigned long fg, bg;
1230 const char *p; 1310 const char *p;
1231 char **s; 1311 char **s;
1232 XIMStyles *xim_styles; 1312 XIMStyles *xim_styles;
1233#ifdef ENABLE_XIM_ONTHESPOT
1234 XIMCallback xcb[4];
1235#endif
1236 1313
1237 set_environ (envv); 1314 set_environ (envv);
1238 1315
1239 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1316 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1240 return false; 1317 return false;
… …
1261 p = pet[pi]; 1338 p = pet[pi];
1262 1339
1263 if (!p) 1340 if (!p)
1264 continue; 1341 continue;
1265 1342
1266 s = rxvt_splitcommastring (p); 1343 s = rxvt_strsplit (',', p);
1267 1344
1268 for (i = found = 0; !found && s[i]; i++) 1345 for (i = found = 0; !found && s[i]; i++)
1269 { 1346 {
1270 if (!strcmp (s[i], "OverTheSpot")) 1347 if (!strcmp (s[i], "OverTheSpot"))
1271 input_style = XIMPreeditPosition | XIMStatusNothing; 1348 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1283 input_style = XIMPreeditNothing | XIMStatusNothing; 1360 input_style = XIMPreeditNothing | XIMStatusNothing;
1284 1361
1285 for (j = 0; j < xim_styles->count_styles; j++) 1362 for (j = 0; j < xim_styles->count_styles; j++)
1286 if (input_style == xim_styles->supported_styles[j]) 1363 if (input_style == xim_styles->supported_styles[j])
1287 { 1364 {
1288 rxvt_freecommastring (s); 1365 rxvt_free_strsplit (s);
1289 1366
1290 found = 1; 1367 found = 1;
1291 goto foundpet; 1368 goto foundpet;
1292 } 1369 }
1293 1370
1294 } 1371 }
1295 1372
1296 rxvt_freecommastring (s); 1373 rxvt_free_strsplit (s);
1297 } 1374 }
1298 1375
1299foundpet: 1376foundpet:
1300 1377
1301 XFree (xim_styles); 1378 XFree (xim_styles);
… …
1380 NULL); 1457 NULL);
1381 } 1458 }
1382#if ENABLE_XIM_ONTHESPOT 1459#if ENABLE_XIM_ONTHESPOT
1383 else if (input_style & XIMPreeditCallbacks) 1460 else if (input_style & XIMPreeditCallbacks)
1384 { 1461 {
1462 XIMCallback xcb[4];
1463
1385 im_set_position (spot); 1464 im_set_position (spot);
1386 1465
1387 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1466 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1388 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1467 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1389 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1468 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1404#endif 1483#endif
1405 1484
1406 Input_Context = XCreateIC (xim, 1485 Input_Context = XCreateIC (xim,
1407 XNInputStyle, input_style, 1486 XNInputStyle, input_style,
1408 XNClientWindow, vt, 1487 XNClientWindow, vt,
1409 XNFocusWindow, parent[0], 1488 XNFocusWindow, parent,
1410 preedit_attr ? XNPreeditAttributes : NULL, 1489 preedit_attr ? XNPreeditAttributes : NULL,
1411 preedit_attr, 1490 preedit_attr,
1412 status_attr ? XNStatusAttributes : NULL, 1491 status_attr ? XNStatusAttributes : NULL,
1413 status_attr, NULL); 1492 status_attr, NULL);
1414 1493
… …
1427 // unfortunately, only the focus window is used by XIM, hard to fix 1506 // unfortunately, only the focus window is used by XIM, hard to fix
1428 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1507 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1429 vt_select_input (); 1508 vt_select_input ();
1430#endif 1509#endif
1431 1510
1432 IMSetPosition (); 1511 im_set_position ();
1433 1512
1434 return true; 1513 return true;
1435} 1514}
1436 1515
1437void 1516void
… …
1447 im_destroy (); 1526 im_destroy ();
1448 1527
1449 if (Input_Context) 1528 if (Input_Context)
1450 return; 1529 return;
1451 1530
1452#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1453 if (rs[Rs_imLocale]) 1531 if (rs[Rs_imLocale])
1454 SET_LOCALE (rs[Rs_imLocale]); 1532 SET_LOCALE (rs[Rs_imLocale]);
1455#endif
1456 1533
1457 p = rs[Rs_inputMethod]; 1534 p = rs[Rs_inputMethod];
1458 if (p && *p) 1535 if (p && *p)
1459 { 1536 {
1460 bool found = false; 1537 bool found = false;
1461 1538
1462 s = rxvt_splitcommastring (p); 1539 s = rxvt_strsplit (',', p);
1463 1540
1464 for (i = 0; s[i]; i++) 1541 for (i = 0; s[i]; i++)
1465 { 1542 {
1466 if (*s[i]) 1543 if (*s[i])
1467 { 1544 {
1468 strcpy (buf, "@im="); 1545 strcpy (buf, "@im=");
1469 strncat (buf, s[i], IMBUFSIZ - 5); 1546 strncat (buf, s[i], IMBUFSIZ - 5);
1470 if (IM_get_IC (buf)) 1547 if (im_get_ic (buf))
1471 { 1548 {
1472 found = true; 1549 found = true;
1473 break; 1550 break;
1474 } 1551 }
1475 } 1552 }
1476 } 1553 }
1477 1554
1478 rxvt_freecommastring (s); 1555 rxvt_free_strsplit (s);
1479 1556
1480 if (found) 1557 if (found)
1481 goto done; 1558 goto done;
1482 } 1559 }
1483 1560
1484 /* try with XMODIFIERS env. var. */ 1561 /* try with XMODIFIERS env. var. */
1485 if (IM_get_IC ("")) 1562 if (im_get_ic (""))
1486 goto done; 1563 goto done;
1487 1564
1488 /* try with no modifiers base IF the user didn't specify an IM */ 1565 /* try with no modifiers base IF the user didn't specify an IM */
1489 if (IM_get_IC ("@im=none")) 1566 if (im_get_ic ("@im=none"))
1490 goto done; 1567 goto done;
1491 1568
1492done: 1569done: ;
1493#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1494 if (rs[Rs_imLocale]) 1570 if (rs[Rs_imLocale])
1495 SET_LOCALE (locale); 1571 SET_LOCALE (locale);
1496#endif
1497} 1572}
1498 1573
1499void 1574void
1500rxvt_term::IMSetPosition () 1575rxvt_term::im_set_position ()
1501{ 1576{
1502 XRectangle preedit_rect, status_rect, *needed_rect; 1577 XRectangle preedit_rect, status_rect, *needed_rect;
1503 XVaNestedList preedit_attr, status_attr; 1578 XVaNestedList preedit_attr, status_attr;
1504 1579
1505 if (!Input_Context 1580 if (!Input_Context
1506 || !focus 1581 || !focus
1507 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1582 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1508 || !IMisRunning ()) 1583 || !im_is_running ())
1509 return; 1584 return;
1510 1585
1511 if (input_style & XIMPreeditPosition) 1586 if (input_style & XIMPreeditPosition)
1512 { 1587 {
1513 im_set_size (preedit_rect); 1588 im_set_size (preedit_rect);
… …
1543 1618
1544void 1619void
1545rxvt_term::get_window_origin (int &x, int &y) 1620rxvt_term::get_window_origin (int &x, int &y)
1546{ 1621{
1547 Window cr; 1622 Window cr;
1548 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1623 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1549/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1550} 1624}
1551 1625
1552Pixmap 1626Pixmap
1553rxvt_term::get_pixmap_property (int prop_id) 1627rxvt_term::get_pixmap_property (Atom property)
1554{ 1628{
1555 if (prop_id > 0 && prop_id < NUM_XA) 1629 Pixmap pixmap = None;
1556 if (xa[prop_id]) 1630
1557 {
1558 int aformat; 1631 int aformat;
1559 unsigned long nitems, bytes_after; 1632 unsigned long nitems, bytes_after;
1560 Atom atype; 1633 Atom atype;
1561 unsigned char *prop = NULL; 1634 unsigned char *prop;
1562 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1635 int result = XGetWindowProperty (dpy, display->root, property,
1563 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1636 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1564 &nitems, &bytes_after, &prop); 1637 &nitems, &bytes_after, &prop);
1565 if (result == Success && prop && atype == XA_PIXMAP) 1638 if (result == Success)
1639 {
1640 if (atype == XA_PIXMAP)
1566 return *(Pixmap *)prop; 1641 pixmap = *(Pixmap *)prop;
1642 XFree (prop);
1567 } 1643 }
1568 1644
1569 return None; 1645 return pixmap;
1570} 1646}
1571 1647
1572#ifdef HAVE_BG_PIXMAP 1648#ifdef HAVE_BG_PIXMAP
1573# if TRACE_PIXMAPS
1574# undef update_background
1575void
1576rxvt_term::trace_update_background (const char *file, int line)
1577{
1578 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1579 update_background ();
1580}
1581# endif
1582 1649
1583void 1650void
1584rxvt_term::update_background () 1651rxvt_term::update_background ()
1585{ 1652{
1586 if (update_background_ev.is_active ()) 1653 if (update_background_ev.is_active ())
1587 return; 1654 return;
1588 1655
1589 bgPixmap.invalidate (); 1656 bg_invalidate ();
1590 1657
1658 if (!mapped)
1659 return;
1660
1591 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1661 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1592 1662
1593 if (to_wait <= 0.) 1663 if (to_wait <= 0.)
1594 bgPixmap.render (); 1664 bg_render ();
1595 else 1665 else
1596 update_background_ev.start (to_wait); 1666 update_background_ev.start (to_wait);
1597} 1667}
1598 1668
1599void 1669void
1600rxvt_term::update_background_cb (ev::timer &w, int revents) 1670rxvt_term::update_background_cb (ev::timer &w, int revents)
1601{ 1671{
1602 make_current (); 1672 make_current ();
1603 1673
1604 update_background_ev.stop (); 1674 update_background_ev.stop ();
1605 bgPixmap.render (); 1675 bg_render ();
1606 refresh_check (); 1676 refresh_check ();
1607} 1677}
1608 1678
1609#endif /* HAVE_BG_PIXMAP */ 1679#endif /* HAVE_BG_PIXMAP */
1610 1680

Diff Legend

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