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.320 by sf-exg, Sat Jan 30 20:43:56 2010 UTC vs.
Revision 1.348 by sf-exg, Thu Jan 20 16:41:23 2011 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 <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "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 <cassert>
40#include <csignal> 42#include <csignal>
41#include <cstring> 43#include <cstring>
42 44
43#include <termios.h> 45#include <termios.h>
44 46
… …
49# ifdef HAVE_SETLOCALE 51# ifdef HAVE_SETLOCALE
50# include <clocale> 52# include <clocale>
51# endif 53# endif
52#endif 54#endif
53 55
56struct termios rxvt_term::def_tio;
54vector<rxvt_term *> rxvt_term::termlist; 57vector<rxvt_term *> rxvt_term::termlist;
55 58
56// used to tell global functions which terminal instance is "active" 59// used to tell global functions which terminal instance is "active"
57rxvt_t rxvt_current_term; 60rxvt_t rxvt_current_term;
58 61
… …
93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 96text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
94{ 97{
95 compose_char *cc; 98 compose_char *cc;
96 99
97 // break compose chains, as stupid readline really likes to duplicate 100 // break compose chains, as stupid readline really likes to duplicate
98 // composing characters for some reason near the end of a line. 101 // composing characters for some reason, near the end of a line.
99 cc = (*this)[c1]; 102 cc = (*this)[c1];
100 while (cc) 103 while (cc)
101 { 104 {
102 if (cc->c2 == c2) return c1; 105 if (cc->c2 == c2) return c1;
103 cc = (*this)[cc->c1]; 106 cc = (*this)[cc->c1];
104 } 107 }
105 108
106 // check to see wether this combination already exists otherwise 109 // check to see whether this combination already exists otherwise
107 for (cc = v.end (); cc-- > v.begin (); ) 110 for (cc = v.end (); cc-- > v.begin (); )
108 {
109 if (cc->c1 == c1 && cc->c2 == c2) 111 if (cc->c1 == c1 && cc->c2 == c2)
110 return COMPOSE_LO + (cc - v.begin ()); 112 return COMPOSE_LO + (cc - v.begin ());
111 }
112 113
113 // allocate a new combination 114 // allocate a new combination
114 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
115 { 116 {
116 static int seen; 117 static int seen;
117 118
118 if (!seen++) 119 if (!seen++)
119 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 120 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
120 121
121 return REPLACEMENT_CHAR; 122 return REPLACEMENT_CHAR;
122 } 123 }
123 124
124 v.push_back (compose_char (c1, c2)); 125 v.push_back (compose_char (c1, c2));
… …
358 make_current (); 359 make_current ();
359 360
360 delete this; 361 delete this;
361} 362}
362 363
364void
365rxvt_term::set_option (uint8_t opt, bool set)
366{
367 if (!opt)
368 return;
369
370 uint8_t mask = 1 << (opt & 7);
371 uint8_t &val = options [opt >> 3];
372
373 val = val & ~mask | (set ? mask : 0);
374}
375
363/*----------------------------------------------------------------------*/ 376/*----------------------------------------------------------------------*/
364/* 377/*
365 * Exit gracefully, clearing the utmp entry and restoring tty attributes 378 * Exit gracefully, clearing the utmp entry and restoring tty attributes
366 * TODO: if debugging, this should free up any known resources if we can 379 * TODO: if debugging, this should free up any known resources if we can
367 */ 380 */
… …
379print_x_error (Display *dpy, XErrorEvent *event) 392print_x_error (Display *dpy, XErrorEvent *event)
380{ 393{
381 char buffer[BUFSIZ]; 394 char buffer[BUFSIZ];
382 char mesg[BUFSIZ]; 395 char mesg[BUFSIZ];
383 char number[32]; 396 char number[32];
384 char *mtype = "XlibMessage"; 397 const char mtype[] = "XlibMessage";
385 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 398 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
386 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 399 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
387 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 400 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
388 rxvt_warn ("%s: %s\n", mesg, buffer); 401 rxvt_warn ("%s: %s\n", mesg, buffer);
389 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 402 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
390 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 403 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
391 sprintf(number, "%d", event->request_code); 404 sprintf(number, "%d", event->request_code);
392 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 405 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
393 rxvt_warn ("(which is %s)\n", buffer); 406 rxvt_warn ("(which is %s)\n", buffer);
394 if (event->request_code >= 128) { 407 if (event->request_code >= 128) {
395 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 408 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
396 mesg, BUFSIZ); 409 mesg, BUFSIZ);
397 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 410 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
398 } 411 }
399 if ((event->error_code == BadWindow) || 412 if ((event->error_code == BadWindow) ||
400 (event->error_code == BadPixmap) || 413 (event->error_code == BadPixmap) ||
401 (event->error_code == BadCursor) || 414 (event->error_code == BadCursor) ||
402 (event->error_code == BadFont) || 415 (event->error_code == BadFont) ||
403 (event->error_code == BadDrawable) || 416 (event->error_code == BadDrawable) ||
404 (event->error_code == BadColor) || 417 (event->error_code == BadColor) ||
405 (event->error_code == BadGC) || 418 (event->error_code == BadGC) ||
406 (event->error_code == BadIDChoice) || 419 (event->error_code == BadIDChoice) ||
407 (event->error_code == BadValue) || 420 (event->error_code == BadValue) ||
408 (event->error_code == BadAtom)) { 421 (event->error_code == BadAtom)) {
409 if (event->error_code == BadValue) 422 if (event->error_code == BadValue)
410 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 423 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
411 mesg, BUFSIZ); 424 mesg, BUFSIZ);
412 else if (event->error_code == BadAtom) 425 else if (event->error_code == BadAtom)
413 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 426 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
414 mesg, BUFSIZ); 427 mesg, BUFSIZ);
415 else 428 else
416 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 429 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
417 mesg, BUFSIZ); 430 mesg, BUFSIZ);
418 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 431 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
419 } 432 }
420 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 433 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
421 mesg, BUFSIZ); 434 mesg, BUFSIZ);
422 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 435 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
423} 436}
424#endif 437#endif
425 438
426int 439int
… …
473 rxvt_emergency_cleanup (); 486 rxvt_emergency_cleanup ();
474 w.stop (); 487 w.stop ();
475 kill (getpid (), w.signum); 488 kill (getpid (), w.signum);
476} 489}
477 490
491static void
492rxvt_get_ttymode (struct termios *tio)
493{
494 if (tcgetattr (STDIN_FILENO, tio) < 0)
495 memset (tio, 0, sizeof (struct termios));
496
497 for (int i = 0; i < NCCS; i++)
498 tio->c_cc[i] = VDISABLE;
499
500 tio->c_cc[VINTR] = CINTR;
501 tio->c_cc[VQUIT] = CQUIT;
502 tio->c_cc[VERASE] = CERASE;
503#ifdef VERASE2
504 tio->c_cc[VERASE2] = CERASE2;
505#endif
506 tio->c_cc[VKILL] = CKILL;
507 tio->c_cc[VEOF] = CEOF;
508 tio->c_cc[VSTART] = CSTART;
509 tio->c_cc[VSTOP] = CSTOP;
510 tio->c_cc[VSUSP] = CSUSP;
511# ifdef VDSUSP
512 tio->c_cc[VDSUSP] = CDSUSP;
513# endif
514# ifdef VREPRINT
515 tio->c_cc[VREPRINT] = CRPRNT;
516# endif
517# ifdef VDISCRD
518 tio->c_cc[VDISCRD] = CFLUSH;
519# endif
520# ifdef VWERSE
521 tio->c_cc[VWERSE] = CWERASE;
522# endif
523# ifdef VLNEXT
524 tio->c_cc[VLNEXT] = CLNEXT;
525# endif
526# ifdef VSTATUS
527 tio->c_cc[VSTATUS] = CSTATUS;
528# endif
529
530# if VMIN != VEOF
531 tio->c_cc[VMIN] = 1;
532# endif
533# if VTIME != VEOL
534 tio->c_cc[VTIME] = 0;
535# endif
536
537 /* input modes */
538 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
539# ifdef IMAXBEL
540 | IMAXBEL
541# endif
542 | IXON);
543
544 /* output modes */
545 tio->c_oflag = (OPOST | ONLCR);
546
547 /* control modes */
548 tio->c_cflag = (CS8 | CREAD);
549
550 /* local modes */
551 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
552# if defined (ECHOCTL) && defined (ECHOKE)
553 | ECHOCTL | ECHOKE
554# endif
555 | ECHOE | ECHOK);
556}
557
478char **rxvt_environ; // startup environment 558char **rxvt_environ; // startup environment
479 559
480void 560void
481rxvt_init () 561rxvt_init ()
482{ 562{
483 ptytty::init (); 563 assert (("fontMask must not overlap other RS masks",
564 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
484 565
566 rxvt_get_ttymode (&rxvt_term::def_tio);
567
568 // get rid of stdin/stdout as we don't need them, to free resources
569 dup2 (STDERR_FILENO, STDIN_FILENO);
570 dup2 (STDERR_FILENO, STDOUT_FILENO);
571
485 if (!ev_default_loop (0)) 572 if (!ev_default_loop ())
486 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 573 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
487 574
488 rxvt_environ = environ; 575 rxvt_environ = environ;
489 576
490 signal (SIGHUP, SIG_IGN); 577 signal (SIGHUP, SIG_IGN);
491 signal (SIGPIPE, SIG_IGN); 578 signal (SIGPIPE, SIG_IGN);
492 579
493 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 580 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
494 sig_handlers.sw_int.start (SIGINT); ev_unref (); 581 sig_handlers.sw_int.start (SIGINT); ev_unref ();
495
496 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
497 /* signal (SIGURG, SIG_DFL); */
498 582
499 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 583 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
500 // TODO: handle this with exceptions and tolerate the memory loss 584 // TODO: handle this with exceptions and tolerate the memory loss
501 XSetIOErrorHandler (rxvt_xioerror_handler); 585 XSetIOErrorHandler (rxvt_xioerror_handler);
502 586
… …
688#endif 772#endif
689 773
690 delete fontset[0]; 774 delete fontset[0];
691 fontset[0] = fs; 775 fontset[0] = fs;
692 776
693 prop = (*fs)[1]->properties (); 777 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
694 prop.height += lineSpace; 778 prop.height += lineSpace;
695 prop.width += letterSpace; 779 prop.width += letterSpace;
696 780
697 fs->set_prop (prop, false); 781 fs->set_prop (prop, false);
698 782
… …
750 prop, XA_STRING, 8, PropModeReplace, 834 prop, XA_STRING, 8, PropModeReplace,
751 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 835 (const unsigned char *)str, len >= 0 ? len : strlen (str));
752} 836}
753 837
754void 838void
839rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
840{
841 XTextProperty ct;
842
843 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
844 {
845 XSetTextProperty (dpy, parent[0], &ct, prop);
846 XFree (ct.value);
847 }
848}
849
850void
755rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 851rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
756{ 852{
757 wchar_t *ws = rxvt_mbstowcs (str, len); 853 wchar_t *ws = rxvt_mbstowcs (str, len);
758 char *s = rxvt_wcstoutf8 (ws); 854 char *s = rxvt_wcstoutf8 (ws);
759 855
… …
769/*----------------------------------------------------------------------*/ 865/*----------------------------------------------------------------------*/
770/* xterm sequences - title, iconName, color (exptl) */ 866/* xterm sequences - title, iconName, color (exptl) */
771void 867void
772rxvt_term::set_title (const char *str) 868rxvt_term::set_title (const char *str)
773{ 869{
774 set_string_property (XA_WM_NAME, str); 870 set_mbstring_property (XA_WM_NAME, str);
775#if ENABLE_EWMH 871#if ENABLE_EWMH
776 set_utf8_property (xa[XA_NET_WM_NAME], str); 872 set_utf8_property (xa[XA_NET_WM_NAME], str);
777#endif 873#endif
778} 874}
779 875
780void 876void
781rxvt_term::set_icon_name (const char *str) 877rxvt_term::set_icon_name (const char *str)
782{ 878{
783 set_string_property (XA_WM_ICON_NAME, str); 879 set_mbstring_property (XA_WM_ICON_NAME, str);
784#if ENABLE_EWMH 880#if ENABLE_EWMH
785 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 881 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
786#endif 882#endif
787} 883}
788 884
… …
860void 956void
861rxvt_term::set_colorfgbg () 957rxvt_term::set_colorfgbg ()
862{ 958{
863 unsigned int i; 959 unsigned int i;
864 const char *xpmb = ""; 960 const char *xpmb = "";
865 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 961 char fstr[] = "default";
962 char bstr[] = "default";
866 963
867 strcpy (fstr, "default");
868 strcpy (bstr, "default");
869 for (i = Color_Black; i <= Color_White; i++) 964 for (i = Color_Black; i <= Color_White; i++)
870 if (pix_colors[Color_fg] == pix_colors[i]) 965 if (pix_colors[Color_fg] == pix_colors[i])
871 { 966 {
872 sprintf (fstr, "%d", (i - Color_Black)); 967 sprintf (fstr, "%d", i - Color_Black);
873 break; 968 break;
874 } 969 }
875 970
876 for (i = Color_Black; i <= Color_White; i++) 971 for (i = Color_Black; i <= Color_White; i++)
877 if (pix_colors[Color_bg] == pix_colors[i]) 972 if (pix_colors[Color_bg] == pix_colors[i])
878 { 973 {
879 sprintf (bstr, "%d", (i - Color_Black)); 974 sprintf (bstr, "%d", i - Color_Black);
880#ifdef BG_IMAGE_FROM_FILE 975#ifdef BG_IMAGE_FROM_FILE
881 xpmb = "default;"; 976 xpmb = "default;";
882#endif 977#endif
883 break; 978 break;
884 } 979 }
… …
995 } 1090 }
996 1091
997 if (fix_screen || old_height == 0) 1092 if (fix_screen || old_height == 0)
998 scr_reset (); 1093 scr_reset ();
999 1094
1000 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1001 //scr_touch (false);
1002
1003#ifdef HAVE_BG_PIXMAP
1004// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1005// if (bgPixmap.pixmap)
1006// scr_touch (false);
1007#endif
1008
1009#ifdef USE_XIM 1095#ifdef USE_XIM
1010 IMSetPosition (); 1096 IMSetPosition ();
1011#endif 1097#endif
1012} 1098}
1013 1099
… …
1261 p = pet[pi]; 1347 p = pet[pi];
1262 1348
1263 if (!p) 1349 if (!p)
1264 continue; 1350 continue;
1265 1351
1266 s = rxvt_splitcommastring (p); 1352 s = rxvt_strsplit (',', p);
1267 1353
1268 for (i = found = 0; !found && s[i]; i++) 1354 for (i = found = 0; !found && s[i]; i++)
1269 { 1355 {
1270 if (!strcmp (s[i], "OverTheSpot")) 1356 if (!strcmp (s[i], "OverTheSpot"))
1271 input_style = XIMPreeditPosition | XIMStatusNothing; 1357 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1283 input_style = XIMPreeditNothing | XIMStatusNothing; 1369 input_style = XIMPreeditNothing | XIMStatusNothing;
1284 1370
1285 for (j = 0; j < xim_styles->count_styles; j++) 1371 for (j = 0; j < xim_styles->count_styles; j++)
1286 if (input_style == xim_styles->supported_styles[j]) 1372 if (input_style == xim_styles->supported_styles[j])
1287 { 1373 {
1288 rxvt_freecommastring (s); 1374 rxvt_free_strsplit (s);
1289 1375
1290 found = 1; 1376 found = 1;
1291 goto foundpet; 1377 goto foundpet;
1292 } 1378 }
1293 1379
1294 } 1380 }
1295 1381
1296 rxvt_freecommastring (s); 1382 rxvt_free_strsplit (s);
1297 } 1383 }
1298 1384
1299foundpet: 1385foundpet:
1300 1386
1301 XFree (xim_styles); 1387 XFree (xim_styles);
… …
1457 p = rs[Rs_inputMethod]; 1543 p = rs[Rs_inputMethod];
1458 if (p && *p) 1544 if (p && *p)
1459 { 1545 {
1460 bool found = false; 1546 bool found = false;
1461 1547
1462 s = rxvt_splitcommastring (p); 1548 s = rxvt_strsplit (',', p);
1463 1549
1464 for (i = 0; s[i]; i++) 1550 for (i = 0; s[i]; i++)
1465 { 1551 {
1466 if (*s[i]) 1552 if (*s[i])
1467 { 1553 {
… …
1473 break; 1559 break;
1474 } 1560 }
1475 } 1561 }
1476 } 1562 }
1477 1563
1478 rxvt_freecommastring (s); 1564 rxvt_free_strsplit (s);
1479 1565
1480 if (found) 1566 if (found)
1481 goto done; 1567 goto done;
1482 } 1568 }
1483 1569
… …
1544void 1630void
1545rxvt_term::get_window_origin (int &x, int &y) 1631rxvt_term::get_window_origin (int &x, int &y)
1546{ 1632{
1547 Window cr; 1633 Window cr;
1548 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1634 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1549/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1550} 1635}
1551 1636
1552Pixmap 1637Pixmap
1553rxvt_term::get_pixmap_property (int prop_id) 1638rxvt_term::get_pixmap_property (Atom property)
1554{ 1639{
1555 if (prop_id > 0 && prop_id < NUM_XA) 1640 Pixmap pixmap = None;
1556 if (xa[prop_id]) 1641
1557 {
1558 int aformat; 1642 int aformat;
1559 unsigned long nitems, bytes_after; 1643 unsigned long nitems, bytes_after;
1560 Atom atype; 1644 Atom atype;
1561 unsigned char *prop = NULL; 1645 unsigned char *prop;
1562 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1646 int result = XGetWindowProperty (dpy, display->root, property,
1563 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1647 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1564 &nitems, &bytes_after, &prop); 1648 &nitems, &bytes_after, &prop);
1565 if (result == Success && prop && atype == XA_PIXMAP) 1649 if (result == Success)
1650 {
1651 if (atype == XA_PIXMAP)
1566 return *(Pixmap *)prop; 1652 pixmap = *(Pixmap *)prop;
1653 XFree (prop);
1567 } 1654 }
1568 1655
1569 return None; 1656 return pixmap;
1570} 1657}
1571 1658
1572#ifdef HAVE_BG_PIXMAP 1659#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 1660
1583void 1661void
1584rxvt_term::update_background () 1662rxvt_term::update_background ()
1585{ 1663{
1586 if (update_background_ev.is_active ()) 1664 if (update_background_ev.is_active ())

Diff Legend

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