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.229 by root, Fri Aug 18 23:03:31 2006 UTC vs.
Revision 1.292 by root, Mon Dec 24 10:58:09 2007 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 TRANSPARENT || 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#ifdef HAVE_SCROLLBARS 177#ifdef HAVE_SCROLLBARS
157 scrollbar_ev (this, &rxvt_term::x_cb), 178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
158#endif 179#endif
159#ifdef CURSOR_BLINK 180#ifdef USE_XIM
160 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 181 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
161#endif
162#ifdef TEXT_BLINK
163 text_blink_ev (this, &rxvt_term::text_blink_cb),
164#endif
165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
166 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
167#endif
168#ifdef SELECTION_SCROLLING
169 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
170#endif
171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
172 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
173#endif 182#endif
174#ifdef POINTER_BLANK 183#ifdef POINTER_BLANK
175 pointer_ev (this, &rxvt_term::pointer_cb), 184 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
176#endif 185#endif
177#ifdef USE_XIM
178 im_ev (this, &rxvt_term::im_cb),
179#endif
180#ifndef NO_BELL 186#ifndef NO_BELL
181 bell_ev (this, &rxvt_term::bell_cb), 187 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
182#endif 188#endif
183 termwin_ev (this, &rxvt_term::x_cb), 189 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
184 vt_ev (this, &rxvt_term::x_cb), 190 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
185 child_ev (this, &rxvt_term::child_cb), 191 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
186 check_ev (this, &rxvt_term::check_cb), 192 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
187 flush_ev (this, &rxvt_term::flush_cb), 193 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
188 destroy_ev (this, &rxvt_term::destroy_cb), 194 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
189 pty_ev (this, &rxvt_term::pty_cb), 195 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
190 incr_ev (this, &rxvt_term::incr_cb) 196
191{
192 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 197 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
193 198
194 termlist.push_back (this); 199 termlist.push_back (this);
195 200
196#ifdef KEYSYM_RESOURCE 201#ifdef KEYSYM_RESOURCE
… …
198#endif 203#endif
199} 204}
200 205
201// 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.
202// for use before an emergency exit 207// for use before an emergency exit
208void
203void rxvt_term::emergency_cleanup () 209rxvt_term::emergency_cleanup ()
204{ 210{
205 if (cmd_pid) 211 if (cmd_pid)
206 kill (-cmd_pid, SIGHUP); 212 kill (-cmd_pid, SIGHUP);
207 213
208 pty_ev.stop (); 214 pty_ev.stop ();
… …
275 delete [] pix_colors_focused; 281 delete [] pix_colors_focused;
276#if OFF_FOCUS_FADING 282#if OFF_FOCUS_FADING
277 delete [] pix_colors_unfocused; 283 delete [] pix_colors_unfocused;
278#endif 284#endif
279 285
286#ifdef HAVE_BG_PIXMAP
287 bgPixmap.destroy ();
288#endif
289 display->flush (); /* ideally .put should do this */
280 displays.put (display); 290 displays.put (display);
281 291
282 scr_release (); 292 scr_release ();
283 293
284 /* clear all resources */ 294 /* clear all resources */
… …
297 delete argv; 307 delete argv;
298 308
299#ifdef KEYSYM_RESOURCE 309#ifdef KEYSYM_RESOURCE
300 delete keyboard; 310 delete keyboard;
301#endif 311#endif
312#ifndef NO_RESOURCES
313 XrmDestroyDatabase (option_db);
314#endif
302} 315}
303 316
304// child has exited, usually destroys 317// child has exited, usually destroys
305void 318void
306rxvt_term::child_cb (child_watcher &w, int status) 319rxvt_term::child_cb (ev::child &w, int status)
307{ 320{
308 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 321 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
309 322
310 cmd_pid = 0; 323 cmd_pid = 0;
311 324
312 if (!OPTION (Opt_hold)) 325 if (!option (Opt_hold))
313 destroy (); 326 destroy ();
314} 327}
315 328
316void 329void
317rxvt_term::destroy () 330rxvt_term::destroy ()
318{ 331{
319 if (destroy_ev.active) 332 if (destroy_ev.is_active ())
320 return; 333 return;
321 334
322 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 335 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
323 336
324#if ENABLE_OVERLAY 337#if ENABLE_OVERLAY
… …
331 im_ev.stop (display); 344 im_ev.stop (display);
332#endif 345#endif
333#if HAVE_SCROLLBARS 346#if HAVE_SCROLLBARS
334 scrollbar_ev.stop (display); 347 scrollbar_ev.stop (display);
335#endif 348#endif
336#if TRANSPARENT || ENABLE_PERL 349#if ENABLE_TRANSPARENCY || ENABLE_PERL
337 rootwin_ev.stop (display); 350 rootwin_ev.stop (display);
338#endif 351#endif
339 incr_ev.stop (); 352 incr_ev.stop ();
340 termwin_ev.stop (display); 353 termwin_ev.stop (display);
341 vt_ev.stop (display); 354 vt_ev.stop (display);
342 } 355 }
343 356
344 check_ev.stop (); 357 flush_ev.stop ();
345 pty_ev.stop (); 358 pty_ev.stop ();
346#ifdef CURSOR_BLINK 359#ifdef CURSOR_BLINK
347 cursor_blink_ev.stop (); 360 cursor_blink_ev.stop ();
348#endif 361#endif
349#ifdef TEXT_BLINK 362#ifdef TEXT_BLINK
… …
357#endif 370#endif
358#ifdef POINTER_BLANK 371#ifdef POINTER_BLANK
359 pointer_ev.stop (); 372 pointer_ev.stop ();
360#endif 373#endif
361 374
362 destroy_ev.start (0); 375 destroy_ev.start ();
363} 376}
364 377
365void 378void
366rxvt_term::destroy_cb (time_watcher &w) 379rxvt_term::destroy_cb (ev::idle &w, int revents)
367{ 380{
368 make_current (); 381 make_current ();
369 382
370 delete this; 383 delete this;
371} 384}
… …
425 else 438 else
426 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 439 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
427 mesg, BUFSIZ); 440 mesg, BUFSIZ);
428 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 441 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
429 } 442 }
430 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 443 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
431 mesg, BUFSIZ); 444 mesg, BUFSIZ);
432 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 445 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
433} 446}
434#endif 447#endif
435 448
… …
460 rxvt_emergency_cleanup (); 473 rxvt_emergency_cleanup ();
461 _exit (EXIT_FAILURE); 474 _exit (EXIT_FAILURE);
462} 475}
463 476
464/*----------------------------------------------------------------------*/ 477/*----------------------------------------------------------------------*/
465bool 478void
466rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 479rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
467{ 480{
468 this->envv = envv; 481 this->envv = envv;
469 482
470 SET_R (this); 483 SET_R (this);
471 set_locale (""); 484 set_locale ("");
472 set_environ (envv); // few things in X do not call setlocale :( 485 set_environ (envv); // few things in X do not call setlocale :(
473 486
474 if (!init_vars ()) 487 init_vars ();
475 return false;
476 488
477 init_secondary (); 489 init_secondary ();
478 490
479 const char **cmd_argv = init_resources (argc, argv); 491 const char **cmd_argv = init_resources (argc, argv);
480 492
481#ifdef KEYSYM_RESOURCE 493#ifdef KEYSYM_RESOURCE
482 keyboard->register_done (); 494 keyboard->register_done ();
483#endif 495#endif
484 496
485#ifdef HAVE_SCROLLBARS 497#ifdef HAVE_SCROLLBARS
486 if (OPTION (Opt_scrollBar)) 498 if (option (Opt_scrollBar))
487 scrollBar.setIdle (); /* set existence for size calculations */ 499 scrollBar.setIdle (); /* set existence for size calculations */
488#endif 500#endif
489 501
490 pty = ptytty::create (); 502 pty = ptytty::create ();
491 503
… …
498#if 0 510#if 0
499 XSynchronize (dpy, True); 511 XSynchronize (dpy, True);
500#endif 512#endif
501 513
502#ifdef HAVE_SCROLLBARS 514#ifdef HAVE_SCROLLBARS
503 if (OPTION (Opt_scrollBar)) 515 if (option (Opt_scrollBar))
504 resize_scrollbar (); /* create and map scrollbar */ 516 resize_scrollbar (); /* create and map scrollbar */
505#endif 517#endif
518#ifdef HAVE_BG_PIXMAP
519 {
520 bgPixmap.set_target (this);
521
506#ifdef TRANSPARENT 522#ifdef ENABLE_TRANSPARENCY
507 if (OPTION (Opt_transparent)) 523 if (option (Opt_transparent))
508 { 524 {
525 bgPixmap.set_transparent ();
526
527#ifdef HAVE_AFTERIMAGE
528 if (rs [Rs_blurradius])
529 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
530#endif
531 if (ISSET_PIXCOLOR (Color_tint))
532 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
533
534 if (rs [Rs_shade])
535 bgPixmap.set_shade (rs [Rs_shade]);
536
537 bgPixmap.set_root_pixmap ();
509 XSelectInput (dpy, display->root, PropertyChangeMask); 538 XSelectInput (dpy, display->root, PropertyChangeMask);
510 check_our_parents ();
511 rootwin_ev.start (display, display->root); 539 rootwin_ev.start (display, display->root);
512 } 540 }
513#endif 541#endif
542
543#ifdef BG_IMAGE_FROM_FILE
544 if (rs[Rs_backgroundPixmap])
545 {
546 const char *p = rs[Rs_backgroundPixmap];
547
548 if ((p = strchr (p, ';')) != 0)
549 {
550 p++;
551 bgPixmap.set_geometry (p);
552 }
553 else
554 bgPixmap.set_defaultGeometry ();
555
556 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
557 if (!bgPixmap.window_position_sensitive ())
558 update_background ();
559 }
560#endif
561 }
562#endif
563
514#if ENABLE_PERL 564#if ENABLE_PERL
515 rootwin_ev.start (display, display->root); 565 rootwin_ev.start (display, display->root);
516#endif 566#endif
517 567
518 set_colorfgbg (); 568 set_colorfgbg ();
… …
520 init_command (cmd_argv); 570 init_command (cmd_argv);
521 571
522 free (cmd_argv); 572 free (cmd_argv);
523 573
524 if (pty->pty >= 0) 574 if (pty->pty >= 0)
525 pty_ev.start (pty->pty, EVENT_READ); 575 pty_ev.start (pty->pty, ev::READ);
526
527 check_ev.start ();
528 576
529 HOOK_INVOKE ((this, HOOK_START, DT_END)); 577 HOOK_INVOKE ((this, HOOK_START, DT_END));
530 578
531#if ENABLE_XEMBED 579#if ENABLE_XEMBED
532 if (rs[Rs_embed]) 580 if (rs[Rs_embed])
… …
538 } 586 }
539#endif 587#endif
540 588
541 XMapWindow (dpy, vt); 589 XMapWindow (dpy, vt);
542 XMapWindow (dpy, parent[0]); 590 XMapWindow (dpy, parent[0]);
543
544 return true;
545} 591}
546 592
547static struct sig_handlers 593static struct sig_handlers
548{ 594{
549 sig_watcher sw_term, sw_int; 595 ev::sig sw_term, sw_int;
550 596
551 /* 597 /*
552 * Catch a fatal signal and tidy up before quitting 598 * Catch a fatal signal and tidy up before quitting
553 */ 599 */
554 void 600 void sig_term (ev::sig &w, int revents);
555 sig_term (sig_watcher &w) 601
602 sig_handlers ()
556 { 603 {
557 rxvt_emergency_cleanup (); 604 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
558 signal (w.signum, SIG_DFL);
559 kill (getpid (), w.signum);
560 }
561
562 sig_handlers ()
563 : sw_term (this, &sig_handlers::sig_term),
564 sw_int (this, &sig_handlers::sig_term) 605 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
565 {
566 } 606 }
567} sig_handlers; 607} sig_handlers;
568 608
609void
610sig_handlers::sig_term (ev::sig &w, int revents)
611{
612 rxvt_emergency_cleanup ();
613 w.stop ();
614 kill (getpid (), w.signum);
615}
616
569char **rxvt_environ; // startup environment 617char **rxvt_environ; // startup environment
570 618
571void 619void
572rxvt_init () 620rxvt_init ()
573{ 621{
574 ptytty::init (); 622 ptytty::init ();
623
624 if (!ev_default_loop (0))
625 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
575 626
576 rxvt_environ = environ; 627 rxvt_environ = environ;
577 628
578 signal (SIGHUP, SIG_IGN); 629 signal (SIGHUP, SIG_IGN);
579 signal (SIGPIPE, SIG_IGN); 630 signal (SIGPIPE, SIG_IGN);
580 631
581 sig_handlers.sw_term.start (SIGTERM); 632 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
582 sig_handlers.sw_int.start (SIGINT); 633 sig_handlers.sw_int.start (SIGINT); ev_unref ();
583 634
584 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 635 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
585 /* signal (SIGURG, SIG_DFL); */ 636 /* signal (SIGURG, SIG_DFL); */
586 637
587 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 638 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
589 XSetIOErrorHandler (rxvt_xioerror_handler); 640 XSetIOErrorHandler (rxvt_xioerror_handler);
590 641
591 XrmInitialize (); 642 XrmInitialize ();
592} 643}
593 644
594/* ------------------------------------------------------------------------- *
595 * MEMORY ALLOCATION WRAPPERS *
596 * ------------------------------------------------------------------------- */
597void *
598rxvt_malloc (size_t size)
599{
600 void *p = malloc (size);
601
602 if (!p)
603 rxvt_fatal ("memory allocation failure. aborting.\n");
604
605 return p;
606}
607
608void *
609rxvt_calloc (size_t number, size_t size)
610{
611 void *p = calloc (number, size);
612
613 if (!p)
614 rxvt_fatal ("memory allocation failure. aborting.\n");
615
616 return p;
617}
618
619void *
620rxvt_realloc (void *ptr, size_t size)
621{
622 void *p = realloc (ptr, size);
623
624 if (!p)
625 rxvt_fatal ("memory allocation failure. aborting.\n");
626
627 return p;
628}
629
630/*----------------------------------------------------------------------*/ 645/*----------------------------------------------------------------------*/
631/* 646/*
632 * window size/position calculcations for XSizeHint and other storage. 647 * window size/position calculations for XSizeHint and other storage.
633 * if width/height are non-zero then override calculated width/height 648 * if width/height are non-zero then override calculated width/height
634 */ 649 */
635void 650void
636rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 651rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
637{ 652{
… …
709 if (scrollBar.state) 724 if (scrollBar.state)
710 { 725 {
711 sb_w = scrollbar_TotalWidth (); 726 sb_w = scrollbar_TotalWidth ();
712 szHint.base_width += sb_w; 727 szHint.base_width += sb_w;
713 728
714 if (!OPTION (Opt_scrollBar_right)) 729 if (!option (Opt_scrollBar_right))
715 window_vt_x += sb_w; 730 window_vt_x += sb_w;
716 } 731 }
717 732
718 szHint.width_inc = fwidth; 733 szHint.width_inc = fwidth;
719 szHint.height_inc = fheight; 734 szHint.height_inc = fheight;
… …
740 { 755 {
741 min_it (height, max_height); 756 min_it (height, max_height);
742 szHint.height = szHint.base_height + height; 757 szHint.height = szHint.base_height + height;
743 } 758 }
744 759
745 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 760 if (scrollBar.state && option (Opt_scrollBar_right))
746 window_sb_x = szHint.width - sb_w; 761 window_sb_x = szHint.width - sb_w;
747 762
748 if (recalc_x) 763 if (recalc_x)
749 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 764 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
750 765
… …
773 ws.ws_xpixel = width; 788 ws.ws_xpixel = width;
774 ws.ws_ypixel = height; 789 ws.ws_ypixel = height;
775 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 790 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
776 791
777#if 0 792#if 0
778 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 793 // TIOCSWINSZ is supposed to do this automatically and correctly
779 if (cmd_pid) /* force through to the command */ 794 if (cmd_pid) /* force through to the command */
780 kill (-cmd_pid, SIGWINCH); 795 kill (-cmd_pid, SIGWINCH);
781#endif 796#endif
782} 797}
783 798
… …
812 delete fontset[0]; 827 delete fontset[0];
813 fontset[0] = fs; 828 fontset[0] = fs;
814 829
815 prop = (*fs)[1]->properties (); 830 prop = (*fs)[1]->properties ();
816 prop.height += lineSpace; 831 prop.height += lineSpace;
832
817 fs->set_prop (prop); 833 fs->set_prop (prop, false);
818 834
819 fwidth = prop.width; 835 fwidth = prop.width;
820 fheight = prop.height; 836 fheight = prop.height;
821 fbase = prop.ascent; 837 fbase = prop.ascent;
822 838
… …
831 { 847 {
832 fontset[style] = fs = new rxvt_fontset (this); 848 fontset[style] = fs = new rxvt_fontset (this);
833 rxvt_fontprop prop2 = prop; 849 rxvt_fontprop prop2 = prop;
834 850
835 if (res) 851 if (res)
836 prop2.weight = prop2.slant = rxvt_fontprop::unset; 852 {
853 fs->populate (res);
854 fs->set_prop (prop2, false);
855 }
837 else 856 else
838 { 857 {
839 res = fontset[0]->fontdesc; 858 fs->populate (fontset[0]->fontdesc);
840 859
841 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 860 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
842 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 861 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
862
863 fs->set_prop (prop2, true);
843 } 864 }
844 865
845 fs->populate (res);
846 fs->set_prop (prop2);
847 } 866 }
848#else 867#else
849 fontset[style] = fontset[0]; 868 fontset[style] = fontset[0];
850#endif 869#endif
851 } 870 }
… …
853 if (parent[0]) 872 if (parent[0])
854 { 873 {
855 resize_all_windows (0, 0, 0); 874 resize_all_windows (0, 0, 0);
856 scr_remap_chars (); 875 scr_remap_chars ();
857 scr_touch (true); 876 scr_touch (true);
858 } 877 }
859 878
860 return true; 879 return true;
861} 880}
862 881
882void
863void rxvt_term::set_string_property (Atom prop, const char *str, int len) 883rxvt_term::set_string_property (Atom prop, const char *str, int len)
864{ 884{
865 XChangeProperty (dpy, parent[0], 885 XChangeProperty (dpy, parent[0],
866 prop, XA_STRING, 8, PropModeReplace, 886 prop, XA_STRING, 8, PropModeReplace,
867 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 887 (const unsigned char *)str, len >= 0 ? len : strlen (str));
868} 888}
869 889
890void
870void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 891rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
871{ 892{
872 wchar_t *ws = rxvt_mbstowcs (str, len); 893 wchar_t *ws = rxvt_mbstowcs (str, len);
873 char *s = rxvt_wcstoutf8 (ws); 894 char *s = rxvt_wcstoutf8 (ws);
874 895
875 XChangeProperty (dpy, parent[0], 896 XChangeProperty (dpy, parent[0],
… …
899#if ENABLE_EWMH 920#if ENABLE_EWMH
900 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 921 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
901#endif 922#endif
902} 923}
903 924
925void
926rxvt_term::set_window_color (int idx, const char *color)
927{
904#ifdef XTERM_COLOR_CHANGE 928#ifdef XTERM_COLOR_CHANGE
905void
906rxvt_term::set_window_color (int idx, const char *color)
907{
908 rxvt_color xcol; 929 rxvt_color xcol;
909 int i; 930 int i;
910 931
911 if (color == NULL || *color == '\0') 932 if (color == NULL || *color == '\0')
912 return; 933 return;
913 934
914 color = strdup (color); 935 color = strdup (color);
915 allocated.push_back ((void *)color); 936 allocated.push_back ((void *)color);
… …
919 if (isdigit (*color)) 940 if (isdigit (*color))
920 { 941 {
921 i = atoi (color); 942 i = atoi (color);
922 943
923 if (i >= 8 && i <= 15) 944 if (i >= 8 && i <= 15)
945 {
924 { /* bright colors */ 946 /* bright colors */
925 i -= 8;
926 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 947 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
927 goto done; 948 goto done;
928 } 949 }
929 950
930 if (i >= 0 && i <= 7) 951 if (i >= 0 && i <= 7)
952 {
931 { /* normal colors */ 953 /* normal colors */
932 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 954 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
933 goto done; 955 goto done;
934 } 956 }
935 } 957 }
936 958
… …
941 * so just keep gobbling up the colormap 963 * so just keep gobbling up the colormap
942 */ 964 */
943 965
944 pix_colors_focused[idx] = xcol; 966 pix_colors_focused[idx] = xcol;
945 967
946 /* XSetWindowAttributes attr; */
947 /* Cursor cursor; */
948done: 968done:
949 /*TODO: handle Color_BD, scrollbar background, etc. */ 969 /*TODO: handle Color_BD, scrollbar background, etc. */
950 970
951 update_fade_color (idx); 971 update_fade_color (idx);
952 recolour_cursor (); 972 recolour_cursor ();
953 scr_recolour (); 973 scr_recolour ();
974#endif /* XTERM_COLOR_CHANGE */
954} 975}
955
956#else
957# define set_window_color (idx,color) ((void)0)
958#endif /* XTERM_COLOR_CHANGE */
959 976
960void 977void
961rxvt_term::recolour_cursor () 978rxvt_term::recolour_cursor ()
962{ 979{
963 XColor fg, bg; 980 XColor fg, bg;
… …
979 */ 996 */
980void 997void
981rxvt_term::set_colorfgbg () 998rxvt_term::set_colorfgbg ()
982{ 999{
983 unsigned int i; 1000 unsigned int i;
984 const char *xpmb = "\0"; 1001 const char *xpmb = "";
985 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1002 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
986 1003
987 strcpy (fstr, "default"); 1004 strcpy (fstr, "default");
988 strcpy (bstr, "default"); 1005 strcpy (bstr, "default");
989 for (i = Color_Black; i <= Color_White; i++) 1006 for (i = Color_Black; i <= Color_White; i++)
… …
995 1012
996 for (i = Color_Black; i <= Color_White; i++) 1013 for (i = Color_Black; i <= Color_White; i++)
997 if (pix_colors[Color_bg] == pix_colors[i]) 1014 if (pix_colors[Color_bg] == pix_colors[i])
998 { 1015 {
999 sprintf (bstr, "%d", (i - Color_Black)); 1016 sprintf (bstr, "%d", (i - Color_Black));
1000#ifdef XPM_BACKGROUND 1017#ifdef BG_IMAGE_FROM_FILE
1001 xpmb = "default;"; 1018 xpmb = "default;";
1002#endif 1019#endif
1003 break; 1020 break;
1004 } 1021 }
1005 1022
… …
1101 1118
1102 XMoveResizeWindow (dpy, vt, 1119 XMoveResizeWindow (dpy, vt,
1103 window_vt_x, window_vt_y, 1120 window_vt_x, window_vt_y,
1104 width, height); 1121 width, height);
1105 1122
1123#ifdef HAVE_BG_PIXMAP
1124 if (bgPixmap.window_size_sensitive ())
1125 update_background ();
1126#endif
1127
1106 scr_clear (); 1128 scr_clear ();
1107#ifdef XPM_BACKGROUND
1108 resize_pixmap ();
1109#endif
1110 } 1129 }
1111 1130
1112 if (fix_screen || old_height == 0) 1131 if (fix_screen || old_height == 0)
1113 scr_reset (); 1132 scr_reset ();
1114 1133
1115 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version 1134 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1116 //scr_touch (false); 1135 //scr_touch (false);
1117 1136
1118#ifdef XPM_BACKGROUND 1137#ifdef HAVE_BG_PIXMAP
1119 if (pixmap) 1138// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1139// if (bgPixmap.pixmap)
1120 scr_touch (false); 1140// scr_touch (false);
1121#endif 1141#endif
1122 1142
1123#ifdef USE_XIM 1143#ifdef USE_XIM
1124 IMSetPosition (); 1144 IMSetPosition ();
1125#endif 1145#endif
… …
1296 if (term->rs[Rs_imLocale]) 1316 if (term->rs[Rs_imLocale])
1297 SET_LOCALE (term->locale); 1317 SET_LOCALE (term->locale);
1298 } 1318 }
1299 else 1319 else
1300 str = (void *)text->string.wide_char; 1320 str = (void *)text->string.wide_char;
1301 1321
1302 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1322 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1303 DT_INT, call_data->caret, 1323 DT_INT, call_data->caret,
1304 DT_INT, call_data->chg_first, 1324 DT_INT, call_data->chg_first,
1305 DT_INT, call_data->chg_length, 1325 DT_INT, call_data->chg_length,
1306 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1326 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1625 1645
1626 if (input_style & XIMPreeditPosition) 1646 if (input_style & XIMPreeditPosition)
1627 { 1647 {
1628 im_set_size (preedit_rect); 1648 im_set_size (preedit_rect);
1629 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1649 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1630 1650
1631 XSetICValues (Input_Context, 1651 XSetICValues (Input_Context,
1632 XNPreeditAttributes, preedit_attr, NULL); 1652 XNPreeditAttributes, preedit_attr, NULL);
1633 } 1653 }
1634 else 1654 else
1635 { 1655 {
… …
1652 XFree (status_attr); 1672 XFree (status_attr);
1653 } 1673 }
1654 1674
1655 XFree (preedit_attr); 1675 XFree (preedit_attr);
1656} 1676}
1657#endif /* USE_XIM */ 1677#endif /* USE_XIM */
1678
1679void
1680rxvt_term::get_window_origin (int &x, int &y)
1681{
1682 Window cr;
1683 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1684/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1685}
1686
1687Pixmap
1688rxvt_term::get_pixmap_property (int prop_id)
1689{
1690 if (prop_id > 0 && prop_id < NUM_XA)
1691 if (xa[prop_id])
1692 {
1693 int aformat;
1694 unsigned long nitems, bytes_after;
1695 Atom atype;
1696 unsigned char *prop = NULL;
1697 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1698 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1699 &nitems, &bytes_after, &prop);
1700 if (result == Success && prop && atype == XA_PIXMAP)
1701 return *(Pixmap *)prop;
1702 }
1703
1704 return None;
1705}
1706
1707#ifdef HAVE_BG_PIXMAP
1708# if TRACE_PIXMAPS
1709# undef update_background
1710void
1711rxvt_term::trace_update_background (const char *file, int line)
1712{
1713 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1714 update_background ();
1715}
1716# endif
1717
1718void
1719rxvt_term::update_background ()
1720{
1721 bgPixmap.invalidate ();
1722
1723 /* no chance of real time refresh if we are blurring! */
1724 if (bgPixmap.invalid_since + 0.50 < ev::now ()
1725 && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1726 {
1727 update_background_ev.stop ();
1728 bgPixmap.render ();
1729 }
1730 else
1731 {
1732 ev_tstamp refresh;
1733
1734 if (!bgPixmap.need_client_side_rendering ())
1735 refresh = .05;
1736 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1737 refresh = .20; /* very slow !!! */
1738 else
1739 refresh = .07;
1740
1741 update_background_ev.start (refresh);
1742 }
1743}
1744
1745void
1746rxvt_term::update_background_cb (ev::timer &w, int revents)
1747{
1748 make_current ();
1749 bgPixmap.render ();
1750 refresh_check ();
1751}
1752
1753#endif /* HAVE_BG_PIXMAP */
1658 1754
1659/*----------------------- end-of-file (C source) -----------------------*/ 1755/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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