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

Diff Legend

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