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.302 by root, Fri Jan 25 16:04:57 2008 UTC vs.
Revision 1.336 by sf-exg, Tue Nov 2 13:32:50 2010 UTC

… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "init.h"
35#include "keyboard.h" 36#include "keyboard.h"
36#include "rxvtperl.h" 37#include "rxvtperl.h"
37 38
38#include <limits> 39#include <limits>
39 40
41#include <cassert>
40#include <csignal> 42#include <csignal>
41#include <cstring> 43#include <cstring>
42 44
43#include <termios.h> 45#include <termios.h>
44 46
… …
49# ifdef HAVE_SETLOCALE 51# ifdef HAVE_SETLOCALE
50# include <clocale> 52# include <clocale>
51# endif 53# endif
52#endif 54#endif
53 55
56struct termios rxvt_term::def_tio;
54vector<rxvt_term *> rxvt_term::termlist; 57vector<rxvt_term *> rxvt_term::termlist;
55 58
56// used to tell global functions which terminal instance is "active" 59// used to tell global functions which terminal instance is "active"
57rxvt_t rxvt_current_term; 60rxvt_t rxvt_current_term;
58 61
… …
101 { 104 {
102 if (cc->c2 == c2) return c1; 105 if (cc->c2 == c2) return c1;
103 cc = (*this)[cc->c1]; 106 cc = (*this)[cc->c1];
104 } 107 }
105 108
106 // check to see wether this combination already exists otherwise 109 // check to see whether this combination already exists otherwise
107 for (cc = v.end (); cc-- > v.begin (); ) 110 for (cc = v.end (); cc-- > v.begin (); )
108 { 111 {
109 if (cc->c1 == c1 && cc->c2 == c2) 112 if (cc->c1 == c1 && cc->c2 == c2)
110 return COMPOSE_LO + (cc - v.begin ()); 113 return COMPOSE_LO + (cc - v.begin ());
111 } 114 }
… …
172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 175 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif 176#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL 177#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 178 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176#endif 179#endif
177#ifdef HAVE_SCROLLBARS
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 180 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#endif
180#ifdef USE_XIM 181#ifdef USE_XIM
181 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 182 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
182#endif 183#endif
183#ifdef POINTER_BLANK 184#ifdef POINTER_BLANK
184 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 185 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
… …
229 delete fontset[0]; 230 delete fontset[0];
230 231
231#ifdef HAVE_BG_PIXMAP 232#ifdef HAVE_BG_PIXMAP
232 bgPixmap.destroy (); 233 bgPixmap.destroy ();
233#endif 234#endif
235#ifdef HAVE_AFTERIMAGE
236 if (asv)
237 destroy_asvisual (asv, 0);
238 if (asimman)
239 destroy_image_manager (asimman, 0);
240#endif
234 241
235 if (display) 242 if (display)
236 { 243 {
237 selection_clear (); 244 selection_clear ();
245 selection_clear (true);
238 246
239#ifdef USE_XIM 247#ifdef USE_XIM
240 im_destroy (); 248 im_destroy ();
241#endif 249#endif
242#ifdef XTERM_SCROLLBAR 250 scrollBar.destroy ();
243 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
244 if (ShadowGC) XFreeGC (dpy, ShadowGC);
245#endif
246#ifdef PLAIN_SCROLLBAR
247 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
248#endif
249#ifdef NEXT_SCROLLBAR
250 if (blackGC) XFreeGC (dpy, blackGC);
251 if (whiteGC) XFreeGC (dpy, whiteGC);
252 if (grayGC) XFreeGC (dpy, grayGC);
253 if (darkGC) XFreeGC (dpy, darkGC);
254 if (stippleGC) XFreeGC (dpy, stippleGC);
255 if (dimple) XFreePixmap (dpy, dimple);
256 if (upArrow) XFreePixmap (dpy, upArrow);
257 if (downArrow) XFreePixmap (dpy, downArrow);
258 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
259 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
260#endif
261#ifdef RXVT_SCROLLBAR
262 if (topShadowGC) XFreeGC (dpy, topShadowGC);
263 if (botShadowGC) XFreeGC (dpy, botShadowGC);
264 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
265#endif
266 if (gc) XFreeGC (dpy, gc); 251 if (gc) XFreeGC (dpy, gc);
267 252
268 delete drawable; 253 delete drawable;
269 // destroy all windows 254 // destroy all windows
270 if (parent[0]) 255 if (parent[0])
… …
290 /* clear all resources */ 275 /* clear all resources */
291 for (int i = 0; i < allocated.size (); i++) 276 for (int i = 0; i < allocated.size (); i++)
292 free (allocated [i]); 277 free (allocated [i]);
293 278
294 free (selection.text); 279 free (selection.text);
280 free (selection.clip_text);
295 // TODO: manage env vars in child only(!) 281 // TODO: manage env vars in child only(!)
296 free (env_display); 282 free (env_display);
297 free (env_term); 283 free (env_term);
298 free (locale); 284 free (locale);
299 free (v_buffer); 285 free (v_buffer);
… …
337 if (display) 323 if (display)
338 { 324 {
339#if USE_XIM 325#if USE_XIM
340 im_ev.stop (display); 326 im_ev.stop (display);
341#endif 327#endif
342#if HAVE_SCROLLBARS
343 scrollbar_ev.stop (display); 328 scrollbar_ev.stop (display);
344#endif
345#if ENABLE_TRANSPARENCY || ENABLE_PERL 329#if ENABLE_TRANSPARENCY || ENABLE_PERL
346 rootwin_ev.stop (display); 330 rootwin_ev.stop (display);
347#endif 331#endif
348 incr_ev.stop (); 332 incr_ev.stop ();
349 termwin_ev.stop (display); 333 termwin_ev.stop (display);
… …
401 char mesg[BUFSIZ]; 385 char mesg[BUFSIZ];
402 char number[32]; 386 char number[32];
403 char *mtype = "XlibMessage"; 387 char *mtype = "XlibMessage";
404 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 388 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
405 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 389 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
406 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 390 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
407 rxvt_warn ("%s: %s\n", mesg, buffer); 391 rxvt_warn ("%s: %s\n", mesg, buffer);
408 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 392 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
409 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 393 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
410 sprintf(number, "%d", event->request_code); 394 sprintf(number, "%d", event->request_code);
411 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 395 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
412 rxvt_warn ("(which is %s)\n", buffer); 396 rxvt_warn ("(which is %s)\n", buffer);
413 if (event->request_code >= 128) { 397 if (event->request_code >= 128) {
414 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 398 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
415 mesg, BUFSIZ); 399 mesg, BUFSIZ);
416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 400 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
417 } 401 }
418 if ((event->error_code == BadWindow) || 402 if ((event->error_code == BadWindow) ||
419 (event->error_code == BadPixmap) || 403 (event->error_code == BadPixmap) ||
420 (event->error_code == BadCursor) || 404 (event->error_code == BadCursor) ||
421 (event->error_code == BadFont) || 405 (event->error_code == BadFont) ||
422 (event->error_code == BadDrawable) || 406 (event->error_code == BadDrawable) ||
423 (event->error_code == BadColor) || 407 (event->error_code == BadColor) ||
424 (event->error_code == BadGC) || 408 (event->error_code == BadGC) ||
425 (event->error_code == BadIDChoice) || 409 (event->error_code == BadIDChoice) ||
426 (event->error_code == BadValue) || 410 (event->error_code == BadValue) ||
427 (event->error_code == BadAtom)) { 411 (event->error_code == BadAtom)) {
428 if (event->error_code == BadValue) 412 if (event->error_code == BadValue)
429 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 413 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
430 mesg, BUFSIZ); 414 mesg, BUFSIZ);
431 else if (event->error_code == BadAtom) 415 else if (event->error_code == BadAtom)
432 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 416 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
433 mesg, BUFSIZ); 417 mesg, BUFSIZ);
434 else 418 else
435 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 419 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
436 mesg, BUFSIZ); 420 mesg, BUFSIZ);
437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
438 } 422 }
439 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 423 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
440 mesg, BUFSIZ); 424 mesg, BUFSIZ);
441 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 425 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
442} 426}
443#endif 427#endif
444 428
445int 429int
… …
492 rxvt_emergency_cleanup (); 476 rxvt_emergency_cleanup ();
493 w.stop (); 477 w.stop ();
494 kill (getpid (), w.signum); 478 kill (getpid (), w.signum);
495} 479}
496 480
481static void
482rxvt_get_ttymode (struct termios *tio)
483{
484 if (tcgetattr (STDIN_FILENO, tio) < 0)
485 memset (tio, 0, sizeof (struct termios));
486
487 for (int i = 0; i < NCCS; i++)
488 tio->c_cc[i] = VDISABLE;
489
490 tio->c_cc[VINTR] = CINTR;
491 tio->c_cc[VQUIT] = CQUIT;
492 tio->c_cc[VERASE] = CERASE;
493#ifdef VERASE2
494 tio->c_cc[VERASE2] = CERASE2;
495#endif
496 tio->c_cc[VKILL] = CKILL;
497 tio->c_cc[VEOF] = CEOF;
498 tio->c_cc[VSTART] = CSTART;
499 tio->c_cc[VSTOP] = CSTOP;
500 tio->c_cc[VSUSP] = CSUSP;
501# ifdef VDSUSP
502 tio->c_cc[VDSUSP] = CDSUSP;
503# endif
504# ifdef VREPRINT
505 tio->c_cc[VREPRINT] = CRPRNT;
506# endif
507# ifdef VDISCRD
508 tio->c_cc[VDISCRD] = CFLUSH;
509# endif
510# ifdef VWERSE
511 tio->c_cc[VWERSE] = CWERASE;
512# endif
513# ifdef VLNEXT
514 tio->c_cc[VLNEXT] = CLNEXT;
515# endif
516# ifdef VSTATUS
517 tio->c_cc[VSTATUS] = CSTATUS;
518# endif
519
520# if VMIN != VEOF
521 tio->c_cc[VMIN] = 1;
522# endif
523# if VTIME != VEOL
524 tio->c_cc[VTIME] = 0;
525# endif
526
527 /* input modes */
528 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
529# ifdef IMAXBEL
530 | IMAXBEL
531# endif
532 | IXON);
533
534 /* output modes */
535 tio->c_oflag = (OPOST | ONLCR);
536
537 /* control modes */
538 tio->c_cflag = (CS8 | CREAD);
539
540 /* local modes */
541 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
542# if defined (ECHOCTL) && defined (ECHOKE)
543 | ECHOCTL | ECHOKE
544# endif
545 | ECHOE | ECHOK);
546}
547
497char **rxvt_environ; // startup environment 548char **rxvt_environ; // startup environment
498 549
499void 550void
500rxvt_init () 551rxvt_init ()
501{ 552{
502 ptytty::init (); 553 assert (("fontMask must not overlap other RS masks",
554 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
503 555
556 rxvt_get_ttymode (&rxvt_term::def_tio);
557
558 // get rid of stdin/stdout as we don't need them, to free resources
559 dup2 (STDERR_FILENO, STDIN_FILENO);
560 dup2 (STDERR_FILENO, STDOUT_FILENO);
561
504 if (!ev_default_loop (0)) 562 if (!ev_default_loop ())
505 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 563 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
506 564
507 rxvt_environ = environ; 565 rxvt_environ = environ;
508 566
509 signal (SIGHUP, SIG_IGN); 567 signal (SIGHUP, SIG_IGN);
510 signal (SIGPIPE, SIG_IGN); 568 signal (SIGPIPE, SIG_IGN);
511 569
512 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 570 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
513 sig_handlers.sw_int.start (SIGINT); ev_unref (); 571 sig_handlers.sw_int.start (SIGINT); ev_unref ();
514
515 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
516 /* signal (SIGURG, SIG_DFL); */
517 572
518 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 573 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
519 // TODO: handle this with exceptions and tolerate the memory loss 574 // TODO: handle this with exceptions and tolerate the memory loss
520 XSetIOErrorHandler (rxvt_xioerror_handler); 575 XSetIOErrorHandler (rxvt_xioerror_handler);
521 576
… …
529 */ 584 */
530void 585void
531rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 586rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
532{ 587{
533 short recalc_x, recalc_y; 588 short recalc_x, recalc_y;
534 int x, y, sb_w, flags; 589 int x, y, flags;
535 unsigned int w, h; 590 unsigned int w, h;
536 unsigned int max_width, max_height; 591 unsigned int max_width, max_height;
537 592
538 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 593 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
539 szHint.win_gravity = NorthWestGravity; 594 szHint.win_gravity = NorthWestGravity;
… …
549 if (rs[Rs_geometry]) 604 if (rs[Rs_geometry])
550 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 605 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
551 606
552 if (flags & WidthValue) 607 if (flags & WidthValue)
553 { 608 {
609 if (!w)
610 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
611
554 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 612 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
555 szHint.flags |= USSize; 613 szHint.flags |= USSize;
556 } 614 }
557 615
558 if (flags & HeightValue) 616 if (flags & HeightValue)
559 { 617 {
618 if (!h)
619 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
620
560 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 621 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
561 szHint.flags |= USSize; 622 szHint.flags |= USSize;
562 } 623 }
563 624
564 if (flags & XValue) 625 if (flags & XValue)
565 { 626 {
… …
596 max_width = MAX_COLS * fwidth; 657 max_width = MAX_COLS * fwidth;
597 max_height = MAX_ROWS * fheight; 658 max_height = MAX_ROWS * fheight;
598 659
599 szHint.base_width = szHint.base_height = 2 * int_bwidth; 660 szHint.base_width = szHint.base_height = 2 * int_bwidth;
600 661
601 sb_w = 0;
602 window_vt_x = window_vt_y = int_bwidth; 662 window_vt_x = window_vt_y = int_bwidth;
603 663
604 if (scrollBar.state) 664 if (scrollBar.state)
605 { 665 {
606 sb_w = scrollbar_TotalWidth (); 666 int sb_w = scrollBar.total_width ();
607 szHint.base_width += sb_w; 667 szHint.base_width += sb_w;
608 668
609 if (!option (Opt_scrollBar_right)) 669 if (!option (Opt_scrollBar_right))
610 window_vt_x += sb_w; 670 window_vt_x += sb_w;
611 } 671 }
… …
635 { 695 {
636 min_it (height, max_height); 696 min_it (height, max_height);
637 szHint.height = szHint.base_height + height; 697 szHint.height = szHint.base_height + height;
638 } 698 }
639 699
640 if (scrollBar.state && option (Opt_scrollBar_right))
641 window_sb_x = szHint.width - sb_w;
642
643 if (recalc_x) 700 if (recalc_x)
644 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 701 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
645 702
646 if (recalc_y) 703 if (recalc_y)
647 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 704 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
648 705
649 ncol = width / fwidth; 706 ncol = width / fwidth;
650 nrow = height / fheight; 707 nrow = height / fheight;
651} 708}
652 709
653/*----------------------------------------------------------------------*/ 710/*----------------------------------------------------------------------*/
654/* 711/*
… …
665 722
666 ws.ws_col = ncol; 723 ws.ws_col = ncol;
667 ws.ws_row = nrow; 724 ws.ws_row = nrow;
668 ws.ws_xpixel = width; 725 ws.ws_xpixel = width;
669 ws.ws_ypixel = height; 726 ws.ws_ypixel = height;
670 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 727 ioctl (pty->pty, TIOCSWINSZ, &ws);
671 728
672#if 0 729#if 0
673 // TIOCSWINSZ is supposed to do this automatically and correctly 730 // TIOCSWINSZ is supposed to do this automatically and correctly
674 if (cmd_pid) /* force through to the command */ 731 if (cmd_pid) /* force through to the command */
675 kill (-cmd_pid, SIGWINCH); 732 kill (-cmd_pid, SIGWINCH);
… …
705#endif 762#endif
706 763
707 delete fontset[0]; 764 delete fontset[0];
708 fontset[0] = fs; 765 fontset[0] = fs;
709 766
710 prop = (*fs)[1]->properties (); 767 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
711 prop.height += lineSpace; 768 prop.height += lineSpace;
769 prop.width += letterSpace;
712 770
713 fs->set_prop (prop, false); 771 fs->set_prop (prop, false);
714 772
715 fwidth = prop.width; 773 fwidth = prop.width;
716 fheight = prop.height; 774 fheight = prop.height;
… …
766 prop, XA_STRING, 8, PropModeReplace, 824 prop, XA_STRING, 8, PropModeReplace,
767 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 825 (const unsigned char *)str, len >= 0 ? len : strlen (str));
768} 826}
769 827
770void 828void
829rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
830{
831 XTextProperty ct;
832
833 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
834 {
835 XSetTextProperty (dpy, parent[0], &ct, prop);
836 XFree (ct.value);
837 }
838}
839
840void
771rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 841rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
772{ 842{
773 wchar_t *ws = rxvt_mbstowcs (str, len); 843 wchar_t *ws = rxvt_mbstowcs (str, len);
774 char *s = rxvt_wcstoutf8 (ws); 844 char *s = rxvt_wcstoutf8 (ws);
775 845
… …
785/*----------------------------------------------------------------------*/ 855/*----------------------------------------------------------------------*/
786/* xterm sequences - title, iconName, color (exptl) */ 856/* xterm sequences - title, iconName, color (exptl) */
787void 857void
788rxvt_term::set_title (const char *str) 858rxvt_term::set_title (const char *str)
789{ 859{
790 set_string_property (XA_WM_NAME, str); 860 set_mbstring_property (XA_WM_NAME, str);
791#if ENABLE_EWMH 861#if ENABLE_EWMH
792 set_utf8_property (xa[XA_NET_WM_NAME], str); 862 set_utf8_property (xa[XA_NET_WM_NAME], str);
793#endif 863#endif
794} 864}
795 865
796void 866void
797rxvt_term::set_icon_name (const char *str) 867rxvt_term::set_icon_name (const char *str)
798{ 868{
799 set_string_property (XA_WM_ICON_NAME, str); 869 set_mbstring_property (XA_WM_ICON_NAME, str);
800#if ENABLE_EWMH 870#if ENABLE_EWMH
801 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 871 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
802#endif 872#endif
803} 873}
804 874
805void 875void
806rxvt_term::set_window_color (int idx, const char *color) 876rxvt_term::set_window_color (int idx, const char *color)
807{ 877{
808#ifdef XTERM_COLOR_CHANGE 878#ifdef XTERM_COLOR_CHANGE
809 rxvt_color xcol; 879 rxvt_color xcol;
810 int i;
811 880
812 if (color == NULL || *color == '\0') 881 if (color == NULL || *color == '\0')
813 return; 882 return;
814 883
815 color = strdup (color); 884 color = strdup (color);
… …
817 rs[Rs_color + idx] = color; 886 rs[Rs_color + idx] = color;
818 887
819 /* handle color aliases */ 888 /* handle color aliases */
820 if (isdigit (*color)) 889 if (isdigit (*color))
821 { 890 {
822 i = atoi (color); 891 int i = atoi (color);
823 892
824 if (i >= 8 && i <= 15) 893 if (i >= 8 && i <= 15)
825 { 894 {
826 /* bright colors */ 895 /* bright colors */
827 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 896 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
… …
931 int old_width = szHint.width; 1000 int old_width = szHint.width;
932 int old_height = szHint.height; 1001 int old_height = szHint.height;
933 1002
934 window_calc (newwidth, newheight); 1003 window_calc (newwidth, newheight);
935 1004
936 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1005 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1006
1007 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1008 if (set_hint)
1009 {
1010 szHint.flags &= ~(PBaseSize | PResizeInc);
937 XSetWMNormalHints (dpy, parent[0], &szHint); 1011 XSetWMNormalHints (dpy, parent[0], &szHint);
1012 szHint.flags |= PBaseSize | PResizeInc;
1013 }
938 1014
939 if (!ignoreparent) 1015 if (!ignoreparent)
940 { 1016 {
941#ifdef SMART_RESIZE 1017#ifdef SMART_RESIZE
942 /* 1018 /*
… …
982#else 1058#else
983 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1059 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
984#endif 1060#endif
985 } 1061 }
986 1062
1063 if (set_hint)
1064 XSetWMNormalHints (dpy, parent[0], &szHint);
1065
987 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1066 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
988 1067
989 if (fix_screen || newwidth != old_width || newheight != old_height) 1068 if (fix_screen || newwidth != old_width || newheight != old_height)
990 { 1069 {
991 if (scrollBar.state) 1070 if (scrollBar.state)
992 { 1071 scrollBar.resize ();
993 XMoveResizeWindow (dpy, scrollBar.win,
994 window_sb_x, 0,
995 scrollbar_TotalWidth (), szHint.height);
996 resize_scrollbar ();
997 }
998 1072
999 XMoveResizeWindow (dpy, vt, 1073 XMoveResizeWindow (dpy, vt,
1000 window_vt_x, window_vt_y, 1074 window_vt_x, window_vt_y,
1001 width, height); 1075 width, height);
1002 1076
1003#ifdef HAVE_BG_PIXMAP 1077#ifdef HAVE_BG_PIXMAP
1004 if (bgPixmap.window_size_sensitive ()) 1078 if (bgPixmap.window_size_sensitive ())
1005 update_background (); 1079 update_background ();
1006#endif 1080#endif
1007
1008 scr_clear ();
1009 } 1081 }
1010 1082
1011 if (fix_screen || old_height == 0) 1083 if (fix_screen || old_height == 0)
1012 scr_reset (); 1084 scr_reset ();
1013
1014 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1015 //scr_touch (false);
1016 1085
1017#ifdef HAVE_BG_PIXMAP 1086#ifdef HAVE_BG_PIXMAP
1018// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ? 1087// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1019// if (bgPixmap.pixmap) 1088// if (bgPixmap.pixmap)
1020// scr_touch (false); 1089// scr_touch (false);
… …
1092 1161
1093/* Checking whether input method is running. */ 1162/* Checking whether input method is running. */
1094bool 1163bool
1095rxvt_term::IMisRunning () 1164rxvt_term::IMisRunning ()
1096{ 1165{
1097 char *p;
1098 Atom atom; 1166 Atom atom;
1099 Window win; 1167 Window win;
1100 char server[IMBUFSIZ]; 1168 char server[IMBUFSIZ];
1101 1169
1102 /* get current locale modifier */ 1170 /* get current locale modifier */
1103 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1171 if (char *p = XSetLocaleModifiers (0))
1104 { 1172 {
1105 strcpy (server, "@server="); 1173 strcpy (server, "@server=");
1106 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1174 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1107 1175
1108 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1176 if (p = strchr (server + 1, '@')) /* first one only */
1109 *p = '\0'; 1177 *p = '\0';
1110 1178
1111 atom = XInternAtom (dpy, server, False); 1179 atom = XInternAtom (dpy, server, False);
1112 win = XGetSelectionOwner (dpy, atom); 1180 win = XGetSelectionOwner (dpy, atom);
1113 1181
… …
1180 1248
1181 term->make_current (); 1249 term->make_current ();
1182 1250
1183 if (text) 1251 if (text)
1184 { 1252 {
1185 void *str; 1253 wchar_t *str;
1186 1254
1187 if (!text->encoding_is_wchar && text->string.multi_byte) 1255 if (!text->encoding_is_wchar && text->string.multi_byte)
1188 { 1256 {
1189 // of course, X makes it ugly again 1257 // of course, X makes it ugly again
1190 if (term->rs[Rs_imLocale]) 1258 if (term->rs[Rs_imLocale])
1191 SET_LOCALE (term->rs[Rs_imLocale]); 1259 SET_LOCALE (term->rs[Rs_imLocale]);
1192 1260
1193 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1261 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1194 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1262 mbstowcs (str, text->string.multi_byte, text->length + 1);
1195 1263
1196 if (term->rs[Rs_imLocale]) 1264 if (term->rs[Rs_imLocale])
1197 SET_LOCALE (term->locale); 1265 SET_LOCALE (term->locale);
1198 } 1266 }
1199 else 1267 else
1200 str = (void *)text->string.wide_char; 1268 str = text->string.wide_char;
1201 1269
1202 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1270 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1203 DT_INT, call_data->caret, 1271 DT_INT, call_data->caret,
1204 DT_INT, call_data->chg_first, 1272 DT_INT, call_data->chg_first,
1205 DT_INT, call_data->chg_length, 1273 DT_INT, call_data->chg_length,
… …
1559void 1627void
1560rxvt_term::get_window_origin (int &x, int &y) 1628rxvt_term::get_window_origin (int &x, int &y)
1561{ 1629{
1562 Window cr; 1630 Window cr;
1563 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1631 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1564/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1565} 1632}
1566 1633
1567Pixmap 1634Pixmap
1568rxvt_term::get_pixmap_property (int prop_id) 1635rxvt_term::get_pixmap_property (int prop_id)
1569{ 1636{
… …
1583 1650
1584 return None; 1651 return None;
1585} 1652}
1586 1653
1587#ifdef HAVE_BG_PIXMAP 1654#ifdef HAVE_BG_PIXMAP
1588# if TRACE_PIXMAPS
1589# undef update_background
1590void
1591rxvt_term::trace_update_background (const char *file, int line)
1592{
1593 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1594 update_background ();
1595}
1596# endif
1597 1655
1598void 1656void
1599rxvt_term::update_background () 1657rxvt_term::update_background ()
1600{ 1658{
1601 if (update_background_ev.is_active ()) 1659 if (update_background_ev.is_active ())

Diff Legend

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