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.241 by sasha, Mon Aug 13 22:41:34 2007 UTC vs.
Revision 1.303 by ayin, Sun Jan 27 22:48: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 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 ENABLE_TRANSPARENCY 177 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
157 check_our_parents_ev(this, &rxvt_term::check_our_parents_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 bool changed = false;
512 bgPixmap.set_target (this);
513
514#ifdef ENABLE_TRANSPARENCY
515 if (option (Opt_transparent))
516 {
517 bgPixmap.set_transparent ();
518#ifdef HAVE_AFTERIMAGE
519 if (rs [Rs_blurradius])
520 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
521#endif
522 if (ISSET_PIXCOLOR (Color_tint))
523 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
524 if (rs [Rs_shade])
525 bgPixmap.set_shade (rs [Rs_shade]);
526 changed = true;
527
528 bgPixmap.set_root_pixmap ();
529 XSelectInput (dpy, display->root, PropertyChangeMask);
530 rootwin_ev.start (display, display->root);
531 }
532#endif
533
534#ifdef XPM_BACKGROUND
535 if (rs[Rs_backgroundPixmap] != NULL)
536 {
537 const char *p = rs[Rs_backgroundPixmap];
538
539 if ((p = strchr (p, ';')) != NULL)
540 {
541 p++;
542 bgPixmap.set_geometry (p);
543 }
544 else
545 bgPixmap.set_defaultGeometry ();
546
547 changed = bgPixmap.set_file (rs[Rs_backgroundPixmap]);
548 }
549#endif
550 if (changed)
551 {
552 bgPixmap.render ();
553 scr_touch (true);
554 }
555 }
556#endif
557
558#if ENABLE_PERL
559 rootwin_ev.start (display, display->root);
560#endif
561
562 set_colorfgbg ();
563
564 init_command (cmd_argv);
565
566 free (cmd_argv);
567
568 if (pty->pty >= 0)
569 pty_ev.start (pty->pty, EVENT_READ);
570
571 check_ev.start ();
572
573 HOOK_INVOKE ((this, HOOK_START, DT_END));
574
575#if ENABLE_XEMBED
576 if (rs[Rs_embed])
577 {
578 long info[2] = { 0, XEMBED_MAPPED };
579
580 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
581 32, PropModeReplace, (unsigned char *)&info, 2);
582 }
583#endif
584
585 XMapWindow (dpy, vt);
586 XMapWindow (dpy, parent[0]);
587
588 return true;
589}
590
591static struct sig_handlers 469static struct sig_handlers
592{ 470{
593 sig_watcher sw_term, sw_int; 471 ev::sig sw_term, sw_int;
594 472
595 /* 473 /*
596 * Catch a fatal signal and tidy up before quitting 474 * Catch a fatal signal and tidy up before quitting
597 */ 475 */
598 void 476 void sig_term (ev::sig &w, int revents);
599 sig_term (sig_watcher &w) 477
478 sig_handlers ()
600 { 479 {
601 rxvt_emergency_cleanup (); 480 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
602 signal (w.signum, SIG_DFL);
603 kill (getpid (), w.signum);
604 }
605
606 sig_handlers ()
607 : sw_term (this, &sig_handlers::sig_term),
608 sw_int (this, &sig_handlers::sig_term) 481 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
609 {
610 } 482 }
611} sig_handlers; 483} sig_handlers;
612 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
613char **rxvt_environ; // startup environment 493char **rxvt_environ; // startup environment
614 494
615void 495void
616rxvt_init () 496rxvt_init ()
617{ 497{
618 ptytty::init (); 498 ptytty::init ();
499
500 if (!ev_default_loop (0))
501 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
619 502
620 rxvt_environ = environ; 503 rxvt_environ = environ;
621 504
622 signal (SIGHUP, SIG_IGN); 505 signal (SIGHUP, SIG_IGN);
623 signal (SIGPIPE, SIG_IGN); 506 signal (SIGPIPE, SIG_IGN);
624 507
625 sig_handlers.sw_term.start (SIGTERM); 508 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
626 sig_handlers.sw_int.start (SIGINT); 509 sig_handlers.sw_int.start (SIGINT); ev_unref ();
627 510
628 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 511 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
629 /* signal (SIGURG, SIG_DFL); */ 512 /* signal (SIGURG, SIG_DFL); */
630 513
631 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 514 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
632 // TODO: handle this with exceptions and tolerate the memory loss 515 // TODO: handle this with exceptions and tolerate the memory loss
633 XSetIOErrorHandler (rxvt_xioerror_handler); 516 XSetIOErrorHandler (rxvt_xioerror_handler);
634 517
635 XrmInitialize (); 518 XrmInitialize ();
636}
637
638/* ------------------------------------------------------------------------- *
639 * MEMORY ALLOCATION WRAPPERS *
640 * ------------------------------------------------------------------------- */
641void *
642rxvt_malloc (size_t size)
643{
644 void *p = malloc (size);
645
646 if (!p)
647 rxvt_fatal ("memory allocation failure. aborting.\n");
648
649 return p;
650}
651
652void *
653rxvt_calloc (size_t number, size_t size)
654{
655 void *p = calloc (number, size);
656
657 if (!p)
658 rxvt_fatal ("memory allocation failure. aborting.\n");
659
660 return p;
661}
662
663void *
664rxvt_realloc (void *ptr, size_t size)
665{
666 void *p = realloc (ptr, size);
667
668 if (!p)
669 rxvt_fatal ("memory allocation failure. aborting.\n");
670
671 return p;
672} 519}
673 520
674/*----------------------------------------------------------------------*/ 521/*----------------------------------------------------------------------*/
675/* 522/*
676 * window size/position calculations for XSizeHint and other storage. 523 * window size/position calculations for XSizeHint and other storage.
817 ws.ws_xpixel = width; 664 ws.ws_xpixel = width;
818 ws.ws_ypixel = height; 665 ws.ws_ypixel = height;
819 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 666 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
820 667
821#if 0 668#if 0
822 // TIOCSWINSZ is supposed to do this automatically and correctly 669 // TIOCSWINSZ is supposed to do this automatically and correctly
823 if (cmd_pid) /* force through to the command */ 670 if (cmd_pid) /* force through to the command */
824 kill (-cmd_pid, SIGWINCH); 671 kill (-cmd_pid, SIGWINCH);
825#endif 672#endif
826} 673}
827 674
901 if (parent[0]) 748 if (parent[0])
902 { 749 {
903 resize_all_windows (0, 0, 0); 750 resize_all_windows (0, 0, 0);
904 scr_remap_chars (); 751 scr_remap_chars ();
905 scr_touch (true); 752 scr_touch (true);
906 } 753 }
907 754
908 return true; 755 return true;
909} 756}
910 757
758void
911void rxvt_term::set_string_property (Atom prop, const char *str, int len) 759rxvt_term::set_string_property (Atom prop, const char *str, int len)
912{ 760{
913 XChangeProperty (dpy, parent[0], 761 XChangeProperty (dpy, parent[0],
914 prop, XA_STRING, 8, PropModeReplace, 762 prop, XA_STRING, 8, PropModeReplace,
915 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 763 (const unsigned char *)str, len >= 0 ? len : strlen (str));
916} 764}
917 765
766void
918void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 767rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
919{ 768{
920 wchar_t *ws = rxvt_mbstowcs (str, len); 769 wchar_t *ws = rxvt_mbstowcs (str, len);
921 char *s = rxvt_wcstoutf8 (ws); 770 char *s = rxvt_wcstoutf8 (ws);
922 771
923 XChangeProperty (dpy, parent[0], 772 XChangeProperty (dpy, parent[0],
947#if ENABLE_EWMH 796#if ENABLE_EWMH
948 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 797 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
949#endif 798#endif
950} 799}
951 800
801void
802rxvt_term::set_window_color (int idx, const char *color)
803{
952#ifdef XTERM_COLOR_CHANGE 804#ifdef XTERM_COLOR_CHANGE
953void
954rxvt_term::set_window_color (int idx, const char *color)
955{
956 rxvt_color xcol; 805 rxvt_color xcol;
957 int i; 806 int i;
958 807
959 if (color == NULL || *color == '\0') 808 if (color == NULL || *color == '\0')
960 return; 809 return;
961 810
962 color = strdup (color); 811 color = strdup (color);
963 allocated.push_back ((void *)color); 812 allocated.push_back ((void *)color);
967 if (isdigit (*color)) 816 if (isdigit (*color))
968 { 817 {
969 i = atoi (color); 818 i = atoi (color);
970 819
971 if (i >= 8 && i <= 15) 820 if (i >= 8 && i <= 15)
821 {
972 { /* bright colors */ 822 /* bright colors */
973 i -= 8;
974 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 823 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
975 goto done; 824 goto done;
976 } 825 }
977 826
978 if (i >= 0 && i <= 7) 827 if (i >= 0 && i <= 7)
828 {
979 { /* normal colors */ 829 /* normal colors */
980 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 830 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
981 goto done; 831 goto done;
982 } 832 }
983 } 833 }
984 834
989 * so just keep gobbling up the colormap 839 * so just keep gobbling up the colormap
990 */ 840 */
991 841
992 pix_colors_focused[idx] = xcol; 842 pix_colors_focused[idx] = xcol;
993 843
994 /* XSetWindowAttributes attr; */
995 /* Cursor cursor; */
996done: 844done:
997 /*TODO: handle Color_BD, scrollbar background, etc. */ 845 /*TODO: handle Color_BD, scrollbar background, etc. */
998 846
999 update_fade_color (idx); 847 update_fade_color (idx);
1000 recolour_cursor (); 848 recolour_cursor ();
1001 scr_recolour (); 849 scr_recolour ();
850#endif /* XTERM_COLOR_CHANGE */
1002} 851}
1003
1004#else
1005# define set_window_color (idx,color) ((void)0)
1006#endif /* XTERM_COLOR_CHANGE */
1007 852
1008void 853void
1009rxvt_term::recolour_cursor () 854rxvt_term::recolour_cursor ()
1010{ 855{
1011 XColor fg, bg; 856 XColor fg, bg;
1027 */ 872 */
1028void 873void
1029rxvt_term::set_colorfgbg () 874rxvt_term::set_colorfgbg ()
1030{ 875{
1031 unsigned int i; 876 unsigned int i;
1032 const char *xpmb = "\0"; 877 const char *xpmb = "";
1033 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 878 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1034 879
1035 strcpy (fstr, "default"); 880 strcpy (fstr, "default");
1036 strcpy (bstr, "default"); 881 strcpy (bstr, "default");
1037 for (i = Color_Black; i <= Color_White; i++) 882 for (i = Color_Black; i <= Color_White; i++)
1043 888
1044 for (i = Color_Black; i <= Color_White; i++) 889 for (i = Color_Black; i <= Color_White; i++)
1045 if (pix_colors[Color_bg] == pix_colors[i]) 890 if (pix_colors[Color_bg] == pix_colors[i])
1046 { 891 {
1047 sprintf (bstr, "%d", (i - Color_Black)); 892 sprintf (bstr, "%d", (i - Color_Black));
1048#ifdef XPM_BACKGROUND 893#ifdef BG_IMAGE_FROM_FILE
1049 xpmb = "default;"; 894 xpmb = "default;";
1050#endif 895#endif
1051 break; 896 break;
1052 } 897 }
1053 898
1149 994
1150 XMoveResizeWindow (dpy, vt, 995 XMoveResizeWindow (dpy, vt,
1151 window_vt_x, window_vt_y, 996 window_vt_x, window_vt_y,
1152 width, height); 997 width, height);
1153 998
999#ifdef HAVE_BG_PIXMAP
1000 if (bgPixmap.window_size_sensitive ())
1001 update_background ();
1002#endif
1003
1154 scr_clear (); 1004 scr_clear ();
1155#ifdef XPM_BACKGROUND
1156 /* TODO: should that really be here ? */
1157 bgPixmap.render ();
1158#endif
1159 } 1005 }
1160 1006
1161 if (fix_screen || old_height == 0) 1007 if (fix_screen || old_height == 0)
1162 scr_reset (); 1008 scr_reset ();
1163 1009
1164 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version 1010 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1165 //scr_touch (false); 1011 //scr_touch (false);
1166 1012
1167#ifdef HAVE_BG_PIXMAP 1013#ifdef HAVE_BG_PIXMAP
1014// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1168 if (bgPixmap.pixmap) 1015// if (bgPixmap.pixmap)
1169 scr_touch (false); 1016// scr_touch (false);
1170#endif 1017#endif
1171 1018
1172#ifdef USE_XIM 1019#ifdef USE_XIM
1173 IMSetPosition (); 1020 IMSetPosition ();
1174#endif 1021#endif
1345 if (term->rs[Rs_imLocale]) 1192 if (term->rs[Rs_imLocale])
1346 SET_LOCALE (term->locale); 1193 SET_LOCALE (term->locale);
1347 } 1194 }
1348 else 1195 else
1349 str = (void *)text->string.wide_char; 1196 str = (void *)text->string.wide_char;
1350 1197
1351 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1198 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1352 DT_INT, call_data->caret, 1199 DT_INT, call_data->caret,
1353 DT_INT, call_data->chg_first, 1200 DT_INT, call_data->chg_first,
1354 DT_INT, call_data->chg_length, 1201 DT_INT, call_data->chg_length,
1355 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1202 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1674 1521
1675 if (input_style & XIMPreeditPosition) 1522 if (input_style & XIMPreeditPosition)
1676 { 1523 {
1677 im_set_size (preedit_rect); 1524 im_set_size (preedit_rect);
1678 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1525 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1679 1526
1680 XSetICValues (Input_Context, 1527 XSetICValues (Input_Context,
1681 XNPreeditAttributes, preedit_attr, NULL); 1528 XNPreeditAttributes, preedit_attr, NULL);
1682 } 1529 }
1683 else 1530 else
1684 { 1531 {
1701 XFree (status_attr); 1548 XFree (status_attr);
1702 } 1549 }
1703 1550
1704 XFree (preedit_attr); 1551 XFree (preedit_attr);
1705} 1552}
1706#endif /* USE_XIM */ 1553#endif /* USE_XIM */
1554
1555void
1556rxvt_term::get_window_origin (int &x, int &y)
1557{
1558 Window cr;
1559 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1560/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1561}
1562
1563Pixmap
1564rxvt_term::get_pixmap_property (int prop_id)
1565{
1566 if (prop_id > 0 && prop_id < NUM_XA)
1567 if (xa[prop_id])
1568 {
1569 int aformat;
1570 unsigned long nitems, bytes_after;
1571 Atom atype;
1572 unsigned char *prop = NULL;
1573 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1574 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1575 &nitems, &bytes_after, &prop);
1576 if (result == Success && prop && atype == XA_PIXMAP)
1577 return *(Pixmap *)prop;
1578 }
1579
1580 return None;
1581}
1582
1583#ifdef HAVE_BG_PIXMAP
1584# if TRACE_PIXMAPS
1585# undef update_background
1586void
1587rxvt_term::trace_update_background (const char *file, int line)
1588{
1589 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1590 update_background ();
1591}
1592# endif
1593
1594void
1595rxvt_term::update_background ()
1596{
1597 if (update_background_ev.is_active ())
1598 return;
1599
1600 bgPixmap.invalidate ();
1601
1602 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1603
1604 if (to_wait <= 0.)
1605 bgPixmap.render ();
1606 else
1607 update_background_ev.start (to_wait);
1608}
1609
1610void
1611rxvt_term::update_background_cb (ev::timer &w, int revents)
1612{
1613 make_current ();
1614
1615 update_background_ev.stop ();
1616 bgPixmap.render ();
1617 refresh_check ();
1618}
1619
1620#endif /* HAVE_BG_PIXMAP */
1707 1621
1708/*----------------------- end-of-file (C source) -----------------------*/ 1622/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines