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.253 by ayin, Mon Oct 15 07:33:48 2007 UTC vs.
Revision 1.300 by root, Sat Jan 19 00:24:53 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-2007 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
156#if HAVE_BG_PIXMAP
157 update_background_ev(this, &rxvt_term::update_background_cb),
158#endif 176#endif
159#ifdef HAVE_SCROLLBARS 177#ifdef HAVE_SCROLLBARS
160 scrollbar_ev (this, &rxvt_term::x_cb), 178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
161#endif 179#endif
162#ifdef CURSOR_BLINK 180#ifdef USE_XIM
163 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 181 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
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 182#endif
177#ifdef POINTER_BLANK 183#ifdef POINTER_BLANK
178 pointer_ev (this, &rxvt_term::pointer_cb), 184 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
179#endif 185#endif
180#ifdef USE_XIM
181 im_ev (this, &rxvt_term::im_cb),
182#endif
183#ifndef NO_BELL 186#ifndef NO_BELL
184 bell_ev (this, &rxvt_term::bell_cb), 187 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
185#endif 188#endif
186 termwin_ev (this, &rxvt_term::x_cb), 189 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
187 vt_ev (this, &rxvt_term::x_cb), 190 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
188 child_ev (this, &rxvt_term::child_cb), 191 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
189 check_ev (this, &rxvt_term::check_cb), 192 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
190 flush_ev (this, &rxvt_term::flush_cb), 193 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
191 destroy_ev (this, &rxvt_term::destroy_cb), 194 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
192 pty_ev (this, &rxvt_term::pty_cb), 195 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
193 incr_ev (this, &rxvt_term::incr_cb) 196
194{
195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 197 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196 198
197 termlist.push_back (this); 199 termlist.push_back (this);
198 200
199#ifdef KEYSYM_RESOURCE 201#ifdef KEYSYM_RESOURCE
223 for (int i = RS_styleCount; --i; ) 225 for (int i = RS_styleCount; --i; )
224 if (fontset[i] != fontset[0]) 226 if (fontset[i] != fontset[0])
225 delete fontset[i]; 227 delete fontset[i];
226#endif 228#endif
227 delete fontset[0]; 229 delete fontset[0];
230
231#ifdef HAVE_BG_PIXMAP
232 bgPixmap.destroy ();
233#endif
228 234
229 if (display) 235 if (display)
230 { 236 {
231 selection_clear (); 237 selection_clear ();
232 238
272 pix_colors_unfocused [i].free (this); 278 pix_colors_unfocused [i].free (this);
273#endif 279#endif
274 } 280 }
275 281
276 clear (); 282 clear ();
277 }
278 283
279 delete [] pix_colors_focused; 284 display->flush (); /* ideally .put should do this */
280#if OFF_FOCUS_FADING
281 delete [] pix_colors_unfocused;
282#endif
283
284 displays.put (display); 285 displays.put (display);
286 }
285 287
286 scr_release (); 288 scr_release ();
287 289
288 /* clear all resources */ 290 /* clear all resources */
289 for (int i = 0; i < allocated.size (); i++) 291 for (int i = 0; i < allocated.size (); i++)
301 delete argv; 303 delete argv;
302 304
303#ifdef KEYSYM_RESOURCE 305#ifdef KEYSYM_RESOURCE
304 delete keyboard; 306 delete keyboard;
305#endif 307#endif
308#ifndef NO_RESOURCES
309 XrmDestroyDatabase (option_db);
310#endif
306} 311}
307 312
308// child has exited, usually destroys 313// child has exited, usually destroys
309void 314void
310rxvt_term::child_cb (child_watcher &w, int status) 315rxvt_term::child_cb (ev::child &w, int status)
311{ 316{
312 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 317 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
313 318
314 cmd_pid = 0; 319 cmd_pid = 0;
315 320
318} 323}
319 324
320void 325void
321rxvt_term::destroy () 326rxvt_term::destroy ()
322{ 327{
323 if (destroy_ev.active) 328 if (destroy_ev.is_active ())
324 return; 329 return;
325 330
326 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 331 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
327 332
328#if ENABLE_OVERLAY 333#if ENABLE_OVERLAY
343 incr_ev.stop (); 348 incr_ev.stop ();
344 termwin_ev.stop (display); 349 termwin_ev.stop (display);
345 vt_ev.stop (display); 350 vt_ev.stop (display);
346 } 351 }
347 352
348 check_ev.stop (); 353 flush_ev.stop ();
349 pty_ev.stop (); 354 pty_ev.stop ();
350#ifdef CURSOR_BLINK 355#ifdef CURSOR_BLINK
351 cursor_blink_ev.stop (); 356 cursor_blink_ev.stop ();
352#endif 357#endif
353#ifdef TEXT_BLINK 358#ifdef TEXT_BLINK
361#endif 366#endif
362#ifdef POINTER_BLANK 367#ifdef POINTER_BLANK
363 pointer_ev.stop (); 368 pointer_ev.stop ();
364#endif 369#endif
365 370
366 destroy_ev.start (0); 371 destroy_ev.start ();
367} 372}
368 373
369void 374void
370rxvt_term::destroy_cb (time_watcher &w) 375rxvt_term::destroy_cb (ev::idle &w, int revents)
371{ 376{
372 make_current (); 377 make_current ();
373 378
374 delete this; 379 delete this;
375} 380}
429 else 434 else
430 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 435 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
431 mesg, BUFSIZ); 436 mesg, BUFSIZ);
432 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
433 } 438 }
434 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 439 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
435 mesg, BUFSIZ); 440 mesg, BUFSIZ);
436 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 441 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
437} 442}
438#endif 443#endif
439 444
464 rxvt_emergency_cleanup (); 469 rxvt_emergency_cleanup ();
465 _exit (EXIT_FAILURE); 470 _exit (EXIT_FAILURE);
466} 471}
467 472
468/*----------------------------------------------------------------------*/ 473/*----------------------------------------------------------------------*/
469bool 474void
470rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 475rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
471{ 476{
472 this->envv = envv; 477 this->envv = envv;
473 478
474 SET_R (this); 479 SET_R (this);
475 set_locale (""); 480 set_locale ("");
476 set_environ (envv); // few things in X do not call setlocale :( 481 set_environ (envv); // few things in X do not call setlocale :(
477 482
478 if (!init_vars ()) 483 init_vars ();
479 return false;
480 484
481 init_secondary (); 485 init_secondary ();
482 486
483 const char **cmd_argv = init_resources (argc, argv); 487 const char **cmd_argv = init_resources (argc, argv);
484 488
508 resize_scrollbar (); /* create and map scrollbar */ 512 resize_scrollbar (); /* create and map scrollbar */
509#endif 513#endif
510#ifdef HAVE_BG_PIXMAP 514#ifdef HAVE_BG_PIXMAP
511 { 515 {
512 bgPixmap.set_target (this); 516 bgPixmap.set_target (this);
517 bgPixmap.invalidate ();
513 518
514#ifdef ENABLE_TRANSPARENCY 519#ifdef ENABLE_TRANSPARENCY
515 if (option (Opt_transparent)) 520 if (option (Opt_transparent))
516 { 521 {
517 bgPixmap.set_transparent (); 522 bgPixmap.set_transparent ();
523
518#ifdef HAVE_AFTERIMAGE 524#ifdef HAVE_AFTERIMAGE
519 if (rs [Rs_blurradius]) 525 if (rs [Rs_blurradius])
520 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 526 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
521#endif 527#endif
522 if (ISSET_PIXCOLOR (Color_tint)) 528 if (ISSET_PIXCOLOR (Color_tint))
523 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 529 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
530
524 if (rs [Rs_shade]) 531 if (rs [Rs_shade])
525 bgPixmap.set_shade (rs [Rs_shade]); 532 bgPixmap.set_shade (rs [Rs_shade]);
526 533
527 bgPixmap.set_root_pixmap (); 534 bgPixmap.set_root_pixmap ();
528 XSelectInput (dpy, display->root, PropertyChangeMask); 535 XSelectInput (dpy, display->root, PropertyChangeMask);
529 rootwin_ev.start (display, display->root); 536 rootwin_ev.start (display, display->root);
530 } 537 }
531#endif 538#endif
532 539
533#ifdef BG_IMAGE_FROM_FILE 540#ifdef BG_IMAGE_FROM_FILE
534 if (rs[Rs_backgroundPixmap] != NULL) 541 if (rs[Rs_backgroundPixmap])
535 { 542 {
536 const char *p = rs[Rs_backgroundPixmap]; 543 const char *p = rs[Rs_backgroundPixmap];
537 544
538 if ((p = strchr (p, ';')) != NULL) 545 if ((p = strchr (p, ';')) != 0)
539 { 546 {
540 p++; 547 p++;
541 bgPixmap.set_geometry (p); 548 bgPixmap.set_geometry (p);
542 } 549 }
543 else 550 else
560 init_command (cmd_argv); 567 init_command (cmd_argv);
561 568
562 free (cmd_argv); 569 free (cmd_argv);
563 570
564 if (pty->pty >= 0) 571 if (pty->pty >= 0)
565 pty_ev.start (pty->pty, EVENT_READ); 572 pty_ev.start (pty->pty, ev::READ);
566
567 check_ev.start ();
568 573
569 HOOK_INVOKE ((this, HOOK_START, DT_END)); 574 HOOK_INVOKE ((this, HOOK_START, DT_END));
570 575
571#if ENABLE_XEMBED 576#if ENABLE_XEMBED
572 if (rs[Rs_embed]) 577 if (rs[Rs_embed])
579#endif 584#endif
580 585
581 XMapWindow (dpy, vt); 586 XMapWindow (dpy, vt);
582 XMapWindow (dpy, parent[0]); 587 XMapWindow (dpy, parent[0]);
583 588
584 return true; 589 refresh_check ();
585} 590}
586 591
587static struct sig_handlers 592static struct sig_handlers
588{ 593{
589 sig_watcher sw_term, sw_int; 594 ev::sig sw_term, sw_int;
590 595
591 /* 596 /*
592 * Catch a fatal signal and tidy up before quitting 597 * Catch a fatal signal and tidy up before quitting
593 */ 598 */
594 void 599 void sig_term (ev::sig &w, int revents);
595 sig_term (sig_watcher &w) 600
601 sig_handlers ()
596 { 602 {
597 rxvt_emergency_cleanup (); 603 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
598 signal (w.signum, SIG_DFL);
599 kill (getpid (), w.signum);
600 }
601
602 sig_handlers ()
603 : sw_term (this, &sig_handlers::sig_term),
604 sw_int (this, &sig_handlers::sig_term) 604 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
605 {
606 } 605 }
607} sig_handlers; 606} sig_handlers;
608 607
608void
609sig_handlers::sig_term (ev::sig &w, int revents)
610{
611 rxvt_emergency_cleanup ();
612 w.stop ();
613 kill (getpid (), w.signum);
614}
615
609char **rxvt_environ; // startup environment 616char **rxvt_environ; // startup environment
610 617
611void 618void
612rxvt_init () 619rxvt_init ()
613{ 620{
614 ptytty::init (); 621 ptytty::init ();
622
623 if (!ev_default_loop (0))
624 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
615 625
616 rxvt_environ = environ; 626 rxvt_environ = environ;
617 627
618 signal (SIGHUP, SIG_IGN); 628 signal (SIGHUP, SIG_IGN);
619 signal (SIGPIPE, SIG_IGN); 629 signal (SIGPIPE, SIG_IGN);
620 630
621 sig_handlers.sw_term.start (SIGTERM); 631 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
622 sig_handlers.sw_int.start (SIGINT); 632 sig_handlers.sw_int.start (SIGINT); ev_unref ();
623 633
624 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 634 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
625 /* signal (SIGURG, SIG_DFL); */ 635 /* signal (SIGURG, SIG_DFL); */
626 636
627 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 637 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
628 // TODO: handle this with exceptions and tolerate the memory loss 638 // TODO: handle this with exceptions and tolerate the memory loss
629 XSetIOErrorHandler (rxvt_xioerror_handler); 639 XSetIOErrorHandler (rxvt_xioerror_handler);
630 640
631 XrmInitialize (); 641 XrmInitialize ();
632}
633
634/* ------------------------------------------------------------------------- *
635 * MEMORY ALLOCATION WRAPPERS *
636 * ------------------------------------------------------------------------- */
637void *
638rxvt_malloc (size_t size)
639{
640 void *p = malloc (size);
641
642 if (!p)
643 rxvt_fatal ("memory allocation failure. aborting.\n");
644
645 return p;
646}
647
648void *
649rxvt_calloc (size_t number, size_t size)
650{
651 void *p = calloc (number, size);
652
653 if (!p)
654 rxvt_fatal ("memory allocation failure. aborting.\n");
655
656 return p;
657}
658
659void *
660rxvt_realloc (void *ptr, size_t size)
661{
662 void *p = realloc (ptr, size);
663
664 if (!p)
665 rxvt_fatal ("memory allocation failure. aborting.\n");
666
667 return p;
668} 642}
669 643
670/*----------------------------------------------------------------------*/ 644/*----------------------------------------------------------------------*/
671/* 645/*
672 * window size/position calculations for XSizeHint and other storage. 646 * window size/position calculations for XSizeHint and other storage.
813 ws.ws_xpixel = width; 787 ws.ws_xpixel = width;
814 ws.ws_ypixel = height; 788 ws.ws_ypixel = height;
815 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 789 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
816 790
817#if 0 791#if 0
818 // TIOCSWINSZ is supposed to do this automatically and correctly 792 // TIOCSWINSZ is supposed to do this automatically and correctly
819 if (cmd_pid) /* force through to the command */ 793 if (cmd_pid) /* force through to the command */
820 kill (-cmd_pid, SIGWINCH); 794 kill (-cmd_pid, SIGWINCH);
821#endif 795#endif
822} 796}
823 797
897 if (parent[0]) 871 if (parent[0])
898 { 872 {
899 resize_all_windows (0, 0, 0); 873 resize_all_windows (0, 0, 0);
900 scr_remap_chars (); 874 scr_remap_chars ();
901 scr_touch (true); 875 scr_touch (true);
902 } 876 }
903 877
904 return true; 878 return true;
905} 879}
906 880
907void 881void
951rxvt_term::set_window_color (int idx, const char *color) 925rxvt_term::set_window_color (int idx, const char *color)
952{ 926{
953#ifdef XTERM_COLOR_CHANGE 927#ifdef XTERM_COLOR_CHANGE
954 rxvt_color xcol; 928 rxvt_color xcol;
955 int i; 929 int i;
956 930
957 if (color == NULL || *color == '\0') 931 if (color == NULL || *color == '\0')
958 return; 932 return;
959 933
960 color = strdup (color); 934 color = strdup (color);
961 allocated.push_back ((void *)color); 935 allocated.push_back ((void *)color);
965 if (isdigit (*color)) 939 if (isdigit (*color))
966 { 940 {
967 i = atoi (color); 941 i = atoi (color);
968 942
969 if (i >= 8 && i <= 15) 943 if (i >= 8 && i <= 15)
944 {
970 { /* bright colors */ 945 /* bright colors */
971 i -= 8;
972 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 946 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
973 goto done; 947 goto done;
974 } 948 }
975 949
976 if (i >= 0 && i <= 7) 950 if (i >= 0 && i <= 7)
951 {
977 { /* normal colors */ 952 /* normal colors */
978 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 953 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
979 goto done; 954 goto done;
980 } 955 }
981 } 956 }
982 957
987 * so just keep gobbling up the colormap 962 * so just keep gobbling up the colormap
988 */ 963 */
989 964
990 pix_colors_focused[idx] = xcol; 965 pix_colors_focused[idx] = xcol;
991 966
992 /* XSetWindowAttributes attr; */
993 /* Cursor cursor; */
994done: 967done:
995 /*TODO: handle Color_BD, scrollbar background, etc. */ 968 /*TODO: handle Color_BD, scrollbar background, etc. */
996 969
997 update_fade_color (idx); 970 update_fade_color (idx);
998 recolour_cursor (); 971 recolour_cursor ();
999 scr_recolour (); 972 scr_recolour ();
1000#endif /* XTERM_COLOR_CHANGE */ 973#endif /* XTERM_COLOR_CHANGE */
1001} 974}
1002 975
1003void 976void
1004rxvt_term::recolour_cursor () 977rxvt_term::recolour_cursor ()
1005{ 978{
1022 */ 995 */
1023void 996void
1024rxvt_term::set_colorfgbg () 997rxvt_term::set_colorfgbg ()
1025{ 998{
1026 unsigned int i; 999 unsigned int i;
1027 const char *xpmb = "\0"; 1000 const char *xpmb = "";
1028 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1001 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1029 1002
1030 strcpy (fstr, "default"); 1003 strcpy (fstr, "default");
1031 strcpy (bstr, "default"); 1004 strcpy (bstr, "default");
1032 for (i = Color_Black; i <= Color_White; i++) 1005 for (i = Color_Black; i <= Color_White; i++)
1342 if (term->rs[Rs_imLocale]) 1315 if (term->rs[Rs_imLocale])
1343 SET_LOCALE (term->locale); 1316 SET_LOCALE (term->locale);
1344 } 1317 }
1345 else 1318 else
1346 str = (void *)text->string.wide_char; 1319 str = (void *)text->string.wide_char;
1347 1320
1348 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1321 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1349 DT_INT, call_data->caret, 1322 DT_INT, call_data->caret,
1350 DT_INT, call_data->chg_first, 1323 DT_INT, call_data->chg_first,
1351 DT_INT, call_data->chg_length, 1324 DT_INT, call_data->chg_length,
1352 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1325 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1671 1644
1672 if (input_style & XIMPreeditPosition) 1645 if (input_style & XIMPreeditPosition)
1673 { 1646 {
1674 im_set_size (preedit_rect); 1647 im_set_size (preedit_rect);
1675 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1648 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1676 1649
1677 XSetICValues (Input_Context, 1650 XSetICValues (Input_Context,
1678 XNPreeditAttributes, preedit_attr, NULL); 1651 XNPreeditAttributes, preedit_attr, NULL);
1679 } 1652 }
1680 else 1653 else
1681 { 1654 {
1698 XFree (status_attr); 1671 XFree (status_attr);
1699 } 1672 }
1700 1673
1701 XFree (preedit_attr); 1674 XFree (preedit_attr);
1702} 1675}
1703#endif /* USE_XIM */ 1676#endif /* USE_XIM */
1704 1677
1705void 1678void
1706rxvt_term::get_window_origin (int &x, int &y) 1679rxvt_term::get_window_origin (int &x, int &y)
1707{ 1680{
1708 Window cr; 1681 Window cr;
1709 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1682 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1710/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/ 1683/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1711} 1684}
1712 1685
1713Pixmap 1686Pixmap
1714rxvt_term::get_pixmap_property (int prop_id) 1687rxvt_term::get_pixmap_property (int prop_id)
1715{ 1688{
1722 unsigned char *prop = NULL; 1695 unsigned char *prop = NULL;
1723 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1696 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1724 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1697 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1725 &nitems, &bytes_after, &prop); 1698 &nitems, &bytes_after, &prop);
1726 if (result == Success && prop && atype == XA_PIXMAP) 1699 if (result == Success && prop && atype == XA_PIXMAP)
1727 {
1728 return *(Pixmap *)prop; 1700 return *(Pixmap *)prop;
1729 }
1730 } 1701 }
1702
1731 return None; 1703 return None;
1732} 1704}
1733 1705
1734#ifdef HAVE_BG_PIXMAP 1706#ifdef HAVE_BG_PIXMAP
1735int 1707# if TRACE_PIXMAPS
1708# undef update_background
1709void
1710rxvt_term::trace_update_background (const char *file, int line)
1711{
1712 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1713 update_background ();
1714}
1715# endif
1716
1717void
1736rxvt_term::update_background () 1718rxvt_term::update_background ()
1737{ 1719{
1720 if (update_background_ev.is_active ())
1721 return;
1722
1738 bgPixmap.invalidate (); 1723 bgPixmap.invalidate ();
1739 1724
1740 /* no chance of real time refresh if we are blurring ! */ 1725 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1741 if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1726
1727 if (to_wait <= 0.)
1742 bgPixmap.render (); 1728 bgPixmap.render ();
1743 else 1729 else
1744 { 1730 update_background_ev.start (to_wait);
1731}
1732
1733void
1734rxvt_term::update_background_cb (ev::timer &w, int revents)
1735{
1736 make_current ();
1737
1745 update_background_ev.stop (); 1738 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 (); 1739 bgPixmap.render ();
1740 refresh_check ();
1760} 1741}
1761 1742
1762#endif /* HAVE_BG_PIXMAP */ 1743#endif /* HAVE_BG_PIXMAP */
1763 1744
1764/*----------------------- end-of-file (C source) -----------------------*/ 1745/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines