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.324 by sf-exg, Wed Mar 31 13:14:50 2010 UTC vs.
Revision 1.379 by root, Tue Jun 5 11:10:58 2012 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "init.h"
35#include "keyboard.h" 36#include "keyboard.h"
36#include "rxvtperl.h" 37#include "rxvtperl.h"
37 38
38#include <limits> 39#include <limits>
39 40
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 whether 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));
… …
173#endif 172#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL 173#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176#endif 175#endif
177 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
178#ifdef USE_XIM 177#if USE_XIM
179 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
180#endif 179#endif
181#ifdef POINTER_BLANK 180#ifdef POINTER_BLANK
182 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
183#endif 182#endif
… …
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 ();
242 selection_clear (true); 234 selection_clear (true);
243 235
244#ifdef USE_XIM 236#if USE_XIM
245 im_destroy (); 237 im_destroy ();
246#endif 238#endif
247 scrollBar.destroy (); 239 scrollBar.destroy ();
248 if (gc) XFreeGC (dpy, gc); 240 if (gc) XFreeGC (dpy, gc);
249 241
250 delete drawable; 242 delete drawable;
251 // destroy all windows 243 // destroy all windows
252 if (parent[0]) 244 if (parent)
253 XDestroyWindow (dpy, parent[0]); 245 XDestroyWindow (dpy, parent);
254 246
255 for (int i = 0; i < TOTAL_COLORS; i++) 247 for (int i = 0; i < TOTAL_COLORS; i++)
256 if (ISSET_PIXCOLOR (i)) 248 if (ISSET_PIXCOLOR (i))
257 { 249 {
258 pix_colors_focused [i].free (this); 250 pix_colors_focused [i].free (this);
… …
273 for (int i = 0; i < allocated.size (); i++) 265 for (int i = 0; i < allocated.size (); i++)
274 free (allocated [i]); 266 free (allocated [i]);
275 267
276 free (selection.text); 268 free (selection.text);
277 free (selection.clip_text); 269 free (selection.clip_text);
278 // TODO: manage env vars in child only(!)
279 free (env_display);
280 free (env_term);
281 free (locale); 270 free (locale);
282 free (v_buffer); 271 free (v_buffer);
283 free (incr_buf); 272
273 delete selection_req;
284 274
285 delete envv; 275 delete envv;
286 delete argv; 276 delete argv;
287 277
288#ifdef KEYSYM_RESOURCE 278#ifdef KEYSYM_RESOURCE
… …
324#endif 314#endif
325 scrollbar_ev.stop (display); 315 scrollbar_ev.stop (display);
326#if ENABLE_TRANSPARENCY || ENABLE_PERL 316#if ENABLE_TRANSPARENCY || ENABLE_PERL
327 rootwin_ev.stop (display); 317 rootwin_ev.stop (display);
328#endif 318#endif
329 incr_ev.stop ();
330 termwin_ev.stop (display); 319 termwin_ev.stop (display);
331 vt_ev.stop (display); 320 vt_ev.stop (display);
332 } 321 }
333 322
334 flush_ev.stop (); 323 flush_ev.stop ();
… …
356rxvt_term::destroy_cb (ev::idle &w, int revents) 345rxvt_term::destroy_cb (ev::idle &w, int revents)
357{ 346{
358 make_current (); 347 make_current ();
359 348
360 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);
361} 362}
362 363
363/*----------------------------------------------------------------------*/ 364/*----------------------------------------------------------------------*/
364/* 365/*
365 * Exit gracefully, clearing the utmp entry and restoring tty attributes 366 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
373 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 374 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
374 (*t)->emergency_cleanup (); 375 (*t)->emergency_cleanup ();
375} 376}
376 377
377#if !ENABLE_MINIMAL 378#if !ENABLE_MINIMAL
378static void 379static void ecb_cold
379print_x_error (Display *dpy, XErrorEvent *event) 380print_x_error (Display *dpy, XErrorEvent *event)
380{ 381{
381 char buffer[BUFSIZ]; 382 char buffer[BUFSIZ];
382 char mesg[BUFSIZ]; 383 char mesg[BUFSIZ];
383 char number[32]; 384 char number[32];
384 char *mtype = "XlibMessage"; 385 const char mtype[] = "XlibMessage";
386
385 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 387 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
386 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 388 XGetErrorDatabaseText (dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
387 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 389 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
388 rxvt_warn ("%s: %s\n", mesg, buffer); 390 rxvt_warn ("%s: %s\n", mesg, buffer);
389 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 391 XGetErrorDatabaseText (dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
390 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 392 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
391 sprintf(number, "%d", event->request_code); 393 sprintf (number, "%d", event->request_code);
392 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 394 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
393 rxvt_warn ("(which is %s)\n", buffer); 395 rxvt_warn ("(which is %s)\n", buffer);
396
394 if (event->request_code >= 128) { 397 if (event->request_code >= 128)
398 {
395 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 399 XGetErrorDatabaseText (dpy, mtype, "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
396 mesg, BUFSIZ);
397 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 400 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
398 } 401 }
402
399 if ((event->error_code == BadWindow) || 403 if (event->error_code == BadWindow
400 (event->error_code == BadPixmap) || 404 || event->error_code == BadPixmap
401 (event->error_code == BadCursor) || 405 || event->error_code == BadCursor
402 (event->error_code == BadFont) || 406 || event->error_code == BadFont
403 (event->error_code == BadDrawable) || 407 || event->error_code == BadDrawable
404 (event->error_code == BadColor) || 408 || event->error_code == BadColor
405 (event->error_code == BadGC) || 409 || event->error_code == BadGC
406 (event->error_code == BadIDChoice) || 410 || event->error_code == BadIDChoice
407 (event->error_code == BadValue) || 411 || event->error_code == BadValue
408 (event->error_code == BadAtom)) { 412 || event->error_code == BadAtom)
413 {
409 if (event->error_code == BadValue) 414 if (event->error_code == BadValue)
410 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 415 XGetErrorDatabaseText (dpy, mtype, "Value", "Value 0x%x", mesg, BUFSIZ);
411 mesg, BUFSIZ);
412 else if (event->error_code == BadAtom) 416 else if (event->error_code == BadAtom)
413 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 417 XGetErrorDatabaseText (dpy, mtype, "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
414 mesg, BUFSIZ); 418 else
415 else
416 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 419 XGetErrorDatabaseText (dpy, mtype, "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
417 mesg, BUFSIZ); 420
418 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
419 } 422 }
423
420 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 424 XGetErrorDatabaseText (dpy, mtype, "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
421 mesg, BUFSIZ);
422 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 425 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
423} 426}
424#endif 427#endif
425 428
426int 429int ecb_cold
427rxvt_xerror_handler (Display *display, XErrorEvent *event) 430rxvt_xerror_handler (Display *display, XErrorEvent *event)
428{ 431{
429 if (GET_R->allowedxerror == -1) 432 if (GET_R->allowedxerror == -1)
430 GET_R->allowedxerror = event->error_code; 433 GET_R->allowedxerror = event->error_code;
431 else 434 else
… …
440 } 443 }
441 444
442 return 0; 445 return 0;
443} 446}
444 447
445int 448int ecb_cold
446rxvt_xioerror_handler (Display *display) 449rxvt_xioerror_handler (Display *display)
447{ 450{
448 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 451 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
449 DisplayString (display)); 452 DisplayString (display));
450 rxvt_emergency_cleanup (); 453 rxvt_emergency_cleanup ();
… …
473 rxvt_emergency_cleanup (); 476 rxvt_emergency_cleanup ();
474 w.stop (); 477 w.stop ();
475 kill (getpid (), w.signum); 478 kill (getpid (), w.signum);
476} 479}
477 480
481static void
482rxvt_get_ttymode (struct termios *tio)
483{
484 if (tcgetattr (STDIN_FILENO, tio) < 0)
485 memset (tio, 0, sizeof (struct termios));
486
487 for (int i = 0; i < NCCS; i++)
488 tio->c_cc[i] = VDISABLE;
489
490 tio->c_cc[VINTR] = CINTR;
491 tio->c_cc[VQUIT] = CQUIT;
492 tio->c_cc[VERASE] = CERASE;
493#ifdef VERASE2
494 tio->c_cc[VERASE2] = CERASE2;
495#endif
496 tio->c_cc[VKILL] = CKILL;
497 tio->c_cc[VEOF] = CEOF;
498 tio->c_cc[VSTART] = CSTART;
499 tio->c_cc[VSTOP] = CSTOP;
500 tio->c_cc[VSUSP] = CSUSP;
501# ifdef VDSUSP
502 tio->c_cc[VDSUSP] = CDSUSP;
503# endif
504# ifdef VREPRINT
505 tio->c_cc[VREPRINT] = CRPRNT;
506# endif
507# ifdef VDISCRD
508 tio->c_cc[VDISCRD] = CFLUSH;
509# endif
510# ifdef VWERSE
511 tio->c_cc[VWERSE] = CWERASE;
512# endif
513# ifdef VLNEXT
514 tio->c_cc[VLNEXT] = CLNEXT;
515# endif
516# ifdef VSTATUS
517 tio->c_cc[VSTATUS] = CSTATUS;
518# endif
519
520# if VMIN != VEOF
521 tio->c_cc[VMIN] = 1;
522# endif
523# if VTIME != VEOL
524 tio->c_cc[VTIME] = 0;
525# endif
526
527 /* input modes */
528 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
529# ifdef IMAXBEL
530 | IMAXBEL
531# endif
532 | IXON);
533
534 /* output modes */
535 tio->c_oflag = (OPOST | ONLCR);
536
537 /* control modes */
538 tio->c_cflag = (CS8 | CREAD);
539
540 /* local modes */
541 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
542# if defined (ECHOCTL) && defined (ECHOKE)
543 | ECHOCTL | ECHOKE
544# endif
545 | ECHOE | ECHOK);
546}
547
478char **rxvt_environ; // startup environment 548char **rxvt_environ; // startup environment
479 549
480void 550void
481rxvt_init () 551rxvt_init ()
482{ 552{
483 ptytty::init (); 553 assert (("fontMask must not overlap other RS masks",
554 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
484 555
556 rxvt_get_ttymode (&rxvt_term::def_tio);
557
558 // get rid of stdin/stdout as we don't need them, to free resources
559 dup2 (STDERR_FILENO, STDIN_FILENO);
560 dup2 (STDERR_FILENO, STDOUT_FILENO);
561
485 if (!ev_default_loop (0)) 562 if (!ev_default_loop ())
486 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 563 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
487 564
488 rxvt_environ = environ; 565 rxvt_environ = environ;
489 566
490 signal (SIGHUP, SIG_IGN); 567 signal (SIGHUP, SIG_IGN);
491 signal (SIGPIPE, SIG_IGN); 568 signal (SIGPIPE, SIG_IGN);
492 569
493 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 570 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
494 sig_handlers.sw_int.start (SIGINT); ev_unref (); 571 sig_handlers.sw_int.start (SIGINT); ev_unref ();
495
496 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
497 /* signal (SIGURG, SIG_DFL); */
498 572
499 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 573 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
500 // TODO: handle this with exceptions and tolerate the memory loss 574 // TODO: handle this with exceptions and tolerate the memory loss
501 XSetIOErrorHandler (rxvt_xioerror_handler); 575 XSetIOErrorHandler (rxvt_xioerror_handler);
502 576
503 XrmInitialize (); 577 XrmInitialize ();
578
579#if HAVE_PIXBUF
580 g_type_init ();
581#endif
504} 582}
505 583
506/*----------------------------------------------------------------------*/ 584/*----------------------------------------------------------------------*/
507/* 585/*
508 * window size/position calculations for XSizeHint and other storage. 586 * window size/position calculations for XSizeHint and other storage.
… …
629 if (recalc_y) 707 if (recalc_y)
630 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 708 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
631 709
632 ncol = width / fwidth; 710 ncol = width / fwidth;
633 nrow = height / fheight; 711 nrow = height / fheight;
712
713 // When the size of the vt window is not a multiple of the cell
714 // size, i.e., when the wm does not honour our size hints, there are
715 // extra areas not covered by the terminal screen. Such gaps, when a
716 // bg pixmap is set, would have to be cleared manually to properly
717 // refresh the background. We take the simpler route and shrink the
718 // vt window so as to avoid creating gaps.
719 vt_width = ncol * fwidth;
720 vt_height = nrow * fheight;
634} 721}
635 722
636/*----------------------------------------------------------------------*/ 723/*----------------------------------------------------------------------*/
637/* 724/*
638 * Tell the teletype handler what size the window is. 725 * Tell the teletype handler what size the window is.
… …
646 733
647 struct winsize ws; 734 struct winsize ws;
648 735
649 ws.ws_col = ncol; 736 ws.ws_col = ncol;
650 ws.ws_row = nrow; 737 ws.ws_row = nrow;
651 ws.ws_xpixel = width; 738 ws.ws_xpixel = vt_width;
652 ws.ws_ypixel = height; 739 ws.ws_ypixel = vt_height;
653 ioctl (pty->pty, TIOCSWINSZ, &ws); 740 ioctl (pty->pty, TIOCSWINSZ, &ws);
654 741
655#if 0 742#if 0
656 // TIOCSWINSZ is supposed to do this automatically and correctly 743 // TIOCSWINSZ is supposed to do this automatically and correctly
657 if (cmd_pid) /* force through to the command */ 744 if (cmd_pid) /* force through to the command */
658 kill (-cmd_pid, SIGWINCH); 745 kill (-cmd_pid, SIGWINCH);
659#endif 746#endif
660} 747}
661 748
662/*----------------------------------------------------------------------*/ 749/*----------------------------------------------------------------------*/
663/* set_fonts () - load and set the various fonts 750/* load and set the various fonts */
664 *
665 * init = 1 - initialize
666 *
667 * fontname == FONT_UP - switch to bigger font
668 * fontname == FONT_DN - switch to smaller font
669 */
670bool 751bool
671rxvt_term::set_fonts () 752rxvt_term::set_fonts ()
672{ 753{
673 rxvt_fontset *fs = new rxvt_fontset (this); 754 rxvt_fontset *fs = new rxvt_fontset (this);
674 rxvt_fontprop prop; 755 rxvt_fontprop prop;
… …
688#endif 769#endif
689 770
690 delete fontset[0]; 771 delete fontset[0];
691 fontset[0] = fs; 772 fontset[0] = fs;
692 773
693 prop = (*fs)[1]->properties (); 774 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
694 prop.height += lineSpace;
695 prop.width += letterSpace; 775 prop.width += letterSpace;
696 776
697 fs->set_prop (prop, false); 777 fs->set_prop (prop, false);
698 778
699 fwidth = prop.width; 779 fwidth = prop.width;
700 fheight = prop.height; 780 fheight = prop.height + lineSpace;
701 fbase = prop.ascent; 781 fbase = prop.ascent;
702 782
703 for (int style = 1; style < 4; style++) 783 for (int style = 1; style < 4; style++)
704 { 784 {
705#if ENABLE_STYLES 785#if ENABLE_STYLES
… …
731#else 811#else
732 fontset[style] = fontset[0]; 812 fontset[style] = fontset[0];
733#endif 813#endif
734 } 814 }
735 815
736 if (parent[0]) 816 if (parent)
737 { 817 {
738 resize_all_windows (0, 0, 0); 818 resize_all_windows (0, 0, 0);
739 scr_remap_chars (); 819 scr_remap_chars ();
740 scr_touch (true); 820 scr_touch (true);
741 } 821 }
… …
744} 824}
745 825
746void 826void
747rxvt_term::set_string_property (Atom prop, const char *str, int len) 827rxvt_term::set_string_property (Atom prop, const char *str, int len)
748{ 828{
749 XChangeProperty (dpy, parent[0], 829 XChangeProperty (dpy, parent,
750 prop, XA_STRING, 8, PropModeReplace, 830 prop, XA_STRING, 8, PropModeReplace,
751 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 831 (const unsigned char *)str, len >= 0 ? len : strlen (str));
752} 832}
753 833
754void 834void
835rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
836{
837 XTextProperty ct;
838
839 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
840 {
841 XSetTextProperty (dpy, parent, &ct, prop);
842 XFree (ct.value);
843 }
844}
845
846void
755rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 847rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
756{ 848{
757 wchar_t *ws = rxvt_mbstowcs (str, len); 849 wchar_t *ws = rxvt_mbstowcs (str, len);
758 char *s = rxvt_wcstoutf8 (ws); 850 char *s = rxvt_wcstoutf8 (ws);
759 851
760 XChangeProperty (dpy, parent[0], 852 XChangeProperty (dpy, parent,
761 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 853 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
762 (const unsigned char *)s, strlen (s)); 854 (const unsigned char *)s, strlen (s));
763 855
764 free (s); 856 free (s);
765 free (ws); 857 free (ws);
… …
769/*----------------------------------------------------------------------*/ 861/*----------------------------------------------------------------------*/
770/* xterm sequences - title, iconName, color (exptl) */ 862/* xterm sequences - title, iconName, color (exptl) */
771void 863void
772rxvt_term::set_title (const char *str) 864rxvt_term::set_title (const char *str)
773{ 865{
774 set_string_property (XA_WM_NAME, str); 866 set_mbstring_property (XA_WM_NAME, str);
775#if ENABLE_EWMH 867#if ENABLE_EWMH
776 set_utf8_property (xa[XA_NET_WM_NAME], str); 868 set_utf8_property (xa[XA_NET_WM_NAME], str);
777#endif 869#endif
778} 870}
779 871
780void 872void
781rxvt_term::set_icon_name (const char *str) 873rxvt_term::set_icon_name (const char *str)
782{ 874{
783 set_string_property (XA_WM_ICON_NAME, str); 875 set_mbstring_property (XA_WM_ICON_NAME, str);
784#if ENABLE_EWMH 876#if ENABLE_EWMH
785 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 877 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
786#endif 878#endif
787} 879}
788 880
… …
855 947
856/*----------------------------------------------------------------------*/ 948/*----------------------------------------------------------------------*/
857/* 949/*
858 * find if fg/bg matches any of the normal (low-intensity) colors 950 * find if fg/bg matches any of the normal (low-intensity) colors
859 */ 951 */
860void 952char *
861rxvt_term::set_colorfgbg () 953rxvt_term::get_colorfgbg ()
862{ 954{
863 unsigned int i; 955 unsigned int i;
864 const char *xpmb = ""; 956 const char *xpmb = "";
865 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 957 char fstr[] = "default";
958 char bstr[] = "default";
959 char *env_colorfgbg;
866 960
867 strcpy (fstr, "default");
868 strcpy (bstr, "default");
869 for (i = Color_Black; i <= Color_White; i++) 961 for (i = Color_Black; i <= Color_White; i++)
870 if (pix_colors[Color_fg] == pix_colors[i]) 962 if (pix_colors[Color_fg] == pix_colors[i])
871 { 963 {
872 sprintf (fstr, "%d", (i - Color_Black)); 964 sprintf (fstr, "%d", i - Color_Black);
873 break; 965 break;
874 } 966 }
875 967
876 for (i = Color_Black; i <= Color_White; i++) 968 for (i = Color_Black; i <= Color_White; i++)
877 if (pix_colors[Color_bg] == pix_colors[i]) 969 if (pix_colors[Color_bg] == pix_colors[i])
878 { 970 {
879 sprintf (bstr, "%d", (i - Color_Black)); 971 sprintf (bstr, "%d", i - Color_Black);
880#ifdef BG_IMAGE_FROM_FILE 972#if BG_IMAGE_FROM_FILE
881 xpmb = "default;"; 973 xpmb = "default;";
882#endif 974#endif
883 break; 975 break;
884 } 976 }
885 977
978 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
886 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 979 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
980 return env_colorfgbg;
887} 981}
888 982
889/*----------------------------------------------------------------------*/ 983/*----------------------------------------------------------------------*/
890 984
891bool 985bool
… …
920 1014
921 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow 1015 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
922 if (set_hint) 1016 if (set_hint)
923 { 1017 {
924 szHint.flags &= ~(PBaseSize | PResizeInc); 1018 szHint.flags &= ~(PBaseSize | PResizeInc);
925 XSetWMNormalHints (dpy, parent[0], &szHint); 1019 XSetWMNormalHints (dpy, parent, &szHint);
926 szHint.flags |= PBaseSize | PResizeInc; 1020 szHint.flags |= PBaseSize | PResizeInc;
927 } 1021 }
928 1022
929 if (!ignoreparent) 1023 if (!ignoreparent)
930 { 1024 {
… …
936 int x, y, x1, y1; 1030 int x, y, x1, y1;
937 int dx, dy; 1031 int dx, dy;
938 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1032 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
939 Window unused_cr; 1033 Window unused_cr;
940 1034
941 XTranslateCoordinates (dpy, parent[0], display->root, 1035 XTranslateCoordinates (dpy, parent, display->root,
942 0, 0, &x, &y, &unused_cr); 1036 0, 0, &x, &y, &unused_cr);
943 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1037 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
944 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1038 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
945 /* 1039 /*
946 * if display->root isn't the parent window, a WM will probably have offset 1040 * if display->root isn't the parent window, a WM will probably have offset
947 * our position for handles and decorations. Counter it 1041 * our position for handles and decorations. Counter it
948 */ 1042 */
… …
965 if (y < y1) /* top half */ 1059 if (y < y1) /* top half */
966 dy = 0; 1060 dy = 0;
967 else if (y == y1) /* exact center */ 1061 else if (y == y1) /* exact center */
968 dy /= 2; 1062 dy /= 2;
969 1063
970 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1064 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
971 szHint.width, szHint.height); 1065 szHint.width, szHint.height);
972#else 1066#else
973 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1067 XResizeWindow (dpy, parent, szHint.width, szHint.height);
974#endif 1068#endif
975 } 1069 }
976 1070
977 if (set_hint) 1071 if (set_hint)
978 XSetWMNormalHints (dpy, parent[0], &szHint); 1072 XSetWMNormalHints (dpy, parent, &szHint);
979 1073
980 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1074 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
981 1075
982 if (fix_screen || newwidth != old_width || newheight != old_height) 1076 if (fix_screen || newwidth != old_width || newheight != old_height)
983 { 1077 {
984 if (scrollBar.state) 1078 if (scrollBar.state)
985 scrollBar.resize (); 1079 scrollBar.resize ();
986 1080
987 XMoveResizeWindow (dpy, vt, 1081 XMoveResizeWindow (dpy, vt,
988 window_vt_x, window_vt_y, 1082 window_vt_x, window_vt_y,
989 width, height); 1083 vt_width, vt_height);
1084
1085 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
990 1086
991#ifdef HAVE_BG_PIXMAP 1087#ifdef HAVE_BG_PIXMAP
992 if (bgPixmap.window_size_sensitive ()) 1088 if (bg_window_size_sensitive ())
993 update_background (); 1089 update_background ();
994#endif 1090#endif
995 } 1091 }
996 1092
997 if (fix_screen || old_height == 0) 1093 if (fix_screen || old_height == 0)
998 scr_reset (); 1094 scr_reset ();
999 1095
1000#ifdef HAVE_BG_PIXMAP
1001// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1002// if (bgPixmap.pixmap)
1003// scr_touch (false);
1004#endif
1005
1006#ifdef USE_XIM 1096#if USE_XIM
1007 IMSetPosition (); 1097 im_set_position ();
1008#endif 1098#endif
1009} 1099}
1010 1100
1011/* 1101/*
1012 * Set the width/height of the vt window in characters. Units are pixels. 1102 * Set the width/height of the vt window in characters. Units are pixels.
… …
1025 newwidth = wattr.width - szHint.base_width; 1115 newwidth = wattr.width - szHint.base_width;
1026 if (newheight == 0) 1116 if (newheight == 0)
1027 newheight = wattr.height - szHint.base_height; 1117 newheight = wattr.height - szHint.base_height;
1028 } 1118 }
1029 1119
1030 if (newwidth != width || newheight != height) 1120 if (newwidth != vt_width || newheight != vt_height)
1031 { 1121 {
1032 newwidth += szHint.base_width; 1122 newwidth += szHint.base_width;
1033 newheight += szHint.base_height; 1123 newheight += szHint.base_height;
1034 resize_all_windows (newwidth, newheight, 0); 1124 resize_all_windows (newwidth, newheight, 0);
1035 } 1125 }
1036} 1126}
1037 1127
1038/* -------------------------------------------------------------------- * 1128/* -------------------------------------------------------------------- *
1039 * - X INPUT METHOD ROUTINES - * 1129 * - X INPUT METHOD ROUTINES - *
1040 * -------------------------------------------------------------------- */ 1130 * -------------------------------------------------------------------- */
1041#ifdef USE_XIM 1131#if USE_XIM
1042 1132
1043void 1133void
1044rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1134rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1045{ 1135{
1046 fg = pix_colors [Color_fg]; 1136 fg = pix_colors [Color_fg];
… …
1073 status_rect.height = fheight; 1163 status_rect.height = fheight;
1074} 1164}
1075 1165
1076/* Checking whether input method is running. */ 1166/* Checking whether input method is running. */
1077bool 1167bool
1078rxvt_term::IMisRunning () 1168rxvt_term::im_is_running ()
1079{ 1169{
1080 Atom atom; 1170 Atom atom;
1081 Window win; 1171 Window win;
1082 char server[IMBUFSIZ]; 1172 char server[IMBUFSIZ];
1083 1173
… …
1092 1182
1093 atom = XInternAtom (dpy, server, False); 1183 atom = XInternAtom (dpy, server, False);
1094 win = XGetSelectionOwner (dpy, atom); 1184 win = XGetSelectionOwner (dpy, atom);
1095 1185
1096 if (win != None) 1186 if (win != None)
1097 return True; 1187 return true;
1098 } 1188 }
1099 1189
1100 return False; 1190 return false;
1101} 1191}
1102 1192
1103void 1193void
1104rxvt_term::IMSendSpot () 1194rxvt_term::im_send_spot ()
1105{ 1195{
1106 XPoint nspot; 1196 XPoint nspot;
1107 XVaNestedList preedit_attr; 1197 XVaNestedList preedit_attr;
1108 1198
1109 if (!Input_Context 1199 if (!Input_Context
… …
1215/* 1305/*
1216 * Try to open a XIM with the current modifiers, then see if we can 1306 * Try to open a XIM with the current modifiers, then see if we can
1217 * open a suitable preedit type 1307 * open a suitable preedit type
1218 */ 1308 */
1219bool 1309bool
1220rxvt_term::IM_get_IC (const char *modifiers) 1310rxvt_term::im_get_ic (const char *modifiers)
1221{ 1311{
1222 int i, j, found; 1312 int i, j, found;
1223 XIM xim; 1313 XIM xim;
1224 XPoint spot; 1314 XPoint spot;
1225 XRectangle rect, status_rect, needed_rect; 1315 XRectangle rect, status_rect, needed_rect;
1226 unsigned long fg, bg; 1316 unsigned long fg, bg;
1227 const char *p; 1317 const char *p;
1228 char **s; 1318 char **s;
1229 XIMStyles *xim_styles; 1319 XIMStyles *xim_styles;
1230#ifdef ENABLE_XIM_ONTHESPOT
1231 XIMCallback xcb[4];
1232#endif
1233 1320
1234 set_environ (envv); 1321 set_environ (envv);
1235 1322
1236 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1323 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1237 return false; 1324 return false;
… …
1258 p = pet[pi]; 1345 p = pet[pi];
1259 1346
1260 if (!p) 1347 if (!p)
1261 continue; 1348 continue;
1262 1349
1263 s = rxvt_splitcommastring (p); 1350 s = rxvt_strsplit (',', p);
1264 1351
1265 for (i = found = 0; !found && s[i]; i++) 1352 for (i = found = 0; !found && s[i]; i++)
1266 { 1353 {
1267 if (!strcmp (s[i], "OverTheSpot")) 1354 if (!strcmp (s[i], "OverTheSpot"))
1268 input_style = XIMPreeditPosition | XIMStatusNothing; 1355 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1280 input_style = XIMPreeditNothing | XIMStatusNothing; 1367 input_style = XIMPreeditNothing | XIMStatusNothing;
1281 1368
1282 for (j = 0; j < xim_styles->count_styles; j++) 1369 for (j = 0; j < xim_styles->count_styles; j++)
1283 if (input_style == xim_styles->supported_styles[j]) 1370 if (input_style == xim_styles->supported_styles[j])
1284 { 1371 {
1285 rxvt_freecommastring (s); 1372 rxvt_free_strsplit (s);
1286 1373
1287 found = 1; 1374 found = 1;
1288 goto foundpet; 1375 goto foundpet;
1289 } 1376 }
1290 1377
1291 } 1378 }
1292 1379
1293 rxvt_freecommastring (s); 1380 rxvt_free_strsplit (s);
1294 } 1381 }
1295 1382
1296foundpet: 1383foundpet:
1297 1384
1298 XFree (xim_styles); 1385 XFree (xim_styles);
… …
1377 NULL); 1464 NULL);
1378 } 1465 }
1379#if ENABLE_XIM_ONTHESPOT 1466#if ENABLE_XIM_ONTHESPOT
1380 else if (input_style & XIMPreeditCallbacks) 1467 else if (input_style & XIMPreeditCallbacks)
1381 { 1468 {
1469 XIMCallback xcb[4];
1470
1382 im_set_position (spot); 1471 im_set_position (spot);
1383 1472
1384 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1473 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1385 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1474 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1386 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1475 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1401#endif 1490#endif
1402 1491
1403 Input_Context = XCreateIC (xim, 1492 Input_Context = XCreateIC (xim,
1404 XNInputStyle, input_style, 1493 XNInputStyle, input_style,
1405 XNClientWindow, vt, 1494 XNClientWindow, vt,
1406 XNFocusWindow, parent[0], 1495 XNFocusWindow, parent,
1407 preedit_attr ? XNPreeditAttributes : NULL, 1496 preedit_attr ? XNPreeditAttributes : NULL,
1408 preedit_attr, 1497 preedit_attr,
1409 status_attr ? XNStatusAttributes : NULL, 1498 status_attr ? XNStatusAttributes : NULL,
1410 status_attr, NULL); 1499 status_attr, NULL);
1411 1500
… …
1424 // unfortunately, only the focus window is used by XIM, hard to fix 1513 // unfortunately, only the focus window is used by XIM, hard to fix
1425 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1514 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1426 vt_select_input (); 1515 vt_select_input ();
1427#endif 1516#endif
1428 1517
1429 IMSetPosition (); 1518 im_set_position ();
1430 1519
1431 return true; 1520 return true;
1432} 1521}
1433 1522
1434void 1523void
… …
1444 im_destroy (); 1533 im_destroy ();
1445 1534
1446 if (Input_Context) 1535 if (Input_Context)
1447 return; 1536 return;
1448 1537
1449#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1450 if (rs[Rs_imLocale]) 1538 if (rs[Rs_imLocale])
1451 SET_LOCALE (rs[Rs_imLocale]); 1539 SET_LOCALE (rs[Rs_imLocale]);
1452#endif
1453 1540
1454 p = rs[Rs_inputMethod]; 1541 p = rs[Rs_inputMethod];
1455 if (p && *p) 1542 if (p && *p)
1456 { 1543 {
1457 bool found = false; 1544 bool found = false;
1458 1545
1459 s = rxvt_splitcommastring (p); 1546 s = rxvt_strsplit (',', p);
1460 1547
1461 for (i = 0; s[i]; i++) 1548 for (i = 0; s[i]; i++)
1462 { 1549 {
1463 if (*s[i]) 1550 if (*s[i])
1464 { 1551 {
1465 strcpy (buf, "@im="); 1552 strcpy (buf, "@im=");
1466 strncat (buf, s[i], IMBUFSIZ - 5); 1553 strncat (buf, s[i], IMBUFSIZ - 5);
1467 if (IM_get_IC (buf)) 1554 if (im_get_ic (buf))
1468 { 1555 {
1469 found = true; 1556 found = true;
1470 break; 1557 break;
1471 } 1558 }
1472 } 1559 }
1473 } 1560 }
1474 1561
1475 rxvt_freecommastring (s); 1562 rxvt_free_strsplit (s);
1476 1563
1477 if (found) 1564 if (found)
1478 goto done; 1565 goto done;
1479 } 1566 }
1480 1567
1481 /* try with XMODIFIERS env. var. */ 1568 /* try with XMODIFIERS env. var. */
1482 if (IM_get_IC ("")) 1569 if (im_get_ic (""))
1483 goto done; 1570 goto done;
1484 1571
1485 /* try with no modifiers base IF the user didn't specify an IM */ 1572 /* try with no modifiers base IF the user didn't specify an IM */
1486 if (IM_get_IC ("@im=none")) 1573 if (im_get_ic ("@im=none"))
1487 goto done; 1574 goto done;
1488 1575
1489done: 1576done:
1490#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1491 if (rs[Rs_imLocale]) 1577 if (rs[Rs_imLocale])
1492 SET_LOCALE (locale); 1578 SET_LOCALE (locale);
1493#endif
1494} 1579}
1495 1580
1496void 1581void
1497rxvt_term::IMSetPosition () 1582rxvt_term::im_set_position ()
1498{ 1583{
1499 XRectangle preedit_rect, status_rect, *needed_rect; 1584 XRectangle preedit_rect, status_rect, *needed_rect;
1500 XVaNestedList preedit_attr, status_attr; 1585 XVaNestedList preedit_attr, status_attr;
1501 1586
1502 if (!Input_Context 1587 if (!Input_Context
1503 || !focus 1588 || !focus
1504 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1589 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1505 || !IMisRunning ()) 1590 || !im_is_running ())
1506 return; 1591 return;
1507 1592
1508 if (input_style & XIMPreeditPosition) 1593 if (input_style & XIMPreeditPosition)
1509 { 1594 {
1510 im_set_size (preedit_rect); 1595 im_set_size (preedit_rect);
… …
1540 1625
1541void 1626void
1542rxvt_term::get_window_origin (int &x, int &y) 1627rxvt_term::get_window_origin (int &x, int &y)
1543{ 1628{
1544 Window cr; 1629 Window cr;
1545 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1630 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1546/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1547}
1548
1549Pixmap
1550rxvt_term::get_pixmap_property (int prop_id)
1551{
1552 if (prop_id > 0 && prop_id < NUM_XA)
1553 if (xa[prop_id])
1554 {
1555 int aformat;
1556 unsigned long nitems, bytes_after;
1557 Atom atype;
1558 unsigned char *prop = NULL;
1559 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1560 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1561 &nitems, &bytes_after, &prop);
1562 if (result == Success && prop && atype == XA_PIXMAP)
1563 return *(Pixmap *)prop;
1564 }
1565
1566 return None;
1567} 1631}
1568 1632
1569#ifdef HAVE_BG_PIXMAP 1633#ifdef HAVE_BG_PIXMAP
1570# if TRACE_PIXMAPS
1571# undef update_background
1572void
1573rxvt_term::trace_update_background (const char *file, int line)
1574{
1575 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1576 update_background ();
1577}
1578# endif
1579 1634
1580void 1635void
1581rxvt_term::update_background () 1636rxvt_term::update_background ()
1582{ 1637{
1583 if (update_background_ev.is_active ()) 1638 if (update_background_ev.is_active ())
1584 return; 1639 return;
1585 1640
1586 bgPixmap.invalidate (); 1641 bg_invalidate ();
1587 1642
1643 if (!mapped)
1644 return;
1645
1588 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1646 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1589 1647
1590 if (to_wait <= 0.) 1648 if (to_wait <= 0.)
1591 bgPixmap.render (); 1649 bg_render ();
1592 else 1650 else
1593 update_background_ev.start (to_wait); 1651 update_background_ev.start (to_wait);
1594} 1652}
1595 1653
1596void 1654void
1597rxvt_term::update_background_cb (ev::timer &w, int revents) 1655rxvt_term::update_background_cb (ev::timer &w, int revents)
1598{ 1656{
1599 make_current (); 1657 make_current ();
1600 1658
1601 update_background_ev.stop (); 1659 update_background_ev.stop ();
1602 bgPixmap.render (); 1660 bg_render ();
1603 refresh_check (); 1661 refresh_check ();
1604} 1662}
1605 1663
1606#endif /* HAVE_BG_PIXMAP */ 1664#endif /* HAVE_BG_PIXMAP */
1607 1665

Diff Legend

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