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.225 by root, Wed Jul 5 22:46:14 2006 UTC vs.
Revision 1.286 by root, Sun Dec 16 19:44:48 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"
… …
56static char curlocale[128], savelocale[128]; 59static char curlocale[128], savelocale[128];
57 60
58bool 61bool
59rxvt_set_locale (const char *locale) NOTHROW 62rxvt_set_locale (const char *locale) NOTHROW
60{ 63{
64 int size = strlen (locale) + 1;
65
66 if (size > sizeof (curlocale))
67 rxvt_fatal ("locale string too long, aborting.\n");
68
61 if (!locale || !strncmp (locale, curlocale, 128)) 69 if (!locale || !memcmp (locale, curlocale, size))
62 return false; 70 return false;
63 71
64 strncpy (curlocale, locale, 128); 72 memcpy (curlocale, locale, size);
65 setlocale (LC_CTYPE, curlocale); 73 setlocale (LC_CTYPE, curlocale);
66 return true; 74 return true;
67} 75}
68 76
69void 77void
… …
83class rxvt_composite_vec rxvt_composite; 91class rxvt_composite_vec rxvt_composite;
84 92
85text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
86{ 94{
87 compose_char *cc; 95 compose_char *cc;
88 96
89 // break compose chains, as stupid readline really likes to duplicate 97 // break compose chains, as stupid readline really likes to duplicate
90 // composing characters for some reason near the end of a line. 98 // composing characters for some reason near the end of a line.
91 cc = (*this)[c1]; 99 cc = (*this)[c1];
92 while (cc) 100 while (cc)
93 { 101 {
… …
142 150
143} 151}
144#endif 152#endif
145 153
146rxvt_term::rxvt_term () 154rxvt_term::rxvt_term ()
147 : 155{
148#if TRANSPARENT 156#if HAVE_BG_PIXMAP
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 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
174#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
150#endif 176#endif
151#ifdef HAVE_SCROLLBARS 177#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb), 178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
153#endif 179#endif
154#ifdef CURSOR_BLINK 180#ifdef USE_XIM
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 181 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
156#endif
157#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb),
159#endif
160#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
162#endif
163#ifdef SELECTION_SCROLLING
164 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
165#endif
166#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
168#endif 182#endif
169#ifdef POINTER_BLANK 183#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb), 184 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
171#endif 185#endif
172#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb),
174#endif
175#ifndef NO_BELL 186#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb), 187 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
177#endif 188#endif
178 termwin_ev (this, &rxvt_term::x_cb), 189 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
179 vt_ev (this, &rxvt_term::x_cb), 190 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
180 child_ev (this, &rxvt_term::child_cb), 191 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
181 check_ev (this, &rxvt_term::check_cb), 192 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
182 flush_ev (this, &rxvt_term::flush_cb), 193 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
183 destroy_ev (this, &rxvt_term::destroy_cb), 194 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
184 pty_ev (this, &rxvt_term::pty_cb), 195 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
185 incr_ev (this, &rxvt_term::incr_cb) 196
186{
187 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 197 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
188 198
189 termlist.push_back (this); 199 termlist.push_back (this);
190 200
191#ifdef KEYSYM_RESOURCE 201#ifdef KEYSYM_RESOURCE
… …
193#endif 203#endif
194} 204}
195 205
196// 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.
197// for use before an emergency exit 207// for use before an emergency exit
208void
198void rxvt_term::emergency_cleanup () 209rxvt_term::emergency_cleanup ()
199{ 210{
200 if (cmd_pid) 211 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 212 kill (-cmd_pid, SIGHUP);
202 213
203 pty_ev.stop (); 214 pty_ev.stop ();
… …
265 } 276 }
266 277
267 clear (); 278 clear ();
268 } 279 }
269 280
270 delete pix_colors_focused; 281 delete [] pix_colors_focused;
271#if OFF_FOCUS_FADING 282#if OFF_FOCUS_FADING
272 delete pix_colors_unfocused; 283 delete [] pix_colors_unfocused;
273#endif 284#endif
274 285
286#ifdef HAVE_BG_PIXMAP
287 bgPixmap.destroy ();
288#endif
289 display->flush (); /* ideally .put should do this */
275 displays.put (display); 290 displays.put (display);
276 291
277 scr_release (); 292 scr_release ();
278 293
279 /* clear all resources */ 294 /* clear all resources */
… …
292 delete argv; 307 delete argv;
293 308
294#ifdef KEYSYM_RESOURCE 309#ifdef KEYSYM_RESOURCE
295 delete keyboard; 310 delete keyboard;
296#endif 311#endif
312#ifndef NO_RESOURCES
313 XrmDestroyDatabase (option_db);
314#endif
297} 315}
298 316
299// child has exited, usually destroys 317// child has exited, usually destroys
300void 318void
301rxvt_term::child_cb (child_watcher &w, int status) 319rxvt_term::child_cb (ev::child &w, int status)
302{ 320{
303 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 321 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
304 322
305 cmd_pid = 0; 323 cmd_pid = 0;
306 324
307 if (!OPTION (Opt_hold)) 325 if (!option (Opt_hold))
308 destroy (); 326 destroy ();
309} 327}
310 328
311void 329void
312rxvt_term::destroy () 330rxvt_term::destroy ()
313{ 331{
314 if (destroy_ev.active) 332 if (destroy_ev.is_active ())
315 return; 333 return;
316 334
317 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 335 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
318 336
319#if ENABLE_OVERLAY 337#if ENABLE_OVERLAY
… …
326 im_ev.stop (display); 344 im_ev.stop (display);
327#endif 345#endif
328#if HAVE_SCROLLBARS 346#if HAVE_SCROLLBARS
329 scrollbar_ev.stop (display); 347 scrollbar_ev.stop (display);
330#endif 348#endif
331#if TRANSPARENT 349#if ENABLE_TRANSPARENCY || ENABLE_PERL
332 rootwin_ev.stop (display); 350 rootwin_ev.stop (display);
333#endif 351#endif
334 incr_ev.stop (); 352 incr_ev.stop ();
335 termwin_ev.stop (display); 353 termwin_ev.stop (display);
336 vt_ev.stop (display); 354 vt_ev.stop (display);
337 } 355 }
338 356
339 check_ev.stop (); 357 flush_ev.stop ();
340 pty_ev.stop (); 358 pty_ev.stop ();
341#ifdef CURSOR_BLINK 359#ifdef CURSOR_BLINK
342 cursor_blink_ev.stop (); 360 cursor_blink_ev.stop ();
343#endif 361#endif
344#ifdef TEXT_BLINK 362#ifdef TEXT_BLINK
… …
352#endif 370#endif
353#ifdef POINTER_BLANK 371#ifdef POINTER_BLANK
354 pointer_ev.stop (); 372 pointer_ev.stop ();
355#endif 373#endif
356 374
357 destroy_ev.start (0); 375 destroy_ev.start ();
358} 376}
359 377
360void 378void
361rxvt_term::destroy_cb (time_watcher &w) 379rxvt_term::destroy_cb (ev::idle &w, int revents)
362{ 380{
363 make_current (); 381 make_current ();
364 382
365 delete this; 383 delete this;
366} 384}
… …
420 else 438 else
421 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 439 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
422 mesg, BUFSIZ); 440 mesg, BUFSIZ);
423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 441 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
424 } 442 }
425 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 443 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
426 mesg, BUFSIZ); 444 mesg, BUFSIZ);
427 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 445 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
428} 446}
429#endif 447#endif
430 448
… …
455 rxvt_emergency_cleanup (); 473 rxvt_emergency_cleanup ();
456 _exit (EXIT_FAILURE); 474 _exit (EXIT_FAILURE);
457} 475}
458 476
459/*----------------------------------------------------------------------*/ 477/*----------------------------------------------------------------------*/
460bool 478void
461rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 479rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
462{ 480{
463 this->envv = envv; 481 this->envv = envv;
464 482
465 SET_R (this); 483 SET_R (this);
466 set_locale (""); 484 set_locale ("");
467 set_environ (envv); // few things in X do not call setlocale :( 485 set_environ (envv); // few things in X do not call setlocale :(
468 486
469 if (!init_vars ()) 487 init_vars ();
470 return false;
471 488
472 init_secondary (); 489 init_secondary ();
473 490
474 const char **cmd_argv = init_resources (argc, argv); 491 const char **cmd_argv = init_resources (argc, argv);
475 492
476#ifdef KEYSYM_RESOURCE 493#ifdef KEYSYM_RESOURCE
477 keyboard->register_done (); 494 keyboard->register_done ();
478#endif 495#endif
479 496
480#ifdef HAVE_SCROLLBARS 497#ifdef HAVE_SCROLLBARS
481 if (OPTION (Opt_scrollBar)) 498 if (option (Opt_scrollBar))
482 scrollBar.setIdle (); /* set existence for size calculations */ 499 scrollBar.setIdle (); /* set existence for size calculations */
483#endif 500#endif
484 501
485 pty = ptytty::create (); 502 pty = ptytty::create ();
486 503
… …
493#if 0 510#if 0
494 XSynchronize (dpy, True); 511 XSynchronize (dpy, True);
495#endif 512#endif
496 513
497#ifdef HAVE_SCROLLBARS 514#ifdef HAVE_SCROLLBARS
498 if (OPTION (Opt_scrollBar)) 515 if (option (Opt_scrollBar))
499 resize_scrollbar (); /* create and map scrollbar */ 516 resize_scrollbar (); /* create and map scrollbar */
500#endif 517#endif
518#ifdef HAVE_BG_PIXMAP
519 {
520 bgPixmap.set_target (this);
521
501#ifdef TRANSPARENT 522#ifdef ENABLE_TRANSPARENCY
502 if (OPTION (Opt_transparent)) 523 if (option (Opt_transparent))
503 { 524 {
525 bgPixmap.set_transparent ();
526#ifdef HAVE_AFTERIMAGE
527 if (rs [Rs_blurradius])
528 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
529#endif
530 if (ISSET_PIXCOLOR (Color_tint))
531 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
532 if (rs [Rs_shade])
533 bgPixmap.set_shade (rs [Rs_shade]);
534
535 bgPixmap.set_root_pixmap ();
504 XSelectInput (dpy, display->root, PropertyChangeMask); 536 XSelectInput (dpy, display->root, PropertyChangeMask);
505 check_our_parents ();
506 rootwin_ev.start (display, display->root); 537 rootwin_ev.start (display, display->root);
507 } 538 }
539#endif
540
541#ifdef BG_IMAGE_FROM_FILE
542 if (rs[Rs_backgroundPixmap] != NULL)
543 {
544 const char *p = rs[Rs_backgroundPixmap];
545
546 if ((p = strchr (p, ';')) != NULL)
547 {
548 p++;
549 bgPixmap.set_geometry (p);
550 }
551 else
552 bgPixmap.set_defaultGeometry ();
553
554 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
555 if (!bgPixmap.window_position_sensitive ())
556 update_background ();
557 }
558#endif
559 }
560#endif
561
562#if ENABLE_PERL
563 rootwin_ev.start (display, display->root);
508#endif 564#endif
509 565
510 set_colorfgbg (); 566 set_colorfgbg ();
511 567
512 init_command (cmd_argv); 568 init_command (cmd_argv);
513 569
514 free (cmd_argv); 570 free (cmd_argv);
515 571
516 if (pty->pty >= 0) 572 if (pty->pty >= 0)
517 pty_ev.start (pty->pty, EVENT_READ); 573 pty_ev.start (pty->pty, ev::READ);
518
519 check_ev.start ();
520 574
521 HOOK_INVOKE ((this, HOOK_START, DT_END)); 575 HOOK_INVOKE ((this, HOOK_START, DT_END));
522 576
523#if ENABLE_XEMBED 577#if ENABLE_XEMBED
524 if (rs[Rs_embed]) 578 if (rs[Rs_embed])
… …
530 } 584 }
531#endif 585#endif
532 586
533 XMapWindow (dpy, vt); 587 XMapWindow (dpy, vt);
534 XMapWindow (dpy, parent[0]); 588 XMapWindow (dpy, parent[0]);
535
536 return true;
537} 589}
538 590
539static struct sig_handlers 591static struct sig_handlers
540{ 592{
541 sig_watcher sw_term, sw_int; 593 ev::sig sw_term, sw_int;
542 594
543 /* 595 /*
544 * Catch a fatal signal and tidy up before quitting 596 * Catch a fatal signal and tidy up before quitting
545 */ 597 */
546 void 598 void sig_term (ev::sig &w, int revents);
547 sig_term (sig_watcher &w) 599
600 sig_handlers ()
548 { 601 {
549 rxvt_emergency_cleanup (); 602 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
550 signal (w.signum, SIG_DFL);
551 kill (getpid (), w.signum);
552 }
553
554 sig_handlers ()
555 : sw_term (this, &sig_handlers::sig_term),
556 sw_int (this, &sig_handlers::sig_term) 603 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
557 {
558 } 604 }
559} sig_handlers; 605} sig_handlers;
560 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
561char **rxvt_environ; // startup environment 615char **rxvt_environ; // startup environment
562 616
563void 617void
564rxvt_init () 618rxvt_init ()
565{ 619{
566 ptytty::init (); 620 ptytty::init ();
621
622 if (!ev_default_loop (0))
623 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
567 624
568 rxvt_environ = environ; 625 rxvt_environ = environ;
569 626
570 signal (SIGHUP, SIG_IGN); 627 signal (SIGHUP, SIG_IGN);
571 signal (SIGPIPE, SIG_IGN); 628 signal (SIGPIPE, SIG_IGN);
572 629
573 sig_handlers.sw_term.start (SIGTERM); 630 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
574 sig_handlers.sw_int.start (SIGINT); 631 sig_handlers.sw_int.start (SIGINT); ev_unref ();
575 632
576 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 633 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
577 /* signal (SIGURG, SIG_DFL); */ 634 /* signal (SIGURG, SIG_DFL); */
578 635
579 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 636 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
619 return p; 676 return p;
620} 677}
621 678
622/*----------------------------------------------------------------------*/ 679/*----------------------------------------------------------------------*/
623/* 680/*
624 * window size/position calculcations for XSizeHint and other storage. 681 * window size/position calculations for XSizeHint and other storage.
625 * if width/height are non-zero then override calculated width/height 682 * if width/height are non-zero then override calculated width/height
626 */ 683 */
627void 684void
628rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 685rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
629{ 686{
… …
701 if (scrollBar.state) 758 if (scrollBar.state)
702 { 759 {
703 sb_w = scrollbar_TotalWidth (); 760 sb_w = scrollbar_TotalWidth ();
704 szHint.base_width += sb_w; 761 szHint.base_width += sb_w;
705 762
706 if (!OPTION (Opt_scrollBar_right)) 763 if (!option (Opt_scrollBar_right))
707 window_vt_x += sb_w; 764 window_vt_x += sb_w;
708 } 765 }
709 766
710 szHint.width_inc = fwidth; 767 szHint.width_inc = fwidth;
711 szHint.height_inc = fheight; 768 szHint.height_inc = fheight;
… …
732 { 789 {
733 min_it (height, max_height); 790 min_it (height, max_height);
734 szHint.height = szHint.base_height + height; 791 szHint.height = szHint.base_height + height;
735 } 792 }
736 793
737 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 794 if (scrollBar.state && option (Opt_scrollBar_right))
738 window_sb_x = szHint.width - sb_w; 795 window_sb_x = szHint.width - sb_w;
739 796
740 if (recalc_x) 797 if (recalc_x)
741 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 798 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
742 799
… …
765 ws.ws_xpixel = width; 822 ws.ws_xpixel = width;
766 ws.ws_ypixel = height; 823 ws.ws_ypixel = height;
767 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 824 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
768 825
769#if 0 826#if 0
770 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 827 // TIOCSWINSZ is supposed to do this automatically and correctly
771 if (cmd_pid) /* force through to the command */ 828 if (cmd_pid) /* force through to the command */
772 kill (-cmd_pid, SIGWINCH); 829 kill (-cmd_pid, SIGWINCH);
773#endif 830#endif
774} 831}
775 832
… …
804 delete fontset[0]; 861 delete fontset[0];
805 fontset[0] = fs; 862 fontset[0] = fs;
806 863
807 prop = (*fs)[1]->properties (); 864 prop = (*fs)[1]->properties ();
808 prop.height += lineSpace; 865 prop.height += lineSpace;
866
809 fs->set_prop (prop); 867 fs->set_prop (prop, false);
810 868
811 fwidth = prop.width; 869 fwidth = prop.width;
812 fheight = prop.height; 870 fheight = prop.height;
813 fbase = prop.ascent; 871 fbase = prop.ascent;
814 872
… …
823 { 881 {
824 fontset[style] = fs = new rxvt_fontset (this); 882 fontset[style] = fs = new rxvt_fontset (this);
825 rxvt_fontprop prop2 = prop; 883 rxvt_fontprop prop2 = prop;
826 884
827 if (res) 885 if (res)
828 prop2.weight = prop2.slant = rxvt_fontprop::unset; 886 {
887 fs->populate (res);
888 fs->set_prop (prop2, false);
889 }
829 else 890 else
830 { 891 {
831 res = fontset[0]->fontdesc; 892 fs->populate (fontset[0]->fontdesc);
832 893
833 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 894 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
834 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 895 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
896
897 fs->set_prop (prop2, true);
835 } 898 }
836 899
837 fs->populate (res);
838 fs->set_prop (prop2);
839 } 900 }
840#else 901#else
841 fontset[style] = fontset[0]; 902 fontset[style] = fontset[0];
842#endif 903#endif
843 } 904 }
… …
845 if (parent[0]) 906 if (parent[0])
846 { 907 {
847 resize_all_windows (0, 0, 0); 908 resize_all_windows (0, 0, 0);
848 scr_remap_chars (); 909 scr_remap_chars ();
849 scr_touch (true); 910 scr_touch (true);
850 } 911 }
851 912
852 return true; 913 return true;
853} 914}
854 915
916void
855void rxvt_term::set_string_property (Atom prop, const char *str, int len) 917rxvt_term::set_string_property (Atom prop, const char *str, int len)
856{ 918{
857 XChangeProperty (dpy, parent[0], 919 XChangeProperty (dpy, parent[0],
858 prop, XA_STRING, 8, PropModeReplace, 920 prop, XA_STRING, 8, PropModeReplace,
859 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 921 (const unsigned char *)str, len >= 0 ? len : strlen (str));
860} 922}
861 923
924void
862void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 925rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
863{ 926{
864 wchar_t *ws = rxvt_mbstowcs (str, len); 927 wchar_t *ws = rxvt_mbstowcs (str, len);
865 char *s = rxvt_wcstoutf8 (ws); 928 char *s = rxvt_wcstoutf8 (ws);
866 929
867 XChangeProperty (dpy, parent[0], 930 XChangeProperty (dpy, parent[0],
… …
891#if ENABLE_EWMH 954#if ENABLE_EWMH
892 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 955 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
893#endif 956#endif
894} 957}
895 958
959void
960rxvt_term::set_window_color (int idx, const char *color)
961{
896#ifdef XTERM_COLOR_CHANGE 962#ifdef XTERM_COLOR_CHANGE
897void
898rxvt_term::set_window_color (int idx, const char *color)
899{
900 rxvt_color xcol; 963 rxvt_color xcol;
901 int i; 964 int i;
902 965
903 if (color == NULL || *color == '\0') 966 if (color == NULL || *color == '\0')
904 return; 967 return;
905 968
906 color = strdup (color); 969 color = strdup (color);
907 allocated.push_back ((void *)color); 970 allocated.push_back ((void *)color);
… …
911 if (isdigit (*color)) 974 if (isdigit (*color))
912 { 975 {
913 i = atoi (color); 976 i = atoi (color);
914 977
915 if (i >= 8 && i <= 15) 978 if (i >= 8 && i <= 15)
979 {
916 { /* bright colors */ 980 /* bright colors */
917 i -= 8;
918 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 981 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
919 goto done; 982 goto done;
920 } 983 }
921 984
922 if (i >= 0 && i <= 7) 985 if (i >= 0 && i <= 7)
986 {
923 { /* normal colors */ 987 /* normal colors */
924 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 988 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
925 goto done; 989 goto done;
926 } 990 }
927 } 991 }
928 992
… …
933 * so just keep gobbling up the colormap 997 * so just keep gobbling up the colormap
934 */ 998 */
935 999
936 pix_colors_focused[idx] = xcol; 1000 pix_colors_focused[idx] = xcol;
937 1001
938 /* XSetWindowAttributes attr; */
939 /* Cursor cursor; */
940done: 1002done:
941 /*TODO: handle Color_BD, scrollbar background, etc. */ 1003 /*TODO: handle Color_BD, scrollbar background, etc. */
942 1004
943 update_fade_color (idx); 1005 update_fade_color (idx);
944 recolour_cursor (); 1006 recolour_cursor ();
945 scr_recolour (); 1007 scr_recolour ();
1008#endif /* XTERM_COLOR_CHANGE */
946} 1009}
947
948#else
949# define set_window_color (idx,color) ((void)0)
950#endif /* XTERM_COLOR_CHANGE */
951 1010
952void 1011void
953rxvt_term::recolour_cursor () 1012rxvt_term::recolour_cursor ()
954{ 1013{
955 XColor fg, bg; 1014 XColor fg, bg;
… …
971 */ 1030 */
972void 1031void
973rxvt_term::set_colorfgbg () 1032rxvt_term::set_colorfgbg ()
974{ 1033{
975 unsigned int i; 1034 unsigned int i;
976 const char *xpmb = "\0"; 1035 const char *xpmb = "";
977 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1036 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
978 1037
979 strcpy (fstr, "default"); 1038 strcpy (fstr, "default");
980 strcpy (bstr, "default"); 1039 strcpy (bstr, "default");
981 for (i = Color_Black; i <= Color_White; i++) 1040 for (i = Color_Black; i <= Color_White; i++)
… …
987 1046
988 for (i = Color_Black; i <= Color_White; i++) 1047 for (i = Color_Black; i <= Color_White; i++)
989 if (pix_colors[Color_bg] == pix_colors[i]) 1048 if (pix_colors[Color_bg] == pix_colors[i])
990 { 1049 {
991 sprintf (bstr, "%d", (i - Color_Black)); 1050 sprintf (bstr, "%d", (i - Color_Black));
992#ifdef XPM_BACKGROUND 1051#ifdef BG_IMAGE_FROM_FILE
993 xpmb = "default;"; 1052 xpmb = "default;";
994#endif 1053#endif
995 break; 1054 break;
996 } 1055 }
997 1056
… …
1093 1152
1094 XMoveResizeWindow (dpy, vt, 1153 XMoveResizeWindow (dpy, vt,
1095 window_vt_x, window_vt_y, 1154 window_vt_x, window_vt_y,
1096 width, height); 1155 width, height);
1097 1156
1157#ifdef HAVE_BG_PIXMAP
1158 if (bgPixmap.window_size_sensitive ())
1159 update_background ();
1160#endif
1161
1098 scr_clear (); 1162 scr_clear ();
1099#ifdef XPM_BACKGROUND
1100 resize_pixmap ();
1101#endif
1102 } 1163 }
1103 1164
1104 if (fix_screen || old_height == 0) 1165 if (fix_screen || old_height == 0)
1105 scr_reset (); 1166 scr_reset ();
1106 1167
1107 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version 1168 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1108 //scr_touch (false); 1169 //scr_touch (false);
1109 1170
1110#ifdef XPM_BACKGROUND 1171#ifdef HAVE_BG_PIXMAP
1111 if (pixmap) 1172// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1173// if (bgPixmap.pixmap)
1112 scr_touch (false); 1174// scr_touch (false);
1113#endif 1175#endif
1114 1176
1115#ifdef USE_XIM 1177#ifdef USE_XIM
1116 IMSetPosition (); 1178 IMSetPosition ();
1117#endif 1179#endif
… …
1288 if (term->rs[Rs_imLocale]) 1350 if (term->rs[Rs_imLocale])
1289 SET_LOCALE (term->locale); 1351 SET_LOCALE (term->locale);
1290 } 1352 }
1291 else 1353 else
1292 str = (void *)text->string.wide_char; 1354 str = (void *)text->string.wide_char;
1293 1355
1294 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1356 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1295 DT_INT, call_data->caret, 1357 DT_INT, call_data->caret,
1296 DT_INT, call_data->chg_first, 1358 DT_INT, call_data->chg_first,
1297 DT_INT, call_data->chg_length, 1359 DT_INT, call_data->chg_length,
1298 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1360 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1617 1679
1618 if (input_style & XIMPreeditPosition) 1680 if (input_style & XIMPreeditPosition)
1619 { 1681 {
1620 im_set_size (preedit_rect); 1682 im_set_size (preedit_rect);
1621 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1683 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1622 1684
1623 XSetICValues (Input_Context, 1685 XSetICValues (Input_Context,
1624 XNPreeditAttributes, preedit_attr, NULL); 1686 XNPreeditAttributes, preedit_attr, NULL);
1625 } 1687 }
1626 else 1688 else
1627 { 1689 {
… …
1644 XFree (status_attr); 1706 XFree (status_attr);
1645 } 1707 }
1646 1708
1647 XFree (preedit_attr); 1709 XFree (preedit_attr);
1648} 1710}
1649#endif /* USE_XIM */ 1711#endif /* USE_XIM */
1712
1713void
1714rxvt_term::get_window_origin (int &x, int &y)
1715{
1716 Window cr;
1717 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1718/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1719}
1720
1721Pixmap
1722rxvt_term::get_pixmap_property (int prop_id)
1723{
1724 if (prop_id > 0 && prop_id < NUM_XA)
1725 if (xa[prop_id])
1726 {
1727 int aformat;
1728 unsigned long nitems, bytes_after;
1729 Atom atype;
1730 unsigned char *prop = NULL;
1731 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1732 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1733 &nitems, &bytes_after, &prop);
1734 if (result == Success && prop && atype == XA_PIXMAP)
1735 {
1736 return *(Pixmap *)prop;
1737 }
1738 }
1739 return None;
1740}
1741
1742#ifdef HAVE_BG_PIXMAP
1743# if TRACE_PIXMAPS
1744# undef update_background
1745int rxvt_term::trace_update_background (const char *file, int line)
1746{
1747 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1748 update_background ();
1749}
1750# endif
1751
1752int
1753rxvt_term::update_background ()
1754{
1755 bgPixmap.invalidate ();
1756
1757 /* no chance of real time refresh if we are blurring! */
1758 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1759 bgPixmap.render ();
1760 else
1761 {
1762 update_background_ev.stop ();
1763
1764 if (!bgPixmap.need_client_side_rendering ())
1765 update_background_ev.start (.05);
1766 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1767 update_background_ev.start (.20); /* very slow !!! */
1768 else
1769 update_background_ev.start (.07);
1770 }
1771
1772 return 0;
1773}
1774
1775void
1776rxvt_term::update_background_cb (ev::timer &w, int revents)
1777{
1778 make_current ();
1779 bgPixmap.render ();
1780 refresh_check ();
1781}
1782
1783#endif /* HAVE_BG_PIXMAP */
1650 1784
1651/*----------------------- end-of-file (C source) -----------------------*/ 1785/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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