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.223 by root, Sat Feb 18 14:14:43 2006 UTC vs.
Revision 1.295 by root, Fri Jan 4 20:39:42 2008 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: main.C 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
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::rootwin_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#ifdef HAVE_BG_PIXMAP
271#if OFF_FOCUS_FADING 282 bgPixmap.destroy ();
272 delete pix_colors_unfocused;
273#endif 283#endif
274 284 display->flush (); /* ideally .put should do this */
275 displays.put (display); 285 displays.put (display);
276 286
277 scr_release (); 287 scr_release ();
278 288
279 /* clear all resources */ 289 /* clear all resources */
… …
292 delete argv; 302 delete argv;
293 303
294#ifdef KEYSYM_RESOURCE 304#ifdef KEYSYM_RESOURCE
295 delete keyboard; 305 delete keyboard;
296#endif 306#endif
307#ifndef NO_RESOURCES
308 XrmDestroyDatabase (option_db);
309#endif
297} 310}
298 311
299// child has exited, usually destroys 312// child has exited, usually destroys
300void 313void
301rxvt_term::child_cb (child_watcher &w, int status) 314rxvt_term::child_cb (ev::child &w, int status)
302{ 315{
303 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 316 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
304 317
305 cmd_pid = 0; 318 cmd_pid = 0;
306 319
307 if (!OPTION (Opt_hold)) 320 if (!option (Opt_hold))
308 destroy (); 321 destroy ();
309} 322}
310 323
311void 324void
312rxvt_term::destroy () 325rxvt_term::destroy ()
313{ 326{
314 if (destroy_ev.active) 327 if (destroy_ev.is_active ())
315 return; 328 return;
316 329
317 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 330 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
318 331
319#if ENABLE_OVERLAY 332#if ENABLE_OVERLAY
… …
326 im_ev.stop (display); 339 im_ev.stop (display);
327#endif 340#endif
328#if HAVE_SCROLLBARS 341#if HAVE_SCROLLBARS
329 scrollbar_ev.stop (display); 342 scrollbar_ev.stop (display);
330#endif 343#endif
331#if TRANSPARENT 344#if ENABLE_TRANSPARENCY || ENABLE_PERL
332 rootwin_ev.stop (display); 345 rootwin_ev.stop (display);
333#endif 346#endif
334 incr_ev.stop (); 347 incr_ev.stop ();
335 termwin_ev.stop (display); 348 termwin_ev.stop (display);
336 vt_ev.stop (display); 349 vt_ev.stop (display);
337 } 350 }
338 351
339 check_ev.stop (); 352 flush_ev.stop ();
340 pty_ev.stop (); 353 pty_ev.stop ();
341#ifdef CURSOR_BLINK 354#ifdef CURSOR_BLINK
342 cursor_blink_ev.stop (); 355 cursor_blink_ev.stop ();
343#endif 356#endif
344#ifdef TEXT_BLINK 357#ifdef TEXT_BLINK
… …
352#endif 365#endif
353#ifdef POINTER_BLANK 366#ifdef POINTER_BLANK
354 pointer_ev.stop (); 367 pointer_ev.stop ();
355#endif 368#endif
356 369
357 destroy_ev.start (0); 370 destroy_ev.start ();
358} 371}
359 372
360void 373void
361rxvt_term::destroy_cb (time_watcher &w) 374rxvt_term::destroy_cb (ev::idle &w, int revents)
362{ 375{
363 make_current (); 376 make_current ();
364 377
365 delete this; 378 delete this;
366} 379}
… …
420 else 433 else
421 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 434 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
422 mesg, BUFSIZ); 435 mesg, BUFSIZ);
423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 436 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
424 } 437 }
425 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 438 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
426 mesg, BUFSIZ); 439 mesg, BUFSIZ);
427 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 440 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
428} 441}
429#endif 442#endif
430 443
… …
455 rxvt_emergency_cleanup (); 468 rxvt_emergency_cleanup ();
456 _exit (EXIT_FAILURE); 469 _exit (EXIT_FAILURE);
457} 470}
458 471
459/*----------------------------------------------------------------------*/ 472/*----------------------------------------------------------------------*/
460bool 473void
461rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 474rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
462{ 475{
463 this->envv = envv; 476 this->envv = envv;
464 477
465 SET_R (this); 478 SET_R (this);
466 set_locale (""); 479 set_locale ("");
467 set_environ (envv); // few things in X do not call setlocale :( 480 set_environ (envv); // few things in X do not call setlocale :(
468 481
469 if (!init_vars ()) 482 init_vars ();
470 return false;
471 483
472 init_secondary (); 484 init_secondary ();
473 485
474 const char **cmd_argv = init_resources (argc, argv); 486 const char **cmd_argv = init_resources (argc, argv);
475 487
476#ifdef KEYSYM_RESOURCE 488#ifdef KEYSYM_RESOURCE
477 keyboard->register_done (); 489 keyboard->register_done ();
478#endif 490#endif
479 491
480#ifdef HAVE_SCROLLBARS 492#ifdef HAVE_SCROLLBARS
481 if (OPTION (Opt_scrollBar)) 493 if (option (Opt_scrollBar))
482 scrollBar.setIdle (); /* set existence for size calculations */ 494 scrollBar.setIdle (); /* set existence for size calculations */
483#endif 495#endif
484 496
485 pty = ptytty::create (); 497 pty = ptytty::create ();
486 498
… …
493#if 0 505#if 0
494 XSynchronize (dpy, True); 506 XSynchronize (dpy, True);
495#endif 507#endif
496 508
497#ifdef HAVE_SCROLLBARS 509#ifdef HAVE_SCROLLBARS
498 if (OPTION (Opt_scrollBar)) 510 if (option (Opt_scrollBar))
499 resize_scrollbar (); /* create and map scrollbar */ 511 resize_scrollbar (); /* create and map scrollbar */
500#endif 512#endif
513#ifdef HAVE_BG_PIXMAP
514 {
515 bgPixmap.set_target (this);
516
501#ifdef TRANSPARENT 517#ifdef ENABLE_TRANSPARENCY
502 if (OPTION (Opt_transparent)) 518 if (option (Opt_transparent))
503 { 519 {
520 bgPixmap.set_transparent ();
521
522#ifdef HAVE_AFTERIMAGE
523 if (rs [Rs_blurradius])
524 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
525#endif
526 if (ISSET_PIXCOLOR (Color_tint))
527 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
528
529 if (rs [Rs_shade])
530 bgPixmap.set_shade (rs [Rs_shade]);
531
532 bgPixmap.set_root_pixmap ();
504 XSelectInput (dpy, display->root, PropertyChangeMask); 533 XSelectInput (dpy, display->root, PropertyChangeMask);
505 check_our_parents ();
506 rootwin_ev.start (display, display->root); 534 rootwin_ev.start (display, display->root);
507 } 535 }
536#endif
537
538#ifdef BG_IMAGE_FROM_FILE
539 if (rs[Rs_backgroundPixmap])
540 {
541 const char *p = rs[Rs_backgroundPixmap];
542
543 if ((p = strchr (p, ';')) != 0)
544 {
545 p++;
546 bgPixmap.set_geometry (p);
547 }
548 else
549 bgPixmap.set_defaultGeometry ();
550
551 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
552 if (!bgPixmap.window_position_sensitive ())
553 update_background ();
554 }
555#endif
556 }
557#endif
558
559#if ENABLE_PERL
560 rootwin_ev.start (display, display->root);
508#endif 561#endif
509 562
510 set_colorfgbg (); 563 set_colorfgbg ();
511 564
512 init_command (cmd_argv); 565 init_command (cmd_argv);
513 566
514 free (cmd_argv); 567 free (cmd_argv);
515 568
516 if (pty->pty >= 0) 569 if (pty->pty >= 0)
517 pty_ev.start (pty->pty, EVENT_READ); 570 pty_ev.start (pty->pty, ev::READ);
518
519 check_ev.start ();
520 571
521 HOOK_INVOKE ((this, HOOK_START, DT_END)); 572 HOOK_INVOKE ((this, HOOK_START, DT_END));
522 573
523#if ENABLE_XEMBED 574#if ENABLE_XEMBED
524 if (rs[Rs_embed]) 575 if (rs[Rs_embed])
… …
530 } 581 }
531#endif 582#endif
532 583
533 XMapWindow (dpy, vt); 584 XMapWindow (dpy, vt);
534 XMapWindow (dpy, parent[0]); 585 XMapWindow (dpy, parent[0]);
535
536 return true;
537} 586}
538 587
539static struct sig_handlers 588static struct sig_handlers
540{ 589{
541 sig_watcher sw_term, sw_int; 590 ev::sig sw_term, sw_int;
542 591
543 /* 592 /*
544 * Catch a fatal signal and tidy up before quitting 593 * Catch a fatal signal and tidy up before quitting
545 */ 594 */
546 void 595 void sig_term (ev::sig &w, int revents);
547 sig_term (sig_watcher &w) 596
597 sig_handlers ()
548 { 598 {
549 rxvt_emergency_cleanup (); 599 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) 600 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
557 {
558 } 601 }
559} sig_handlers; 602} sig_handlers;
560 603
604void
605sig_handlers::sig_term (ev::sig &w, int revents)
606{
607 rxvt_emergency_cleanup ();
608 w.stop ();
609 kill (getpid (), w.signum);
610}
611
561char **rxvt_environ; // startup environment 612char **rxvt_environ; // startup environment
562 613
563void 614void
564rxvt_init () 615rxvt_init ()
565{ 616{
566 ptytty::init (); 617 ptytty::init ();
618
619 if (!ev_default_loop (0))
620 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
567 621
568 rxvt_environ = environ; 622 rxvt_environ = environ;
569 623
570 signal (SIGHUP, SIG_IGN); 624 signal (SIGHUP, SIG_IGN);
571 signal (SIGPIPE, SIG_IGN); 625 signal (SIGPIPE, SIG_IGN);
572 626
573 sig_handlers.sw_term.start (SIGTERM); 627 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
574 sig_handlers.sw_int.start (SIGINT); 628 sig_handlers.sw_int.start (SIGINT); ev_unref ();
575 629
576 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 630 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
577 /* signal (SIGURG, SIG_DFL); */ 631 /* signal (SIGURG, SIG_DFL); */
578 632
579 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 633 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
581 XSetIOErrorHandler (rxvt_xioerror_handler); 635 XSetIOErrorHandler (rxvt_xioerror_handler);
582 636
583 XrmInitialize (); 637 XrmInitialize ();
584} 638}
585 639
586/* ------------------------------------------------------------------------- *
587 * MEMORY ALLOCATION WRAPPERS *
588 * ------------------------------------------------------------------------- */
589void *
590rxvt_malloc (size_t size)
591{
592 void *p = malloc (size);
593
594 if (!p)
595 rxvt_fatal ("memory allocation failure. aborting.\n");
596
597 return p;
598}
599
600void *
601rxvt_calloc (size_t number, size_t size)
602{
603 void *p = calloc (number, size);
604
605 if (!p)
606 rxvt_fatal ("memory allocation failure. aborting.\n");
607
608 return p;
609}
610
611void *
612rxvt_realloc (void *ptr, size_t size)
613{
614 void *p = realloc (ptr, size);
615
616 if (!p)
617 rxvt_fatal ("memory allocation failure. aborting.\n");
618
619 return p;
620}
621
622/*----------------------------------------------------------------------*/ 640/*----------------------------------------------------------------------*/
623/* 641/*
624 * window size/position calculcations for XSizeHint and other storage. 642 * window size/position calculations for XSizeHint and other storage.
625 * if width/height are non-zero then override calculated width/height 643 * if width/height are non-zero then override calculated width/height
626 */ 644 */
627void 645void
628rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 646rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
629{ 647{
… …
701 if (scrollBar.state) 719 if (scrollBar.state)
702 { 720 {
703 sb_w = scrollbar_TotalWidth (); 721 sb_w = scrollbar_TotalWidth ();
704 szHint.base_width += sb_w; 722 szHint.base_width += sb_w;
705 723
706 if (!OPTION (Opt_scrollBar_right)) 724 if (!option (Opt_scrollBar_right))
707 window_vt_x += sb_w; 725 window_vt_x += sb_w;
708 } 726 }
709 727
710 szHint.width_inc = fwidth; 728 szHint.width_inc = fwidth;
711 szHint.height_inc = fheight; 729 szHint.height_inc = fheight;
… …
732 { 750 {
733 min_it (height, max_height); 751 min_it (height, max_height);
734 szHint.height = szHint.base_height + height; 752 szHint.height = szHint.base_height + height;
735 } 753 }
736 754
737 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 755 if (scrollBar.state && option (Opt_scrollBar_right))
738 window_sb_x = szHint.width - sb_w; 756 window_sb_x = szHint.width - sb_w;
739 757
740 if (recalc_x) 758 if (recalc_x)
741 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 759 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
742 760
… …
765 ws.ws_xpixel = width; 783 ws.ws_xpixel = width;
766 ws.ws_ypixel = height; 784 ws.ws_ypixel = height;
767 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 785 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
768 786
769#if 0 787#if 0
770 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 788 // TIOCSWINSZ is supposed to do this automatically and correctly
771 if (cmd_pid) /* force through to the command */ 789 if (cmd_pid) /* force through to the command */
772 kill (-cmd_pid, SIGWINCH); 790 kill (-cmd_pid, SIGWINCH);
773#endif 791#endif
774} 792}
775 793
… …
804 delete fontset[0]; 822 delete fontset[0];
805 fontset[0] = fs; 823 fontset[0] = fs;
806 824
807 prop = (*fs)[1]->properties (); 825 prop = (*fs)[1]->properties ();
808 prop.height += lineSpace; 826 prop.height += lineSpace;
827
809 fs->set_prop (prop); 828 fs->set_prop (prop, false);
810 829
811 fwidth = prop.width; 830 fwidth = prop.width;
812 fheight = prop.height; 831 fheight = prop.height;
813 fbase = prop.ascent; 832 fbase = prop.ascent;
814 833
… …
823 { 842 {
824 fontset[style] = fs = new rxvt_fontset (this); 843 fontset[style] = fs = new rxvt_fontset (this);
825 rxvt_fontprop prop2 = prop; 844 rxvt_fontprop prop2 = prop;
826 845
827 if (res) 846 if (res)
828 prop2.weight = prop2.slant = rxvt_fontprop::unset; 847 {
848 fs->populate (res);
849 fs->set_prop (prop2, false);
850 }
829 else 851 else
830 { 852 {
831 res = fontset[0]->fontdesc; 853 fs->populate (fontset[0]->fontdesc);
832 854
833 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 855 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; 856 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
857
858 fs->set_prop (prop2, true);
835 } 859 }
836 860
837 fs->populate (res);
838 fs->set_prop (prop2);
839 } 861 }
840#else 862#else
841 fontset[style] = fontset[0]; 863 fontset[style] = fontset[0];
842#endif 864#endif
843 } 865 }
… …
845 if (parent[0]) 867 if (parent[0])
846 { 868 {
847 resize_all_windows (0, 0, 0); 869 resize_all_windows (0, 0, 0);
848 scr_remap_chars (); 870 scr_remap_chars ();
849 scr_touch (true); 871 scr_touch (true);
850 } 872 }
851 873
852 return true; 874 return true;
853} 875}
854 876
877void
855void rxvt_term::set_string_property (Atom prop, const char *str, int len) 878rxvt_term::set_string_property (Atom prop, const char *str, int len)
856{ 879{
857 XChangeProperty (dpy, parent[0], 880 XChangeProperty (dpy, parent[0],
858 prop, XA_STRING, 8, PropModeReplace, 881 prop, XA_STRING, 8, PropModeReplace,
859 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 882 (const unsigned char *)str, len >= 0 ? len : strlen (str));
860} 883}
861 884
885void
862void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 886rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
863{ 887{
864 wchar_t *ws = rxvt_mbstowcs (str, len); 888 wchar_t *ws = rxvt_mbstowcs (str, len);
865 char *s = rxvt_wcstoutf8 (ws); 889 char *s = rxvt_wcstoutf8 (ws);
866 890
867 XChangeProperty (dpy, parent[0], 891 XChangeProperty (dpy, parent[0],
… …
891#if ENABLE_EWMH 915#if ENABLE_EWMH
892 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 916 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
893#endif 917#endif
894} 918}
895 919
920void
921rxvt_term::set_window_color (int idx, const char *color)
922{
896#ifdef XTERM_COLOR_CHANGE 923#ifdef XTERM_COLOR_CHANGE
897void
898rxvt_term::set_window_color (int idx, const char *color)
899{
900 rxvt_color xcol; 924 rxvt_color xcol;
901 int i; 925 int i;
902 926
903 if (color == NULL || *color == '\0') 927 if (color == NULL || *color == '\0')
904 return; 928 return;
905 929
906 color = strdup (color); 930 color = strdup (color);
907 allocated.push_back ((void *)color); 931 allocated.push_back ((void *)color);
… …
911 if (isdigit (*color)) 935 if (isdigit (*color))
912 { 936 {
913 i = atoi (color); 937 i = atoi (color);
914 938
915 if (i >= 8 && i <= 15) 939 if (i >= 8 && i <= 15)
940 {
916 { /* bright colors */ 941 /* bright colors */
917 i -= 8;
918 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 942 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
919 goto done; 943 goto done;
920 } 944 }
921 945
922 if (i >= 0 && i <= 7) 946 if (i >= 0 && i <= 7)
947 {
923 { /* normal colors */ 948 /* normal colors */
924 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 949 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
925 goto done; 950 goto done;
926 } 951 }
927 } 952 }
928 953
… …
933 * so just keep gobbling up the colormap 958 * so just keep gobbling up the colormap
934 */ 959 */
935 960
936 pix_colors_focused[idx] = xcol; 961 pix_colors_focused[idx] = xcol;
937 962
938 /* XSetWindowAttributes attr; */
939 /* Cursor cursor; */
940done: 963done:
941
942#if OFF_FOCUS_FADING
943 if (rs[Rs_fade])
944 {
945 rgba c;
946 pix_colors [Color_fade].get (c);
947 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
948 }
949#endif
950
951 /*TODO: handle Color_BD, scrollbar background, etc. */ 964 /*TODO: handle Color_BD, scrollbar background, etc. */
952 965
966 update_fade_color (idx);
953 recolour_cursor (); 967 recolour_cursor ();
954 scr_recolour (); 968 scr_recolour ();
969#endif /* XTERM_COLOR_CHANGE */
955} 970}
956
957#else
958# define set_window_color (idx,color) ((void)0)
959#endif /* XTERM_COLOR_CHANGE */
960 971
961void 972void
962rxvt_term::recolour_cursor () 973rxvt_term::recolour_cursor ()
963{ 974{
964 XColor fg, bg; 975 XColor fg, bg;
… …
980 */ 991 */
981void 992void
982rxvt_term::set_colorfgbg () 993rxvt_term::set_colorfgbg ()
983{ 994{
984 unsigned int i; 995 unsigned int i;
985 const char *xpmb = "\0"; 996 const char *xpmb = "";
986 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 997 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
987 998
988 strcpy (fstr, "default"); 999 strcpy (fstr, "default");
989 strcpy (bstr, "default"); 1000 strcpy (bstr, "default");
990 for (i = Color_Black; i <= Color_White; i++) 1001 for (i = Color_Black; i <= Color_White; i++)
… …
996 1007
997 for (i = Color_Black; i <= Color_White; i++) 1008 for (i = Color_Black; i <= Color_White; i++)
998 if (pix_colors[Color_bg] == pix_colors[i]) 1009 if (pix_colors[Color_bg] == pix_colors[i])
999 { 1010 {
1000 sprintf (bstr, "%d", (i - Color_Black)); 1011 sprintf (bstr, "%d", (i - Color_Black));
1001#ifdef XPM_BACKGROUND 1012#ifdef BG_IMAGE_FROM_FILE
1002 xpmb = "default;"; 1013 xpmb = "default;";
1003#endif 1014#endif
1004 break; 1015 break;
1005 } 1016 }
1006 1017
… …
1102 1113
1103 XMoveResizeWindow (dpy, vt, 1114 XMoveResizeWindow (dpy, vt,
1104 window_vt_x, window_vt_y, 1115 window_vt_x, window_vt_y,
1105 width, height); 1116 width, height);
1106 1117
1118#ifdef HAVE_BG_PIXMAP
1119 if (bgPixmap.window_size_sensitive ())
1120 update_background ();
1121#endif
1122
1107 scr_clear (); 1123 scr_clear ();
1108#ifdef XPM_BACKGROUND
1109 resize_pixmap ();
1110#endif
1111 } 1124 }
1112 1125
1113 if (fix_screen || old_height == 0) 1126 if (fix_screen || old_height == 0)
1114 scr_reset (); 1127 scr_reset ();
1115 1128
1116 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version 1129 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1117 //scr_touch (false); 1130 //scr_touch (false);
1118 1131
1119#ifdef XPM_BACKGROUND 1132#ifdef HAVE_BG_PIXMAP
1120 if (pixmap) 1133// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1134// if (bgPixmap.pixmap)
1121 scr_touch (false); 1135// scr_touch (false);
1122#endif 1136#endif
1123 1137
1124#ifdef USE_XIM 1138#ifdef USE_XIM
1125 IMSetPosition (); 1139 IMSetPosition ();
1126#endif 1140#endif
… …
1297 if (term->rs[Rs_imLocale]) 1311 if (term->rs[Rs_imLocale])
1298 SET_LOCALE (term->locale); 1312 SET_LOCALE (term->locale);
1299 } 1313 }
1300 else 1314 else
1301 str = (void *)text->string.wide_char; 1315 str = (void *)text->string.wide_char;
1302 1316
1303 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1317 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1304 DT_INT, call_data->caret, 1318 DT_INT, call_data->caret,
1305 DT_INT, call_data->chg_first, 1319 DT_INT, call_data->chg_first,
1306 DT_INT, call_data->chg_length, 1320 DT_INT, call_data->chg_length,
1307 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1321 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1626 1640
1627 if (input_style & XIMPreeditPosition) 1641 if (input_style & XIMPreeditPosition)
1628 { 1642 {
1629 im_set_size (preedit_rect); 1643 im_set_size (preedit_rect);
1630 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1644 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1631 1645
1632 XSetICValues (Input_Context, 1646 XSetICValues (Input_Context,
1633 XNPreeditAttributes, preedit_attr, NULL); 1647 XNPreeditAttributes, preedit_attr, NULL);
1634 } 1648 }
1635 else 1649 else
1636 { 1650 {
… …
1653 XFree (status_attr); 1667 XFree (status_attr);
1654 } 1668 }
1655 1669
1656 XFree (preedit_attr); 1670 XFree (preedit_attr);
1657} 1671}
1658#endif /* USE_XIM */ 1672#endif /* USE_XIM */
1673
1674void
1675rxvt_term::get_window_origin (int &x, int &y)
1676{
1677 Window cr;
1678 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1679/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1680}
1681
1682Pixmap
1683rxvt_term::get_pixmap_property (int prop_id)
1684{
1685 if (prop_id > 0 && prop_id < NUM_XA)
1686 if (xa[prop_id])
1687 {
1688 int aformat;
1689 unsigned long nitems, bytes_after;
1690 Atom atype;
1691 unsigned char *prop = NULL;
1692 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1693 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1694 &nitems, &bytes_after, &prop);
1695 if (result == Success && prop && atype == XA_PIXMAP)
1696 return *(Pixmap *)prop;
1697 }
1698
1699 return None;
1700}
1701
1702#ifdef HAVE_BG_PIXMAP
1703# if TRACE_PIXMAPS
1704# undef update_background
1705void
1706rxvt_term::trace_update_background (const char *file, int line)
1707{
1708 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1709 update_background ();
1710}
1711# endif
1712
1713void
1714rxvt_term::update_background ()
1715{
1716 if (update_background_ev.is_active ())
1717 return;
1718
1719 bgPixmap.invalidate ();
1720
1721 ev_tstamp refresh;
1722
1723 if (!bgPixmap.need_client_side_rendering ())
1724 refresh = .05;
1725 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1726 /* no chance of real time refresh if we are bluring! */
1727 refresh = .50;
1728 else
1729 refresh = .07;
1730
1731 update_background_ev.start (refresh);
1732}
1733
1734void
1735rxvt_term::update_background_cb (ev::timer &w, int revents)
1736{
1737 make_current ();
1738
1739 update_background_ev.stop ();
1740 bgPixmap.render ();
1741 refresh_check ();
1742}
1743
1744#endif /* HAVE_BG_PIXMAP */
1659 1745
1660/*----------------------- end-of-file (C source) -----------------------*/ 1746/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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