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.251 by sasha, Tue Sep 18 22:01:36 2007 UTC vs.
Revision 1.304 by ayin, Wed Feb 6 12:05:35 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 TTY_GID_SUPPORT
44# include <grp.h>
45#endif
46
47#ifdef HAVE_TERMIOS_H
48# include <termios.h> 43#include <termios.h>
44
45#ifdef HAVE_XSETLOCALE
46# define X_LOCALE
47# include <X11/Xlocale.h>
48#else
49# ifdef HAVE_SETLOCALE
50# include <clocale>
51# endif
49#endif 52#endif
50 53
51vector<rxvt_term *> rxvt_term::termlist; 54vector<rxvt_term *> rxvt_term::termlist;
52 55
53// used to tell global functions which terminal instance is "active" 56// used to tell global functions which terminal instance is "active"
88class rxvt_composite_vec rxvt_composite; 91class rxvt_composite_vec rxvt_composite;
89 92
90text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
91{ 94{
92 compose_char *cc; 95 compose_char *cc;
93 96
94 // break compose chains, as stupid readline really likes to duplicate 97 // break compose chains, as stupid readline really likes to duplicate
95 // composing characters for some reason near the end of a line. 98 // composing characters for some reason near the end of a line.
96 cc = (*this)[c1]; 99 cc = (*this)[c1];
97 while (cc) 100 while (cc)
98 { 101 {
147 150
148} 151}
149#endif 152#endif
150 153
151rxvt_term::rxvt_term () 154rxvt_term::rxvt_term ()
152 : 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
153#if ENABLE_TRANSPARENCY || ENABLE_PERL 174#if ENABLE_TRANSPARENCY || ENABLE_PERL
154 rootwin_ev (this, &rxvt_term::rootwin_cb), 175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
155#endif 176#endif
156#if HAVE_BG_PIXMAP 177 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
157 update_background_ev(this, &rxvt_term::update_background_cb), 178#ifdef USE_XIM
158#endif 179 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
159#ifdef HAVE_SCROLLBARS
160 scrollbar_ev (this, &rxvt_term::x_cb),
161#endif
162#ifdef CURSOR_BLINK
163 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
164#endif
165#ifdef TEXT_BLINK
166 text_blink_ev (this, &rxvt_term::text_blink_cb),
167#endif
168#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
169 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
170#endif
171#ifdef SELECTION_SCROLLING
172 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
173#endif
174#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
175 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
176#endif 180#endif
177#ifdef POINTER_BLANK 181#ifdef POINTER_BLANK
178 pointer_ev (this, &rxvt_term::pointer_cb), 182 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
179#endif 183#endif
180#ifdef USE_XIM
181 im_ev (this, &rxvt_term::im_cb),
182#endif
183#ifndef NO_BELL 184#ifndef NO_BELL
184 bell_ev (this, &rxvt_term::bell_cb), 185 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
185#endif 186#endif
186 termwin_ev (this, &rxvt_term::x_cb), 187 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
187 vt_ev (this, &rxvt_term::x_cb), 188 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
188 child_ev (this, &rxvt_term::child_cb), 189 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
189 check_ev (this, &rxvt_term::check_cb), 190 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
190 flush_ev (this, &rxvt_term::flush_cb), 191 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
191 destroy_ev (this, &rxvt_term::destroy_cb), 192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
192 pty_ev (this, &rxvt_term::pty_cb), 193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
193 incr_ev (this, &rxvt_term::incr_cb) 194
194{
195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196 196
197 termlist.push_back (this); 197 termlist.push_back (this);
198 198
199#ifdef KEYSYM_RESOURCE 199#ifdef KEYSYM_RESOURCE
201#endif 201#endif
202} 202}
203 203
204// clean up the most important stuff, do *not* call x or free mem etc. 204// clean up the most important stuff, do *not* call x or free mem etc.
205// for use before an emergency exit 205// for use before an emergency exit
206void
206void rxvt_term::emergency_cleanup () 207rxvt_term::emergency_cleanup ()
207{ 208{
208 if (cmd_pid) 209 if (cmd_pid)
209 kill (-cmd_pid, SIGHUP); 210 kill (-cmd_pid, SIGHUP);
210 211
211 pty_ev.stop (); 212 pty_ev.stop ();
222 for (int i = RS_styleCount; --i; ) 223 for (int i = RS_styleCount; --i; )
223 if (fontset[i] != fontset[0]) 224 if (fontset[i] != fontset[0])
224 delete fontset[i]; 225 delete fontset[i];
225#endif 226#endif
226 delete fontset[0]; 227 delete fontset[0];
228
229#ifdef HAVE_BG_PIXMAP
230 bgPixmap.destroy ();
231#endif
227 232
228 if (display) 233 if (display)
229 { 234 {
230 selection_clear (); 235 selection_clear ();
231 236
271 pix_colors_unfocused [i].free (this); 276 pix_colors_unfocused [i].free (this);
272#endif 277#endif
273 } 278 }
274 279
275 clear (); 280 clear ();
276 }
277 281
278 delete [] pix_colors_focused; 282 display->flush (); /* ideally .put should do this */
279#if OFF_FOCUS_FADING
280 delete [] pix_colors_unfocused;
281#endif
282
283 displays.put (display); 283 displays.put (display);
284 }
284 285
285 scr_release (); 286 scr_release ();
286 287
287 /* clear all resources */ 288 /* clear all resources */
288 for (int i = 0; i < allocated.size (); i++) 289 for (int i = 0; i < allocated.size (); i++)
300 delete argv; 301 delete argv;
301 302
302#ifdef KEYSYM_RESOURCE 303#ifdef KEYSYM_RESOURCE
303 delete keyboard; 304 delete keyboard;
304#endif 305#endif
306#ifndef NO_RESOURCES
307 XrmDestroyDatabase (option_db);
308#endif
305} 309}
306 310
307// child has exited, usually destroys 311// child has exited, usually destroys
308void 312void
309rxvt_term::child_cb (child_watcher &w, int status) 313rxvt_term::child_cb (ev::child &w, int status)
310{ 314{
311 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 315 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
312 316
313 cmd_pid = 0; 317 cmd_pid = 0;
314 318
317} 321}
318 322
319void 323void
320rxvt_term::destroy () 324rxvt_term::destroy ()
321{ 325{
322 if (destroy_ev.active) 326 if (destroy_ev.is_active ())
323 return; 327 return;
324 328
325 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 329 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
326 330
327#if ENABLE_OVERLAY 331#if ENABLE_OVERLAY
331 if (display) 335 if (display)
332 { 336 {
333#if USE_XIM 337#if USE_XIM
334 im_ev.stop (display); 338 im_ev.stop (display);
335#endif 339#endif
336#if HAVE_SCROLLBARS
337 scrollbar_ev.stop (display); 340 scrollbar_ev.stop (display);
338#endif
339#if ENABLE_TRANSPARENCY || ENABLE_PERL 341#if ENABLE_TRANSPARENCY || ENABLE_PERL
340 rootwin_ev.stop (display); 342 rootwin_ev.stop (display);
341#endif 343#endif
342 incr_ev.stop (); 344 incr_ev.stop ();
343 termwin_ev.stop (display); 345 termwin_ev.stop (display);
344 vt_ev.stop (display); 346 vt_ev.stop (display);
345 } 347 }
346 348
347 check_ev.stop (); 349 flush_ev.stop ();
348 pty_ev.stop (); 350 pty_ev.stop ();
349#ifdef CURSOR_BLINK 351#ifdef CURSOR_BLINK
350 cursor_blink_ev.stop (); 352 cursor_blink_ev.stop ();
351#endif 353#endif
352#ifdef TEXT_BLINK 354#ifdef TEXT_BLINK
360#endif 362#endif
361#ifdef POINTER_BLANK 363#ifdef POINTER_BLANK
362 pointer_ev.stop (); 364 pointer_ev.stop ();
363#endif 365#endif
364 366
365 destroy_ev.start (0); 367 destroy_ev.start ();
366} 368}
367 369
368void 370void
369rxvt_term::destroy_cb (time_watcher &w) 371rxvt_term::destroy_cb (ev::idle &w, int revents)
370{ 372{
371 make_current (); 373 make_current ();
372 374
373 delete this; 375 delete this;
374} 376}
428 else 430 else
429 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 431 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
430 mesg, BUFSIZ); 432 mesg, BUFSIZ);
431 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 433 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
432 } 434 }
433 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 435 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
434 mesg, BUFSIZ); 436 mesg, BUFSIZ);
435 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
436} 438}
437#endif 439#endif
438 440
462 DisplayString (display)); 464 DisplayString (display));
463 rxvt_emergency_cleanup (); 465 rxvt_emergency_cleanup ();
464 _exit (EXIT_FAILURE); 466 _exit (EXIT_FAILURE);
465} 467}
466 468
467/*----------------------------------------------------------------------*/
468bool
469rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
470{
471 this->envv = envv;
472
473 SET_R (this);
474 set_locale ("");
475 set_environ (envv); // few things in X do not call setlocale :(
476
477 if (!init_vars ())
478 return false;
479
480 init_secondary ();
481
482 const char **cmd_argv = init_resources (argc, argv);
483
484#ifdef KEYSYM_RESOURCE
485 keyboard->register_done ();
486#endif
487
488#ifdef HAVE_SCROLLBARS
489 if (option (Opt_scrollBar))
490 scrollBar.setIdle (); /* set existence for size calculations */
491#endif
492
493 pty = ptytty::create ();
494
495 create_windows (argc, argv);
496
497 init_xlocale ();
498
499 scr_reset (); // initialize screen
500
501#if 0
502 XSynchronize (dpy, True);
503#endif
504
505#ifdef HAVE_SCROLLBARS
506 if (option (Opt_scrollBar))
507 resize_scrollbar (); /* create and map scrollbar */
508#endif
509#ifdef HAVE_BG_PIXMAP
510 {
511 bgPixmap.set_target (this);
512
513#ifdef ENABLE_TRANSPARENCY
514 if (option (Opt_transparent))
515 {
516 bgPixmap.set_transparent ();
517#ifdef HAVE_AFTERIMAGE
518 if (rs [Rs_blurradius])
519 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
520#endif
521 if (ISSET_PIXCOLOR (Color_tint))
522 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
523 if (rs [Rs_shade])
524 bgPixmap.set_shade (rs [Rs_shade]);
525
526 bgPixmap.set_root_pixmap ();
527 XSelectInput (dpy, display->root, PropertyChangeMask);
528 rootwin_ev.start (display, display->root);
529 }
530#endif
531
532#ifdef BG_IMAGE_FROM_FILE
533 if (rs[Rs_backgroundPixmap] != NULL)
534 {
535 const char *p = rs[Rs_backgroundPixmap];
536
537 if ((p = strchr (p, ';')) != NULL)
538 {
539 p++;
540 bgPixmap.set_geometry (p);
541 }
542 else
543 bgPixmap.set_defaultGeometry ();
544
545 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
546 if (!bgPixmap.window_position_sensitive ())
547 update_background ();
548 }
549#endif
550 }
551#endif
552
553#if ENABLE_PERL
554 rootwin_ev.start (display, display->root);
555#endif
556
557 set_colorfgbg ();
558
559 init_command (cmd_argv);
560
561 free (cmd_argv);
562
563 if (pty->pty >= 0)
564 pty_ev.start (pty->pty, EVENT_READ);
565
566 check_ev.start ();
567
568 HOOK_INVOKE ((this, HOOK_START, DT_END));
569
570#if ENABLE_XEMBED
571 if (rs[Rs_embed])
572 {
573 long info[2] = { 0, XEMBED_MAPPED };
574
575 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
576 32, PropModeReplace, (unsigned char *)&info, 2);
577 }
578#endif
579
580 XMapWindow (dpy, vt);
581 XMapWindow (dpy, parent[0]);
582
583 return true;
584}
585
586static struct sig_handlers 469static struct sig_handlers
587{ 470{
588 sig_watcher sw_term, sw_int; 471 ev::sig sw_term, sw_int;
589 472
590 /* 473 /*
591 * Catch a fatal signal and tidy up before quitting 474 * Catch a fatal signal and tidy up before quitting
592 */ 475 */
593 void 476 void sig_term (ev::sig &w, int revents);
594 sig_term (sig_watcher &w) 477
478 sig_handlers ()
595 { 479 {
596 rxvt_emergency_cleanup (); 480 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
597 signal (w.signum, SIG_DFL);
598 kill (getpid (), w.signum);
599 }
600
601 sig_handlers ()
602 : sw_term (this, &sig_handlers::sig_term),
603 sw_int (this, &sig_handlers::sig_term) 481 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
604 {
605 } 482 }
606} sig_handlers; 483} sig_handlers;
607 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
608char **rxvt_environ; // startup environment 493char **rxvt_environ; // startup environment
609 494
610void 495void
611rxvt_init () 496rxvt_init ()
612{ 497{
613 ptytty::init (); 498 ptytty::init ();
499
500 if (!ev_default_loop (0))
501 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
614 502
615 rxvt_environ = environ; 503 rxvt_environ = environ;
616 504
617 signal (SIGHUP, SIG_IGN); 505 signal (SIGHUP, SIG_IGN);
618 signal (SIGPIPE, SIG_IGN); 506 signal (SIGPIPE, SIG_IGN);
619 507
620 sig_handlers.sw_term.start (SIGTERM); 508 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
621 sig_handlers.sw_int.start (SIGINT); 509 sig_handlers.sw_int.start (SIGINT); ev_unref ();
622 510
623 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 511 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
624 /* signal (SIGURG, SIG_DFL); */ 512 /* signal (SIGURG, SIG_DFL); */
625 513
626 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 514 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
627 // TODO: handle this with exceptions and tolerate the memory loss 515 // TODO: handle this with exceptions and tolerate the memory loss
628 XSetIOErrorHandler (rxvt_xioerror_handler); 516 XSetIOErrorHandler (rxvt_xioerror_handler);
629 517
630 XrmInitialize (); 518 XrmInitialize ();
631}
632
633/* ------------------------------------------------------------------------- *
634 * MEMORY ALLOCATION WRAPPERS *
635 * ------------------------------------------------------------------------- */
636void *
637rxvt_malloc (size_t size)
638{
639 void *p = malloc (size);
640
641 if (!p)
642 rxvt_fatal ("memory allocation failure. aborting.\n");
643
644 return p;
645}
646
647void *
648rxvt_calloc (size_t number, size_t size)
649{
650 void *p = calloc (number, size);
651
652 if (!p)
653 rxvt_fatal ("memory allocation failure. aborting.\n");
654
655 return p;
656}
657
658void *
659rxvt_realloc (void *ptr, size_t size)
660{
661 void *p = realloc (ptr, size);
662
663 if (!p)
664 rxvt_fatal ("memory allocation failure. aborting.\n");
665
666 return p;
667} 519}
668 520
669/*----------------------------------------------------------------------*/ 521/*----------------------------------------------------------------------*/
670/* 522/*
671 * window size/position calculations for XSizeHint and other storage. 523 * window size/position calculations for XSizeHint and other storage.
812 ws.ws_xpixel = width; 664 ws.ws_xpixel = width;
813 ws.ws_ypixel = height; 665 ws.ws_ypixel = height;
814 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 666 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
815 667
816#if 0 668#if 0
817 // TIOCSWINSZ is supposed to do this automatically and correctly 669 // TIOCSWINSZ is supposed to do this automatically and correctly
818 if (cmd_pid) /* force through to the command */ 670 if (cmd_pid) /* force through to the command */
819 kill (-cmd_pid, SIGWINCH); 671 kill (-cmd_pid, SIGWINCH);
820#endif 672#endif
821} 673}
822 674
896 if (parent[0]) 748 if (parent[0])
897 { 749 {
898 resize_all_windows (0, 0, 0); 750 resize_all_windows (0, 0, 0);
899 scr_remap_chars (); 751 scr_remap_chars ();
900 scr_touch (true); 752 scr_touch (true);
901 } 753 }
902 754
903 return true; 755 return true;
904} 756}
905 757
758void
906void rxvt_term::set_string_property (Atom prop, const char *str, int len) 759rxvt_term::set_string_property (Atom prop, const char *str, int len)
907{ 760{
908 XChangeProperty (dpy, parent[0], 761 XChangeProperty (dpy, parent[0],
909 prop, XA_STRING, 8, PropModeReplace, 762 prop, XA_STRING, 8, PropModeReplace,
910 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 763 (const unsigned char *)str, len >= 0 ? len : strlen (str));
911} 764}
912 765
766void
913void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 767rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
914{ 768{
915 wchar_t *ws = rxvt_mbstowcs (str, len); 769 wchar_t *ws = rxvt_mbstowcs (str, len);
916 char *s = rxvt_wcstoutf8 (ws); 770 char *s = rxvt_wcstoutf8 (ws);
917 771
918 XChangeProperty (dpy, parent[0], 772 XChangeProperty (dpy, parent[0],
942#if ENABLE_EWMH 796#if ENABLE_EWMH
943 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 797 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
944#endif 798#endif
945} 799}
946 800
801void
802rxvt_term::set_window_color (int idx, const char *color)
803{
947#ifdef XTERM_COLOR_CHANGE 804#ifdef XTERM_COLOR_CHANGE
948void
949rxvt_term::set_window_color (int idx, const char *color)
950{
951 rxvt_color xcol; 805 rxvt_color xcol;
952 int i; 806
953
954 if (color == NULL || *color == '\0') 807 if (color == NULL || *color == '\0')
955 return; 808 return;
956 809
957 color = strdup (color); 810 color = strdup (color);
958 allocated.push_back ((void *)color); 811 allocated.push_back ((void *)color);
959 rs[Rs_color + idx] = color; 812 rs[Rs_color + idx] = color;
960 813
961 /* handle color aliases */ 814 /* handle color aliases */
962 if (isdigit (*color)) 815 if (isdigit (*color))
963 { 816 {
964 i = atoi (color); 817 int i = atoi (color);
965 818
966 if (i >= 8 && i <= 15) 819 if (i >= 8 && i <= 15)
820 {
967 { /* bright colors */ 821 /* bright colors */
968 i -= 8;
969 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 822 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
970 goto done; 823 goto done;
971 } 824 }
972 825
973 if (i >= 0 && i <= 7) 826 if (i >= 0 && i <= 7)
827 {
974 { /* normal colors */ 828 /* normal colors */
975 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 829 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
976 goto done; 830 goto done;
977 } 831 }
978 } 832 }
979 833
984 * so just keep gobbling up the colormap 838 * so just keep gobbling up the colormap
985 */ 839 */
986 840
987 pix_colors_focused[idx] = xcol; 841 pix_colors_focused[idx] = xcol;
988 842
989 /* XSetWindowAttributes attr; */
990 /* Cursor cursor; */
991done: 843done:
992 /*TODO: handle Color_BD, scrollbar background, etc. */ 844 /*TODO: handle Color_BD, scrollbar background, etc. */
993 845
994 update_fade_color (idx); 846 update_fade_color (idx);
995 recolour_cursor (); 847 recolour_cursor ();
996 scr_recolour (); 848 scr_recolour ();
849#endif /* XTERM_COLOR_CHANGE */
997} 850}
998
999#else
1000# define set_window_color (idx,color) ((void)0)
1001#endif /* XTERM_COLOR_CHANGE */
1002 851
1003void 852void
1004rxvt_term::recolour_cursor () 853rxvt_term::recolour_cursor ()
1005{ 854{
1006 XColor fg, bg; 855 XColor fg, bg;
1022 */ 871 */
1023void 872void
1024rxvt_term::set_colorfgbg () 873rxvt_term::set_colorfgbg ()
1025{ 874{
1026 unsigned int i; 875 unsigned int i;
1027 const char *xpmb = "\0"; 876 const char *xpmb = "";
1028 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 877 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1029 878
1030 strcpy (fstr, "default"); 879 strcpy (fstr, "default");
1031 strcpy (bstr, "default"); 880 strcpy (bstr, "default");
1032 for (i = Color_Black; i <= Color_White; i++) 881 for (i = Color_Black; i <= Color_White; i++)
1342 if (term->rs[Rs_imLocale]) 1191 if (term->rs[Rs_imLocale])
1343 SET_LOCALE (term->locale); 1192 SET_LOCALE (term->locale);
1344 } 1193 }
1345 else 1194 else
1346 str = (void *)text->string.wide_char; 1195 str = (void *)text->string.wide_char;
1347 1196
1348 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1197 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1349 DT_INT, call_data->caret, 1198 DT_INT, call_data->caret,
1350 DT_INT, call_data->chg_first, 1199 DT_INT, call_data->chg_first,
1351 DT_INT, call_data->chg_length, 1200 DT_INT, call_data->chg_length,
1352 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1201 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1671 1520
1672 if (input_style & XIMPreeditPosition) 1521 if (input_style & XIMPreeditPosition)
1673 { 1522 {
1674 im_set_size (preedit_rect); 1523 im_set_size (preedit_rect);
1675 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1524 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1676 1525
1677 XSetICValues (Input_Context, 1526 XSetICValues (Input_Context,
1678 XNPreeditAttributes, preedit_attr, NULL); 1527 XNPreeditAttributes, preedit_attr, NULL);
1679 } 1528 }
1680 else 1529 else
1681 { 1530 {
1698 XFree (status_attr); 1547 XFree (status_attr);
1699 } 1548 }
1700 1549
1701 XFree (preedit_attr); 1550 XFree (preedit_attr);
1702} 1551}
1703#endif /* USE_XIM */ 1552#endif /* USE_XIM */
1704 1553
1705void 1554void
1706rxvt_term::get_window_origin (int &x, int &y) 1555rxvt_term::get_window_origin (int &x, int &y)
1707{ 1556{
1708 Window cr; 1557 Window cr;
1709 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1558 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1710/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/ 1559/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1711} 1560}
1712 1561
1713Pixmap 1562Pixmap
1714rxvt_term::get_pixmap_property (int prop_id) 1563rxvt_term::get_pixmap_property (int prop_id)
1715{ 1564{
1722 unsigned char *prop = NULL; 1571 unsigned char *prop = NULL;
1723 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1572 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1724 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1573 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1725 &nitems, &bytes_after, &prop); 1574 &nitems, &bytes_after, &prop);
1726 if (result == Success && prop && atype == XA_PIXMAP) 1575 if (result == Success && prop && atype == XA_PIXMAP)
1727 {
1728 return *(Pixmap *)prop; 1576 return *(Pixmap *)prop;
1729 }
1730 } 1577 }
1578
1731 return None; 1579 return None;
1732} 1580}
1733 1581
1734#ifdef HAVE_BG_PIXMAP 1582#ifdef HAVE_BG_PIXMAP
1735int 1583# if TRACE_PIXMAPS
1584# undef update_background
1585void
1586rxvt_term::trace_update_background (const char *file, int line)
1587{
1588 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1589 update_background ();
1590}
1591# endif
1592
1593void
1736rxvt_term::update_background () 1594rxvt_term::update_background ()
1737{ 1595{
1596 if (update_background_ev.is_active ())
1597 return;
1598
1738 bgPixmap.invalidate (); 1599 bgPixmap.invalidate ();
1739 1600
1740 /* no chance of real time refresh if we are blurring ! */ 1601 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1741 if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1602
1603 if (to_wait <= 0.)
1742 bgPixmap.render (); 1604 bgPixmap.render ();
1743 else 1605 else
1744 { 1606 update_background_ev.start (to_wait);
1607}
1608
1609void
1610rxvt_term::update_background_cb (ev::timer &w, int revents)
1611{
1612 make_current ();
1613
1745 update_background_ev.stop (); 1614 update_background_ev.stop ();
1746 if (!bgPixmap.need_client_side_rendering())
1747 update_background_ev.start (NOW + .05);
1748 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1749 update_background_ev.start (NOW + .2); /* very slow !!! */
1750 else
1751 update_background_ev.start (NOW + .07);
1752 }
1753 return 0;
1754}
1755
1756void
1757rxvt_term::update_background_cb (time_watcher &w)
1758{
1759 bgPixmap.render (); 1615 bgPixmap.render ();
1616 refresh_check ();
1760} 1617}
1761 1618
1762#endif /* HAVE_BG_PIXMAP */ 1619#endif /* HAVE_BG_PIXMAP */
1763 1620
1764/*----------------------- end-of-file (C source) -----------------------*/ 1621/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines