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.215 by root, Wed Feb 1 18:36:48 2006 UTC vs.
Revision 1.256 by root, Sun Nov 11 04:08:00 2007 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>
… …
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 43#ifdef HAVE_TERMIOS_H
48# include <termios.h> 44# include <termios.h>
49#endif 45#endif
50 46
47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale>
53# endif
54#endif
55
51vector<rxvt_term *> rxvt_term::termlist; 56vector<rxvt_term *> rxvt_term::termlist;
52 57
53// used to tell global functions which terminal instance is "active" 58// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term; 59rxvt_t rxvt_current_term;
55 60
56static char curlocale[128], savelocale[128]; 61static char curlocale[128], savelocale[128];
57 62
58bool 63bool
59rxvt_set_locale (const char *locale) NOTHROW 64rxvt_set_locale (const char *locale) NOTHROW
60{ 65{
66 int size = strlen (locale) + 1;
67
68 if (size > sizeof (curlocale))
69 rxvt_fatal ("locale string too long, aborting.\n");
70
61 if (!locale || !strncmp (locale, curlocale, 128)) 71 if (!locale || !memcmp (locale, curlocale, size))
62 return false; 72 return false;
63 73
64 strncpy (curlocale, locale, 128); 74 memcpy (curlocale, locale, size);
65 setlocale (LC_CTYPE, curlocale); 75 setlocale (LC_CTYPE, curlocale);
66 return true; 76 return true;
67} 77}
68 78
69void 79void
… …
83class rxvt_composite_vec rxvt_composite; 93class rxvt_composite_vec rxvt_composite;
84 94
85text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 95text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
86{ 96{
87 compose_char *cc; 97 compose_char *cc;
88 98
89 // break compose chains, as stupid readline really likes to duplicate 99 // break compose chains, as stupid readline really likes to duplicate
90 // composing characters for some reason near the end of a line. 100 // composing characters for some reason near the end of a line.
91 cc = (*this)[c1]; 101 cc = (*this)[c1];
92 while (cc) 102 while (cc)
93 { 103 {
… …
143} 153}
144#endif 154#endif
145 155
146rxvt_term::rxvt_term () 156rxvt_term::rxvt_term ()
147 : 157 :
148#if TRANSPARENT 158#if ENABLE_TRANSPARENCY || ENABLE_PERL
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 159 rootwin_ev (this, &rxvt_term::rootwin_cb),
160#endif
161#if HAVE_BG_PIXMAP
162 update_background_ev(this, &rxvt_term::update_background_cb),
150#endif 163#endif
151#ifdef HAVE_SCROLLBARS 164#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb), 165 scrollbar_ev (this, &rxvt_term::x_cb),
153#endif 166#endif
154#ifdef CURSOR_BLINK 167#ifdef CURSOR_BLINK
… …
170 pointer_ev (this, &rxvt_term::pointer_cb), 183 pointer_ev (this, &rxvt_term::pointer_cb),
171#endif 184#endif
172#ifdef USE_XIM 185#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb), 186 im_ev (this, &rxvt_term::im_cb),
174#endif 187#endif
175#ifndef NO_BELL 188#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb), 189 bell_ev (this, &rxvt_term::bell_cb),
177#endif 190#endif
178 termwin_ev (this, &rxvt_term::x_cb), 191 termwin_ev (this, &rxvt_term::x_cb),
179 vt_ev (this, &rxvt_term::x_cb), 192 vt_ev (this, &rxvt_term::x_cb),
180 child_ev (this, &rxvt_term::child_cb), 193 child_ev (this, &rxvt_term::child_cb),
181 check_ev (this, &rxvt_term::check_cb), 194 prepare_ev (this, &rxvt_term::prepare_cb),
182 flush_ev (this, &rxvt_term::flush_cb), 195 flush_ev (this, &rxvt_term::flush_cb),
183 destroy_ev (this, &rxvt_term::destroy_cb), 196 destroy_ev (this, &rxvt_term::destroy_cb),
184 pty_ev (this, &rxvt_term::pty_cb), 197 pty_ev (this, &rxvt_term::pty_cb),
185 incr_ev (this, &rxvt_term::incr_cb) 198 incr_ev (this, &rxvt_term::incr_cb)
186{ 199{
… …
193#endif 206#endif
194} 207}
195 208
196// clean up the most important stuff, do *not* call x or free mem etc. 209// clean up the most important stuff, do *not* call x or free mem etc.
197// for use before an emergency exit 210// for use before an emergency exit
211void
198void rxvt_term::emergency_cleanup () 212rxvt_term::emergency_cleanup ()
199{ 213{
200 if (cmd_pid) 214 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 215 kill (-cmd_pid, SIGHUP);
202 216
217 pty_ev.stop ();
203 delete pty; pty = 0; 218 delete pty; pty = 0;
204} 219}
205 220
206rxvt_term::~rxvt_term () 221rxvt_term::~rxvt_term ()
207{ 222{
… …
222 237
223#ifdef USE_XIM 238#ifdef USE_XIM
224 im_destroy (); 239 im_destroy ();
225#endif 240#endif
226#ifdef XTERM_SCROLLBAR 241#ifdef XTERM_SCROLLBAR
227 if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC); 242 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
228 if (ShadowGC) XFreeGC (xdisp, ShadowGC); 243 if (ShadowGC) XFreeGC (dpy, ShadowGC);
229#endif 244#endif
230#ifdef PLAIN_SCROLLBAR 245#ifdef PLAIN_SCROLLBAR
231 if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC); 246 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
232#endif 247#endif
233#ifdef NEXT_SCROLLBAR 248#ifdef NEXT_SCROLLBAR
234 if (blackGC) XFreeGC (xdisp, blackGC); 249 if (blackGC) XFreeGC (dpy, blackGC);
235 if (whiteGC) XFreeGC (xdisp, whiteGC); 250 if (whiteGC) XFreeGC (dpy, whiteGC);
236 if (grayGC) XFreeGC (xdisp, grayGC); 251 if (grayGC) XFreeGC (dpy, grayGC);
237 if (darkGC) XFreeGC (xdisp, darkGC); 252 if (darkGC) XFreeGC (dpy, darkGC);
238 if (stippleGC) XFreeGC (xdisp, stippleGC); 253 if (stippleGC) XFreeGC (dpy, stippleGC);
239 if (dimple) XFreePixmap (xdisp, dimple); 254 if (dimple) XFreePixmap (dpy, dimple);
240 if (upArrow) XFreePixmap (xdisp, upArrow); 255 if (upArrow) XFreePixmap (dpy, upArrow);
241 if (downArrow) XFreePixmap (xdisp, downArrow); 256 if (downArrow) XFreePixmap (dpy, downArrow);
242 if (upArrowHi) XFreePixmap (xdisp, upArrowHi); 257 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
243 if (downArrowHi) XFreePixmap (xdisp, downArrowHi); 258 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
244#endif 259#endif
245#ifdef RXVT_SCROLLBAR 260#ifdef RXVT_SCROLLBAR
246 if (topShadowGC) XFreeGC (xdisp, topShadowGC); 261 if (topShadowGC) XFreeGC (dpy, topShadowGC);
247 if (botShadowGC) XFreeGC (xdisp, botShadowGC); 262 if (botShadowGC) XFreeGC (dpy, botShadowGC);
248 if (scrollbarGC) XFreeGC (xdisp, scrollbarGC); 263 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
249#endif 264#endif
250 if (gc) XFreeGC (xdisp, gc); 265 if (gc) XFreeGC (dpy, gc);
251 266
252 delete drawable; 267 delete drawable;
253 // destroy all windows 268 // destroy all windows
254 if (parent[0]) 269 if (parent[0])
255 XDestroyWindow (xdisp, parent[0]); 270 XDestroyWindow (dpy, parent[0]);
271
272 for (int i = 0; i < TOTAL_COLORS; i++)
273 if (ISSET_PIXCOLOR (i))
274 {
275 pix_colors_focused [i].free (this);
276#if OFF_FOCUS_FADING
277 pix_colors_unfocused [i].free (this);
278#endif
279 }
256 280
257 clear (); 281 clear ();
258 } 282 }
259 283
260 // TODO: free pixcolours, colours should become part of rxvt_display
261 delete pix_colors_focused; 284 delete [] pix_colors_focused;
262#if OFF_FOCUS_FADING 285#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused; 286 delete [] pix_colors_unfocused;
264#endif 287#endif
265 288
266 displays.put (display); 289 displays.put (display);
267 290
268 scr_release (); 291 scr_release ();
… …
287#endif 310#endif
288} 311}
289 312
290// child has exited, usually destroys 313// child has exited, usually destroys
291void 314void
292rxvt_term::child_cb (child_watcher &w, int status) 315rxvt_term::child_cb (ev::child &w, int status)
293{ 316{
294 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 317 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
295 318
296 cmd_pid = 0; 319 cmd_pid = 0;
297 320
298 if (!OPTION (Opt_hold)) 321 if (!option (Opt_hold))
299 destroy (); 322 destroy ();
300} 323}
301 324
302void 325void
303rxvt_term::destroy () 326rxvt_term::destroy ()
… …
317 im_ev.stop (display); 340 im_ev.stop (display);
318#endif 341#endif
319#if HAVE_SCROLLBARS 342#if HAVE_SCROLLBARS
320 scrollbar_ev.stop (display); 343 scrollbar_ev.stop (display);
321#endif 344#endif
322#if TRANSPARENT 345#if ENABLE_TRANSPARENCY || ENABLE_PERL
323 rootwin_ev.stop (display); 346 rootwin_ev.stop (display);
324#endif 347#endif
325 incr_ev.stop (); 348 incr_ev.stop ();
326 termwin_ev.stop (display); 349 termwin_ev.stop (display);
327 vt_ev.stop (display); 350 vt_ev.stop (display);
328 } 351 }
329 352
330 check_ev.stop (); 353 prepare_ev.stop ();
331 pty_ev.stop (); 354 pty_ev.stop ();
332#ifdef CURSOR_BLINK 355#ifdef CURSOR_BLINK
333 cursor_blink_ev.stop (); 356 cursor_blink_ev.stop ();
334#endif 357#endif
335#ifdef TEXT_BLINK 358#ifdef TEXT_BLINK
… …
343#endif 366#endif
344#ifdef POINTER_BLANK 367#ifdef POINTER_BLANK
345 pointer_ev.stop (); 368 pointer_ev.stop ();
346#endif 369#endif
347 370
348 destroy_ev.start (0); 371 destroy_ev.start ();
349} 372}
350 373
351void 374void
352rxvt_term::destroy_cb (time_watcher &w) 375rxvt_term::destroy_cb (ev::check &w, int revents)
353{ 376{
354 make_current (); 377 make_current ();
355 378
356 delete this; 379 delete this;
357} 380}
… …
411 else 434 else
412 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 435 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
413 mesg, BUFSIZ); 436 mesg, BUFSIZ);
414 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
415 } 438 }
416 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 439 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
417 mesg, BUFSIZ); 440 mesg, BUFSIZ);
418 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 441 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
419} 442}
420#endif 443#endif
421 444
… …
467#ifdef KEYSYM_RESOURCE 490#ifdef KEYSYM_RESOURCE
468 keyboard->register_done (); 491 keyboard->register_done ();
469#endif 492#endif
470 493
471#ifdef HAVE_SCROLLBARS 494#ifdef HAVE_SCROLLBARS
472 if (OPTION (Opt_scrollBar)) 495 if (option (Opt_scrollBar))
473 scrollBar.setIdle (); /* set existence for size calculations */ 496 scrollBar.setIdle (); /* set existence for size calculations */
474#endif 497#endif
475 498
476 pty = ptytty::create (); 499 pty = ptytty::create ();
477 500
… …
480 init_xlocale (); 503 init_xlocale ();
481 504
482 scr_reset (); // initialize screen 505 scr_reset (); // initialize screen
483 506
484#if 0 507#if 0
485 XSynchronize (xdisp, True); 508 XSynchronize (dpy, True);
486#endif 509#endif
487 510
488#ifdef HAVE_SCROLLBARS 511#ifdef HAVE_SCROLLBARS
489 if (OPTION (Opt_scrollBar)) 512 if (option (Opt_scrollBar))
490 resize_scrollbar (); /* create and map scrollbar */ 513 resize_scrollbar (); /* create and map scrollbar */
491#endif 514#endif
515#ifdef HAVE_BG_PIXMAP
516 {
517 bgPixmap.set_target (this);
518
492#ifdef TRANSPARENT 519#ifdef ENABLE_TRANSPARENCY
493 if (OPTION (Opt_transparent)) 520 if (option (Opt_transparent))
494 { 521 {
522 bgPixmap.set_transparent ();
523#ifdef HAVE_AFTERIMAGE
524 if (rs [Rs_blurradius])
525 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
526#endif
527 if (ISSET_PIXCOLOR (Color_tint))
528 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
529 if (rs [Rs_shade])
530 bgPixmap.set_shade (rs [Rs_shade]);
531
532 bgPixmap.set_root_pixmap ();
495 XSelectInput (xdisp, display->root, PropertyChangeMask); 533 XSelectInput (dpy, display->root, PropertyChangeMask);
496 check_our_parents ();
497 rootwin_ev.start (display, display->root); 534 rootwin_ev.start (display, display->root);
498 } 535 }
536#endif
537
538#ifdef BG_IMAGE_FROM_FILE
539 if (rs[Rs_backgroundPixmap] != NULL)
540 {
541 const char *p = rs[Rs_backgroundPixmap];
542
543 if ((p = strchr (p, ';')) != NULL)
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);
499#endif 561#endif
500 562
501 set_colorfgbg (); 563 set_colorfgbg ();
502 564
503 init_command (cmd_argv); 565 init_command (cmd_argv);
504 566
505 free (cmd_argv); 567 free (cmd_argv);
506 568
507 if (pty->pty >= 0) 569 if (pty->pty >= 0)
508 pty_ev.start (pty->pty, EVENT_READ); 570 pty_ev.start (pty->pty, ev::READ);
509 571
510 check_ev.start (); 572 prepare_ev.start ();
511 573
512 HOOK_INVOKE ((this, HOOK_START, DT_END)); 574 HOOK_INVOKE ((this, HOOK_START, DT_END));
513 575
514#if ENABLE_XEMBED 576#if ENABLE_XEMBED
515 if (rs[Rs_embed]) 577 if (rs[Rs_embed])
516 { 578 {
517 long info[2] = { 0, XEMBED_MAPPED }; 579 long info[2] = { 0, XEMBED_MAPPED };
518 580
519 XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 581 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
520 32, PropModeReplace, (unsigned char *)&info, 2); 582 32, PropModeReplace, (unsigned char *)&info, 2);
521 } 583 }
522#endif 584#endif
523 585
524 XMapWindow (xdisp, vt); 586 XMapWindow (dpy, vt);
525 XMapWindow (xdisp, parent[0]); 587 XMapWindow (dpy, parent[0]);
526 588
527 return true; 589 return true;
528} 590}
529 591
530static struct sig_handlers 592static struct sig_handlers
531{ 593{
532 sig_watcher sw_term, sw_int; 594 ev::sig sw_term, sw_int;
533 595
534 /* 596 /*
535 * Catch a fatal signal and tidy up before quitting 597 * Catch a fatal signal and tidy up before quitting
536 */ 598 */
537 void 599 void
538 sig_term (sig_watcher &w) 600 sig_term (ev::sig &w, int revents)
539 { 601 {
540 rxvt_emergency_cleanup (); 602 rxvt_emergency_cleanup ();
541 signal (w.signum, SIG_DFL); 603 w.stop ();
542 kill (getpid (), w.signum); 604 kill (getpid (), w.signum);
543 } 605 }
544 606
545 sig_handlers () 607 sig_handlers ()
546 : sw_term (this, &sig_handlers::sig_term), 608 : sw_term (this, &sig_handlers::sig_term),
… …
553 615
554void 616void
555rxvt_init () 617rxvt_init ()
556{ 618{
557 ptytty::init (); 619 ptytty::init ();
620 ev::ev_default_loop (0);
558 621
559 rxvt_environ = environ; 622 rxvt_environ = environ;
560 623
561 signal (SIGHUP, SIG_IGN); 624 signal (SIGHUP, SIG_IGN);
562 signal (SIGPIPE, SIG_IGN); 625 signal (SIGPIPE, SIG_IGN);
563 626
564 sig_handlers.sw_term.start (SIGTERM); 627 sig_handlers.sw_term.start (SIGTERM); ev::ev_unref ();
565 sig_handlers.sw_int.start (SIGINT); 628 sig_handlers.sw_int.start (SIGINT); ev::ev_unref ();
566 629
567 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 630 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
568 /* signal (SIGURG, SIG_DFL); */ 631 /* signal (SIGURG, SIG_DFL); */
569 632
570 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 633 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
610 return p; 673 return p;
611} 674}
612 675
613/*----------------------------------------------------------------------*/ 676/*----------------------------------------------------------------------*/
614/* 677/*
615 * window size/position calculcations for XSizeHint and other storage. 678 * window size/position calculations for XSizeHint and other storage.
616 * if width/height are non-zero then override calculated width/height 679 * if width/height are non-zero then override calculated width/height
617 */ 680 */
618void 681void
619rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 682rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
620{ 683{
… …
692 if (scrollBar.state) 755 if (scrollBar.state)
693 { 756 {
694 sb_w = scrollbar_TotalWidth (); 757 sb_w = scrollbar_TotalWidth ();
695 szHint.base_width += sb_w; 758 szHint.base_width += sb_w;
696 759
697 if (!OPTION (Opt_scrollBar_right)) 760 if (!option (Opt_scrollBar_right))
698 window_vt_x += sb_w; 761 window_vt_x += sb_w;
699 } 762 }
700 763
701 szHint.width_inc = fwidth; 764 szHint.width_inc = fwidth;
702 szHint.height_inc = fheight; 765 szHint.height_inc = fheight;
703 szHint.min_width = szHint.base_width + szHint.width_inc; 766 szHint.min_width = szHint.base_width + szHint.width_inc;
704 szHint.min_height = szHint.base_height + szHint.height_inc; 767 szHint.min_height = szHint.base_height + szHint.height_inc;
705 768
706 if (newwidth && newwidth - szHint.base_width < max_width) 769 if (newwidth && newwidth - szHint.base_width < max_width)
707 { 770 {
708 szHint.width = newwidth; 771 szHint.width = newwidth;
… …
723 { 786 {
724 min_it (height, max_height); 787 min_it (height, max_height);
725 szHint.height = szHint.base_height + height; 788 szHint.height = szHint.base_height + height;
726 } 789 }
727 790
728 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 791 if (scrollBar.state && option (Opt_scrollBar_right))
729 window_sb_x = szHint.width - sb_w; 792 window_sb_x = szHint.width - sb_w;
730 793
731 if (recalc_x) 794 if (recalc_x)
732 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth; 795 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
733 796
734 if (recalc_y) 797 if (recalc_y)
735 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth; 798 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
736 799
737 ncol = width / fwidth; 800 ncol = width / fwidth;
738 nrow = height / fheight; 801 nrow = height / fheight;
739} 802}
740 803
… …
795 delete fontset[0]; 858 delete fontset[0];
796 fontset[0] = fs; 859 fontset[0] = fs;
797 860
798 prop = (*fs)[1]->properties (); 861 prop = (*fs)[1]->properties ();
799 prop.height += lineSpace; 862 prop.height += lineSpace;
863
800 fs->set_prop (prop); 864 fs->set_prop (prop, false);
801 865
802 fwidth = prop.width; 866 fwidth = prop.width;
803 fheight = prop.height; 867 fheight = prop.height;
804 fbase = prop.ascent; 868 fbase = prop.ascent;
805 869
… …
814 { 878 {
815 fontset[style] = fs = new rxvt_fontset (this); 879 fontset[style] = fs = new rxvt_fontset (this);
816 rxvt_fontprop prop2 = prop; 880 rxvt_fontprop prop2 = prop;
817 881
818 if (res) 882 if (res)
819 prop2.weight = prop2.slant = rxvt_fontprop::unset; 883 {
884 fs->populate (res);
885 fs->set_prop (prop2, false);
886 }
820 else 887 else
821 { 888 {
822 res = fontset[0]->fontdesc; 889 fs->populate (fontset[0]->fontdesc);
823 890
824 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 891 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
825 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 892 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
893
894 fs->set_prop (prop2, true);
826 } 895 }
827 896
828 fs->populate (res);
829 fs->set_prop (prop2);
830 } 897 }
831#else 898#else
832 fontset[style] = fontset[0]; 899 fontset[style] = fontset[0];
833#endif 900#endif
834 } 901 }
… …
836 if (parent[0]) 903 if (parent[0])
837 { 904 {
838 resize_all_windows (0, 0, 0); 905 resize_all_windows (0, 0, 0);
839 scr_remap_chars (); 906 scr_remap_chars ();
840 scr_touch (true); 907 scr_touch (true);
841 } 908 }
842 909
843 return true; 910 return true;
844} 911}
845 912
913void
846void rxvt_term::set_string_property (Atom prop, const char *str, int len) 914rxvt_term::set_string_property (Atom prop, const char *str, int len)
847{ 915{
848 XChangeProperty (xdisp, parent[0], 916 XChangeProperty (dpy, parent[0],
849 prop, XA_STRING, 8, PropModeReplace, 917 prop, XA_STRING, 8, PropModeReplace,
850 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 918 (const unsigned char *)str, len >= 0 ? len : strlen (str));
851} 919}
852 920
921void
853void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 922rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
854{ 923{
855 wchar_t *ws = rxvt_mbstowcs (str, len); 924 wchar_t *ws = rxvt_mbstowcs (str, len);
856 char *s = rxvt_wcstoutf8 (ws); 925 char *s = rxvt_wcstoutf8 (ws);
857 926
858 XChangeProperty (xdisp, parent[0], 927 XChangeProperty (dpy, parent[0],
859 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 928 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
860 (const unsigned char *)s, strlen (s)); 929 (const unsigned char *)s, strlen (s));
861 930
862 free (s); 931 free (s);
863 free (ws); 932 free (ws);
… …
882#if ENABLE_EWMH 951#if ENABLE_EWMH
883 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 952 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
884#endif 953#endif
885} 954}
886 955
956void
957rxvt_term::set_window_color (int idx, const char *color)
958{
887#ifdef XTERM_COLOR_CHANGE 959#ifdef XTERM_COLOR_CHANGE
888void
889rxvt_term::set_window_color (int idx, const char *color)
890{
891 rxvt_color xcol; 960 rxvt_color xcol;
892 int i; 961 int i;
893 962
894 if (color == NULL || *color == '\0') 963 if (color == NULL || *color == '\0')
895 return; 964 return;
896 965
897 color = strdup (color); 966 color = strdup (color);
898 allocated.push_back ((void *)color); 967 allocated.push_back ((void *)color);
… …
927 pix_colors_focused[idx] = xcol; 996 pix_colors_focused[idx] = xcol;
928 997
929 /* XSetWindowAttributes attr; */ 998 /* XSetWindowAttributes attr; */
930 /* Cursor cursor; */ 999 /* Cursor cursor; */
931done: 1000done:
932
933#if OFF_FOCUS_FADING
934 if (rs[Rs_fade])
935 {
936 rgba c;
937 pix_colors [Color_fade].get (c);
938 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
939 }
940#endif
941
942 /*TODO: handle Color_BD, scrollbar background, etc. */ 1001 /*TODO: handle Color_BD, scrollbar background, etc. */
943 1002
1003 update_fade_color (idx);
944 recolour_cursor (); 1004 recolour_cursor ();
945 scr_recolour (); 1005 scr_recolour ();
946}
947
948#else
949# define set_window_color (idx,color) ((void)0)
950#endif /* XTERM_COLOR_CHANGE */ 1006#endif /* XTERM_COLOR_CHANGE */
1007}
951 1008
952void 1009void
953rxvt_term::recolour_cursor () 1010rxvt_term::recolour_cursor ()
954{ 1011{
955 XColor fg, bg; 1012 XColor fg, bg;
… …
960 1017
961 (ISSET_PIXCOLOR (Color_pointer_bg) 1018 (ISSET_PIXCOLOR (Color_pointer_bg)
962 ? pix_colors_focused[Color_pointer_bg] 1019 ? pix_colors_focused[Color_pointer_bg]
963 : pix_colors_focused[Color_bg]).get (bg); 1020 : pix_colors_focused[Color_bg]).get (bg);
964 1021
965 XRecolorCursor (xdisp, TermWin_cursor, &fg, &bg); 1022 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
966} 1023}
967 1024
968/*----------------------------------------------------------------------*/ 1025/*----------------------------------------------------------------------*/
969/* 1026/*
970 * find if fg/bg matches any of the normal (low-intensity) colors 1027 * find if fg/bg matches any of the normal (low-intensity) colors
… …
987 1044
988 for (i = Color_Black; i <= Color_White; i++) 1045 for (i = Color_Black; i <= Color_White; i++)
989 if (pix_colors[Color_bg] == pix_colors[i]) 1046 if (pix_colors[Color_bg] == pix_colors[i])
990 { 1047 {
991 sprintf (bstr, "%d", (i - Color_Black)); 1048 sprintf (bstr, "%d", (i - Color_Black));
992#ifdef XPM_BACKGROUND 1049#ifdef BG_IMAGE_FROM_FILE
993 xpmb = "default;"; 1050 xpmb = "default;";
994#endif 1051#endif
995 break; 1052 break;
996 } 1053 }
997 1054
… …
1006 if (color.set (this, name)) 1063 if (color.set (this, name))
1007 return true; 1064 return true;
1008 1065
1009 rxvt_warn ("can't get colour '%s', continuing without.\n", name); 1066 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1010 return false; 1067 return false;
1068}
1069
1070void
1071rxvt_term::alias_color (int dst, int src)
1072{
1073 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1011} 1074}
1012 1075
1013/* -------------------------------------------------------------------- * 1076/* -------------------------------------------------------------------- *
1014 * - WINDOW RESIZING - * 1077 * - WINDOW RESIZING - *
1015 * -------------------------------------------------------------------- */ 1078 * -------------------------------------------------------------------- */
… …
1019 int fix_screen; 1082 int fix_screen;
1020 int old_width = szHint.width; 1083 int old_width = szHint.width;
1021 int old_height = szHint.height; 1084 int old_height = szHint.height;
1022 1085
1023 window_calc (newwidth, newheight); 1086 window_calc (newwidth, newheight);
1087
1088 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1024 XSetWMNormalHints (xdisp, parent[0], &szHint); 1089 XSetWMNormalHints (dpy, parent[0], &szHint);
1025 1090
1026 if (!ignoreparent) 1091 if (!ignoreparent)
1027 { 1092 {
1028#ifdef SMART_RESIZE 1093#ifdef SMART_RESIZE
1029 /* 1094 /*
… …
1033 int x, y, x1, y1; 1098 int x, y, x1, y1;
1034 int dx, dy; 1099 int dx, dy;
1035 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1100 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1036 Window unused_cr; 1101 Window unused_cr;
1037 1102
1038 XTranslateCoordinates (xdisp, parent[0], display->root, 1103 XTranslateCoordinates (dpy, parent[0], display->root,
1039 0, 0, &x, &y, &unused_cr); 1104 0, 0, &x, &y, &unused_cr);
1040 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1, 1105 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1041 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1106 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1042 /* 1107 /*
1043 * if display->root isn't the parent window, a WM will probably have offset 1108 * if display->root isn't the parent window, a WM will probably have offset
1044 * our position for handles and decorations. Counter it 1109 * our position for handles and decorations. Counter it
1045 */ 1110 */
… …
1047 { 1112 {
1048 x -= x1; 1113 x -= x1;
1049 y -= y1; 1114 y -= y1;
1050 } 1115 }
1051 1116
1052 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2; 1117 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1053 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2; 1118 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1054 dx = old_width - szHint.width; 1119 dx = old_width - szHint.width;
1055 dy = old_height - szHint.height; 1120 dy = old_height - szHint.height;
1056 1121
1057 /* Check position of the center of the window */ 1122 /* Check position of the center of the window */
1058 if (x < x1) /* left half */ 1123 if (x < x1) /* left half */
… …
1062 if (y < y1) /* top half */ 1127 if (y < y1) /* top half */
1063 dy = 0; 1128 dy = 0;
1064 else if (y == y1) /* exact center */ 1129 else if (y == y1) /* exact center */
1065 dy /= 2; 1130 dy /= 2;
1066 1131
1067 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy, 1132 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1068 szHint.width, szHint.height); 1133 szHint.width, szHint.height);
1069#else 1134#else
1070 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height); 1135 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1071#endif 1136#endif
1072 } 1137 }
1073 1138
1074 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1139 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1075 1140
1076 if (fix_screen || newwidth != old_width || newheight != old_height) 1141 if (fix_screen || newwidth != old_width || newheight != old_height)
1077 { 1142 {
1078 if (scrollBar.state) 1143 if (scrollBar.state)
1079 { 1144 {
1080 XMoveResizeWindow (xdisp, scrollBar.win, 1145 XMoveResizeWindow (dpy, scrollBar.win,
1081 window_sb_x, 0, 1146 window_sb_x, 0,
1082 scrollbar_TotalWidth (), szHint.height); 1147 scrollbar_TotalWidth (), szHint.height);
1083 resize_scrollbar (); 1148 resize_scrollbar ();
1084 } 1149 }
1085 1150
1086 XMoveResizeWindow (xdisp, vt, 1151 XMoveResizeWindow (dpy, vt,
1087 window_vt_x, window_vt_y, 1152 window_vt_x, window_vt_y,
1088 width, height); 1153 width, height);
1089 1154
1155#ifdef HAVE_BG_PIXMAP
1156 if (bgPixmap.window_size_sensitive ())
1157 update_background ();
1158#endif
1159
1090 scr_clear (); 1160 scr_clear ();
1091#ifdef XPM_BACKGROUND
1092 resize_pixmap ();
1093#endif
1094 } 1161 }
1095 1162
1096 if (fix_screen || old_height == 0) 1163 if (fix_screen || old_height == 0)
1097 scr_reset (); 1164 scr_reset ();
1098 1165
1099#ifdef XPM_BACKGROUND 1166 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1100 if (pixmap) 1167 //scr_touch (false);
1168
1169#ifdef HAVE_BG_PIXMAP
1170// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1171// if (bgPixmap.pixmap)
1101 scr_touch (false); 1172// scr_touch (false);
1102#endif 1173#endif
1103 1174
1104#ifdef USE_XIM 1175#ifdef USE_XIM
1105 IMSetStatusPosition (); 1176 IMSetPosition ();
1106#endif 1177#endif
1107} 1178}
1108 1179
1109/* 1180/*
1110 * Set the width/height of the vt window in characters. Units are pixels. 1181 * Set the width/height of the vt window in characters. Units are pixels.
… …
1115{ 1186{
1116 XWindowAttributes wattr; 1187 XWindowAttributes wattr;
1117 1188
1118 if (newwidth == 0 || newheight == 0) 1189 if (newwidth == 0 || newheight == 0)
1119 { 1190 {
1120 XGetWindowAttributes (xdisp, display->root, &wattr); 1191 XGetWindowAttributes (dpy, display->root, &wattr);
1121 1192
1122 if (newwidth == 0) 1193 if (newwidth == 0)
1123 newwidth = wattr.width - szHint.base_width; 1194 newwidth = wattr.width - szHint.base_width;
1124 if (newheight == 0) 1195 if (newheight == 0)
1125 newheight = wattr.height - szHint.base_height; 1196 newheight = wattr.height - szHint.base_height;
… …
1139#ifdef USE_XIM 1210#ifdef USE_XIM
1140 1211
1141void 1212void
1142rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1213rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1143{ 1214{
1144 fg = pix_colors[Color_fg]; 1215 fg = pix_colors [Color_fg];
1145 bg = pix_colors[Color_bg]; 1216 bg = pix_colors [Color_bg];
1146} 1217}
1147 1218
1148void 1219void
1149rxvt_term::im_set_size (XRectangle &size) 1220rxvt_term::im_set_size (XRectangle &size)
1150{ 1221{
… …
1187 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1258 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1188 1259
1189 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1260 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1190 *p = '\0'; 1261 *p = '\0';
1191 1262
1192 atom = XInternAtom (xdisp, server, False); 1263 atom = XInternAtom (dpy, server, False);
1193 win = XGetSelectionOwner (xdisp, atom); 1264 win = XGetSelectionOwner (dpy, atom);
1194 1265
1195 if (win != None) 1266 if (win != None)
1196 return True; 1267 return True;
1197 } 1268 }
1198 1269
… …
1277 if (term->rs[Rs_imLocale]) 1348 if (term->rs[Rs_imLocale])
1278 SET_LOCALE (term->locale); 1349 SET_LOCALE (term->locale);
1279 } 1350 }
1280 else 1351 else
1281 str = (void *)text->string.wide_char; 1352 str = (void *)text->string.wide_char;
1282 1353
1283 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1354 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1284 DT_INT, call_data->caret, 1355 DT_INT, call_data->caret,
1285 DT_INT, call_data->chg_first, 1356 DT_INT, call_data->chg_first,
1286 DT_INT, call_data->chg_length, 1357 DT_INT, call_data->chg_length,
1287 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1358 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1422 "*", 1493 "*",
1423 fheight, 1494 fheight,
1424 fheight + 1, fheight - 1, 1495 fheight + 1, fheight - 1,
1425 fheight - 2, fheight + 2); 1496 fheight - 2, fheight + 2);
1426 1497
1427 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1498 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1428 &missing_charset_list, &missing_charset_count, &def_string); 1499 &missing_charset_list, &missing_charset_count, &def_string);
1429 1500
1430 if (missing_charset_list) 1501 if (missing_charset_list)
1431 XFreeStringList (missing_charset_list); 1502 XFreeStringList (missing_charset_list);
1432 1503
… …
1507 preedit_attr, 1578 preedit_attr,
1508 status_attr ? XNStatusAttributes : NULL, 1579 status_attr ? XNStatusAttributes : NULL,
1509 status_attr, NULL); 1580 status_attr, NULL);
1510 1581
1511 if (preedit_attr) XFree (preedit_attr); 1582 if (preedit_attr) XFree (preedit_attr);
1512 if (status_attr) XFree (status_attr); 1583 if (status_attr) XFree (status_attr);
1513 if (fs) XFreeFontSet (xdisp, fs); 1584 if (fs) XFreeFontSet (dpy, fs);
1514 1585
1515 if (Input_Context == NULL) 1586 if (Input_Context == NULL)
1516 { 1587 {
1517 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1588 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1518 im_destroy (); 1589 im_destroy ();
… …
1523 // unfortunately, only the focus window is used by XIM, hard to fix 1594 // unfortunately, only the focus window is used by XIM, hard to fix
1524 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1595 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1525 vt_select_input (); 1596 vt_select_input ();
1526#endif 1597#endif
1527 1598
1528 if (input_style & XIMPreeditArea)
1529 IMSetStatusPosition (); 1599 IMSetPosition ();
1530 1600
1531 return true; 1601 return true;
1532} 1602}
1533 1603
1534void 1604void
… …
1592 SET_LOCALE (locale); 1662 SET_LOCALE (locale);
1593#endif 1663#endif
1594} 1664}
1595 1665
1596void 1666void
1597rxvt_term::IMSetStatusPosition () 1667rxvt_term::IMSetPosition ()
1598{ 1668{
1599 XRectangle preedit_rect, status_rect, *needed_rect; 1669 XRectangle preedit_rect, status_rect, *needed_rect;
1600 XVaNestedList preedit_attr, status_attr; 1670 XVaNestedList preedit_attr, status_attr;
1601 1671
1602 if (!Input_Context 1672 if (!Input_Context
1603 || !focus 1673 || !focus
1604 || !(input_style & XIMPreeditArea) 1674 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1605 || !IMisRunning ()) 1675 || !IMisRunning ())
1606 return; 1676 return;
1607 1677
1678 if (input_style & XIMPreeditPosition)
1679 {
1680 im_set_size (preedit_rect);
1681 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1682
1683 XSetICValues (Input_Context,
1684 XNPreeditAttributes, preedit_attr, NULL);
1685 }
1686 else
1687 {
1608 /* Getting the necessary width of preedit area */ 1688 /* Getting the necessary width of preedit area */
1609 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1689 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1610 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1690 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1611 XFree (status_attr); 1691 XFree (status_attr);
1612 1692
1613 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1693 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1614 XFree (needed_rect); 1694 XFree (needed_rect);
1615 1695
1616 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1696 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1617 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1697 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1618 1698
1619 XSetICValues (Input_Context, 1699 XSetICValues (Input_Context,
1620 XNPreeditAttributes, preedit_attr, 1700 XNPreeditAttributes, preedit_attr,
1621 XNStatusAttributes, status_attr, NULL); 1701 XNStatusAttributes, status_attr,
1702 NULL);
1622 1703
1704 XFree (status_attr);
1705 }
1706
1623 XFree (preedit_attr); 1707 XFree (preedit_attr);
1624 XFree (status_attr);
1625} 1708}
1626#endif /* USE_XIM */ 1709#endif /* USE_XIM */
1627 1710
1711void
1712rxvt_term::get_window_origin (int &x, int &y)
1713{
1714 Window cr;
1715 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1716/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1717}
1718
1719Pixmap
1720rxvt_term::get_pixmap_property (int prop_id)
1721{
1722 if (prop_id > 0 && prop_id < NUM_XA)
1723 if (xa[prop_id])
1724 {
1725 int aformat;
1726 unsigned long nitems, bytes_after;
1727 Atom atype;
1728 unsigned char *prop = NULL;
1729 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1730 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1731 &nitems, &bytes_after, &prop);
1732 if (result == Success && prop && atype == XA_PIXMAP)
1733 {
1734 return *(Pixmap *)prop;
1735 }
1736 }
1737 return None;
1738}
1739
1740#ifdef HAVE_BG_PIXMAP
1741int
1742rxvt_term::update_background ()
1743{
1744 bgPixmap.invalidate ();
1745
1746 /* no chance of real time refresh if we are blurring! */
1747 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1748 bgPixmap.render ();
1749 else
1750 {
1751 update_background_ev.stop ();
1752
1753 if (!bgPixmap.need_client_side_rendering())
1754 update_background_ev.start (.05);
1755 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1756 update_background_ev.start (.20); /* very slow !!! */
1757 else
1758 update_background_ev.start (.07);
1759 }
1760
1761 return 0;
1762}
1763
1764void
1765rxvt_term::update_background_cb (ev::timer &w, int revents)
1766{
1767 bgPixmap.render ();
1768}
1769
1770#endif /* HAVE_BG_PIXMAP */
1771
1628/*----------------------- end-of-file (C source) -----------------------*/ 1772/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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