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.285 by root, Fri Dec 14 06:32:38 2007 UTC vs.
Revision 1.352 by sf-exg, Fri Feb 11 01:24:46 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-2007 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));
170#endif 171#endif
171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 172#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 173 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif 174#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL 175#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 176 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176#endif 177#endif
177#ifdef HAVE_SCROLLBARS
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#endif
180#ifdef USE_XIM 179#ifdef USE_XIM
181 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 180 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
182#endif 181#endif
183#ifdef POINTER_BLANK 182#ifdef POINTER_BLANK
184 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 183 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
188#endif 187#endif
189 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
190 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
191 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
192 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
193 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
194 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
195 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
196 194
197 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
198 196
226 if (fontset[i] != fontset[0]) 224 if (fontset[i] != fontset[0])
227 delete fontset[i]; 225 delete fontset[i];
228#endif 226#endif
229 delete fontset[0]; 227 delete fontset[0];
230 228
229#ifdef HAVE_BG_PIXMAP
230 bg_destroy ();
231#endif
232
231 if (display) 233 if (display)
232 { 234 {
233 selection_clear (); 235 selection_clear ();
236 selection_clear (true);
234 237
235#ifdef USE_XIM 238#ifdef USE_XIM
236 im_destroy (); 239 im_destroy ();
237#endif 240#endif
238#ifdef XTERM_SCROLLBAR 241 scrollBar.destroy ();
239 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
240 if (ShadowGC) XFreeGC (dpy, ShadowGC);
241#endif
242#ifdef PLAIN_SCROLLBAR
243 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
244#endif
245#ifdef NEXT_SCROLLBAR
246 if (blackGC) XFreeGC (dpy, blackGC);
247 if (whiteGC) XFreeGC (dpy, whiteGC);
248 if (grayGC) XFreeGC (dpy, grayGC);
249 if (darkGC) XFreeGC (dpy, darkGC);
250 if (stippleGC) XFreeGC (dpy, stippleGC);
251 if (dimple) XFreePixmap (dpy, dimple);
252 if (upArrow) XFreePixmap (dpy, upArrow);
253 if (downArrow) XFreePixmap (dpy, downArrow);
254 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
255 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
256#endif
257#ifdef RXVT_SCROLLBAR
258 if (topShadowGC) XFreeGC (dpy, topShadowGC);
259 if (botShadowGC) XFreeGC (dpy, botShadowGC);
260 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
261#endif
262 if (gc) XFreeGC (dpy, gc); 242 if (gc) XFreeGC (dpy, gc);
263 243
264 delete drawable; 244 delete drawable;
265 // destroy all windows 245 // destroy all windows
266 if (parent[0]) 246 if (parent[0])
274 pix_colors_unfocused [i].free (this); 254 pix_colors_unfocused [i].free (this);
275#endif 255#endif
276 } 256 }
277 257
278 clear (); 258 clear ();
279 }
280 259
281 delete [] pix_colors_focused; 260 display->flush (); /* ideally .put should do this */
282#if OFF_FOCUS_FADING
283 delete [] pix_colors_unfocused;
284#endif
285
286#ifdef HAVE_BG_PIXMAP
287 bgPixmap.destroy ();
288#endif
289 displays.put (display); 261 displays.put (display);
262 }
290 263
291 scr_release (); 264 scr_release ();
292 265
293 /* clear all resources */ 266 /* clear all resources */
294 for (int i = 0; i < allocated.size (); i++) 267 for (int i = 0; i < allocated.size (); i++)
295 free (allocated [i]); 268 free (allocated [i]);
296 269
297 free (selection.text); 270 free (selection.text);
271 free (selection.clip_text);
298 // TODO: manage env vars in child only(!) 272 // TODO: manage env vars in child only(!)
299 free (env_display); 273 free (env_display);
300 free (env_term); 274 free (env_term);
301 free (locale); 275 free (locale);
302 free (v_buffer); 276 free (v_buffer);
303 free (incr_buf);
304 277
305 delete envv; 278 delete envv;
306 delete argv; 279 delete argv;
307 280
308#ifdef KEYSYM_RESOURCE 281#ifdef KEYSYM_RESOURCE
340 if (display) 313 if (display)
341 { 314 {
342#if USE_XIM 315#if USE_XIM
343 im_ev.stop (display); 316 im_ev.stop (display);
344#endif 317#endif
345#if HAVE_SCROLLBARS
346 scrollbar_ev.stop (display); 318 scrollbar_ev.stop (display);
347#endif
348#if ENABLE_TRANSPARENCY || ENABLE_PERL 319#if ENABLE_TRANSPARENCY || ENABLE_PERL
349 rootwin_ev.stop (display); 320 rootwin_ev.stop (display);
350#endif 321#endif
351 incr_ev.stop ();
352 termwin_ev.stop (display); 322 termwin_ev.stop (display);
353 vt_ev.stop (display); 323 vt_ev.stop (display);
354 } 324 }
355 325
356 flush_ev.stop (); 326 flush_ev.stop ();
378rxvt_term::destroy_cb (ev::idle &w, int revents) 348rxvt_term::destroy_cb (ev::idle &w, int revents)
379{ 349{
380 make_current (); 350 make_current ();
381 351
382 delete this; 352 delete this;
353}
354
355void
356rxvt_term::set_option (uint8_t opt, bool set)
357{
358 if (!opt)
359 return;
360
361 uint8_t mask = 1 << (opt & 7);
362 uint8_t &val = options [opt >> 3];
363
364 val = val & ~mask | (set ? mask : 0);
383} 365}
384 366
385/*----------------------------------------------------------------------*/ 367/*----------------------------------------------------------------------*/
386/* 368/*
387 * Exit gracefully, clearing the utmp entry and restoring tty attributes 369 * Exit gracefully, clearing the utmp entry and restoring tty attributes
401print_x_error (Display *dpy, XErrorEvent *event) 383print_x_error (Display *dpy, XErrorEvent *event)
402{ 384{
403 char buffer[BUFSIZ]; 385 char buffer[BUFSIZ];
404 char mesg[BUFSIZ]; 386 char mesg[BUFSIZ];
405 char number[32]; 387 char number[32];
406 char *mtype = "XlibMessage"; 388 const char mtype[] = "XlibMessage";
407 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 389 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
408 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 390 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
409 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 391 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
410 rxvt_warn ("%s: %s\n", mesg, buffer); 392 rxvt_warn ("%s: %s\n", mesg, buffer);
411 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 393 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
412 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 394 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
413 sprintf(number, "%d", event->request_code); 395 sprintf(number, "%d", event->request_code);
414 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 396 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
415 rxvt_warn ("(which is %s)\n", buffer); 397 rxvt_warn ("(which is %s)\n", buffer);
416 if (event->request_code >= 128) { 398 if (event->request_code >= 128) {
417 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 399 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
418 mesg, BUFSIZ); 400 mesg, BUFSIZ);
419 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 401 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
420 } 402 }
421 if ((event->error_code == BadWindow) || 403 if ((event->error_code == BadWindow) ||
422 (event->error_code == BadPixmap) || 404 (event->error_code == BadPixmap) ||
423 (event->error_code == BadCursor) || 405 (event->error_code == BadCursor) ||
424 (event->error_code == BadFont) || 406 (event->error_code == BadFont) ||
425 (event->error_code == BadDrawable) || 407 (event->error_code == BadDrawable) ||
426 (event->error_code == BadColor) || 408 (event->error_code == BadColor) ||
427 (event->error_code == BadGC) || 409 (event->error_code == BadGC) ||
428 (event->error_code == BadIDChoice) || 410 (event->error_code == BadIDChoice) ||
429 (event->error_code == BadValue) || 411 (event->error_code == BadValue) ||
430 (event->error_code == BadAtom)) { 412 (event->error_code == BadAtom)) {
431 if (event->error_code == BadValue) 413 if (event->error_code == BadValue)
432 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 414 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
433 mesg, BUFSIZ); 415 mesg, BUFSIZ);
434 else if (event->error_code == BadAtom) 416 else if (event->error_code == BadAtom)
435 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 417 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
436 mesg, BUFSIZ); 418 mesg, BUFSIZ);
437 else 419 else
438 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 420 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
439 mesg, BUFSIZ); 421 mesg, BUFSIZ);
440 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 422 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
441 } 423 }
442 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 424 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
443 mesg, BUFSIZ); 425 mesg, BUFSIZ);
444 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 426 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
445} 427}
446#endif 428#endif
447 429
448int 430int
471 DisplayString (display)); 453 DisplayString (display));
472 rxvt_emergency_cleanup (); 454 rxvt_emergency_cleanup ();
473 _exit (EXIT_FAILURE); 455 _exit (EXIT_FAILURE);
474} 456}
475 457
476/*----------------------------------------------------------------------*/
477void
478rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
479{
480 this->envv = envv;
481
482 SET_R (this);
483 set_locale ("");
484 set_environ (envv); // few things in X do not call setlocale :(
485
486 init_vars ();
487
488 init_secondary ();
489
490 const char **cmd_argv = init_resources (argc, argv);
491
492#ifdef KEYSYM_RESOURCE
493 keyboard->register_done ();
494#endif
495
496#ifdef HAVE_SCROLLBARS
497 if (option (Opt_scrollBar))
498 scrollBar.setIdle (); /* set existence for size calculations */
499#endif
500
501 pty = ptytty::create ();
502
503 create_windows (argc, argv);
504
505 init_xlocale ();
506
507 scr_reset (); // initialize screen
508
509#if 0
510 XSynchronize (dpy, True);
511#endif
512
513#ifdef HAVE_SCROLLBARS
514 if (option (Opt_scrollBar))
515 resize_scrollbar (); /* create and map scrollbar */
516#endif
517#ifdef HAVE_BG_PIXMAP
518 {
519 bgPixmap.set_target (this);
520
521#ifdef ENABLE_TRANSPARENCY
522 if (option (Opt_transparent))
523 {
524 bgPixmap.set_transparent ();
525#ifdef HAVE_AFTERIMAGE
526 if (rs [Rs_blurradius])
527 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
528#endif
529 if (ISSET_PIXCOLOR (Color_tint))
530 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
531 if (rs [Rs_shade])
532 bgPixmap.set_shade (rs [Rs_shade]);
533
534 bgPixmap.set_root_pixmap ();
535 XSelectInput (dpy, display->root, PropertyChangeMask);
536 rootwin_ev.start (display, display->root);
537 }
538#endif
539
540#ifdef BG_IMAGE_FROM_FILE
541 if (rs[Rs_backgroundPixmap] != NULL)
542 {
543 const char *p = rs[Rs_backgroundPixmap];
544
545 if ((p = strchr (p, ';')) != NULL)
546 {
547 p++;
548 bgPixmap.set_geometry (p);
549 }
550 else
551 bgPixmap.set_defaultGeometry ();
552
553 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
554 if (!bgPixmap.window_position_sensitive ())
555 update_background ();
556 }
557#endif
558 }
559#endif
560
561#if ENABLE_PERL
562 rootwin_ev.start (display, display->root);
563#endif
564
565 set_colorfgbg ();
566
567 init_command (cmd_argv);
568
569 free (cmd_argv);
570
571 if (pty->pty >= 0)
572 pty_ev.start (pty->pty, ev::READ);
573
574 HOOK_INVOKE ((this, HOOK_START, DT_END));
575
576#if ENABLE_XEMBED
577 if (rs[Rs_embed])
578 {
579 long info[2] = { 0, XEMBED_MAPPED };
580
581 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
582 32, PropModeReplace, (unsigned char *)&info, 2);
583 }
584#endif
585
586 XMapWindow (dpy, vt);
587 XMapWindow (dpy, parent[0]);
588}
589
590static struct sig_handlers 458static struct sig_handlers
591{ 459{
592 ev::sig sw_term, sw_int; 460 ev::sig sw_term, sw_int;
593 461
594 /* 462 /*
609 rxvt_emergency_cleanup (); 477 rxvt_emergency_cleanup ();
610 w.stop (); 478 w.stop ();
611 kill (getpid (), w.signum); 479 kill (getpid (), w.signum);
612} 480}
613 481
482static void
483rxvt_get_ttymode (struct termios *tio)
484{
485 if (tcgetattr (STDIN_FILENO, tio) < 0)
486 memset (tio, 0, sizeof (struct termios));
487
488 for (int i = 0; i < NCCS; i++)
489 tio->c_cc[i] = VDISABLE;
490
491 tio->c_cc[VINTR] = CINTR;
492 tio->c_cc[VQUIT] = CQUIT;
493 tio->c_cc[VERASE] = CERASE;
494#ifdef VERASE2
495 tio->c_cc[VERASE2] = CERASE2;
496#endif
497 tio->c_cc[VKILL] = CKILL;
498 tio->c_cc[VEOF] = CEOF;
499 tio->c_cc[VSTART] = CSTART;
500 tio->c_cc[VSTOP] = CSTOP;
501 tio->c_cc[VSUSP] = CSUSP;
502# ifdef VDSUSP
503 tio->c_cc[VDSUSP] = CDSUSP;
504# endif
505# ifdef VREPRINT
506 tio->c_cc[VREPRINT] = CRPRNT;
507# endif
508# ifdef VDISCRD
509 tio->c_cc[VDISCRD] = CFLUSH;
510# endif
511# ifdef VWERSE
512 tio->c_cc[VWERSE] = CWERASE;
513# endif
514# ifdef VLNEXT
515 tio->c_cc[VLNEXT] = CLNEXT;
516# endif
517# ifdef VSTATUS
518 tio->c_cc[VSTATUS] = CSTATUS;
519# endif
520
521# if VMIN != VEOF
522 tio->c_cc[VMIN] = 1;
523# endif
524# if VTIME != VEOL
525 tio->c_cc[VTIME] = 0;
526# endif
527
528 /* input modes */
529 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
530# ifdef IMAXBEL
531 | IMAXBEL
532# endif
533 | IXON);
534
535 /* output modes */
536 tio->c_oflag = (OPOST | ONLCR);
537
538 /* control modes */
539 tio->c_cflag = (CS8 | CREAD);
540
541 /* local modes */
542 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
543# if defined (ECHOCTL) && defined (ECHOKE)
544 | ECHOCTL | ECHOKE
545# endif
546 | ECHOE | ECHOK);
547}
548
614char **rxvt_environ; // startup environment 549char **rxvt_environ; // startup environment
615 550
616void 551void
617rxvt_init () 552rxvt_init ()
618{ 553{
619 ptytty::init (); 554 assert (("fontMask must not overlap other RS masks",
555 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
620 556
557 rxvt_get_ttymode (&rxvt_term::def_tio);
558
559 // get rid of stdin/stdout as we don't need them, to free resources
560 dup2 (STDERR_FILENO, STDIN_FILENO);
561 dup2 (STDERR_FILENO, STDOUT_FILENO);
562
621 if (!ev_default_loop (0)) 563 if (!ev_default_loop ())
622 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 564 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
623 565
624 rxvt_environ = environ; 566 rxvt_environ = environ;
625 567
626 signal (SIGHUP, SIG_IGN); 568 signal (SIGHUP, SIG_IGN);
627 signal (SIGPIPE, SIG_IGN); 569 signal (SIGPIPE, SIG_IGN);
628 570
629 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 571 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
630 sig_handlers.sw_int.start (SIGINT); ev_unref (); 572 sig_handlers.sw_int.start (SIGINT); ev_unref ();
631
632 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
633 /* signal (SIGURG, SIG_DFL); */
634 573
635 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 574 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
636 // TODO: handle this with exceptions and tolerate the memory loss 575 // TODO: handle this with exceptions and tolerate the memory loss
637 XSetIOErrorHandler (rxvt_xioerror_handler); 576 XSetIOErrorHandler (rxvt_xioerror_handler);
638 577
639 XrmInitialize (); 578 XrmInitialize ();
640}
641
642/* ------------------------------------------------------------------------- *
643 * MEMORY ALLOCATION WRAPPERS *
644 * ------------------------------------------------------------------------- */
645void *
646rxvt_malloc (size_t size)
647{
648 void *p = malloc (size);
649
650 if (!p)
651 rxvt_fatal ("memory allocation failure. aborting.\n");
652
653 return p;
654}
655
656void *
657rxvt_calloc (size_t number, size_t size)
658{
659 void *p = calloc (number, size);
660
661 if (!p)
662 rxvt_fatal ("memory allocation failure. aborting.\n");
663
664 return p;
665}
666
667void *
668rxvt_realloc (void *ptr, size_t size)
669{
670 void *p = realloc (ptr, size);
671
672 if (!p)
673 rxvt_fatal ("memory allocation failure. aborting.\n");
674
675 return p;
676} 579}
677 580
678/*----------------------------------------------------------------------*/ 581/*----------------------------------------------------------------------*/
679/* 582/*
680 * window size/position calculations for XSizeHint and other storage. 583 * window size/position calculations for XSizeHint and other storage.
682 */ 585 */
683void 586void
684rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 587rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
685{ 588{
686 short recalc_x, recalc_y; 589 short recalc_x, recalc_y;
687 int x, y, sb_w, flags; 590 int x, y, flags;
688 unsigned int w, h; 591 unsigned int w, h;
689 unsigned int max_width, max_height; 592 unsigned int max_width, max_height;
690 593
691 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 594 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
692 szHint.win_gravity = NorthWestGravity; 595 szHint.win_gravity = NorthWestGravity;
702 if (rs[Rs_geometry]) 605 if (rs[Rs_geometry])
703 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 606 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
704 607
705 if (flags & WidthValue) 608 if (flags & WidthValue)
706 { 609 {
610 if (!w)
611 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
612
707 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 613 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
708 szHint.flags |= USSize; 614 szHint.flags |= USSize;
709 } 615 }
710 616
711 if (flags & HeightValue) 617 if (flags & HeightValue)
712 { 618 {
619 if (!h)
620 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
621
713 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 622 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
714 szHint.flags |= USSize; 623 szHint.flags |= USSize;
715 } 624 }
716 625
717 if (flags & XValue) 626 if (flags & XValue)
718 { 627 {
749 max_width = MAX_COLS * fwidth; 658 max_width = MAX_COLS * fwidth;
750 max_height = MAX_ROWS * fheight; 659 max_height = MAX_ROWS * fheight;
751 660
752 szHint.base_width = szHint.base_height = 2 * int_bwidth; 661 szHint.base_width = szHint.base_height = 2 * int_bwidth;
753 662
754 sb_w = 0;
755 window_vt_x = window_vt_y = int_bwidth; 663 window_vt_x = window_vt_y = int_bwidth;
756 664
757 if (scrollBar.state) 665 if (scrollBar.state)
758 { 666 {
759 sb_w = scrollbar_TotalWidth (); 667 int sb_w = scrollBar.total_width ();
760 szHint.base_width += sb_w; 668 szHint.base_width += sb_w;
761 669
762 if (!option (Opt_scrollBar_right)) 670 if (!option (Opt_scrollBar_right))
763 window_vt_x += sb_w; 671 window_vt_x += sb_w;
764 } 672 }
788 { 696 {
789 min_it (height, max_height); 697 min_it (height, max_height);
790 szHint.height = szHint.base_height + height; 698 szHint.height = szHint.base_height + height;
791 } 699 }
792 700
793 if (scrollBar.state && option (Opt_scrollBar_right))
794 window_sb_x = szHint.width - sb_w;
795
796 if (recalc_x) 701 if (recalc_x)
797 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 702 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
798 703
799 if (recalc_y) 704 if (recalc_y)
800 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 705 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
801 706
802 ncol = width / fwidth; 707 ncol = width / fwidth;
803 nrow = height / fheight; 708 nrow = height / fheight;
804} 709}
805 710
806/*----------------------------------------------------------------------*/ 711/*----------------------------------------------------------------------*/
807/* 712/*
818 723
819 ws.ws_col = ncol; 724 ws.ws_col = ncol;
820 ws.ws_row = nrow; 725 ws.ws_row = nrow;
821 ws.ws_xpixel = width; 726 ws.ws_xpixel = width;
822 ws.ws_ypixel = height; 727 ws.ws_ypixel = height;
823 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 728 ioctl (pty->pty, TIOCSWINSZ, &ws);
824 729
825#if 0 730#if 0
826 // TIOCSWINSZ is supposed to do this automatically and correctly 731 // TIOCSWINSZ is supposed to do this automatically and correctly
827 if (cmd_pid) /* force through to the command */ 732 if (cmd_pid) /* force through to the command */
828 kill (-cmd_pid, SIGWINCH); 733 kill (-cmd_pid, SIGWINCH);
858#endif 763#endif
859 764
860 delete fontset[0]; 765 delete fontset[0];
861 fontset[0] = fs; 766 fontset[0] = fs;
862 767
863 prop = (*fs)[1]->properties (); 768 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
864 prop.height += lineSpace; 769 prop.height += lineSpace;
770 prop.width += letterSpace;
865 771
866 fs->set_prop (prop, false); 772 fs->set_prop (prop, false);
867 773
868 fwidth = prop.width; 774 fwidth = prop.width;
869 fheight = prop.height; 775 fheight = prop.height;
919 prop, XA_STRING, 8, PropModeReplace, 825 prop, XA_STRING, 8, PropModeReplace,
920 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 826 (const unsigned char *)str, len >= 0 ? len : strlen (str));
921} 827}
922 828
923void 829void
830rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
831{
832 XTextProperty ct;
833
834 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
835 {
836 XSetTextProperty (dpy, parent[0], &ct, prop);
837 XFree (ct.value);
838 }
839}
840
841void
924rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 842rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
925{ 843{
926 wchar_t *ws = rxvt_mbstowcs (str, len); 844 wchar_t *ws = rxvt_mbstowcs (str, len);
927 char *s = rxvt_wcstoutf8 (ws); 845 char *s = rxvt_wcstoutf8 (ws);
928 846
938/*----------------------------------------------------------------------*/ 856/*----------------------------------------------------------------------*/
939/* xterm sequences - title, iconName, color (exptl) */ 857/* xterm sequences - title, iconName, color (exptl) */
940void 858void
941rxvt_term::set_title (const char *str) 859rxvt_term::set_title (const char *str)
942{ 860{
943 set_string_property (XA_WM_NAME, str); 861 set_mbstring_property (XA_WM_NAME, str);
944#if ENABLE_EWMH 862#if ENABLE_EWMH
945 set_utf8_property (xa[XA_NET_WM_NAME], str); 863 set_utf8_property (xa[XA_NET_WM_NAME], str);
946#endif 864#endif
947} 865}
948 866
949void 867void
950rxvt_term::set_icon_name (const char *str) 868rxvt_term::set_icon_name (const char *str)
951{ 869{
952 set_string_property (XA_WM_ICON_NAME, str); 870 set_mbstring_property (XA_WM_ICON_NAME, str);
953#if ENABLE_EWMH 871#if ENABLE_EWMH
954 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 872 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
955#endif 873#endif
956} 874}
957 875
958void 876void
959rxvt_term::set_window_color (int idx, const char *color) 877rxvt_term::set_window_color (int idx, const char *color)
960{ 878{
961#ifdef XTERM_COLOR_CHANGE 879#ifdef XTERM_COLOR_CHANGE
962 rxvt_color xcol; 880 rxvt_color xcol;
963 int i;
964 881
965 if (color == NULL || *color == '\0') 882 if (color == NULL || *color == '\0')
966 return; 883 return;
967 884
968 color = strdup (color); 885 color = strdup (color);
970 rs[Rs_color + idx] = color; 887 rs[Rs_color + idx] = color;
971 888
972 /* handle color aliases */ 889 /* handle color aliases */
973 if (isdigit (*color)) 890 if (isdigit (*color))
974 { 891 {
975 i = atoi (color); 892 int i = atoi (color);
976 893
977 if (i >= 8 && i <= 15) 894 if (i >= 8 && i <= 15)
978 { 895 {
979 /* bright colors */ 896 /* bright colors */
980 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 897 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
1030void 947void
1031rxvt_term::set_colorfgbg () 948rxvt_term::set_colorfgbg ()
1032{ 949{
1033 unsigned int i; 950 unsigned int i;
1034 const char *xpmb = ""; 951 const char *xpmb = "";
1035 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 952 char fstr[] = "default";
953 char bstr[] = "default";
1036 954
1037 strcpy (fstr, "default");
1038 strcpy (bstr, "default");
1039 for (i = Color_Black; i <= Color_White; i++) 955 for (i = Color_Black; i <= Color_White; i++)
1040 if (pix_colors[Color_fg] == pix_colors[i]) 956 if (pix_colors[Color_fg] == pix_colors[i])
1041 { 957 {
1042 sprintf (fstr, "%d", (i - Color_Black)); 958 sprintf (fstr, "%d", i - Color_Black);
1043 break; 959 break;
1044 } 960 }
1045 961
1046 for (i = Color_Black; i <= Color_White; i++) 962 for (i = Color_Black; i <= Color_White; i++)
1047 if (pix_colors[Color_bg] == pix_colors[i]) 963 if (pix_colors[Color_bg] == pix_colors[i])
1048 { 964 {
1049 sprintf (bstr, "%d", (i - Color_Black)); 965 sprintf (bstr, "%d", i - Color_Black);
1050#ifdef BG_IMAGE_FROM_FILE 966#ifdef BG_IMAGE_FROM_FILE
1051 xpmb = "default;"; 967 xpmb = "default;";
1052#endif 968#endif
1053 break; 969 break;
1054 } 970 }
1084 int old_width = szHint.width; 1000 int old_width = szHint.width;
1085 int old_height = szHint.height; 1001 int old_height = szHint.height;
1086 1002
1087 window_calc (newwidth, newheight); 1003 window_calc (newwidth, newheight);
1088 1004
1089 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1005 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1006
1007 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1008 if (set_hint)
1009 {
1010 szHint.flags &= ~(PBaseSize | PResizeInc);
1090 XSetWMNormalHints (dpy, parent[0], &szHint); 1011 XSetWMNormalHints (dpy, parent[0], &szHint);
1012 szHint.flags |= PBaseSize | PResizeInc;
1013 }
1091 1014
1092 if (!ignoreparent) 1015 if (!ignoreparent)
1093 { 1016 {
1094#ifdef SMART_RESIZE 1017#ifdef SMART_RESIZE
1095 /* 1018 /*
1135#else 1058#else
1136 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1059 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1137#endif 1060#endif
1138 } 1061 }
1139 1062
1063 if (set_hint)
1064 XSetWMNormalHints (dpy, parent[0], &szHint);
1065
1140 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1066 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1141 1067
1142 if (fix_screen || newwidth != old_width || newheight != old_height) 1068 if (fix_screen || newwidth != old_width || newheight != old_height)
1143 { 1069 {
1144 if (scrollBar.state) 1070 if (scrollBar.state)
1145 { 1071 scrollBar.resize ();
1146 XMoveResizeWindow (dpy, scrollBar.win,
1147 window_sb_x, 0,
1148 scrollbar_TotalWidth (), szHint.height);
1149 resize_scrollbar ();
1150 }
1151 1072
1152 XMoveResizeWindow (dpy, vt, 1073 XMoveResizeWindow (dpy, vt,
1153 window_vt_x, window_vt_y, 1074 window_vt_x, window_vt_y,
1154 width, height); 1075 width, height);
1155 1076
1156#ifdef HAVE_BG_PIXMAP 1077#ifdef HAVE_BG_PIXMAP
1157 if (bgPixmap.window_size_sensitive ()) 1078 if (bg_window_size_sensitive ())
1158 update_background (); 1079 update_background ();
1159#endif 1080#endif
1160
1161 scr_clear ();
1162 } 1081 }
1163 1082
1164 if (fix_screen || old_height == 0) 1083 if (fix_screen || old_height == 0)
1165 scr_reset (); 1084 scr_reset ();
1166
1167 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1168 //scr_touch (false);
1169
1170#ifdef HAVE_BG_PIXMAP
1171// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1172// if (bgPixmap.pixmap)
1173// scr_touch (false);
1174#endif
1175 1085
1176#ifdef USE_XIM 1086#ifdef USE_XIM
1177 IMSetPosition (); 1087 IMSetPosition ();
1178#endif 1088#endif
1179} 1089}
1245 1155
1246/* Checking whether input method is running. */ 1156/* Checking whether input method is running. */
1247bool 1157bool
1248rxvt_term::IMisRunning () 1158rxvt_term::IMisRunning ()
1249{ 1159{
1250 char *p;
1251 Atom atom; 1160 Atom atom;
1252 Window win; 1161 Window win;
1253 char server[IMBUFSIZ]; 1162 char server[IMBUFSIZ];
1254 1163
1255 /* get current locale modifier */ 1164 /* get current locale modifier */
1256 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1165 if (char *p = XSetLocaleModifiers (0))
1257 { 1166 {
1258 strcpy (server, "@server="); 1167 strcpy (server, "@server=");
1259 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1168 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1260 1169
1261 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1170 if (p = strchr (server + 1, '@')) /* first one only */
1262 *p = '\0'; 1171 *p = '\0';
1263 1172
1264 atom = XInternAtom (dpy, server, False); 1173 atom = XInternAtom (dpy, server, False);
1265 win = XGetSelectionOwner (dpy, atom); 1174 win = XGetSelectionOwner (dpy, atom);
1266 1175
1267 if (win != None) 1176 if (win != None)
1268 return True; 1177 return true;
1269 } 1178 }
1270 1179
1271 return False; 1180 return false;
1272} 1181}
1273 1182
1274void 1183void
1275rxvt_term::IMSendSpot () 1184rxvt_term::IMSendSpot ()
1276{ 1185{
1333 1242
1334 term->make_current (); 1243 term->make_current ();
1335 1244
1336 if (text) 1245 if (text)
1337 { 1246 {
1338 void *str; 1247 wchar_t *str;
1339 1248
1340 if (!text->encoding_is_wchar && text->string.multi_byte) 1249 if (!text->encoding_is_wchar && text->string.multi_byte)
1341 { 1250 {
1342 // of course, X makes it ugly again 1251 // of course, X makes it ugly again
1343 if (term->rs[Rs_imLocale]) 1252 if (term->rs[Rs_imLocale])
1344 SET_LOCALE (term->rs[Rs_imLocale]); 1253 SET_LOCALE (term->rs[Rs_imLocale]);
1345 1254
1346 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1255 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1347 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1256 mbstowcs (str, text->string.multi_byte, text->length + 1);
1348 1257
1349 if (term->rs[Rs_imLocale]) 1258 if (term->rs[Rs_imLocale])
1350 SET_LOCALE (term->locale); 1259 SET_LOCALE (term->locale);
1351 } 1260 }
1352 else 1261 else
1353 str = (void *)text->string.wide_char; 1262 str = text->string.wide_char;
1354 1263
1355 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1264 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1356 DT_INT, call_data->caret, 1265 DT_INT, call_data->caret,
1357 DT_INT, call_data->chg_first, 1266 DT_INT, call_data->chg_first,
1358 DT_INT, call_data->chg_length, 1267 DT_INT, call_data->chg_length,
1429 p = pet[pi]; 1338 p = pet[pi];
1430 1339
1431 if (!p) 1340 if (!p)
1432 continue; 1341 continue;
1433 1342
1434 s = rxvt_splitcommastring (p); 1343 s = rxvt_strsplit (',', p);
1435 1344
1436 for (i = found = 0; !found && s[i]; i++) 1345 for (i = found = 0; !found && s[i]; i++)
1437 { 1346 {
1438 if (!strcmp (s[i], "OverTheSpot")) 1347 if (!strcmp (s[i], "OverTheSpot"))
1439 input_style = XIMPreeditPosition | XIMStatusNothing; 1348 input_style = XIMPreeditPosition | XIMStatusNothing;
1451 input_style = XIMPreeditNothing | XIMStatusNothing; 1360 input_style = XIMPreeditNothing | XIMStatusNothing;
1452 1361
1453 for (j = 0; j < xim_styles->count_styles; j++) 1362 for (j = 0; j < xim_styles->count_styles; j++)
1454 if (input_style == xim_styles->supported_styles[j]) 1363 if (input_style == xim_styles->supported_styles[j])
1455 { 1364 {
1456 rxvt_freecommastring (s); 1365 rxvt_free_strsplit (s);
1457 1366
1458 found = 1; 1367 found = 1;
1459 goto foundpet; 1368 goto foundpet;
1460 } 1369 }
1461 1370
1462 } 1371 }
1463 1372
1464 rxvt_freecommastring (s); 1373 rxvt_free_strsplit (s);
1465 } 1374 }
1466 1375
1467foundpet: 1376foundpet:
1468 1377
1469 XFree (xim_styles); 1378 XFree (xim_styles);
1625 p = rs[Rs_inputMethod]; 1534 p = rs[Rs_inputMethod];
1626 if (p && *p) 1535 if (p && *p)
1627 { 1536 {
1628 bool found = false; 1537 bool found = false;
1629 1538
1630 s = rxvt_splitcommastring (p); 1539 s = rxvt_strsplit (',', p);
1631 1540
1632 for (i = 0; s[i]; i++) 1541 for (i = 0; s[i]; i++)
1633 { 1542 {
1634 if (*s[i]) 1543 if (*s[i])
1635 { 1544 {
1641 break; 1550 break;
1642 } 1551 }
1643 } 1552 }
1644 } 1553 }
1645 1554
1646 rxvt_freecommastring (s); 1555 rxvt_free_strsplit (s);
1647 1556
1648 if (found) 1557 if (found)
1649 goto done; 1558 goto done;
1650 } 1559 }
1651 1560
1712void 1621void
1713rxvt_term::get_window_origin (int &x, int &y) 1622rxvt_term::get_window_origin (int &x, int &y)
1714{ 1623{
1715 Window cr; 1624 Window cr;
1716 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1625 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1717/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1718} 1626}
1719 1627
1720Pixmap 1628Pixmap
1721rxvt_term::get_pixmap_property (int prop_id) 1629rxvt_term::get_pixmap_property (Atom property)
1722{ 1630{
1723 if (prop_id > 0 && prop_id < NUM_XA) 1631 Pixmap pixmap = None;
1724 if (xa[prop_id]) 1632
1725 {
1726 int aformat; 1633 int aformat;
1727 unsigned long nitems, bytes_after; 1634 unsigned long nitems, bytes_after;
1728 Atom atype; 1635 Atom atype;
1729 unsigned char *prop = NULL; 1636 unsigned char *prop;
1730 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1637 int result = XGetWindowProperty (dpy, display->root, property,
1731 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1638 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1732 &nitems, &bytes_after, &prop); 1639 &nitems, &bytes_after, &prop);
1733 if (result == Success && prop && atype == XA_PIXMAP) 1640 if (result == Success)
1734 { 1641 {
1735 return *(Pixmap *)prop; 1642 if (atype == XA_PIXMAP)
1736 } 1643 pixmap = *(Pixmap *)prop;
1644 XFree (prop);
1737 } 1645 }
1738 return None; 1646
1647 return pixmap;
1739} 1648}
1740 1649
1741#ifdef HAVE_BG_PIXMAP 1650#ifdef HAVE_BG_PIXMAP
1742# if TRACE_PIXMAPS
1743# undef update_background
1744int rxvt_term::trace_update_background (const char *file, int line)
1745{
1746 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1747 update_background ();
1748}
1749# endif
1750 1651
1751int 1652void
1752rxvt_term::update_background () 1653rxvt_term::update_background ()
1753{ 1654{
1655 if (update_background_ev.is_active ())
1656 return;
1657
1754 bgPixmap.invalidate (); 1658 bg_invalidate ();
1755 1659
1756 /* no chance of real time refresh if we are blurring! */ 1660 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1757 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1661
1662 if (to_wait <= 0.)
1758 bgPixmap.render (); 1663 bg_render ();
1759 else 1664 else
1760 {
1761 update_background_ev.stop ();
1762
1763 if (!bgPixmap.need_client_side_rendering ())
1764 update_background_ev.start (.05); 1665 update_background_ev.start (to_wait);
1765 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1766 update_background_ev.start (.20); /* very slow !!! */
1767 else
1768 update_background_ev.start (.07);
1769 }
1770
1771 return 0;
1772} 1666}
1773 1667
1774void 1668void
1775rxvt_term::update_background_cb (ev::timer &w, int revents) 1669rxvt_term::update_background_cb (ev::timer &w, int revents)
1776{ 1670{
1777 make_current (); 1671 make_current ();
1672
1673 update_background_ev.stop ();
1778 bgPixmap.render (); 1674 bg_render ();
1779 refresh_check (); 1675 refresh_check ();
1780} 1676}
1781 1677
1782#endif /* HAVE_BG_PIXMAP */ 1678#endif /* HAVE_BG_PIXMAP */
1783 1679

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines