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.239 by sasha, Fri Aug 3 22:40:10 2007 UTC vs.
Revision 1.299 by sasha, Tue Jan 15 23:21:18 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 ENABLE_TRANSPARENCY
157 check_our_parents_ev(this, &rxvt_term::check_our_parents_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
… …
201#endif 203#endif
202} 204}
203 205
204// clean up the most important stuff, do *not* call x or free mem etc. 206// clean up the most important stuff, do *not* call x or free mem etc.
205// for use before an emergency exit 207// for use before an emergency exit
208void
206void rxvt_term::emergency_cleanup () 209rxvt_term::emergency_cleanup ()
207{ 210{
208 if (cmd_pid) 211 if (cmd_pid)
209 kill (-cmd_pid, SIGHUP); 212 kill (-cmd_pid, SIGHUP);
210 213
211 pty_ev.stop (); 214 pty_ev.stop ();
… …
273 } 276 }
274 277
275 clear (); 278 clear ();
276 } 279 }
277 280
278 delete [] pix_colors_focused; 281#ifdef HAVE_BG_PIXMAP
279#if OFF_FOCUS_FADING 282 bgPixmap.destroy ();
280 delete [] pix_colors_unfocused;
281#endif 283#endif
282 284 display->flush (); /* ideally .put should do this */
283 displays.put (display); 285 displays.put (display);
284 286
285 scr_release (); 287 scr_release ();
286 288
287 /* clear all resources */ 289 /* clear all resources */
… …
300 delete argv; 302 delete argv;
301 303
302#ifdef KEYSYM_RESOURCE 304#ifdef KEYSYM_RESOURCE
303 delete keyboard; 305 delete keyboard;
304#endif 306#endif
307#ifndef NO_RESOURCES
308 XrmDestroyDatabase (option_db);
309#endif
305} 310}
306 311
307// child has exited, usually destroys 312// child has exited, usually destroys
308void 313void
309rxvt_term::child_cb (child_watcher &w, int status) 314rxvt_term::child_cb (ev::child &w, int status)
310{ 315{
311 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 316 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
312 317
313 cmd_pid = 0; 318 cmd_pid = 0;
314 319
… …
317} 322}
318 323
319void 324void
320rxvt_term::destroy () 325rxvt_term::destroy ()
321{ 326{
322 if (destroy_ev.active) 327 if (destroy_ev.is_active ())
323 return; 328 return;
324 329
325 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 330 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
326 331
327#if ENABLE_OVERLAY 332#if ENABLE_OVERLAY
… …
342 incr_ev.stop (); 347 incr_ev.stop ();
343 termwin_ev.stop (display); 348 termwin_ev.stop (display);
344 vt_ev.stop (display); 349 vt_ev.stop (display);
345 } 350 }
346 351
347 check_ev.stop (); 352 flush_ev.stop ();
348 pty_ev.stop (); 353 pty_ev.stop ();
349#ifdef CURSOR_BLINK 354#ifdef CURSOR_BLINK
350 cursor_blink_ev.stop (); 355 cursor_blink_ev.stop ();
351#endif 356#endif
352#ifdef TEXT_BLINK 357#ifdef TEXT_BLINK
… …
360#endif 365#endif
361#ifdef POINTER_BLANK 366#ifdef POINTER_BLANK
362 pointer_ev.stop (); 367 pointer_ev.stop ();
363#endif 368#endif
364 369
365 destroy_ev.start (0); 370 destroy_ev.start ();
366} 371}
367 372
368void 373void
369rxvt_term::destroy_cb (time_watcher &w) 374rxvt_term::destroy_cb (ev::idle &w, int revents)
370{ 375{
371 make_current (); 376 make_current ();
372 377
373 delete this; 378 delete this;
374} 379}
… …
428 else 433 else
429 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 434 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
430 mesg, BUFSIZ); 435 mesg, BUFSIZ);
431 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 436 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
432 } 437 }
433 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 438 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
434 mesg, BUFSIZ); 439 mesg, BUFSIZ);
435 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 440 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
436} 441}
437#endif 442#endif
438 443
… …
463 rxvt_emergency_cleanup (); 468 rxvt_emergency_cleanup ();
464 _exit (EXIT_FAILURE); 469 _exit (EXIT_FAILURE);
465} 470}
466 471
467/*----------------------------------------------------------------------*/ 472/*----------------------------------------------------------------------*/
468bool 473void
469rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 474rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
470{ 475{
471 this->envv = envv; 476 this->envv = envv;
472 477
473 SET_R (this); 478 SET_R (this);
474 set_locale (""); 479 set_locale ("");
475 set_environ (envv); // few things in X do not call setlocale :( 480 set_environ (envv); // few things in X do not call setlocale :(
476 481
477 if (!init_vars ()) 482 init_vars ();
478 return false;
479 483
480 init_secondary (); 484 init_secondary ();
481 485
482 const char **cmd_argv = init_resources (argc, argv); 486 const char **cmd_argv = init_resources (argc, argv);
483 487
… …
504 508
505#ifdef HAVE_SCROLLBARS 509#ifdef HAVE_SCROLLBARS
506 if (option (Opt_scrollBar)) 510 if (option (Opt_scrollBar))
507 resize_scrollbar (); /* create and map scrollbar */ 511 resize_scrollbar (); /* create and map scrollbar */
508#endif 512#endif
513#ifdef HAVE_BG_PIXMAP
514 {
515 bgPixmap.set_target (this);
516 bgPixmap.invalidate ();
517
509#ifdef ENABLE_TRANSPARENCY 518#ifdef ENABLE_TRANSPARENCY
510 if (option (Opt_transparent)) 519 if (option (Opt_transparent))
511 { 520 {
521 bgPixmap.set_transparent ();
522
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
530 if (rs [Rs_shade])
531 bgPixmap.set_shade (rs [Rs_shade]);
532
533 bgPixmap.set_root_pixmap ();
512 XSelectInput (dpy, display->root, PropertyChangeMask); 534 XSelectInput (dpy, display->root, PropertyChangeMask);
513 check_our_parents ();
514 rootwin_ev.start (display, display->root); 535 rootwin_ev.start (display, display->root);
515 } 536 }
516#endif 537#endif
538
539#ifdef BG_IMAGE_FROM_FILE
540 if (rs[Rs_backgroundPixmap])
541 {
542 const char *p = rs[Rs_backgroundPixmap];
543
544 if ((p = strchr (p, ';')) != 0)
545 {
546 p++;
547 bgPixmap.set_geometry (p);
548 }
549 else
550 bgPixmap.set_defaultGeometry ();
551
552 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
553 if (!bgPixmap.window_position_sensitive ())
554 update_background ();
555 }
556#endif
557 }
558#endif
559
517#if ENABLE_PERL 560#if ENABLE_PERL
518 rootwin_ev.start (display, display->root); 561 rootwin_ev.start (display, display->root);
519#endif 562#endif
520 563
521 set_colorfgbg (); 564 set_colorfgbg ();
… …
523 init_command (cmd_argv); 566 init_command (cmd_argv);
524 567
525 free (cmd_argv); 568 free (cmd_argv);
526 569
527 if (pty->pty >= 0) 570 if (pty->pty >= 0)
528 pty_ev.start (pty->pty, EVENT_READ); 571 pty_ev.start (pty->pty, ev::READ);
529
530 check_ev.start ();
531 572
532 HOOK_INVOKE ((this, HOOK_START, DT_END)); 573 HOOK_INVOKE ((this, HOOK_START, DT_END));
533 574
534#if ENABLE_XEMBED 575#if ENABLE_XEMBED
535 if (rs[Rs_embed]) 576 if (rs[Rs_embed])
… …
542#endif 583#endif
543 584
544 XMapWindow (dpy, vt); 585 XMapWindow (dpy, vt);
545 XMapWindow (dpy, parent[0]); 586 XMapWindow (dpy, parent[0]);
546 587
547 return true; 588 refresh_check ();
548} 589}
549 590
550static struct sig_handlers 591static struct sig_handlers
551{ 592{
552 sig_watcher sw_term, sw_int; 593 ev::sig sw_term, sw_int;
553 594
554 /* 595 /*
555 * Catch a fatal signal and tidy up before quitting 596 * Catch a fatal signal and tidy up before quitting
556 */ 597 */
557 void 598 void sig_term (ev::sig &w, int revents);
558 sig_term (sig_watcher &w) 599
600 sig_handlers ()
559 { 601 {
560 rxvt_emergency_cleanup (); 602 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
561 signal (w.signum, SIG_DFL);
562 kill (getpid (), w.signum);
563 }
564
565 sig_handlers ()
566 : sw_term (this, &sig_handlers::sig_term),
567 sw_int (this, &sig_handlers::sig_term) 603 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
568 {
569 } 604 }
570} sig_handlers; 605} sig_handlers;
571 606
607void
608sig_handlers::sig_term (ev::sig &w, int revents)
609{
610 rxvt_emergency_cleanup ();
611 w.stop ();
612 kill (getpid (), w.signum);
613}
614
572char **rxvt_environ; // startup environment 615char **rxvt_environ; // startup environment
573 616
574void 617void
575rxvt_init () 618rxvt_init ()
576{ 619{
577 ptytty::init (); 620 ptytty::init ();
621
622 if (!ev_default_loop (0))
623 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
578 624
579 rxvt_environ = environ; 625 rxvt_environ = environ;
580 626
581 signal (SIGHUP, SIG_IGN); 627 signal (SIGHUP, SIG_IGN);
582 signal (SIGPIPE, SIG_IGN); 628 signal (SIGPIPE, SIG_IGN);
583 629
584 sig_handlers.sw_term.start (SIGTERM); 630 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
585 sig_handlers.sw_int.start (SIGINT); 631 sig_handlers.sw_int.start (SIGINT); ev_unref ();
586 632
587 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 633 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
588 /* signal (SIGURG, SIG_DFL); */ 634 /* signal (SIGURG, SIG_DFL); */
589 635
590 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 636 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
591 // TODO: handle this with exceptions and tolerate the memory loss 637 // TODO: handle this with exceptions and tolerate the memory loss
592 XSetIOErrorHandler (rxvt_xioerror_handler); 638 XSetIOErrorHandler (rxvt_xioerror_handler);
593 639
594 XrmInitialize (); 640 XrmInitialize ();
595}
596
597/* ------------------------------------------------------------------------- *
598 * MEMORY ALLOCATION WRAPPERS *
599 * ------------------------------------------------------------------------- */
600void *
601rxvt_malloc (size_t size)
602{
603 void *p = malloc (size);
604
605 if (!p)
606 rxvt_fatal ("memory allocation failure. aborting.\n");
607
608 return p;
609}
610
611void *
612rxvt_calloc (size_t number, size_t size)
613{
614 void *p = calloc (number, size);
615
616 if (!p)
617 rxvt_fatal ("memory allocation failure. aborting.\n");
618
619 return p;
620}
621
622void *
623rxvt_realloc (void *ptr, size_t size)
624{
625 void *p = realloc (ptr, size);
626
627 if (!p)
628 rxvt_fatal ("memory allocation failure. aborting.\n");
629
630 return p;
631} 641}
632 642
633/*----------------------------------------------------------------------*/ 643/*----------------------------------------------------------------------*/
634/* 644/*
635 * window size/position calculations for XSizeHint and other storage. 645 * window size/position calculations for XSizeHint and other storage.
… …
776 ws.ws_xpixel = width; 786 ws.ws_xpixel = width;
777 ws.ws_ypixel = height; 787 ws.ws_ypixel = height;
778 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 788 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
779 789
780#if 0 790#if 0
781 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 791 // TIOCSWINSZ is supposed to do this automatically and correctly
782 if (cmd_pid) /* force through to the command */ 792 if (cmd_pid) /* force through to the command */
783 kill (-cmd_pid, SIGWINCH); 793 kill (-cmd_pid, SIGWINCH);
784#endif 794#endif
785} 795}
786 796
… …
860 if (parent[0]) 870 if (parent[0])
861 { 871 {
862 resize_all_windows (0, 0, 0); 872 resize_all_windows (0, 0, 0);
863 scr_remap_chars (); 873 scr_remap_chars ();
864 scr_touch (true); 874 scr_touch (true);
865 } 875 }
866 876
867 return true; 877 return true;
868} 878}
869 879
880void
870void rxvt_term::set_string_property (Atom prop, const char *str, int len) 881rxvt_term::set_string_property (Atom prop, const char *str, int len)
871{ 882{
872 XChangeProperty (dpy, parent[0], 883 XChangeProperty (dpy, parent[0],
873 prop, XA_STRING, 8, PropModeReplace, 884 prop, XA_STRING, 8, PropModeReplace,
874 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 885 (const unsigned char *)str, len >= 0 ? len : strlen (str));
875} 886}
876 887
888void
877void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 889rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
878{ 890{
879 wchar_t *ws = rxvt_mbstowcs (str, len); 891 wchar_t *ws = rxvt_mbstowcs (str, len);
880 char *s = rxvt_wcstoutf8 (ws); 892 char *s = rxvt_wcstoutf8 (ws);
881 893
882 XChangeProperty (dpy, parent[0], 894 XChangeProperty (dpy, parent[0],
… …
906#if ENABLE_EWMH 918#if ENABLE_EWMH
907 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 919 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
908#endif 920#endif
909} 921}
910 922
923void
924rxvt_term::set_window_color (int idx, const char *color)
925{
911#ifdef XTERM_COLOR_CHANGE 926#ifdef XTERM_COLOR_CHANGE
912void
913rxvt_term::set_window_color (int idx, const char *color)
914{
915 rxvt_color xcol; 927 rxvt_color xcol;
916 int i; 928 int i;
917 929
918 if (color == NULL || *color == '\0') 930 if (color == NULL || *color == '\0')
919 return; 931 return;
920 932
921 color = strdup (color); 933 color = strdup (color);
922 allocated.push_back ((void *)color); 934 allocated.push_back ((void *)color);
… …
926 if (isdigit (*color)) 938 if (isdigit (*color))
927 { 939 {
928 i = atoi (color); 940 i = atoi (color);
929 941
930 if (i >= 8 && i <= 15) 942 if (i >= 8 && i <= 15)
943 {
931 { /* bright colors */ 944 /* bright colors */
932 i -= 8;
933 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 945 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
934 goto done; 946 goto done;
935 } 947 }
936 948
937 if (i >= 0 && i <= 7) 949 if (i >= 0 && i <= 7)
950 {
938 { /* normal colors */ 951 /* normal colors */
939 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 952 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
940 goto done; 953 goto done;
941 } 954 }
942 } 955 }
943 956
… …
948 * so just keep gobbling up the colormap 961 * so just keep gobbling up the colormap
949 */ 962 */
950 963
951 pix_colors_focused[idx] = xcol; 964 pix_colors_focused[idx] = xcol;
952 965
953 /* XSetWindowAttributes attr; */
954 /* Cursor cursor; */
955done: 966done:
956 /*TODO: handle Color_BD, scrollbar background, etc. */ 967 /*TODO: handle Color_BD, scrollbar background, etc. */
957 968
958 update_fade_color (idx); 969 update_fade_color (idx);
959 recolour_cursor (); 970 recolour_cursor ();
960 scr_recolour (); 971 scr_recolour ();
972#endif /* XTERM_COLOR_CHANGE */
961} 973}
962
963#else
964# define set_window_color (idx,color) ((void)0)
965#endif /* XTERM_COLOR_CHANGE */
966 974
967void 975void
968rxvt_term::recolour_cursor () 976rxvt_term::recolour_cursor ()
969{ 977{
970 XColor fg, bg; 978 XColor fg, bg;
… …
986 */ 994 */
987void 995void
988rxvt_term::set_colorfgbg () 996rxvt_term::set_colorfgbg ()
989{ 997{
990 unsigned int i; 998 unsigned int i;
991 const char *xpmb = "\0"; 999 const char *xpmb = "";
992 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1000 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
993 1001
994 strcpy (fstr, "default"); 1002 strcpy (fstr, "default");
995 strcpy (bstr, "default"); 1003 strcpy (bstr, "default");
996 for (i = Color_Black; i <= Color_White; i++) 1004 for (i = Color_Black; i <= Color_White; i++)
… …
1002 1010
1003 for (i = Color_Black; i <= Color_White; i++) 1011 for (i = Color_Black; i <= Color_White; i++)
1004 if (pix_colors[Color_bg] == pix_colors[i]) 1012 if (pix_colors[Color_bg] == pix_colors[i])
1005 { 1013 {
1006 sprintf (bstr, "%d", (i - Color_Black)); 1014 sprintf (bstr, "%d", (i - Color_Black));
1007#ifdef XPM_BACKGROUND 1015#ifdef BG_IMAGE_FROM_FILE
1008 xpmb = "default;"; 1016 xpmb = "default;";
1009#endif 1017#endif
1010 break; 1018 break;
1011 } 1019 }
1012 1020
… …
1108 1116
1109 XMoveResizeWindow (dpy, vt, 1117 XMoveResizeWindow (dpy, vt,
1110 window_vt_x, window_vt_y, 1118 window_vt_x, window_vt_y,
1111 width, height); 1119 width, height);
1112 1120
1121#ifdef HAVE_BG_PIXMAP
1122 if (bgPixmap.window_size_sensitive ())
1123 update_background ();
1124#endif
1125
1113 scr_clear (); 1126 scr_clear ();
1114#ifdef XPM_BACKGROUND
1115 resize_pixmap ();
1116#endif
1117 } 1127 }
1118 1128
1119 if (fix_screen || old_height == 0) 1129 if (fix_screen || old_height == 0)
1120 scr_reset (); 1130 scr_reset ();
1121 1131
1122 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version 1132 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1123 //scr_touch (false); 1133 //scr_touch (false);
1124 1134
1125#ifdef HAVE_BG_PIXMAP 1135#ifdef HAVE_BG_PIXMAP
1136// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1126 if (bgPixmap.pixmap) 1137// if (bgPixmap.pixmap)
1127 scr_touch (false); 1138// scr_touch (false);
1128#endif 1139#endif
1129 1140
1130#ifdef USE_XIM 1141#ifdef USE_XIM
1131 IMSetPosition (); 1142 IMSetPosition ();
1132#endif 1143#endif
… …
1303 if (term->rs[Rs_imLocale]) 1314 if (term->rs[Rs_imLocale])
1304 SET_LOCALE (term->locale); 1315 SET_LOCALE (term->locale);
1305 } 1316 }
1306 else 1317 else
1307 str = (void *)text->string.wide_char; 1318 str = (void *)text->string.wide_char;
1308 1319
1309 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1320 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1310 DT_INT, call_data->caret, 1321 DT_INT, call_data->caret,
1311 DT_INT, call_data->chg_first, 1322 DT_INT, call_data->chg_first,
1312 DT_INT, call_data->chg_length, 1323 DT_INT, call_data->chg_length,
1313 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1324 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1632 1643
1633 if (input_style & XIMPreeditPosition) 1644 if (input_style & XIMPreeditPosition)
1634 { 1645 {
1635 im_set_size (preedit_rect); 1646 im_set_size (preedit_rect);
1636 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1647 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1637 1648
1638 XSetICValues (Input_Context, 1649 XSetICValues (Input_Context,
1639 XNPreeditAttributes, preedit_attr, NULL); 1650 XNPreeditAttributes, preedit_attr, NULL);
1640 } 1651 }
1641 else 1652 else
1642 { 1653 {
… …
1659 XFree (status_attr); 1670 XFree (status_attr);
1660 } 1671 }
1661 1672
1662 XFree (preedit_attr); 1673 XFree (preedit_attr);
1663} 1674}
1664#endif /* USE_XIM */ 1675#endif /* USE_XIM */
1676
1677void
1678rxvt_term::get_window_origin (int &x, int &y)
1679{
1680 Window cr;
1681 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1682/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1683}
1684
1685Pixmap
1686rxvt_term::get_pixmap_property (int prop_id)
1687{
1688 if (prop_id > 0 && prop_id < NUM_XA)
1689 if (xa[prop_id])
1690 {
1691 int aformat;
1692 unsigned long nitems, bytes_after;
1693 Atom atype;
1694 unsigned char *prop = NULL;
1695 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1696 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1697 &nitems, &bytes_after, &prop);
1698 if (result == Success && prop && atype == XA_PIXMAP)
1699 return *(Pixmap *)prop;
1700 }
1701
1702 return None;
1703}
1704
1705#ifdef HAVE_BG_PIXMAP
1706# if TRACE_PIXMAPS
1707# undef update_background
1708void
1709rxvt_term::trace_update_background (const char *file, int line)
1710{
1711 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1712 update_background ();
1713}
1714# endif
1715
1716void
1717rxvt_term::update_background ()
1718{
1719 if (update_background_ev.is_active ())
1720 return;
1721
1722 bgPixmap.invalidate ();
1723
1724 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1725
1726 if (to_wait <= 0.)
1727 bgPixmap.render ();
1728 else
1729 update_background_ev.start (to_wait);
1730}
1731
1732void
1733rxvt_term::update_background_cb (ev::timer &w, int revents)
1734{
1735 make_current ();
1736
1737 update_background_ev.stop ();
1738 bgPixmap.render ();
1739 refresh_check ();
1740}
1741
1742#endif /* HAVE_BG_PIXMAP */
1665 1743
1666/*----------------------- end-of-file (C source) -----------------------*/ 1744/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines