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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines