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.256 by root, Sun Nov 11 04:08:00 2007 UTC vs.
Revision 1.341 by sf-exg, Sun Dec 12 23:13:29 2010 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#ifdef HAVE_TERMIOS_H
44# include <termios.h> 45#include <termios.h>
45#endif
46 46
47#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 48# define X_LOCALE
49# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
50#else 50#else
51# ifdef HAVE_SETLOCALE 51# ifdef HAVE_SETLOCALE
52# include <clocale> 52# include <clocale>
53# endif 53# endif
54#endif 54#endif
55 55
56struct termios rxvt_term::def_tio;
56vector<rxvt_term *> rxvt_term::termlist; 57vector<rxvt_term *> rxvt_term::termlist;
57 58
58// used to tell global functions which terminal instance is "active" 59// used to tell global functions which terminal instance is "active"
59rxvt_t rxvt_current_term; 60rxvt_t rxvt_current_term;
60 61
103 { 104 {
104 if (cc->c2 == c2) return c1; 105 if (cc->c2 == c2) return c1;
105 cc = (*this)[cc->c1]; 106 cc = (*this)[cc->c1];
106 } 107 }
107 108
108 // check to see wether this combination already exists otherwise 109 // check to see whether this combination already exists otherwise
109 for (cc = v.end (); cc-- > v.begin (); ) 110 for (cc = v.end (); cc-- > v.begin (); )
110 { 111 {
111 if (cc->c1 == c1 && cc->c2 == c2) 112 if (cc->c1 == c1 && cc->c2 == c2)
112 return COMPOSE_LO + (cc - v.begin ()); 113 return COMPOSE_LO + (cc - v.begin ());
113 } 114 }
152 153
153} 154}
154#endif 155#endif
155 156
156rxvt_term::rxvt_term () 157rxvt_term::rxvt_term ()
157 : 158{
159#if HAVE_BG_PIXMAP
160 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
161#endif
162#ifdef CURSOR_BLINK
163 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
164#endif
165#ifdef TEXT_BLINK
166 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
167#endif
168#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
169 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
170#endif
171#ifdef SELECTION_SCROLLING
172 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
173#endif
174#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
175 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
176#endif
158#if ENABLE_TRANSPARENCY || ENABLE_PERL 177#if ENABLE_TRANSPARENCY || ENABLE_PERL
159 rootwin_ev (this, &rxvt_term::rootwin_cb), 178 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
160#endif 179#endif
161#if HAVE_BG_PIXMAP 180 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
162 update_background_ev(this, &rxvt_term::update_background_cb), 181#ifdef USE_XIM
163#endif 182 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
164#ifdef HAVE_SCROLLBARS
165 scrollbar_ev (this, &rxvt_term::x_cb),
166#endif
167#ifdef CURSOR_BLINK
168 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
169#endif
170#ifdef TEXT_BLINK
171 text_blink_ev (this, &rxvt_term::text_blink_cb),
172#endif
173#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
174 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
175#endif
176#ifdef SELECTION_SCROLLING
177 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
178#endif
179#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
180 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
181#endif 183#endif
182#ifdef POINTER_BLANK 184#ifdef POINTER_BLANK
183 pointer_ev (this, &rxvt_term::pointer_cb), 185 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
184#endif
185#ifdef USE_XIM
186 im_ev (this, &rxvt_term::im_cb),
187#endif 186#endif
188#ifndef NO_BELL 187#ifndef NO_BELL
189 bell_ev (this, &rxvt_term::bell_cb), 188 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
190#endif 189#endif
191 termwin_ev (this, &rxvt_term::x_cb), 190 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
192 vt_ev (this, &rxvt_term::x_cb), 191 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
193 child_ev (this, &rxvt_term::child_cb), 192 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
194 prepare_ev (this, &rxvt_term::prepare_cb), 193 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
195 flush_ev (this, &rxvt_term::flush_cb), 194 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
196 destroy_ev (this, &rxvt_term::destroy_cb), 195 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
197 pty_ev (this, &rxvt_term::pty_cb), 196 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
198 incr_ev (this, &rxvt_term::incr_cb) 197
199{
200 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 198 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
201 199
202 termlist.push_back (this); 200 termlist.push_back (this);
203 201
204#ifdef KEYSYM_RESOURCE 202#ifdef KEYSYM_RESOURCE
229 if (fontset[i] != fontset[0]) 227 if (fontset[i] != fontset[0])
230 delete fontset[i]; 228 delete fontset[i];
231#endif 229#endif
232 delete fontset[0]; 230 delete fontset[0];
233 231
232#ifdef HAVE_BG_PIXMAP
233 bgPixmap.destroy ();
234#endif
235#ifdef HAVE_AFTERIMAGE
236 if (asv)
237 destroy_asvisual (asv, 0);
238 if (asimman)
239 destroy_image_manager (asimman, 0);
240#endif
241
234 if (display) 242 if (display)
235 { 243 {
236 selection_clear (); 244 selection_clear ();
245 selection_clear (true);
237 246
238#ifdef USE_XIM 247#ifdef USE_XIM
239 im_destroy (); 248 im_destroy ();
240#endif 249#endif
241#ifdef XTERM_SCROLLBAR 250 scrollBar.destroy ();
242 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
243 if (ShadowGC) XFreeGC (dpy, ShadowGC);
244#endif
245#ifdef PLAIN_SCROLLBAR
246 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
247#endif
248#ifdef NEXT_SCROLLBAR
249 if (blackGC) XFreeGC (dpy, blackGC);
250 if (whiteGC) XFreeGC (dpy, whiteGC);
251 if (grayGC) XFreeGC (dpy, grayGC);
252 if (darkGC) XFreeGC (dpy, darkGC);
253 if (stippleGC) XFreeGC (dpy, stippleGC);
254 if (dimple) XFreePixmap (dpy, dimple);
255 if (upArrow) XFreePixmap (dpy, upArrow);
256 if (downArrow) XFreePixmap (dpy, downArrow);
257 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
258 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
259#endif
260#ifdef RXVT_SCROLLBAR
261 if (topShadowGC) XFreeGC (dpy, topShadowGC);
262 if (botShadowGC) XFreeGC (dpy, botShadowGC);
263 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
264#endif
265 if (gc) XFreeGC (dpy, gc); 251 if (gc) XFreeGC (dpy, gc);
266 252
267 delete drawable; 253 delete drawable;
268 // destroy all windows 254 // destroy all windows
269 if (parent[0]) 255 if (parent[0])
277 pix_colors_unfocused [i].free (this); 263 pix_colors_unfocused [i].free (this);
278#endif 264#endif
279 } 265 }
280 266
281 clear (); 267 clear ();
282 }
283 268
284 delete [] pix_colors_focused; 269 display->flush (); /* ideally .put should do this */
285#if OFF_FOCUS_FADING
286 delete [] pix_colors_unfocused;
287#endif
288
289 displays.put (display); 270 displays.put (display);
271 }
290 272
291 scr_release (); 273 scr_release ();
292 274
293 /* clear all resources */ 275 /* clear all resources */
294 for (int i = 0; i < allocated.size (); i++) 276 for (int i = 0; i < allocated.size (); i++)
295 free (allocated [i]); 277 free (allocated [i]);
296 278
297 free (selection.text); 279 free (selection.text);
280 free (selection.clip_text);
298 // TODO: manage env vars in child only(!) 281 // TODO: manage env vars in child only(!)
299 free (env_display); 282 free (env_display);
300 free (env_term); 283 free (env_term);
301 free (locale); 284 free (locale);
302 free (v_buffer); 285 free (v_buffer);
306 delete argv; 289 delete argv;
307 290
308#ifdef KEYSYM_RESOURCE 291#ifdef KEYSYM_RESOURCE
309 delete keyboard; 292 delete keyboard;
310#endif 293#endif
294#ifndef NO_RESOURCES
295 XrmDestroyDatabase (option_db);
296#endif
311} 297}
312 298
313// child has exited, usually destroys 299// child has exited, usually destroys
314void 300void
315rxvt_term::child_cb (ev::child &w, int status) 301rxvt_term::child_cb (ev::child &w, int status)
323} 309}
324 310
325void 311void
326rxvt_term::destroy () 312rxvt_term::destroy ()
327{ 313{
328 if (destroy_ev.active) 314 if (destroy_ev.is_active ())
329 return; 315 return;
330 316
331 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 317 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
332 318
333#if ENABLE_OVERLAY 319#if ENABLE_OVERLAY
337 if (display) 323 if (display)
338 { 324 {
339#if USE_XIM 325#if USE_XIM
340 im_ev.stop (display); 326 im_ev.stop (display);
341#endif 327#endif
342#if HAVE_SCROLLBARS
343 scrollbar_ev.stop (display); 328 scrollbar_ev.stop (display);
344#endif
345#if ENABLE_TRANSPARENCY || ENABLE_PERL 329#if ENABLE_TRANSPARENCY || ENABLE_PERL
346 rootwin_ev.stop (display); 330 rootwin_ev.stop (display);
347#endif 331#endif
348 incr_ev.stop (); 332 incr_ev.stop ();
349 termwin_ev.stop (display); 333 termwin_ev.stop (display);
350 vt_ev.stop (display); 334 vt_ev.stop (display);
351 } 335 }
352 336
353 prepare_ev.stop (); 337 flush_ev.stop ();
354 pty_ev.stop (); 338 pty_ev.stop ();
355#ifdef CURSOR_BLINK 339#ifdef CURSOR_BLINK
356 cursor_blink_ev.stop (); 340 cursor_blink_ev.stop ();
357#endif 341#endif
358#ifdef TEXT_BLINK 342#ifdef TEXT_BLINK
370 354
371 destroy_ev.start (); 355 destroy_ev.start ();
372} 356}
373 357
374void 358void
375rxvt_term::destroy_cb (ev::check &w, int revents) 359rxvt_term::destroy_cb (ev::idle &w, int revents)
376{ 360{
377 make_current (); 361 make_current ();
378 362
379 delete this; 363 delete this;
364}
365
366void
367rxvt_term::set_option (uint8_t opt, bool set)
368{
369 if (!opt)
370 return;
371
372 uint8_t mask = 1 << (opt & 7);
373 uint8_t &val = options [opt >> 3];
374
375 val = val & ~mask | (set ? mask : 0);
380} 376}
381 377
382/*----------------------------------------------------------------------*/ 378/*----------------------------------------------------------------------*/
383/* 379/*
384 * Exit gracefully, clearing the utmp entry and restoring tty attributes 380 * Exit gracefully, clearing the utmp entry and restoring tty attributes
401 char mesg[BUFSIZ]; 397 char mesg[BUFSIZ];
402 char number[32]; 398 char number[32];
403 char *mtype = "XlibMessage"; 399 char *mtype = "XlibMessage";
404 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 400 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
405 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 401 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
406 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 402 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
407 rxvt_warn ("%s: %s\n", mesg, buffer); 403 rxvt_warn ("%s: %s\n", mesg, buffer);
408 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 404 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
409 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 405 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
410 sprintf(number, "%d", event->request_code); 406 sprintf(number, "%d", event->request_code);
411 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 407 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
412 rxvt_warn ("(which is %s)\n", buffer); 408 rxvt_warn ("(which is %s)\n", buffer);
413 if (event->request_code >= 128) { 409 if (event->request_code >= 128) {
414 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 410 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
415 mesg, BUFSIZ); 411 mesg, BUFSIZ);
416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 412 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
417 } 413 }
418 if ((event->error_code == BadWindow) || 414 if ((event->error_code == BadWindow) ||
419 (event->error_code == BadPixmap) || 415 (event->error_code == BadPixmap) ||
420 (event->error_code == BadCursor) || 416 (event->error_code == BadCursor) ||
421 (event->error_code == BadFont) || 417 (event->error_code == BadFont) ||
422 (event->error_code == BadDrawable) || 418 (event->error_code == BadDrawable) ||
423 (event->error_code == BadColor) || 419 (event->error_code == BadColor) ||
424 (event->error_code == BadGC) || 420 (event->error_code == BadGC) ||
425 (event->error_code == BadIDChoice) || 421 (event->error_code == BadIDChoice) ||
426 (event->error_code == BadValue) || 422 (event->error_code == BadValue) ||
427 (event->error_code == BadAtom)) { 423 (event->error_code == BadAtom)) {
428 if (event->error_code == BadValue) 424 if (event->error_code == BadValue)
429 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 425 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
430 mesg, BUFSIZ); 426 mesg, BUFSIZ);
431 else if (event->error_code == BadAtom) 427 else if (event->error_code == BadAtom)
432 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 428 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
433 mesg, BUFSIZ); 429 mesg, BUFSIZ);
434 else 430 else
435 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 431 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
436 mesg, BUFSIZ); 432 mesg, BUFSIZ);
437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 433 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
438 } 434 }
439 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 435 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
440 mesg, BUFSIZ); 436 mesg, BUFSIZ);
441 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
442} 438}
443#endif 439#endif
444 440
445int 441int
468 DisplayString (display)); 464 DisplayString (display));
469 rxvt_emergency_cleanup (); 465 rxvt_emergency_cleanup ();
470 _exit (EXIT_FAILURE); 466 _exit (EXIT_FAILURE);
471} 467}
472 468
473/*----------------------------------------------------------------------*/
474bool
475rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
476{
477 this->envv = envv;
478
479 SET_R (this);
480 set_locale ("");
481 set_environ (envv); // few things in X do not call setlocale :(
482
483 if (!init_vars ())
484 return false;
485
486 init_secondary ();
487
488 const char **cmd_argv = init_resources (argc, argv);
489
490#ifdef KEYSYM_RESOURCE
491 keyboard->register_done ();
492#endif
493
494#ifdef HAVE_SCROLLBARS
495 if (option (Opt_scrollBar))
496 scrollBar.setIdle (); /* set existence for size calculations */
497#endif
498
499 pty = ptytty::create ();
500
501 create_windows (argc, argv);
502
503 init_xlocale ();
504
505 scr_reset (); // initialize screen
506
507#if 0
508 XSynchronize (dpy, True);
509#endif
510
511#ifdef HAVE_SCROLLBARS
512 if (option (Opt_scrollBar))
513 resize_scrollbar (); /* create and map scrollbar */
514#endif
515#ifdef HAVE_BG_PIXMAP
516 {
517 bgPixmap.set_target (this);
518
519#ifdef ENABLE_TRANSPARENCY
520 if (option (Opt_transparent))
521 {
522 bgPixmap.set_transparent ();
523#ifdef HAVE_AFTERIMAGE
524 if (rs [Rs_blurradius])
525 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
526#endif
527 if (ISSET_PIXCOLOR (Color_tint))
528 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
529 if (rs [Rs_shade])
530 bgPixmap.set_shade (rs [Rs_shade]);
531
532 bgPixmap.set_root_pixmap ();
533 XSelectInput (dpy, display->root, PropertyChangeMask);
534 rootwin_ev.start (display, display->root);
535 }
536#endif
537
538#ifdef BG_IMAGE_FROM_FILE
539 if (rs[Rs_backgroundPixmap] != NULL)
540 {
541 const char *p = rs[Rs_backgroundPixmap];
542
543 if ((p = strchr (p, ';')) != NULL)
544 {
545 p++;
546 bgPixmap.set_geometry (p);
547 }
548 else
549 bgPixmap.set_defaultGeometry ();
550
551 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
552 if (!bgPixmap.window_position_sensitive ())
553 update_background ();
554 }
555#endif
556 }
557#endif
558
559#if ENABLE_PERL
560 rootwin_ev.start (display, display->root);
561#endif
562
563 set_colorfgbg ();
564
565 init_command (cmd_argv);
566
567 free (cmd_argv);
568
569 if (pty->pty >= 0)
570 pty_ev.start (pty->pty, ev::READ);
571
572 prepare_ev.start ();
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 return true;
590}
591
592static struct sig_handlers 469static struct sig_handlers
593{ 470{
594 ev::sig sw_term, sw_int; 471 ev::sig sw_term, sw_int;
595 472
596 /* 473 /*
597 * Catch a fatal signal and tidy up before quitting 474 * Catch a fatal signal and tidy up before quitting
598 */ 475 */
599 void
600 sig_term (ev::sig &w, int revents) 476 void sig_term (ev::sig &w, int revents);
477
478 sig_handlers ()
601 { 479 {
602 rxvt_emergency_cleanup (); 480 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
603 w.stop ();
604 kill (getpid (), w.signum);
605 }
606
607 sig_handlers ()
608 : sw_term (this, &sig_handlers::sig_term),
609 sw_int (this, &sig_handlers::sig_term) 481 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
610 {
611 } 482 }
612} sig_handlers; 483} sig_handlers;
613 484
485void
486sig_handlers::sig_term (ev::sig &w, int revents)
487{
488 rxvt_emergency_cleanup ();
489 w.stop ();
490 kill (getpid (), w.signum);
491}
492
493static void
494rxvt_get_ttymode (struct termios *tio)
495{
496 if (tcgetattr (STDIN_FILENO, tio) < 0)
497 memset (tio, 0, sizeof (struct termios));
498
499 for (int i = 0; i < NCCS; i++)
500 tio->c_cc[i] = VDISABLE;
501
502 tio->c_cc[VINTR] = CINTR;
503 tio->c_cc[VQUIT] = CQUIT;
504 tio->c_cc[VERASE] = CERASE;
505#ifdef VERASE2
506 tio->c_cc[VERASE2] = CERASE2;
507#endif
508 tio->c_cc[VKILL] = CKILL;
509 tio->c_cc[VEOF] = CEOF;
510 tio->c_cc[VSTART] = CSTART;
511 tio->c_cc[VSTOP] = CSTOP;
512 tio->c_cc[VSUSP] = CSUSP;
513# ifdef VDSUSP
514 tio->c_cc[VDSUSP] = CDSUSP;
515# endif
516# ifdef VREPRINT
517 tio->c_cc[VREPRINT] = CRPRNT;
518# endif
519# ifdef VDISCRD
520 tio->c_cc[VDISCRD] = CFLUSH;
521# endif
522# ifdef VWERSE
523 tio->c_cc[VWERSE] = CWERASE;
524# endif
525# ifdef VLNEXT
526 tio->c_cc[VLNEXT] = CLNEXT;
527# endif
528# ifdef VSTATUS
529 tio->c_cc[VSTATUS] = CSTATUS;
530# endif
531
532# if VMIN != VEOF
533 tio->c_cc[VMIN] = 1;
534# endif
535# if VTIME != VEOL
536 tio->c_cc[VTIME] = 0;
537# endif
538
539 /* input modes */
540 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
541# ifdef IMAXBEL
542 | IMAXBEL
543# endif
544 | IXON);
545
546 /* output modes */
547 tio->c_oflag = (OPOST | ONLCR);
548
549 /* control modes */
550 tio->c_cflag = (CS8 | CREAD);
551
552 /* local modes */
553 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
554# if defined (ECHOCTL) && defined (ECHOKE)
555 | ECHOCTL | ECHOKE
556# endif
557 | ECHOE | ECHOK);
558}
559
614char **rxvt_environ; // startup environment 560char **rxvt_environ; // startup environment
615 561
616void 562void
617rxvt_init () 563rxvt_init ()
618{ 564{
619 ptytty::init (); 565 assert (("fontMask must not overlap other RS masks",
566 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
567
568 rxvt_get_ttymode (&rxvt_term::def_tio);
569
570 // get rid of stdin/stdout as we don't need them, to free resources
571 dup2 (STDERR_FILENO, STDIN_FILENO);
572 dup2 (STDERR_FILENO, STDOUT_FILENO);
573
620 ev::ev_default_loop (0); 574 if (!ev_default_loop ())
575 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
621 576
622 rxvt_environ = environ; 577 rxvt_environ = environ;
623 578
624 signal (SIGHUP, SIG_IGN); 579 signal (SIGHUP, SIG_IGN);
625 signal (SIGPIPE, SIG_IGN); 580 signal (SIGPIPE, SIG_IGN);
626 581
627 sig_handlers.sw_term.start (SIGTERM); ev::ev_unref (); 582 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
628 sig_handlers.sw_int.start (SIGINT); ev::ev_unref (); 583 sig_handlers.sw_int.start (SIGINT); ev_unref ();
629
630 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
631 /* signal (SIGURG, SIG_DFL); */
632 584
633 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 585 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
634 // TODO: handle this with exceptions and tolerate the memory loss 586 // TODO: handle this with exceptions and tolerate the memory loss
635 XSetIOErrorHandler (rxvt_xioerror_handler); 587 XSetIOErrorHandler (rxvt_xioerror_handler);
636 588
637 XrmInitialize (); 589 XrmInitialize ();
638}
639
640/* ------------------------------------------------------------------------- *
641 * MEMORY ALLOCATION WRAPPERS *
642 * ------------------------------------------------------------------------- */
643void *
644rxvt_malloc (size_t size)
645{
646 void *p = malloc (size);
647
648 if (!p)
649 rxvt_fatal ("memory allocation failure. aborting.\n");
650
651 return p;
652}
653
654void *
655rxvt_calloc (size_t number, size_t size)
656{
657 void *p = calloc (number, size);
658
659 if (!p)
660 rxvt_fatal ("memory allocation failure. aborting.\n");
661
662 return p;
663}
664
665void *
666rxvt_realloc (void *ptr, size_t size)
667{
668 void *p = realloc (ptr, size);
669
670 if (!p)
671 rxvt_fatal ("memory allocation failure. aborting.\n");
672
673 return p;
674} 590}
675 591
676/*----------------------------------------------------------------------*/ 592/*----------------------------------------------------------------------*/
677/* 593/*
678 * window size/position calculations for XSizeHint and other storage. 594 * window size/position calculations for XSizeHint and other storage.
680 */ 596 */
681void 597void
682rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 598rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
683{ 599{
684 short recalc_x, recalc_y; 600 short recalc_x, recalc_y;
685 int x, y, sb_w, flags; 601 int x, y, flags;
686 unsigned int w, h; 602 unsigned int w, h;
687 unsigned int max_width, max_height; 603 unsigned int max_width, max_height;
688 604
689 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 605 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
690 szHint.win_gravity = NorthWestGravity; 606 szHint.win_gravity = NorthWestGravity;
700 if (rs[Rs_geometry]) 616 if (rs[Rs_geometry])
701 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 617 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
702 618
703 if (flags & WidthValue) 619 if (flags & WidthValue)
704 { 620 {
621 if (!w)
622 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
623
705 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 624 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
706 szHint.flags |= USSize; 625 szHint.flags |= USSize;
707 } 626 }
708 627
709 if (flags & HeightValue) 628 if (flags & HeightValue)
710 { 629 {
630 if (!h)
631 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
632
711 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 633 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
712 szHint.flags |= USSize; 634 szHint.flags |= USSize;
713 } 635 }
714 636
715 if (flags & XValue) 637 if (flags & XValue)
716 { 638 {
747 max_width = MAX_COLS * fwidth; 669 max_width = MAX_COLS * fwidth;
748 max_height = MAX_ROWS * fheight; 670 max_height = MAX_ROWS * fheight;
749 671
750 szHint.base_width = szHint.base_height = 2 * int_bwidth; 672 szHint.base_width = szHint.base_height = 2 * int_bwidth;
751 673
752 sb_w = 0;
753 window_vt_x = window_vt_y = int_bwidth; 674 window_vt_x = window_vt_y = int_bwidth;
754 675
755 if (scrollBar.state) 676 if (scrollBar.state)
756 { 677 {
757 sb_w = scrollbar_TotalWidth (); 678 int sb_w = scrollBar.total_width ();
758 szHint.base_width += sb_w; 679 szHint.base_width += sb_w;
759 680
760 if (!option (Opt_scrollBar_right)) 681 if (!option (Opt_scrollBar_right))
761 window_vt_x += sb_w; 682 window_vt_x += sb_w;
762 } 683 }
786 { 707 {
787 min_it (height, max_height); 708 min_it (height, max_height);
788 szHint.height = szHint.base_height + height; 709 szHint.height = szHint.base_height + height;
789 } 710 }
790 711
791 if (scrollBar.state && option (Opt_scrollBar_right))
792 window_sb_x = szHint.width - sb_w;
793
794 if (recalc_x) 712 if (recalc_x)
795 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 713 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
796 714
797 if (recalc_y) 715 if (recalc_y)
798 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 716 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
799 717
800 ncol = width / fwidth; 718 ncol = width / fwidth;
801 nrow = height / fheight; 719 nrow = height / fheight;
802} 720}
803 721
804/*----------------------------------------------------------------------*/ 722/*----------------------------------------------------------------------*/
805/* 723/*
816 734
817 ws.ws_col = ncol; 735 ws.ws_col = ncol;
818 ws.ws_row = nrow; 736 ws.ws_row = nrow;
819 ws.ws_xpixel = width; 737 ws.ws_xpixel = width;
820 ws.ws_ypixel = height; 738 ws.ws_ypixel = height;
821 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 739 ioctl (pty->pty, TIOCSWINSZ, &ws);
822 740
823#if 0 741#if 0
824 // TIOCSWINSZ is supposed to do this automatically and correctly 742 // TIOCSWINSZ is supposed to do this automatically and correctly
825 if (cmd_pid) /* force through to the command */ 743 if (cmd_pid) /* force through to the command */
826 kill (-cmd_pid, SIGWINCH); 744 kill (-cmd_pid, SIGWINCH);
827#endif 745#endif
828} 746}
829 747
856#endif 774#endif
857 775
858 delete fontset[0]; 776 delete fontset[0];
859 fontset[0] = fs; 777 fontset[0] = fs;
860 778
861 prop = (*fs)[1]->properties (); 779 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
862 prop.height += lineSpace; 780 prop.height += lineSpace;
781 prop.width += letterSpace;
863 782
864 fs->set_prop (prop, false); 783 fs->set_prop (prop, false);
865 784
866 fwidth = prop.width; 785 fwidth = prop.width;
867 fheight = prop.height; 786 fheight = prop.height;
917 prop, XA_STRING, 8, PropModeReplace, 836 prop, XA_STRING, 8, PropModeReplace,
918 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 837 (const unsigned char *)str, len >= 0 ? len : strlen (str));
919} 838}
920 839
921void 840void
841rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
842{
843 XTextProperty ct;
844
845 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
846 {
847 XSetTextProperty (dpy, parent[0], &ct, prop);
848 XFree (ct.value);
849 }
850}
851
852void
922rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 853rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
923{ 854{
924 wchar_t *ws = rxvt_mbstowcs (str, len); 855 wchar_t *ws = rxvt_mbstowcs (str, len);
925 char *s = rxvt_wcstoutf8 (ws); 856 char *s = rxvt_wcstoutf8 (ws);
926 857
936/*----------------------------------------------------------------------*/ 867/*----------------------------------------------------------------------*/
937/* xterm sequences - title, iconName, color (exptl) */ 868/* xterm sequences - title, iconName, color (exptl) */
938void 869void
939rxvt_term::set_title (const char *str) 870rxvt_term::set_title (const char *str)
940{ 871{
941 set_string_property (XA_WM_NAME, str); 872 set_mbstring_property (XA_WM_NAME, str);
942#if ENABLE_EWMH 873#if ENABLE_EWMH
943 set_utf8_property (xa[XA_NET_WM_NAME], str); 874 set_utf8_property (xa[XA_NET_WM_NAME], str);
944#endif 875#endif
945} 876}
946 877
947void 878void
948rxvt_term::set_icon_name (const char *str) 879rxvt_term::set_icon_name (const char *str)
949{ 880{
950 set_string_property (XA_WM_ICON_NAME, str); 881 set_mbstring_property (XA_WM_ICON_NAME, str);
951#if ENABLE_EWMH 882#if ENABLE_EWMH
952 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 883 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
953#endif 884#endif
954} 885}
955 886
956void 887void
957rxvt_term::set_window_color (int idx, const char *color) 888rxvt_term::set_window_color (int idx, const char *color)
958{ 889{
959#ifdef XTERM_COLOR_CHANGE 890#ifdef XTERM_COLOR_CHANGE
960 rxvt_color xcol; 891 rxvt_color xcol;
961 int i;
962 892
963 if (color == NULL || *color == '\0') 893 if (color == NULL || *color == '\0')
964 return; 894 return;
965 895
966 color = strdup (color); 896 color = strdup (color);
968 rs[Rs_color + idx] = color; 898 rs[Rs_color + idx] = color;
969 899
970 /* handle color aliases */ 900 /* handle color aliases */
971 if (isdigit (*color)) 901 if (isdigit (*color))
972 { 902 {
973 i = atoi (color); 903 int i = atoi (color);
974 904
975 if (i >= 8 && i <= 15) 905 if (i >= 8 && i <= 15)
906 {
976 { /* bright colors */ 907 /* bright colors */
977 i -= 8;
978 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 908 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
979 goto done; 909 goto done;
980 } 910 }
981 911
982 if (i >= 0 && i <= 7) 912 if (i >= 0 && i <= 7)
913 {
983 { /* normal colors */ 914 /* normal colors */
984 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 915 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
985 goto done; 916 goto done;
986 } 917 }
987 } 918 }
988 919
993 * so just keep gobbling up the colormap 924 * so just keep gobbling up the colormap
994 */ 925 */
995 926
996 pix_colors_focused[idx] = xcol; 927 pix_colors_focused[idx] = xcol;
997 928
998 /* XSetWindowAttributes attr; */
999 /* Cursor cursor; */
1000done: 929done:
1001 /*TODO: handle Color_BD, scrollbar background, etc. */ 930 /*TODO: handle Color_BD, scrollbar background, etc. */
1002 931
1003 update_fade_color (idx); 932 update_fade_color (idx);
1004 recolour_cursor (); 933 recolour_cursor ();
1005 scr_recolour (); 934 scr_recolour ();
1006#endif /* XTERM_COLOR_CHANGE */ 935#endif /* XTERM_COLOR_CHANGE */
1007} 936}
1008 937
1009void 938void
1010rxvt_term::recolour_cursor () 939rxvt_term::recolour_cursor ()
1011{ 940{
1028 */ 957 */
1029void 958void
1030rxvt_term::set_colorfgbg () 959rxvt_term::set_colorfgbg ()
1031{ 960{
1032 unsigned int i; 961 unsigned int i;
1033 const char *xpmb = "\0"; 962 const char *xpmb = "";
1034 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 963 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1035 964
1036 strcpy (fstr, "default"); 965 strcpy (fstr, "default");
1037 strcpy (bstr, "default"); 966 strcpy (bstr, "default");
1038 for (i = Color_Black; i <= Color_White; i++) 967 for (i = Color_Black; i <= Color_White; i++)
1083 int old_width = szHint.width; 1012 int old_width = szHint.width;
1084 int old_height = szHint.height; 1013 int old_height = szHint.height;
1085 1014
1086 window_calc (newwidth, newheight); 1015 window_calc (newwidth, newheight);
1087 1016
1088 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1017 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1018
1019 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1020 if (set_hint)
1021 {
1022 szHint.flags &= ~(PBaseSize | PResizeInc);
1089 XSetWMNormalHints (dpy, parent[0], &szHint); 1023 XSetWMNormalHints (dpy, parent[0], &szHint);
1024 szHint.flags |= PBaseSize | PResizeInc;
1025 }
1090 1026
1091 if (!ignoreparent) 1027 if (!ignoreparent)
1092 { 1028 {
1093#ifdef SMART_RESIZE 1029#ifdef SMART_RESIZE
1094 /* 1030 /*
1134#else 1070#else
1135 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1071 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1136#endif 1072#endif
1137 } 1073 }
1138 1074
1075 if (set_hint)
1076 XSetWMNormalHints (dpy, parent[0], &szHint);
1077
1139 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1078 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1140 1079
1141 if (fix_screen || newwidth != old_width || newheight != old_height) 1080 if (fix_screen || newwidth != old_width || newheight != old_height)
1142 { 1081 {
1143 if (scrollBar.state) 1082 if (scrollBar.state)
1144 { 1083 scrollBar.resize ();
1145 XMoveResizeWindow (dpy, scrollBar.win,
1146 window_sb_x, 0,
1147 scrollbar_TotalWidth (), szHint.height);
1148 resize_scrollbar ();
1149 }
1150 1084
1151 XMoveResizeWindow (dpy, vt, 1085 XMoveResizeWindow (dpy, vt,
1152 window_vt_x, window_vt_y, 1086 window_vt_x, window_vt_y,
1153 width, height); 1087 width, height);
1154 1088
1155#ifdef HAVE_BG_PIXMAP 1089#ifdef HAVE_BG_PIXMAP
1156 if (bgPixmap.window_size_sensitive ()) 1090 if (bgPixmap.window_size_sensitive ())
1157 update_background (); 1091 update_background ();
1158#endif 1092#endif
1159
1160 scr_clear ();
1161 } 1093 }
1162 1094
1163 if (fix_screen || old_height == 0) 1095 if (fix_screen || old_height == 0)
1164 scr_reset (); 1096 scr_reset ();
1165
1166 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1167 //scr_touch (false);
1168 1097
1169#ifdef HAVE_BG_PIXMAP 1098#ifdef HAVE_BG_PIXMAP
1170// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ? 1099// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1171// if (bgPixmap.pixmap) 1100// if (bgPixmap.pixmap)
1172// scr_touch (false); 1101// scr_touch (false);
1244 1173
1245/* Checking whether input method is running. */ 1174/* Checking whether input method is running. */
1246bool 1175bool
1247rxvt_term::IMisRunning () 1176rxvt_term::IMisRunning ()
1248{ 1177{
1249 char *p;
1250 Atom atom; 1178 Atom atom;
1251 Window win; 1179 Window win;
1252 char server[IMBUFSIZ]; 1180 char server[IMBUFSIZ];
1253 1181
1254 /* get current locale modifier */ 1182 /* get current locale modifier */
1255 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1183 if (char *p = XSetLocaleModifiers (0))
1256 { 1184 {
1257 strcpy (server, "@server="); 1185 strcpy (server, "@server=");
1258 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1186 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1259 1187
1260 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1188 if (p = strchr (server + 1, '@')) /* first one only */
1261 *p = '\0'; 1189 *p = '\0';
1262 1190
1263 atom = XInternAtom (dpy, server, False); 1191 atom = XInternAtom (dpy, server, False);
1264 win = XGetSelectionOwner (dpy, atom); 1192 win = XGetSelectionOwner (dpy, atom);
1265 1193
1332 1260
1333 term->make_current (); 1261 term->make_current ();
1334 1262
1335 if (text) 1263 if (text)
1336 { 1264 {
1337 void *str; 1265 wchar_t *str;
1338 1266
1339 if (!text->encoding_is_wchar && text->string.multi_byte) 1267 if (!text->encoding_is_wchar && text->string.multi_byte)
1340 { 1268 {
1341 // of course, X makes it ugly again 1269 // of course, X makes it ugly again
1342 if (term->rs[Rs_imLocale]) 1270 if (term->rs[Rs_imLocale])
1343 SET_LOCALE (term->rs[Rs_imLocale]); 1271 SET_LOCALE (term->rs[Rs_imLocale]);
1344 1272
1345 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1273 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1346 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1274 mbstowcs (str, text->string.multi_byte, text->length + 1);
1347 1275
1348 if (term->rs[Rs_imLocale]) 1276 if (term->rs[Rs_imLocale])
1349 SET_LOCALE (term->locale); 1277 SET_LOCALE (term->locale);
1350 } 1278 }
1351 else 1279 else
1352 str = (void *)text->string.wide_char; 1280 str = text->string.wide_char;
1353 1281
1354 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1282 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1355 DT_INT, call_data->caret, 1283 DT_INT, call_data->caret,
1356 DT_INT, call_data->chg_first, 1284 DT_INT, call_data->chg_first,
1357 DT_INT, call_data->chg_length, 1285 DT_INT, call_data->chg_length,
1704 XFree (status_attr); 1632 XFree (status_attr);
1705 } 1633 }
1706 1634
1707 XFree (preedit_attr); 1635 XFree (preedit_attr);
1708} 1636}
1709#endif /* USE_XIM */ 1637#endif /* USE_XIM */
1710 1638
1711void 1639void
1712rxvt_term::get_window_origin (int &x, int &y) 1640rxvt_term::get_window_origin (int &x, int &y)
1713{ 1641{
1714 Window cr; 1642 Window cr;
1715 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1643 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1716/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1717} 1644}
1718 1645
1719Pixmap 1646Pixmap
1720rxvt_term::get_pixmap_property (int prop_id) 1647rxvt_term::get_pixmap_property (int prop_id)
1721{ 1648{
1649 Pixmap pixmap = None;
1650
1722 if (prop_id > 0 && prop_id < NUM_XA) 1651 if (prop_id > 0 && prop_id < NUM_XA)
1723 if (xa[prop_id]) 1652 if (xa[prop_id])
1724 { 1653 {
1725 int aformat; 1654 int aformat;
1726 unsigned long nitems, bytes_after; 1655 unsigned long nitems, bytes_after;
1727 Atom atype; 1656 Atom atype;
1728 unsigned char *prop = NULL; 1657 unsigned char *prop;
1729 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1658 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1730 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1659 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1731 &nitems, &bytes_after, &prop); 1660 &nitems, &bytes_after, &prop);
1732 if (result == Success && prop && atype == XA_PIXMAP) 1661 if (result == Success)
1733 { 1662 {
1663 if (atype == XA_PIXMAP)
1734 return *(Pixmap *)prop; 1664 pixmap = *(Pixmap *)prop;
1665 XFree (prop);
1735 } 1666 }
1736 } 1667 }
1737 return None; 1668
1669 return pixmap;
1738} 1670}
1739 1671
1740#ifdef HAVE_BG_PIXMAP 1672#ifdef HAVE_BG_PIXMAP
1741int 1673
1674void
1742rxvt_term::update_background () 1675rxvt_term::update_background ()
1743{ 1676{
1677 if (update_background_ev.is_active ())
1678 return;
1679
1744 bgPixmap.invalidate (); 1680 bgPixmap.invalidate ();
1745 1681
1746 /* no chance of real time refresh if we are blurring! */ 1682 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1747 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1683
1684 if (to_wait <= 0.)
1748 bgPixmap.render (); 1685 bgPixmap.render ();
1749 else 1686 else
1750 {
1751 update_background_ev.stop ();
1752
1753 if (!bgPixmap.need_client_side_rendering())
1754 update_background_ev.start (.05); 1687 update_background_ev.start (to_wait);
1755 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1756 update_background_ev.start (.20); /* very slow !!! */
1757 else
1758 update_background_ev.start (.07);
1759 }
1760
1761 return 0;
1762} 1688}
1763 1689
1764void 1690void
1765rxvt_term::update_background_cb (ev::timer &w, int revents) 1691rxvt_term::update_background_cb (ev::timer &w, int revents)
1766{ 1692{
1693 make_current ();
1694
1695 update_background_ev.stop ();
1767 bgPixmap.render (); 1696 bgPixmap.render ();
1697 refresh_check ();
1768} 1698}
1769 1699
1770#endif /* HAVE_BG_PIXMAP */ 1700#endif /* HAVE_BG_PIXMAP */
1771 1701
1772/*----------------------- end-of-file (C source) -----------------------*/ 1702/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines