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.311 by root, Tue Nov 4 13:28:40 2008 UTC vs.
Revision 1.372 by sf-exg, Sat Jan 28 15:18:29 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
… …
625 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 699 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
626 700
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.width += letterSpace;
693 770
694 fs->set_prop (prop, false); 771 fs->set_prop (prop, false);
695 772
696 fwidth = prop.width; 773 fwidth = prop.width;
697 fheight = prop.height; 774 fheight = prop.height + lineSpace;
698 fbase = prop.ascent; 775 fbase = prop.ascent;
699 776
700 for (int style = 1; style < 4; style++) 777 for (int style = 1; style < 4; style++)
701 { 778 {
702#if ENABLE_STYLES 779#if ENABLE_STYLES
… …
728#else 805#else
729 fontset[style] = fontset[0]; 806 fontset[style] = fontset[0];
730#endif 807#endif
731 } 808 }
732 809
733 if (parent[0]) 810 if (parent)
734 { 811 {
735 resize_all_windows (0, 0, 0); 812 resize_all_windows (0, 0, 0);
736 scr_remap_chars (); 813 scr_remap_chars ();
737 scr_touch (true); 814 scr_touch (true);
738 } 815 }
… …
741} 818}
742 819
743void 820void
744rxvt_term::set_string_property (Atom prop, const char *str, int len) 821rxvt_term::set_string_property (Atom prop, const char *str, int len)
745{ 822{
746 XChangeProperty (dpy, parent[0], 823 XChangeProperty (dpy, parent,
747 prop, XA_STRING, 8, PropModeReplace, 824 prop, XA_STRING, 8, PropModeReplace,
748 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 825 (const unsigned char *)str, len >= 0 ? len : strlen (str));
749} 826}
750 827
751void 828void
829rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
830{
831 XTextProperty ct;
832
833 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
834 {
835 XSetTextProperty (dpy, parent, &ct, prop);
836 XFree (ct.value);
837 }
838}
839
840void
752rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 841rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
753{ 842{
754 wchar_t *ws = rxvt_mbstowcs (str, len); 843 wchar_t *ws = rxvt_mbstowcs (str, len);
755 char *s = rxvt_wcstoutf8 (ws); 844 char *s = rxvt_wcstoutf8 (ws);
756 845
757 XChangeProperty (dpy, parent[0], 846 XChangeProperty (dpy, parent,
758 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 847 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
759 (const unsigned char *)s, strlen (s)); 848 (const unsigned char *)s, strlen (s));
760 849
761 free (s); 850 free (s);
762 free (ws); 851 free (ws);
… …
766/*----------------------------------------------------------------------*/ 855/*----------------------------------------------------------------------*/
767/* xterm sequences - title, iconName, color (exptl) */ 856/* xterm sequences - title, iconName, color (exptl) */
768void 857void
769rxvt_term::set_title (const char *str) 858rxvt_term::set_title (const char *str)
770{ 859{
771 set_string_property (XA_WM_NAME, str); 860 set_mbstring_property (XA_WM_NAME, str);
772#if ENABLE_EWMH 861#if ENABLE_EWMH
773 set_utf8_property (xa[XA_NET_WM_NAME], str); 862 set_utf8_property (xa[XA_NET_WM_NAME], str);
774#endif 863#endif
775} 864}
776 865
777void 866void
778rxvt_term::set_icon_name (const char *str) 867rxvt_term::set_icon_name (const char *str)
779{ 868{
780 set_string_property (XA_WM_ICON_NAME, str); 869 set_mbstring_property (XA_WM_ICON_NAME, str);
781#if ENABLE_EWMH 870#if ENABLE_EWMH
782 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 871 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
783#endif 872#endif
784} 873}
785 874
… …
852 941
853/*----------------------------------------------------------------------*/ 942/*----------------------------------------------------------------------*/
854/* 943/*
855 * find if fg/bg matches any of the normal (low-intensity) colors 944 * find if fg/bg matches any of the normal (low-intensity) colors
856 */ 945 */
857void 946char *
858rxvt_term::set_colorfgbg () 947rxvt_term::get_colorfgbg ()
859{ 948{
860 unsigned int i; 949 unsigned int i;
861 const char *xpmb = ""; 950 const char *xpmb = "";
862 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 951 char fstr[] = "default";
952 char bstr[] = "default";
953 char *env_colorfgbg;
863 954
864 strcpy (fstr, "default");
865 strcpy (bstr, "default");
866 for (i = Color_Black; i <= Color_White; i++) 955 for (i = Color_Black; i <= Color_White; i++)
867 if (pix_colors[Color_fg] == pix_colors[i]) 956 if (pix_colors[Color_fg] == pix_colors[i])
868 { 957 {
869 sprintf (fstr, "%d", (i - Color_Black)); 958 sprintf (fstr, "%d", i - Color_Black);
870 break; 959 break;
871 } 960 }
872 961
873 for (i = Color_Black; i <= Color_White; i++) 962 for (i = Color_Black; i <= Color_White; i++)
874 if (pix_colors[Color_bg] == pix_colors[i]) 963 if (pix_colors[Color_bg] == pix_colors[i])
875 { 964 {
876 sprintf (bstr, "%d", (i - Color_Black)); 965 sprintf (bstr, "%d", i - Color_Black);
877#ifdef BG_IMAGE_FROM_FILE 966#ifdef BG_IMAGE_FROM_FILE
878 xpmb = "default;"; 967 xpmb = "default;";
879#endif 968#endif
880 break; 969 break;
881 } 970 }
882 971
972 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
883 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 973 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
974 return env_colorfgbg;
884} 975}
885 976
886/*----------------------------------------------------------------------*/ 977/*----------------------------------------------------------------------*/
887 978
888bool 979bool
… …
911 int old_width = szHint.width; 1002 int old_width = szHint.width;
912 int old_height = szHint.height; 1003 int old_height = szHint.height;
913 1004
914 window_calc (newwidth, newheight); 1005 window_calc (newwidth, newheight);
915 1006
916 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1007 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1008
1009 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1010 if (set_hint)
1011 {
1012 szHint.flags &= ~(PBaseSize | PResizeInc);
917 XSetWMNormalHints (dpy, parent[0], &szHint); 1013 XSetWMNormalHints (dpy, parent, &szHint);
1014 szHint.flags |= PBaseSize | PResizeInc;
1015 }
918 1016
919 if (!ignoreparent) 1017 if (!ignoreparent)
920 { 1018 {
921#ifdef SMART_RESIZE 1019#ifdef SMART_RESIZE
922 /* 1020 /*
… …
926 int x, y, x1, y1; 1024 int x, y, x1, y1;
927 int dx, dy; 1025 int dx, dy;
928 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1026 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
929 Window unused_cr; 1027 Window unused_cr;
930 1028
931 XTranslateCoordinates (dpy, parent[0], display->root, 1029 XTranslateCoordinates (dpy, parent, display->root,
932 0, 0, &x, &y, &unused_cr); 1030 0, 0, &x, &y, &unused_cr);
933 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1031 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
934 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1032 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
935 /* 1033 /*
936 * if display->root isn't the parent window, a WM will probably have offset 1034 * if display->root isn't the parent window, a WM will probably have offset
937 * our position for handles and decorations. Counter it 1035 * our position for handles and decorations. Counter it
938 */ 1036 */
… …
955 if (y < y1) /* top half */ 1053 if (y < y1) /* top half */
956 dy = 0; 1054 dy = 0;
957 else if (y == y1) /* exact center */ 1055 else if (y == y1) /* exact center */
958 dy /= 2; 1056 dy /= 2;
959 1057
960 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1058 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
961 szHint.width, szHint.height); 1059 szHint.width, szHint.height);
962#else 1060#else
963 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1061 XResizeWindow (dpy, parent, szHint.width, szHint.height);
964#endif 1062#endif
965 } 1063 }
1064
1065 if (set_hint)
1066 XSetWMNormalHints (dpy, parent, &szHint);
966 1067
967 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1068 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
968 1069
969 if (fix_screen || newwidth != old_width || newheight != old_height) 1070 if (fix_screen || newwidth != old_width || newheight != old_height)
970 { 1071 {
971 if (scrollBar.state) 1072 if (scrollBar.state)
972 scrollBar.resize (); 1073 scrollBar.resize ();
973 1074
974 XMoveResizeWindow (dpy, vt, 1075 XMoveResizeWindow (dpy, vt,
975 window_vt_x, window_vt_y, 1076 window_vt_x, window_vt_y,
976 width, height); 1077 vt_width, vt_height);
977 1078
978#ifdef HAVE_BG_PIXMAP 1079#ifdef HAVE_BG_PIXMAP
979 if (bgPixmap.window_size_sensitive ()) 1080 if (bg_window_size_sensitive ())
980 update_background (); 1081 update_background ();
981#endif 1082#endif
982
983 scr_clear ();
984 } 1083 }
985 1084
986 if (fix_screen || old_height == 0) 1085 if (fix_screen || old_height == 0)
987 scr_reset (); 1086 scr_reset ();
988 1087
989 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
990 //scr_touch (false);
991
992#ifdef HAVE_BG_PIXMAP
993// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
994// if (bgPixmap.pixmap)
995// scr_touch (false);
996#endif
997
998#ifdef USE_XIM 1088#ifdef USE_XIM
999 IMSetPosition (); 1089 im_set_position ();
1000#endif 1090#endif
1001} 1091}
1002 1092
1003/* 1093/*
1004 * Set the width/height of the vt window in characters. Units are pixels. 1094 * Set the width/height of the vt window in characters. Units are pixels.
… …
1017 newwidth = wattr.width - szHint.base_width; 1107 newwidth = wattr.width - szHint.base_width;
1018 if (newheight == 0) 1108 if (newheight == 0)
1019 newheight = wattr.height - szHint.base_height; 1109 newheight = wattr.height - szHint.base_height;
1020 } 1110 }
1021 1111
1022 if (newwidth != width || newheight != height) 1112 if (newwidth != vt_width || newheight != vt_height)
1023 { 1113 {
1024 newwidth += szHint.base_width; 1114 newwidth += szHint.base_width;
1025 newheight += szHint.base_height; 1115 newheight += szHint.base_height;
1026 resize_all_windows (newwidth, newheight, 0); 1116 resize_all_windows (newwidth, newheight, 0);
1027 } 1117 }
… …
1065 status_rect.height = fheight; 1155 status_rect.height = fheight;
1066} 1156}
1067 1157
1068/* Checking whether input method is running. */ 1158/* Checking whether input method is running. */
1069bool 1159bool
1070rxvt_term::IMisRunning () 1160rxvt_term::im_is_running ()
1071{ 1161{
1072 char *p;
1073 Atom atom; 1162 Atom atom;
1074 Window win; 1163 Window win;
1075 char server[IMBUFSIZ]; 1164 char server[IMBUFSIZ];
1076 1165
1077 /* get current locale modifier */ 1166 /* get current locale modifier */
1078 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1167 if (char *p = XSetLocaleModifiers (0))
1079 { 1168 {
1080 strcpy (server, "@server="); 1169 strcpy (server, "@server=");
1081 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1170 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1082 1171
1083 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1172 if (p = strchr (server + 1, '@')) /* first one only */
1084 *p = '\0'; 1173 *p = '\0';
1085 1174
1086 atom = XInternAtom (dpy, server, False); 1175 atom = XInternAtom (dpy, server, False);
1087 win = XGetSelectionOwner (dpy, atom); 1176 win = XGetSelectionOwner (dpy, atom);
1088 1177
1089 if (win != None) 1178 if (win != None)
1090 return True; 1179 return true;
1091 } 1180 }
1092 1181
1093 return False; 1182 return false;
1094} 1183}
1095 1184
1096void 1185void
1097rxvt_term::IMSendSpot () 1186rxvt_term::im_send_spot ()
1098{ 1187{
1099 XPoint nspot; 1188 XPoint nspot;
1100 XVaNestedList preedit_attr; 1189 XVaNestedList preedit_attr;
1101 1190
1102 if (!Input_Context 1191 if (!Input_Context
… …
1155 1244
1156 term->make_current (); 1245 term->make_current ();
1157 1246
1158 if (text) 1247 if (text)
1159 { 1248 {
1160 void *str; 1249 wchar_t *str;
1161 1250
1162 if (!text->encoding_is_wchar && text->string.multi_byte) 1251 if (!text->encoding_is_wchar && text->string.multi_byte)
1163 { 1252 {
1164 // of course, X makes it ugly again 1253 // of course, X makes it ugly again
1165 if (term->rs[Rs_imLocale]) 1254 if (term->rs[Rs_imLocale])
1166 SET_LOCALE (term->rs[Rs_imLocale]); 1255 SET_LOCALE (term->rs[Rs_imLocale]);
1167 1256
1168 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1257 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1169 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1258 mbstowcs (str, text->string.multi_byte, text->length + 1);
1170 1259
1171 if (term->rs[Rs_imLocale]) 1260 if (term->rs[Rs_imLocale])
1172 SET_LOCALE (term->locale); 1261 SET_LOCALE (term->locale);
1173 } 1262 }
1174 else 1263 else
1175 str = (void *)text->string.wide_char; 1264 str = text->string.wide_char;
1176 1265
1177 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1266 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1178 DT_INT, call_data->caret, 1267 DT_INT, call_data->caret,
1179 DT_INT, call_data->chg_first, 1268 DT_INT, call_data->chg_first,
1180 DT_INT, call_data->chg_length, 1269 DT_INT, call_data->chg_length,
… …
1208/* 1297/*
1209 * Try to open a XIM with the current modifiers, then see if we can 1298 * Try to open a XIM with the current modifiers, then see if we can
1210 * open a suitable preedit type 1299 * open a suitable preedit type
1211 */ 1300 */
1212bool 1301bool
1213rxvt_term::IM_get_IC (const char *modifiers) 1302rxvt_term::im_get_ic (const char *modifiers)
1214{ 1303{
1215 int i, j, found; 1304 int i, j, found;
1216 XIM xim; 1305 XIM xim;
1217 XPoint spot; 1306 XPoint spot;
1218 XRectangle rect, status_rect, needed_rect; 1307 XRectangle rect, status_rect, needed_rect;
1219 unsigned long fg, bg; 1308 unsigned long fg, bg;
1220 const char *p; 1309 const char *p;
1221 char **s; 1310 char **s;
1222 XIMStyles *xim_styles; 1311 XIMStyles *xim_styles;
1223#ifdef ENABLE_XIM_ONTHESPOT
1224 XIMCallback xcb[4];
1225#endif
1226 1312
1227 set_environ (envv); 1313 set_environ (envv);
1228 1314
1229 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1315 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1230 return false; 1316 return false;
… …
1251 p = pet[pi]; 1337 p = pet[pi];
1252 1338
1253 if (!p) 1339 if (!p)
1254 continue; 1340 continue;
1255 1341
1256 s = rxvt_splitcommastring (p); 1342 s = rxvt_strsplit (',', p);
1257 1343
1258 for (i = found = 0; !found && s[i]; i++) 1344 for (i = found = 0; !found && s[i]; i++)
1259 { 1345 {
1260 if (!strcmp (s[i], "OverTheSpot")) 1346 if (!strcmp (s[i], "OverTheSpot"))
1261 input_style = XIMPreeditPosition | XIMStatusNothing; 1347 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1273 input_style = XIMPreeditNothing | XIMStatusNothing; 1359 input_style = XIMPreeditNothing | XIMStatusNothing;
1274 1360
1275 for (j = 0; j < xim_styles->count_styles; j++) 1361 for (j = 0; j < xim_styles->count_styles; j++)
1276 if (input_style == xim_styles->supported_styles[j]) 1362 if (input_style == xim_styles->supported_styles[j])
1277 { 1363 {
1278 rxvt_freecommastring (s); 1364 rxvt_free_strsplit (s);
1279 1365
1280 found = 1; 1366 found = 1;
1281 goto foundpet; 1367 goto foundpet;
1282 } 1368 }
1283 1369
1284 } 1370 }
1285 1371
1286 rxvt_freecommastring (s); 1372 rxvt_free_strsplit (s);
1287 } 1373 }
1288 1374
1289foundpet: 1375foundpet:
1290 1376
1291 XFree (xim_styles); 1377 XFree (xim_styles);
… …
1370 NULL); 1456 NULL);
1371 } 1457 }
1372#if ENABLE_XIM_ONTHESPOT 1458#if ENABLE_XIM_ONTHESPOT
1373 else if (input_style & XIMPreeditCallbacks) 1459 else if (input_style & XIMPreeditCallbacks)
1374 { 1460 {
1461 XIMCallback xcb[4];
1462
1375 im_set_position (spot); 1463 im_set_position (spot);
1376 1464
1377 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1465 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1378 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1466 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1379 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1467 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1394#endif 1482#endif
1395 1483
1396 Input_Context = XCreateIC (xim, 1484 Input_Context = XCreateIC (xim,
1397 XNInputStyle, input_style, 1485 XNInputStyle, input_style,
1398 XNClientWindow, vt, 1486 XNClientWindow, vt,
1399 XNFocusWindow, parent[0], 1487 XNFocusWindow, parent,
1400 preedit_attr ? XNPreeditAttributes : NULL, 1488 preedit_attr ? XNPreeditAttributes : NULL,
1401 preedit_attr, 1489 preedit_attr,
1402 status_attr ? XNStatusAttributes : NULL, 1490 status_attr ? XNStatusAttributes : NULL,
1403 status_attr, NULL); 1491 status_attr, NULL);
1404 1492
… …
1417 // unfortunately, only the focus window is used by XIM, hard to fix 1505 // unfortunately, only the focus window is used by XIM, hard to fix
1418 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1506 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1419 vt_select_input (); 1507 vt_select_input ();
1420#endif 1508#endif
1421 1509
1422 IMSetPosition (); 1510 im_set_position ();
1423 1511
1424 return true; 1512 return true;
1425} 1513}
1426 1514
1427void 1515void
… …
1437 im_destroy (); 1525 im_destroy ();
1438 1526
1439 if (Input_Context) 1527 if (Input_Context)
1440 return; 1528 return;
1441 1529
1442#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1443 if (rs[Rs_imLocale]) 1530 if (rs[Rs_imLocale])
1444 SET_LOCALE (rs[Rs_imLocale]); 1531 SET_LOCALE (rs[Rs_imLocale]);
1445#endif
1446 1532
1447 p = rs[Rs_inputMethod]; 1533 p = rs[Rs_inputMethod];
1448 if (p && *p) 1534 if (p && *p)
1449 { 1535 {
1450 bool found = false; 1536 bool found = false;
1451 1537
1452 s = rxvt_splitcommastring (p); 1538 s = rxvt_strsplit (',', p);
1453 1539
1454 for (i = 0; s[i]; i++) 1540 for (i = 0; s[i]; i++)
1455 { 1541 {
1456 if (*s[i]) 1542 if (*s[i])
1457 { 1543 {
1458 strcpy (buf, "@im="); 1544 strcpy (buf, "@im=");
1459 strncat (buf, s[i], IMBUFSIZ - 5); 1545 strncat (buf, s[i], IMBUFSIZ - 5);
1460 if (IM_get_IC (buf)) 1546 if (im_get_ic (buf))
1461 { 1547 {
1462 found = true; 1548 found = true;
1463 break; 1549 break;
1464 } 1550 }
1465 } 1551 }
1466 } 1552 }
1467 1553
1468 rxvt_freecommastring (s); 1554 rxvt_free_strsplit (s);
1469 1555
1470 if (found) 1556 if (found)
1471 goto done; 1557 goto done;
1472 } 1558 }
1473 1559
1474 /* try with XMODIFIERS env. var. */ 1560 /* try with XMODIFIERS env. var. */
1475 if (IM_get_IC ("")) 1561 if (im_get_ic (""))
1476 goto done; 1562 goto done;
1477 1563
1478 /* try with no modifiers base IF the user didn't specify an IM */ 1564 /* try with no modifiers base IF the user didn't specify an IM */
1479 if (IM_get_IC ("@im=none")) 1565 if (im_get_ic ("@im=none"))
1480 goto done; 1566 goto done;
1481 1567
1482done: 1568done:
1483#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1484 if (rs[Rs_imLocale]) 1569 if (rs[Rs_imLocale])
1485 SET_LOCALE (locale); 1570 SET_LOCALE (locale);
1486#endif
1487} 1571}
1488 1572
1489void 1573void
1490rxvt_term::IMSetPosition () 1574rxvt_term::im_set_position ()
1491{ 1575{
1492 XRectangle preedit_rect, status_rect, *needed_rect; 1576 XRectangle preedit_rect, status_rect, *needed_rect;
1493 XVaNestedList preedit_attr, status_attr; 1577 XVaNestedList preedit_attr, status_attr;
1494 1578
1495 if (!Input_Context 1579 if (!Input_Context
1496 || !focus 1580 || !focus
1497 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1581 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1498 || !IMisRunning ()) 1582 || !im_is_running ())
1499 return; 1583 return;
1500 1584
1501 if (input_style & XIMPreeditPosition) 1585 if (input_style & XIMPreeditPosition)
1502 { 1586 {
1503 im_set_size (preedit_rect); 1587 im_set_size (preedit_rect);
… …
1533 1617
1534void 1618void
1535rxvt_term::get_window_origin (int &x, int &y) 1619rxvt_term::get_window_origin (int &x, int &y)
1536{ 1620{
1537 Window cr; 1621 Window cr;
1538 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1622 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1539/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1540} 1623}
1541 1624
1542Pixmap 1625Pixmap
1543rxvt_term::get_pixmap_property (int prop_id) 1626rxvt_term::get_pixmap_property (Atom property)
1544{ 1627{
1545 if (prop_id > 0 && prop_id < NUM_XA) 1628 Pixmap pixmap = None;
1546 if (xa[prop_id]) 1629
1547 {
1548 int aformat; 1630 int aformat;
1549 unsigned long nitems, bytes_after; 1631 unsigned long nitems, bytes_after;
1550 Atom atype; 1632 Atom atype;
1551 unsigned char *prop = NULL; 1633 unsigned char *prop;
1552 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1634 int result = XGetWindowProperty (dpy, display->root, property,
1553 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1635 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1554 &nitems, &bytes_after, &prop); 1636 &nitems, &bytes_after, &prop);
1555 if (result == Success && prop && atype == XA_PIXMAP) 1637 if (result == Success)
1638 {
1639 if (atype == XA_PIXMAP)
1556 return *(Pixmap *)prop; 1640 pixmap = *(Pixmap *)prop;
1641 XFree (prop);
1557 } 1642 }
1558 1643
1559 return None; 1644 return pixmap;
1560} 1645}
1561 1646
1562#ifdef HAVE_BG_PIXMAP 1647#ifdef HAVE_BG_PIXMAP
1563# if TRACE_PIXMAPS
1564# undef update_background
1565void
1566rxvt_term::trace_update_background (const char *file, int line)
1567{
1568 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1569 update_background ();
1570}
1571# endif
1572 1648
1573void 1649void
1574rxvt_term::update_background () 1650rxvt_term::update_background ()
1575{ 1651{
1576 if (update_background_ev.is_active ()) 1652 if (update_background_ev.is_active ())
1577 return; 1653 return;
1578 1654
1579 bgPixmap.invalidate (); 1655 bg_invalidate ();
1580 1656
1657 if (!mapped)
1658 return;
1659
1581 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1660 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1582 1661
1583 if (to_wait <= 0.) 1662 if (to_wait <= 0.)
1584 bgPixmap.render (); 1663 bg_render ();
1585 else 1664 else
1586 update_background_ev.start (to_wait); 1665 update_background_ev.start (to_wait);
1587} 1666}
1588 1667
1589void 1668void
1590rxvt_term::update_background_cb (ev::timer &w, int revents) 1669rxvt_term::update_background_cb (ev::timer &w, int revents)
1591{ 1670{
1592 make_current (); 1671 make_current ();
1593 1672
1594 update_background_ev.stop (); 1673 update_background_ev.stop ();
1595 bgPixmap.render (); 1674 bg_render ();
1596 refresh_check (); 1675 refresh_check ();
1597} 1676}
1598 1677
1599#endif /* HAVE_BG_PIXMAP */ 1678#endif /* HAVE_BG_PIXMAP */
1600 1679

Diff Legend

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