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.216 by root, Wed Feb 1 21:15:33 2006 UTC vs.
Revision 1.262 by ayin, Wed Nov 21 09:15:33 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
… …
168#endif 181#endif
169#ifdef POINTER_BLANK 182#ifdef POINTER_BLANK
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{
187 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 200 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
188 201
189 termlist.push_back (this); 202 termlist.push_back (this);
190 203
… …
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]);
256 271
257 for (int i = 0; i < TOTAL_COLORS; i++) 272 for (int i = 0; i < TOTAL_COLORS; i++)
258 if (ISSET_PIXCOLOR (i)) 273 if (ISSET_PIXCOLOR (i))
259 { 274 {
260 pix_colors_focused [i].free (this); 275 pix_colors_focused [i].free (this);
… …
264 } 279 }
265 280
266 clear (); 281 clear ();
267 } 282 }
268 283
269 delete pix_colors_focused; 284 delete [] pix_colors_focused;
270#if OFF_FOCUS_FADING 285#if OFF_FOCUS_FADING
271 delete pix_colors_unfocused; 286 delete [] pix_colors_unfocused;
272#endif 287#endif
273 288
289#ifdef HAVE_BG_PIXMAP
290 bgPixmap.destroy ();
291#endif
274 displays.put (display); 292 displays.put (display);
275 293
276 scr_release (); 294 scr_release ();
277 295
278 /* clear all resources */ 296 /* clear all resources */
… …
295#endif 313#endif
296} 314}
297 315
298// child has exited, usually destroys 316// child has exited, usually destroys
299void 317void
300rxvt_term::child_cb (child_watcher &w, int status) 318rxvt_term::child_cb (ev::child &w, int status)
301{ 319{
302 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 320 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
303 321
304 cmd_pid = 0; 322 cmd_pid = 0;
305 323
306 if (!OPTION (Opt_hold)) 324 if (!option (Opt_hold))
307 destroy (); 325 destroy ();
308} 326}
309 327
310void 328void
311rxvt_term::destroy () 329rxvt_term::destroy ()
… …
325 im_ev.stop (display); 343 im_ev.stop (display);
326#endif 344#endif
327#if HAVE_SCROLLBARS 345#if HAVE_SCROLLBARS
328 scrollbar_ev.stop (display); 346 scrollbar_ev.stop (display);
329#endif 347#endif
330#if TRANSPARENT 348#if ENABLE_TRANSPARENCY || ENABLE_PERL
331 rootwin_ev.stop (display); 349 rootwin_ev.stop (display);
332#endif 350#endif
333 incr_ev.stop (); 351 incr_ev.stop ();
334 termwin_ev.stop (display); 352 termwin_ev.stop (display);
335 vt_ev.stop (display); 353 vt_ev.stop (display);
336 } 354 }
337 355
338 check_ev.stop (); 356 prepare_ev.stop ();
339 pty_ev.stop (); 357 pty_ev.stop ();
340#ifdef CURSOR_BLINK 358#ifdef CURSOR_BLINK
341 cursor_blink_ev.stop (); 359 cursor_blink_ev.stop ();
342#endif 360#endif
343#ifdef TEXT_BLINK 361#ifdef TEXT_BLINK
… …
351#endif 369#endif
352#ifdef POINTER_BLANK 370#ifdef POINTER_BLANK
353 pointer_ev.stop (); 371 pointer_ev.stop ();
354#endif 372#endif
355 373
356 destroy_ev.start (0); 374 destroy_ev.start ();
357} 375}
358 376
359void 377void
360rxvt_term::destroy_cb (time_watcher &w) 378rxvt_term::destroy_cb (ev::idle &w, int revents)
361{ 379{
362 make_current (); 380 make_current ();
363 381
364 delete this; 382 delete this;
365} 383}
… …
419 else 437 else
420 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 438 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
421 mesg, BUFSIZ); 439 mesg, BUFSIZ);
422 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 440 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
423 } 441 }
424 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 442 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
425 mesg, BUFSIZ); 443 mesg, BUFSIZ);
426 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 444 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
427} 445}
428#endif 446#endif
429 447
… …
475#ifdef KEYSYM_RESOURCE 493#ifdef KEYSYM_RESOURCE
476 keyboard->register_done (); 494 keyboard->register_done ();
477#endif 495#endif
478 496
479#ifdef HAVE_SCROLLBARS 497#ifdef HAVE_SCROLLBARS
480 if (OPTION (Opt_scrollBar)) 498 if (option (Opt_scrollBar))
481 scrollBar.setIdle (); /* set existence for size calculations */ 499 scrollBar.setIdle (); /* set existence for size calculations */
482#endif 500#endif
483 501
484 pty = ptytty::create (); 502 pty = ptytty::create ();
485 503
… …
488 init_xlocale (); 506 init_xlocale ();
489 507
490 scr_reset (); // initialize screen 508 scr_reset (); // initialize screen
491 509
492#if 0 510#if 0
493 XSynchronize (xdisp, True); 511 XSynchronize (dpy, True);
494#endif 512#endif
495 513
496#ifdef HAVE_SCROLLBARS 514#ifdef HAVE_SCROLLBARS
497 if (OPTION (Opt_scrollBar)) 515 if (option (Opt_scrollBar))
498 resize_scrollbar (); /* create and map scrollbar */ 516 resize_scrollbar (); /* create and map scrollbar */
499#endif 517#endif
518#ifdef HAVE_BG_PIXMAP
519 {
520 bgPixmap.set_target (this);
521
500#ifdef TRANSPARENT 522#ifdef ENABLE_TRANSPARENCY
501 if (OPTION (Opt_transparent)) 523 if (option (Opt_transparent))
502 { 524 {
525 bgPixmap.set_transparent ();
526#ifdef HAVE_AFTERIMAGE
527 if (rs [Rs_blurradius])
528 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
529#endif
530 if (ISSET_PIXCOLOR (Color_tint))
531 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
532 if (rs [Rs_shade])
533 bgPixmap.set_shade (rs [Rs_shade]);
534
535 bgPixmap.set_root_pixmap ();
503 XSelectInput (xdisp, display->root, PropertyChangeMask); 536 XSelectInput (dpy, display->root, PropertyChangeMask);
504 check_our_parents ();
505 rootwin_ev.start (display, display->root); 537 rootwin_ev.start (display, display->root);
506 } 538 }
539#endif
540
541#ifdef BG_IMAGE_FROM_FILE
542 if (rs[Rs_backgroundPixmap] != NULL)
543 {
544 const char *p = rs[Rs_backgroundPixmap];
545
546 if ((p = strchr (p, ';')) != NULL)
547 {
548 p++;
549 bgPixmap.set_geometry (p);
550 }
551 else
552 bgPixmap.set_defaultGeometry ();
553
554 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
555 if (!bgPixmap.window_position_sensitive ())
556 update_background ();
557 }
558#endif
559 }
560#endif
561
562#if ENABLE_PERL
563 rootwin_ev.start (display, display->root);
507#endif 564#endif
508 565
509 set_colorfgbg (); 566 set_colorfgbg ();
510 567
511 init_command (cmd_argv); 568 init_command (cmd_argv);
512 569
513 free (cmd_argv); 570 free (cmd_argv);
514 571
515 if (pty->pty >= 0) 572 if (pty->pty >= 0)
516 pty_ev.start (pty->pty, EVENT_READ); 573 pty_ev.start (pty->pty, ev::READ);
517 574
518 check_ev.start (); 575 prepare_ev.start ();
519 576
520 HOOK_INVOKE ((this, HOOK_START, DT_END)); 577 HOOK_INVOKE ((this, HOOK_START, DT_END));
521 578
522#if ENABLE_XEMBED 579#if ENABLE_XEMBED
523 if (rs[Rs_embed]) 580 if (rs[Rs_embed])
524 { 581 {
525 long info[2] = { 0, XEMBED_MAPPED }; 582 long info[2] = { 0, XEMBED_MAPPED };
526 583
527 XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 584 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
528 32, PropModeReplace, (unsigned char *)&info, 2); 585 32, PropModeReplace, (unsigned char *)&info, 2);
529 } 586 }
530#endif 587#endif
531 588
532 XMapWindow (xdisp, vt); 589 XMapWindow (dpy, vt);
533 XMapWindow (xdisp, parent[0]); 590 XMapWindow (dpy, parent[0]);
534 591
535 return true; 592 return true;
536} 593}
537 594
538static struct sig_handlers 595static struct sig_handlers
539{ 596{
540 sig_watcher sw_term, sw_int; 597 ev::sig sw_term, sw_int;
541 598
542 /* 599 /*
543 * Catch a fatal signal and tidy up before quitting 600 * Catch a fatal signal and tidy up before quitting
544 */ 601 */
545 void 602 void
546 sig_term (sig_watcher &w) 603 sig_term (ev::sig &w, int revents)
547 { 604 {
548 rxvt_emergency_cleanup (); 605 rxvt_emergency_cleanup ();
549 signal (w.signum, SIG_DFL); 606 w.stop ();
550 kill (getpid (), w.signum); 607 kill (getpid (), w.signum);
551 } 608 }
552 609
553 sig_handlers () 610 sig_handlers ()
554 : sw_term (this, &sig_handlers::sig_term), 611 : sw_term (this, &sig_handlers::sig_term),
… …
562void 619void
563rxvt_init () 620rxvt_init ()
564{ 621{
565 ptytty::init (); 622 ptytty::init ();
566 623
624 if (!ev::ev_default_loop (0))
625 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
626
567 rxvt_environ = environ; 627 rxvt_environ = environ;
568 628
569 signal (SIGHUP, SIG_IGN); 629 signal (SIGHUP, SIG_IGN);
570 signal (SIGPIPE, SIG_IGN); 630 signal (SIGPIPE, SIG_IGN);
571 631
572 sig_handlers.sw_term.start (SIGTERM); 632 sig_handlers.sw_term.start (SIGTERM); ev::ev_unref ();
573 sig_handlers.sw_int.start (SIGINT); 633 sig_handlers.sw_int.start (SIGINT); ev::ev_unref ();
574 634
575 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 635 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
576 /* signal (SIGURG, SIG_DFL); */ 636 /* signal (SIGURG, SIG_DFL); */
577 637
578 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 638 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
618 return p; 678 return p;
619} 679}
620 680
621/*----------------------------------------------------------------------*/ 681/*----------------------------------------------------------------------*/
622/* 682/*
623 * window size/position calculcations for XSizeHint and other storage. 683 * window size/position calculations for XSizeHint and other storage.
624 * if width/height are non-zero then override calculated width/height 684 * if width/height are non-zero then override calculated width/height
625 */ 685 */
626void 686void
627rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 687rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
628{ 688{
… …
700 if (scrollBar.state) 760 if (scrollBar.state)
701 { 761 {
702 sb_w = scrollbar_TotalWidth (); 762 sb_w = scrollbar_TotalWidth ();
703 szHint.base_width += sb_w; 763 szHint.base_width += sb_w;
704 764
705 if (!OPTION (Opt_scrollBar_right)) 765 if (!option (Opt_scrollBar_right))
706 window_vt_x += sb_w; 766 window_vt_x += sb_w;
707 } 767 }
708 768
709 szHint.width_inc = fwidth; 769 szHint.width_inc = fwidth;
710 szHint.height_inc = fheight; 770 szHint.height_inc = fheight;
711 szHint.min_width = szHint.base_width + szHint.width_inc; 771 szHint.min_width = szHint.base_width + szHint.width_inc;
712 szHint.min_height = szHint.base_height + szHint.height_inc; 772 szHint.min_height = szHint.base_height + szHint.height_inc;
713 773
714 if (newwidth && newwidth - szHint.base_width < max_width) 774 if (newwidth && newwidth - szHint.base_width < max_width)
715 { 775 {
716 szHint.width = newwidth; 776 szHint.width = newwidth;
… …
731 { 791 {
732 min_it (height, max_height); 792 min_it (height, max_height);
733 szHint.height = szHint.base_height + height; 793 szHint.height = szHint.base_height + height;
734 } 794 }
735 795
736 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 796 if (scrollBar.state && option (Opt_scrollBar_right))
737 window_sb_x = szHint.width - sb_w; 797 window_sb_x = szHint.width - sb_w;
738 798
739 if (recalc_x) 799 if (recalc_x)
740 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth; 800 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
741 801
742 if (recalc_y) 802 if (recalc_y)
743 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth; 803 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
744 804
745 ncol = width / fwidth; 805 ncol = width / fwidth;
746 nrow = height / fheight; 806 nrow = height / fheight;
747} 807}
748 808
… …
803 delete fontset[0]; 863 delete fontset[0];
804 fontset[0] = fs; 864 fontset[0] = fs;
805 865
806 prop = (*fs)[1]->properties (); 866 prop = (*fs)[1]->properties ();
807 prop.height += lineSpace; 867 prop.height += lineSpace;
868
808 fs->set_prop (prop); 869 fs->set_prop (prop, false);
809 870
810 fwidth = prop.width; 871 fwidth = prop.width;
811 fheight = prop.height; 872 fheight = prop.height;
812 fbase = prop.ascent; 873 fbase = prop.ascent;
813 874
… …
822 { 883 {
823 fontset[style] = fs = new rxvt_fontset (this); 884 fontset[style] = fs = new rxvt_fontset (this);
824 rxvt_fontprop prop2 = prop; 885 rxvt_fontprop prop2 = prop;
825 886
826 if (res) 887 if (res)
827 prop2.weight = prop2.slant = rxvt_fontprop::unset; 888 {
889 fs->populate (res);
890 fs->set_prop (prop2, false);
891 }
828 else 892 else
829 { 893 {
830 res = fontset[0]->fontdesc; 894 fs->populate (fontset[0]->fontdesc);
831 895
832 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 896 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; 897 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
898
899 fs->set_prop (prop2, true);
834 } 900 }
835 901
836 fs->populate (res);
837 fs->set_prop (prop2);
838 } 902 }
839#else 903#else
840 fontset[style] = fontset[0]; 904 fontset[style] = fontset[0];
841#endif 905#endif
842 } 906 }
… …
844 if (parent[0]) 908 if (parent[0])
845 { 909 {
846 resize_all_windows (0, 0, 0); 910 resize_all_windows (0, 0, 0);
847 scr_remap_chars (); 911 scr_remap_chars ();
848 scr_touch (true); 912 scr_touch (true);
849 } 913 }
850 914
851 return true; 915 return true;
852} 916}
853 917
918void
854void rxvt_term::set_string_property (Atom prop, const char *str, int len) 919rxvt_term::set_string_property (Atom prop, const char *str, int len)
855{ 920{
856 XChangeProperty (xdisp, parent[0], 921 XChangeProperty (dpy, parent[0],
857 prop, XA_STRING, 8, PropModeReplace, 922 prop, XA_STRING, 8, PropModeReplace,
858 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 923 (const unsigned char *)str, len >= 0 ? len : strlen (str));
859} 924}
860 925
926void
861void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 927rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
862{ 928{
863 wchar_t *ws = rxvt_mbstowcs (str, len); 929 wchar_t *ws = rxvt_mbstowcs (str, len);
864 char *s = rxvt_wcstoutf8 (ws); 930 char *s = rxvt_wcstoutf8 (ws);
865 931
866 XChangeProperty (xdisp, parent[0], 932 XChangeProperty (dpy, parent[0],
867 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 933 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
868 (const unsigned char *)s, strlen (s)); 934 (const unsigned char *)s, strlen (s));
869 935
870 free (s); 936 free (s);
871 free (ws); 937 free (ws);
… …
890#if ENABLE_EWMH 956#if ENABLE_EWMH
891 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 957 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
892#endif 958#endif
893} 959}
894 960
961void
962rxvt_term::set_window_color (int idx, const char *color)
963{
895#ifdef XTERM_COLOR_CHANGE 964#ifdef XTERM_COLOR_CHANGE
896void
897rxvt_term::set_window_color (int idx, const char *color)
898{
899 rxvt_color xcol; 965 rxvt_color xcol;
900 int i; 966 int i;
901 967
902 if (color == NULL || *color == '\0') 968 if (color == NULL || *color == '\0')
903 return; 969 return;
904 970
905 color = strdup (color); 971 color = strdup (color);
906 allocated.push_back ((void *)color); 972 allocated.push_back ((void *)color);
… …
935 pix_colors_focused[idx] = xcol; 1001 pix_colors_focused[idx] = xcol;
936 1002
937 /* XSetWindowAttributes attr; */ 1003 /* XSetWindowAttributes attr; */
938 /* Cursor cursor; */ 1004 /* Cursor cursor; */
939done: 1005done:
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. */ 1006 /*TODO: handle Color_BD, scrollbar background, etc. */
951 1007
1008 update_fade_color (idx);
952 recolour_cursor (); 1009 recolour_cursor ();
953 scr_recolour (); 1010 scr_recolour ();
1011#endif /* XTERM_COLOR_CHANGE */
954} 1012}
955
956#else
957# define set_window_color (idx,color) ((void)0)
958#endif /* XTERM_COLOR_CHANGE */
959 1013
960void 1014void
961rxvt_term::recolour_cursor () 1015rxvt_term::recolour_cursor ()
962{ 1016{
963 XColor fg, bg; 1017 XColor fg, bg;
… …
968 1022
969 (ISSET_PIXCOLOR (Color_pointer_bg) 1023 (ISSET_PIXCOLOR (Color_pointer_bg)
970 ? pix_colors_focused[Color_pointer_bg] 1024 ? pix_colors_focused[Color_pointer_bg]
971 : pix_colors_focused[Color_bg]).get (bg); 1025 : pix_colors_focused[Color_bg]).get (bg);
972 1026
973 XRecolorCursor (xdisp, TermWin_cursor, &fg, &bg); 1027 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
974} 1028}
975 1029
976/*----------------------------------------------------------------------*/ 1030/*----------------------------------------------------------------------*/
977/* 1031/*
978 * find if fg/bg matches any of the normal (low-intensity) colors 1032 * find if fg/bg matches any of the normal (low-intensity) colors
… …
995 1049
996 for (i = Color_Black; i <= Color_White; i++) 1050 for (i = Color_Black; i <= Color_White; i++)
997 if (pix_colors[Color_bg] == pix_colors[i]) 1051 if (pix_colors[Color_bg] == pix_colors[i])
998 { 1052 {
999 sprintf (bstr, "%d", (i - Color_Black)); 1053 sprintf (bstr, "%d", (i - Color_Black));
1000#ifdef XPM_BACKGROUND 1054#ifdef BG_IMAGE_FROM_FILE
1001 xpmb = "default;"; 1055 xpmb = "default;";
1002#endif 1056#endif
1003 break; 1057 break;
1004 } 1058 }
1005 1059
… …
1033 int fix_screen; 1087 int fix_screen;
1034 int old_width = szHint.width; 1088 int old_width = szHint.width;
1035 int old_height = szHint.height; 1089 int old_height = szHint.height;
1036 1090
1037 window_calc (newwidth, newheight); 1091 window_calc (newwidth, newheight);
1092
1093 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1038 XSetWMNormalHints (xdisp, parent[0], &szHint); 1094 XSetWMNormalHints (dpy, parent[0], &szHint);
1039 1095
1040 if (!ignoreparent) 1096 if (!ignoreparent)
1041 { 1097 {
1042#ifdef SMART_RESIZE 1098#ifdef SMART_RESIZE
1043 /* 1099 /*
… …
1047 int x, y, x1, y1; 1103 int x, y, x1, y1;
1048 int dx, dy; 1104 int dx, dy;
1049 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1105 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1050 Window unused_cr; 1106 Window unused_cr;
1051 1107
1052 XTranslateCoordinates (xdisp, parent[0], display->root, 1108 XTranslateCoordinates (dpy, parent[0], display->root,
1053 0, 0, &x, &y, &unused_cr); 1109 0, 0, &x, &y, &unused_cr);
1054 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1, 1110 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1055 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1111 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1056 /* 1112 /*
1057 * if display->root isn't the parent window, a WM will probably have offset 1113 * if display->root isn't the parent window, a WM will probably have offset
1058 * our position for handles and decorations. Counter it 1114 * our position for handles and decorations. Counter it
1059 */ 1115 */
… …
1061 { 1117 {
1062 x -= x1; 1118 x -= x1;
1063 y -= y1; 1119 y -= y1;
1064 } 1120 }
1065 1121
1066 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2; 1122 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1067 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2; 1123 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1068 dx = old_width - szHint.width; 1124 dx = old_width - szHint.width;
1069 dy = old_height - szHint.height; 1125 dy = old_height - szHint.height;
1070 1126
1071 /* Check position of the center of the window */ 1127 /* Check position of the center of the window */
1072 if (x < x1) /* left half */ 1128 if (x < x1) /* left half */
… …
1076 if (y < y1) /* top half */ 1132 if (y < y1) /* top half */
1077 dy = 0; 1133 dy = 0;
1078 else if (y == y1) /* exact center */ 1134 else if (y == y1) /* exact center */
1079 dy /= 2; 1135 dy /= 2;
1080 1136
1081 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy, 1137 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1082 szHint.width, szHint.height); 1138 szHint.width, szHint.height);
1083#else 1139#else
1084 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height); 1140 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1085#endif 1141#endif
1086 } 1142 }
1087 1143
1088 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1144 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1089 1145
1090 if (fix_screen || newwidth != old_width || newheight != old_height) 1146 if (fix_screen || newwidth != old_width || newheight != old_height)
1091 { 1147 {
1092 if (scrollBar.state) 1148 if (scrollBar.state)
1093 { 1149 {
1094 XMoveResizeWindow (xdisp, scrollBar.win, 1150 XMoveResizeWindow (dpy, scrollBar.win,
1095 window_sb_x, 0, 1151 window_sb_x, 0,
1096 scrollbar_TotalWidth (), szHint.height); 1152 scrollbar_TotalWidth (), szHint.height);
1097 resize_scrollbar (); 1153 resize_scrollbar ();
1098 } 1154 }
1099 1155
1100 XMoveResizeWindow (xdisp, vt, 1156 XMoveResizeWindow (dpy, vt,
1101 window_vt_x, window_vt_y, 1157 window_vt_x, window_vt_y,
1102 width, height); 1158 width, height);
1103 1159
1160#ifdef HAVE_BG_PIXMAP
1161 if (bgPixmap.window_size_sensitive ())
1162 update_background ();
1163#endif
1164
1104 scr_clear (); 1165 scr_clear ();
1105#ifdef XPM_BACKGROUND
1106 resize_pixmap ();
1107#endif
1108 } 1166 }
1109 1167
1110 if (fix_screen || old_height == 0) 1168 if (fix_screen || old_height == 0)
1111 scr_reset (); 1169 scr_reset ();
1112 1170
1113#ifdef XPM_BACKGROUND 1171 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1114 if (pixmap) 1172 //scr_touch (false);
1173
1174#ifdef HAVE_BG_PIXMAP
1175// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1176// if (bgPixmap.pixmap)
1115 scr_touch (false); 1177// scr_touch (false);
1116#endif 1178#endif
1117 1179
1118#ifdef USE_XIM 1180#ifdef USE_XIM
1119 IMSetStatusPosition (); 1181 IMSetPosition ();
1120#endif 1182#endif
1121} 1183}
1122 1184
1123/* 1185/*
1124 * Set the width/height of the vt window in characters. Units are pixels. 1186 * Set the width/height of the vt window in characters. Units are pixels.
… …
1129{ 1191{
1130 XWindowAttributes wattr; 1192 XWindowAttributes wattr;
1131 1193
1132 if (newwidth == 0 || newheight == 0) 1194 if (newwidth == 0 || newheight == 0)
1133 { 1195 {
1134 XGetWindowAttributes (xdisp, display->root, &wattr); 1196 XGetWindowAttributes (dpy, display->root, &wattr);
1135 1197
1136 if (newwidth == 0) 1198 if (newwidth == 0)
1137 newwidth = wattr.width - szHint.base_width; 1199 newwidth = wattr.width - szHint.base_width;
1138 if (newheight == 0) 1200 if (newheight == 0)
1139 newheight = wattr.height - szHint.base_height; 1201 newheight = wattr.height - szHint.base_height;
… …
1201 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1263 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1202 1264
1203 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1265 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1204 *p = '\0'; 1266 *p = '\0';
1205 1267
1206 atom = XInternAtom (xdisp, server, False); 1268 atom = XInternAtom (dpy, server, False);
1207 win = XGetSelectionOwner (xdisp, atom); 1269 win = XGetSelectionOwner (dpy, atom);
1208 1270
1209 if (win != None) 1271 if (win != None)
1210 return True; 1272 return True;
1211 } 1273 }
1212 1274
… …
1291 if (term->rs[Rs_imLocale]) 1353 if (term->rs[Rs_imLocale])
1292 SET_LOCALE (term->locale); 1354 SET_LOCALE (term->locale);
1293 } 1355 }
1294 else 1356 else
1295 str = (void *)text->string.wide_char; 1357 str = (void *)text->string.wide_char;
1296 1358
1297 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1359 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1298 DT_INT, call_data->caret, 1360 DT_INT, call_data->caret,
1299 DT_INT, call_data->chg_first, 1361 DT_INT, call_data->chg_first,
1300 DT_INT, call_data->chg_length, 1362 DT_INT, call_data->chg_length,
1301 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1363 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1436 "*", 1498 "*",
1437 fheight, 1499 fheight,
1438 fheight + 1, fheight - 1, 1500 fheight + 1, fheight - 1,
1439 fheight - 2, fheight + 2); 1501 fheight - 2, fheight + 2);
1440 1502
1441 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1503 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1442 &missing_charset_list, &missing_charset_count, &def_string); 1504 &missing_charset_list, &missing_charset_count, &def_string);
1443 1505
1444 if (missing_charset_list) 1506 if (missing_charset_list)
1445 XFreeStringList (missing_charset_list); 1507 XFreeStringList (missing_charset_list);
1446 1508
… …
1521 preedit_attr, 1583 preedit_attr,
1522 status_attr ? XNStatusAttributes : NULL, 1584 status_attr ? XNStatusAttributes : NULL,
1523 status_attr, NULL); 1585 status_attr, NULL);
1524 1586
1525 if (preedit_attr) XFree (preedit_attr); 1587 if (preedit_attr) XFree (preedit_attr);
1526 if (status_attr) XFree (status_attr); 1588 if (status_attr) XFree (status_attr);
1527 if (fs) XFreeFontSet (xdisp, fs); 1589 if (fs) XFreeFontSet (dpy, fs);
1528 1590
1529 if (Input_Context == NULL) 1591 if (Input_Context == NULL)
1530 { 1592 {
1531 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1593 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1532 im_destroy (); 1594 im_destroy ();
… …
1537 // unfortunately, only the focus window is used by XIM, hard to fix 1599 // unfortunately, only the focus window is used by XIM, hard to fix
1538 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1600 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1539 vt_select_input (); 1601 vt_select_input ();
1540#endif 1602#endif
1541 1603
1542 if (input_style & XIMPreeditArea)
1543 IMSetStatusPosition (); 1604 IMSetPosition ();
1544 1605
1545 return true; 1606 return true;
1546} 1607}
1547 1608
1548void 1609void
… …
1606 SET_LOCALE (locale); 1667 SET_LOCALE (locale);
1607#endif 1668#endif
1608} 1669}
1609 1670
1610void 1671void
1611rxvt_term::IMSetStatusPosition () 1672rxvt_term::IMSetPosition ()
1612{ 1673{
1613 XRectangle preedit_rect, status_rect, *needed_rect; 1674 XRectangle preedit_rect, status_rect, *needed_rect;
1614 XVaNestedList preedit_attr, status_attr; 1675 XVaNestedList preedit_attr, status_attr;
1615 1676
1616 if (!Input_Context 1677 if (!Input_Context
1617 || !focus 1678 || !focus
1618 || !(input_style & XIMPreeditArea) 1679 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1619 || !IMisRunning ()) 1680 || !IMisRunning ())
1620 return; 1681 return;
1621 1682
1683 if (input_style & XIMPreeditPosition)
1684 {
1685 im_set_size (preedit_rect);
1686 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1687
1688 XSetICValues (Input_Context,
1689 XNPreeditAttributes, preedit_attr, NULL);
1690 }
1691 else
1692 {
1622 /* Getting the necessary width of preedit area */ 1693 /* Getting the necessary width of preedit area */
1623 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1694 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1624 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1695 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1625 XFree (status_attr); 1696 XFree (status_attr);
1626 1697
1627 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1698 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1628 XFree (needed_rect); 1699 XFree (needed_rect);
1629 1700
1630 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1701 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1631 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1702 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1632 1703
1633 XSetICValues (Input_Context, 1704 XSetICValues (Input_Context,
1634 XNPreeditAttributes, preedit_attr, 1705 XNPreeditAttributes, preedit_attr,
1635 XNStatusAttributes, status_attr, NULL); 1706 XNStatusAttributes, status_attr,
1707 NULL);
1636 1708
1709 XFree (status_attr);
1710 }
1711
1637 XFree (preedit_attr); 1712 XFree (preedit_attr);
1638 XFree (status_attr);
1639} 1713}
1640#endif /* USE_XIM */ 1714#endif /* USE_XIM */
1715
1716void
1717rxvt_term::get_window_origin (int &x, int &y)
1718{
1719 Window cr;
1720 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1721/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1722}
1723
1724Pixmap
1725rxvt_term::get_pixmap_property (int prop_id)
1726{
1727 if (prop_id > 0 && prop_id < NUM_XA)
1728 if (xa[prop_id])
1729 {
1730 int aformat;
1731 unsigned long nitems, bytes_after;
1732 Atom atype;
1733 unsigned char *prop = NULL;
1734 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1735 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1736 &nitems, &bytes_after, &prop);
1737 if (result == Success && prop && atype == XA_PIXMAP)
1738 {
1739 return *(Pixmap *)prop;
1740 }
1741 }
1742 return None;
1743}
1744
1745#ifdef HAVE_BG_PIXMAP
1746# if TRACE_PIXMAPS
1747# undef update_background
1748int rxvt_term::trace_update_background (const char* file, int line)
1749{
1750 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1751 update_background ();
1752}
1753# endif
1754int
1755rxvt_term::update_background ()
1756{
1757 bgPixmap.invalidate ();
1758
1759 /* no chance of real time refresh if we are blurring! */
1760 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1761 bgPixmap.render ();
1762 else
1763 {
1764 update_background_ev.stop ();
1765
1766 if (!bgPixmap.need_client_side_rendering())
1767 update_background_ev.start (.05);
1768 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1769 update_background_ev.start (.20); /* very slow !!! */
1770 else
1771 update_background_ev.start (.07);
1772 }
1773
1774 return 0;
1775}
1776
1777void
1778rxvt_term::update_background_cb (ev::timer &w, int revents)
1779{
1780 bgPixmap.render ();
1781}
1782
1783#endif /* HAVE_BG_PIXMAP */
1641 1784
1642/*----------------------- end-of-file (C source) -----------------------*/ 1785/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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