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.255 by ayin, Wed Oct 31 09:55:23 2007 UTC vs.
Revision 1.309 by root, Wed Feb 27 01:02:33 2008 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-2008 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.
38#include <limits> 38#include <limits>
39 39
40#include <csignal> 40#include <csignal>
41#include <cstring> 41#include <cstring>
42 42
43#ifdef HAVE_TERMIOS_H
44# include <termios.h> 43#include <termios.h>
45#endif
46 44
47#ifdef HAVE_XSETLOCALE 45#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 46# define X_LOCALE
49# include <X11/Xlocale.h> 47# include <X11/Xlocale.h>
50#else 48#else
152 150
153} 151}
154#endif 152#endif
155 153
156rxvt_term::rxvt_term () 154rxvt_term::rxvt_term ()
157 : 155{
156#if HAVE_BG_PIXMAP
157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
158#endif
159#ifdef CURSOR_BLINK
160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
161#endif
162#ifdef TEXT_BLINK
163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
164#endif
165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
166 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
167#endif
168#ifdef SELECTION_SCROLLING
169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
170#endif
171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif
158#if ENABLE_TRANSPARENCY || ENABLE_PERL 174#if ENABLE_TRANSPARENCY || ENABLE_PERL
159 rootwin_ev (this, &rxvt_term::rootwin_cb), 175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
160#endif 176#endif
161#if HAVE_BG_PIXMAP 177 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
162 update_background_ev(this, &rxvt_term::update_background_cb), 178#ifdef USE_XIM
163#endif 179 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 180#endif
182#ifdef POINTER_BLANK 181#ifdef POINTER_BLANK
183 pointer_ev (this, &rxvt_term::pointer_cb), 182 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 183#endif
188#ifndef NO_BELL 184#ifndef NO_BELL
189 bell_ev (this, &rxvt_term::bell_cb), 185 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
190#endif 186#endif
191 termwin_ev (this, &rxvt_term::x_cb), 187 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
192 vt_ev (this, &rxvt_term::x_cb), 188 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
193 child_ev (this, &rxvt_term::child_cb), 189 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
194 check_ev (this, &rxvt_term::check_cb), 190 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
195 flush_ev (this, &rxvt_term::flush_cb), 191 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
196 destroy_ev (this, &rxvt_term::destroy_cb), 192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
197 pty_ev (this, &rxvt_term::pty_cb), 193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
198 incr_ev (this, &rxvt_term::incr_cb) 194
199{
200 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
201 196
202 termlist.push_back (this); 197 termlist.push_back (this);
203 198
204#ifdef KEYSYM_RESOURCE 199#ifdef KEYSYM_RESOURCE
229 if (fontset[i] != fontset[0]) 224 if (fontset[i] != fontset[0])
230 delete fontset[i]; 225 delete fontset[i];
231#endif 226#endif
232 delete fontset[0]; 227 delete fontset[0];
233 228
229#ifdef HAVE_BG_PIXMAP
230 bgPixmap.destroy ();
231#endif
232
234 if (display) 233 if (display)
235 { 234 {
236 selection_clear (); 235 selection_clear ();
237 236
238#ifdef USE_XIM 237#ifdef USE_XIM
239 im_destroy (); 238 im_destroy ();
240#endif 239#endif
241#ifdef XTERM_SCROLLBAR 240 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); 241 if (gc) XFreeGC (dpy, gc);
266 242
267 delete drawable; 243 delete drawable;
268 // destroy all windows 244 // destroy all windows
269 if (parent[0]) 245 if (parent[0])
277 pix_colors_unfocused [i].free (this); 253 pix_colors_unfocused [i].free (this);
278#endif 254#endif
279 } 255 }
280 256
281 clear (); 257 clear ();
282 }
283 258
284 delete [] pix_colors_focused; 259 display->flush (); /* ideally .put should do this */
285#if OFF_FOCUS_FADING
286 delete [] pix_colors_unfocused;
287#endif
288
289 displays.put (display); 260 displays.put (display);
261 }
290 262
291 scr_release (); 263 scr_release ();
292 264
293 /* clear all resources */ 265 /* clear all resources */
294 for (int i = 0; i < allocated.size (); i++) 266 for (int i = 0; i < allocated.size (); i++)
306 delete argv; 278 delete argv;
307 279
308#ifdef KEYSYM_RESOURCE 280#ifdef KEYSYM_RESOURCE
309 delete keyboard; 281 delete keyboard;
310#endif 282#endif
283#ifndef NO_RESOURCES
284 XrmDestroyDatabase (option_db);
285#endif
311} 286}
312 287
313// child has exited, usually destroys 288// child has exited, usually destroys
314void 289void
315rxvt_term::child_cb (child_watcher &w, int status) 290rxvt_term::child_cb (ev::child &w, int status)
316{ 291{
317 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 292 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
318 293
319 cmd_pid = 0; 294 cmd_pid = 0;
320 295
323} 298}
324 299
325void 300void
326rxvt_term::destroy () 301rxvt_term::destroy ()
327{ 302{
328 if (destroy_ev.active) 303 if (destroy_ev.is_active ())
329 return; 304 return;
330 305
331 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 306 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
332 307
333#if ENABLE_OVERLAY 308#if ENABLE_OVERLAY
337 if (display) 312 if (display)
338 { 313 {
339#if USE_XIM 314#if USE_XIM
340 im_ev.stop (display); 315 im_ev.stop (display);
341#endif 316#endif
342#if HAVE_SCROLLBARS
343 scrollbar_ev.stop (display); 317 scrollbar_ev.stop (display);
344#endif
345#if ENABLE_TRANSPARENCY || ENABLE_PERL 318#if ENABLE_TRANSPARENCY || ENABLE_PERL
346 rootwin_ev.stop (display); 319 rootwin_ev.stop (display);
347#endif 320#endif
348 incr_ev.stop (); 321 incr_ev.stop ();
349 termwin_ev.stop (display); 322 termwin_ev.stop (display);
350 vt_ev.stop (display); 323 vt_ev.stop (display);
351 } 324 }
352 325
353 check_ev.stop (); 326 flush_ev.stop ();
354 pty_ev.stop (); 327 pty_ev.stop ();
355#ifdef CURSOR_BLINK 328#ifdef CURSOR_BLINK
356 cursor_blink_ev.stop (); 329 cursor_blink_ev.stop ();
357#endif 330#endif
358#ifdef TEXT_BLINK 331#ifdef TEXT_BLINK
366#endif 339#endif
367#ifdef POINTER_BLANK 340#ifdef POINTER_BLANK
368 pointer_ev.stop (); 341 pointer_ev.stop ();
369#endif 342#endif
370 343
371 destroy_ev.start (0); 344 destroy_ev.start ();
372} 345}
373 346
374void 347void
375rxvt_term::destroy_cb (time_watcher &w) 348rxvt_term::destroy_cb (ev::idle &w, int revents)
376{ 349{
377 make_current (); 350 make_current ();
378 351
379 delete this; 352 delete this;
380} 353}
468 DisplayString (display)); 441 DisplayString (display));
469 rxvt_emergency_cleanup (); 442 rxvt_emergency_cleanup ();
470 _exit (EXIT_FAILURE); 443 _exit (EXIT_FAILURE);
471} 444}
472 445
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, EVENT_READ);
571
572 check_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 446static struct sig_handlers
593{ 447{
594 sig_watcher sw_term, sw_int; 448 ev::sig sw_term, sw_int;
595 449
596 /* 450 /*
597 * Catch a fatal signal and tidy up before quitting 451 * Catch a fatal signal and tidy up before quitting
598 */ 452 */
599 void 453 void sig_term (ev::sig &w, int revents);
600 sig_term (sig_watcher &w) 454
455 sig_handlers ()
601 { 456 {
602 rxvt_emergency_cleanup (); 457 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
603 signal (w.signum, SIG_DFL);
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) 458 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
610 {
611 } 459 }
612} sig_handlers; 460} sig_handlers;
613 461
462void
463sig_handlers::sig_term (ev::sig &w, int revents)
464{
465 rxvt_emergency_cleanup ();
466 w.stop ();
467 kill (getpid (), w.signum);
468}
469
614char **rxvt_environ; // startup environment 470char **rxvt_environ; // startup environment
615 471
616void 472void
617rxvt_init () 473rxvt_init ()
618{ 474{
619 ptytty::init (); 475 ptytty::init ();
476
477 if (!ev_default_loop (0))
478 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
620 479
621 rxvt_environ = environ; 480 rxvt_environ = environ;
622 481
623 signal (SIGHUP, SIG_IGN); 482 signal (SIGHUP, SIG_IGN);
624 signal (SIGPIPE, SIG_IGN); 483 signal (SIGPIPE, SIG_IGN);
625 484
626 sig_handlers.sw_term.start (SIGTERM); 485 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
627 sig_handlers.sw_int.start (SIGINT); 486 sig_handlers.sw_int.start (SIGINT); ev_unref ();
628 487
629 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 488 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
630 /* signal (SIGURG, SIG_DFL); */ 489 /* signal (SIGURG, SIG_DFL); */
631 490
632 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 491 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
633 // TODO: handle this with exceptions and tolerate the memory loss 492 // TODO: handle this with exceptions and tolerate the memory loss
634 XSetIOErrorHandler (rxvt_xioerror_handler); 493 XSetIOErrorHandler (rxvt_xioerror_handler);
635 494
636 XrmInitialize (); 495 XrmInitialize ();
637}
638
639/* ------------------------------------------------------------------------- *
640 * MEMORY ALLOCATION WRAPPERS *
641 * ------------------------------------------------------------------------- */
642void *
643rxvt_malloc (size_t size)
644{
645 void *p = malloc (size);
646
647 if (!p)
648 rxvt_fatal ("memory allocation failure. aborting.\n");
649
650 return p;
651}
652
653void *
654rxvt_calloc (size_t number, size_t size)
655{
656 void *p = calloc (number, size);
657
658 if (!p)
659 rxvt_fatal ("memory allocation failure. aborting.\n");
660
661 return p;
662}
663
664void *
665rxvt_realloc (void *ptr, size_t size)
666{
667 void *p = realloc (ptr, size);
668
669 if (!p)
670 rxvt_fatal ("memory allocation failure. aborting.\n");
671
672 return p;
673} 496}
674 497
675/*----------------------------------------------------------------------*/ 498/*----------------------------------------------------------------------*/
676/* 499/*
677 * window size/position calculations for XSizeHint and other storage. 500 * window size/position calculations for XSizeHint and other storage.
679 */ 502 */
680void 503void
681rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 504rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
682{ 505{
683 short recalc_x, recalc_y; 506 short recalc_x, recalc_y;
684 int x, y, sb_w, flags; 507 int x, y, flags;
685 unsigned int w, h; 508 unsigned int w, h;
686 unsigned int max_width, max_height; 509 unsigned int max_width, max_height;
687 510
688 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 511 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
689 szHint.win_gravity = NorthWestGravity; 512 szHint.win_gravity = NorthWestGravity;
736 szHint.win_gravity = SouthEastGravity; 559 szHint.win_gravity = SouthEastGravity;
737 else 560 else
738 szHint.win_gravity = SouthWestGravity; 561 szHint.win_gravity = SouthWestGravity;
739 } 562 }
740 } 563 }
564
565 if (!szHint.width || !szHint.height)
566 rxvt_fatal ("window width or height must not be zero, aborting.\n");
741 } 567 }
742 568
743 /* TODO: BOUNDS */ 569 /* TODO: BOUNDS */
744 width = ncol * fwidth; 570 width = ncol * fwidth;
745 height = nrow * fheight; 571 height = nrow * fheight;
746 max_width = MAX_COLS * fwidth; 572 max_width = MAX_COLS * fwidth;
747 max_height = MAX_ROWS * fheight; 573 max_height = MAX_ROWS * fheight;
748 574
749 szHint.base_width = szHint.base_height = 2 * int_bwidth; 575 szHint.base_width = szHint.base_height = 2 * int_bwidth;
750 576
751 sb_w = 0;
752 window_vt_x = window_vt_y = int_bwidth; 577 window_vt_x = window_vt_y = int_bwidth;
753 578
754 if (scrollBar.state) 579 if (scrollBar.state)
755 { 580 {
756 sb_w = scrollbar_TotalWidth (); 581 int sb_w = scrollBar.total_width ();
757 szHint.base_width += sb_w; 582 szHint.base_width += sb_w;
758 583
759 if (!option (Opt_scrollBar_right)) 584 if (!option (Opt_scrollBar_right))
760 window_vt_x += sb_w; 585 window_vt_x += sb_w;
761 } 586 }
784 else 609 else
785 { 610 {
786 min_it (height, max_height); 611 min_it (height, max_height);
787 szHint.height = szHint.base_height + height; 612 szHint.height = szHint.base_height + height;
788 } 613 }
789
790 if (scrollBar.state && option (Opt_scrollBar_right))
791 window_sb_x = szHint.width - sb_w;
792 614
793 if (recalc_x) 615 if (recalc_x)
794 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 616 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
795 617
796 if (recalc_y) 618 if (recalc_y)
818 ws.ws_xpixel = width; 640 ws.ws_xpixel = width;
819 ws.ws_ypixel = height; 641 ws.ws_ypixel = height;
820 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 642 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
821 643
822#if 0 644#if 0
823 // TIOCSWINSZ is supposed to do this automatically and correctly 645 // TIOCSWINSZ is supposed to do this automatically and correctly
824 if (cmd_pid) /* force through to the command */ 646 if (cmd_pid) /* force through to the command */
825 kill (-cmd_pid, SIGWINCH); 647 kill (-cmd_pid, SIGWINCH);
826#endif 648#endif
827} 649}
828 650
955void 777void
956rxvt_term::set_window_color (int idx, const char *color) 778rxvt_term::set_window_color (int idx, const char *color)
957{ 779{
958#ifdef XTERM_COLOR_CHANGE 780#ifdef XTERM_COLOR_CHANGE
959 rxvt_color xcol; 781 rxvt_color xcol;
960 int i;
961 782
962 if (color == NULL || *color == '\0') 783 if (color == NULL || *color == '\0')
963 return; 784 return;
964 785
965 color = strdup (color); 786 color = strdup (color);
967 rs[Rs_color + idx] = color; 788 rs[Rs_color + idx] = color;
968 789
969 /* handle color aliases */ 790 /* handle color aliases */
970 if (isdigit (*color)) 791 if (isdigit (*color))
971 { 792 {
972 i = atoi (color); 793 int i = atoi (color);
973 794
974 if (i >= 8 && i <= 15) 795 if (i >= 8 && i <= 15)
796 {
975 { /* bright colors */ 797 /* bright colors */
976 i -= 8;
977 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 798 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
978 goto done; 799 goto done;
979 } 800 }
980 801
981 if (i >= 0 && i <= 7) 802 if (i >= 0 && i <= 7)
803 {
982 { /* normal colors */ 804 /* normal colors */
983 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 805 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
984 goto done; 806 goto done;
985 } 807 }
986 } 808 }
987 809
992 * so just keep gobbling up the colormap 814 * so just keep gobbling up the colormap
993 */ 815 */
994 816
995 pix_colors_focused[idx] = xcol; 817 pix_colors_focused[idx] = xcol;
996 818
997 /* XSetWindowAttributes attr; */
998 /* Cursor cursor; */
999done: 819done:
1000 /*TODO: handle Color_BD, scrollbar background, etc. */ 820 /*TODO: handle Color_BD, scrollbar background, etc. */
1001 821
1002 update_fade_color (idx); 822 update_fade_color (idx);
1003 recolour_cursor (); 823 recolour_cursor ();
1004 scr_recolour (); 824 scr_recolour ();
1005#endif /* XTERM_COLOR_CHANGE */ 825#endif /* XTERM_COLOR_CHANGE */
1006} 826}
1007 827
1008void 828void
1009rxvt_term::recolour_cursor () 829rxvt_term::recolour_cursor ()
1010{ 830{
1027 */ 847 */
1028void 848void
1029rxvt_term::set_colorfgbg () 849rxvt_term::set_colorfgbg ()
1030{ 850{
1031 unsigned int i; 851 unsigned int i;
1032 const char *xpmb = "\0"; 852 const char *xpmb = "";
1033 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 853 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1034 854
1035 strcpy (fstr, "default"); 855 strcpy (fstr, "default");
1036 strcpy (bstr, "default"); 856 strcpy (bstr, "default");
1037 for (i = Color_Black; i <= Color_White; i++) 857 for (i = Color_Black; i <= Color_White; i++)
1138 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 958 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1139 959
1140 if (fix_screen || newwidth != old_width || newheight != old_height) 960 if (fix_screen || newwidth != old_width || newheight != old_height)
1141 { 961 {
1142 if (scrollBar.state) 962 if (scrollBar.state)
1143 { 963 scrollBar.resize ();
1144 XMoveResizeWindow (dpy, scrollBar.win,
1145 window_sb_x, 0,
1146 scrollbar_TotalWidth (), szHint.height);
1147 resize_scrollbar ();
1148 }
1149 964
1150 XMoveResizeWindow (dpy, vt, 965 XMoveResizeWindow (dpy, vt,
1151 window_vt_x, window_vt_y, 966 window_vt_x, window_vt_y,
1152 width, height); 967 width, height);
1153 968
1703 XFree (status_attr); 1518 XFree (status_attr);
1704 } 1519 }
1705 1520
1706 XFree (preedit_attr); 1521 XFree (preedit_attr);
1707} 1522}
1708#endif /* USE_XIM */ 1523#endif /* USE_XIM */
1709 1524
1710void 1525void
1711rxvt_term::get_window_origin (int &x, int &y) 1526rxvt_term::get_window_origin (int &x, int &y)
1712{ 1527{
1713 Window cr; 1528 Window cr;
1714 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1529 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1715/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/ 1530/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1716} 1531}
1717 1532
1718Pixmap 1533Pixmap
1719rxvt_term::get_pixmap_property (int prop_id) 1534rxvt_term::get_pixmap_property (int prop_id)
1720{ 1535{
1727 unsigned char *prop = NULL; 1542 unsigned char *prop = NULL;
1728 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1543 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1729 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1544 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1730 &nitems, &bytes_after, &prop); 1545 &nitems, &bytes_after, &prop);
1731 if (result == Success && prop && atype == XA_PIXMAP) 1546 if (result == Success && prop && atype == XA_PIXMAP)
1732 {
1733 return *(Pixmap *)prop; 1547 return *(Pixmap *)prop;
1734 }
1735 } 1548 }
1549
1736 return None; 1550 return None;
1737} 1551}
1738 1552
1739#ifdef HAVE_BG_PIXMAP 1553#ifdef HAVE_BG_PIXMAP
1740int 1554# if TRACE_PIXMAPS
1555# undef update_background
1556void
1557rxvt_term::trace_update_background (const char *file, int line)
1558{
1559 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1560 update_background ();
1561}
1562# endif
1563
1564void
1741rxvt_term::update_background () 1565rxvt_term::update_background ()
1742{ 1566{
1567 if (update_background_ev.is_active ())
1568 return;
1569
1743 bgPixmap.invalidate (); 1570 bgPixmap.invalidate ();
1744 1571
1745 /* no chance of real time refresh if we are blurring ! */ 1572 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1746 if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1573
1574 if (to_wait <= 0.)
1747 bgPixmap.render (); 1575 bgPixmap.render ();
1748 else 1576 else
1749 { 1577 update_background_ev.start (to_wait);
1578}
1579
1580void
1581rxvt_term::update_background_cb (ev::timer &w, int revents)
1582{
1583 make_current ();
1584
1750 update_background_ev.stop (); 1585 update_background_ev.stop ();
1751 if (!bgPixmap.need_client_side_rendering())
1752 update_background_ev.start (NOW + .05);
1753 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1754 update_background_ev.start (NOW + .2); /* very slow !!! */
1755 else
1756 update_background_ev.start (NOW + .07);
1757 }
1758 return 0;
1759}
1760
1761void
1762rxvt_term::update_background_cb (time_watcher &w)
1763{
1764 bgPixmap.render (); 1586 bgPixmap.render ();
1587 refresh_check ();
1765} 1588}
1766 1589
1767#endif /* HAVE_BG_PIXMAP */ 1590#endif /* HAVE_BG_PIXMAP */
1768 1591
1769/*----------------------- end-of-file (C source) -----------------------*/ 1592/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines