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.305 by ayin, Sun Feb 17 11:37:21 2008 UTC vs.
Revision 1.333 by root, Fri Oct 22 05:57:59 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 }
… …
227 delete fontset[0]; 230 delete fontset[0];
228 231
229#ifdef HAVE_BG_PIXMAP 232#ifdef HAVE_BG_PIXMAP
230 bgPixmap.destroy (); 233 bgPixmap.destroy ();
231#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
232 241
233 if (display) 242 if (display)
234 { 243 {
235 selection_clear (); 244 selection_clear ();
245 selection_clear (true);
236 246
237#ifdef USE_XIM 247#ifdef USE_XIM
238 im_destroy (); 248 im_destroy ();
239#endif 249#endif
240#ifdef XTERM_SCROLLBAR 250 scrollBar.destroy ();
241 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
242 if (ShadowGC) XFreeGC (dpy, ShadowGC);
243#endif
244#ifdef PLAIN_SCROLLBAR
245 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
246#endif
247#ifdef NEXT_SCROLLBAR
248 if (blackGC) XFreeGC (dpy, blackGC);
249 if (whiteGC) XFreeGC (dpy, whiteGC);
250 if (grayGC) XFreeGC (dpy, grayGC);
251 if (darkGC) XFreeGC (dpy, darkGC);
252 if (stippleGC) XFreeGC (dpy, stippleGC);
253 if (dimple) XFreePixmap (dpy, dimple);
254 if (upArrow) XFreePixmap (dpy, upArrow);
255 if (downArrow) XFreePixmap (dpy, downArrow);
256 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
257 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
258#endif
259#ifdef RXVT_SCROLLBAR
260 if (topShadowGC) XFreeGC (dpy, topShadowGC);
261 if (botShadowGC) XFreeGC (dpy, botShadowGC);
262 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
263#endif
264 if (gc) XFreeGC (dpy, gc); 251 if (gc) XFreeGC (dpy, gc);
265 252
266 delete drawable; 253 delete drawable;
267 // destroy all windows 254 // destroy all windows
268 if (parent[0]) 255 if (parent[0])
… …
288 /* clear all resources */ 275 /* clear all resources */
289 for (int i = 0; i < allocated.size (); i++) 276 for (int i = 0; i < allocated.size (); i++)
290 free (allocated [i]); 277 free (allocated [i]);
291 278
292 free (selection.text); 279 free (selection.text);
280 free (selection.clip_text);
293 // TODO: manage env vars in child only(!) 281 // TODO: manage env vars in child only(!)
294 free (env_display); 282 free (env_display);
295 free (env_term); 283 free (env_term);
296 free (locale); 284 free (locale);
297 free (v_buffer); 285 free (v_buffer);
… …
397 char mesg[BUFSIZ]; 385 char mesg[BUFSIZ];
398 char number[32]; 386 char number[32];
399 char *mtype = "XlibMessage"; 387 char *mtype = "XlibMessage";
400 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 388 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
401 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 389 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
402 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");
403 rxvt_warn ("%s: %s\n", mesg, buffer); 391 rxvt_warn ("%s: %s\n", mesg, buffer);
404 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 392 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
405 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 393 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
406 sprintf(number, "%d", event->request_code); 394 sprintf(number, "%d", event->request_code);
407 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 395 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
408 rxvt_warn ("(which is %s)\n", buffer); 396 rxvt_warn ("(which is %s)\n", buffer);
409 if (event->request_code >= 128) { 397 if (event->request_code >= 128) {
410 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 398 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
411 mesg, BUFSIZ); 399 mesg, BUFSIZ);
412 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 400 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
413 } 401 }
414 if ((event->error_code == BadWindow) || 402 if ((event->error_code == BadWindow) ||
415 (event->error_code == BadPixmap) || 403 (event->error_code == BadPixmap) ||
416 (event->error_code == BadCursor) || 404 (event->error_code == BadCursor) ||
417 (event->error_code == BadFont) || 405 (event->error_code == BadFont) ||
418 (event->error_code == BadDrawable) || 406 (event->error_code == BadDrawable) ||
419 (event->error_code == BadColor) || 407 (event->error_code == BadColor) ||
420 (event->error_code == BadGC) || 408 (event->error_code == BadGC) ||
421 (event->error_code == BadIDChoice) || 409 (event->error_code == BadIDChoice) ||
422 (event->error_code == BadValue) || 410 (event->error_code == BadValue) ||
423 (event->error_code == BadAtom)) { 411 (event->error_code == BadAtom)) {
424 if (event->error_code == BadValue) 412 if (event->error_code == BadValue)
425 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 413 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
426 mesg, BUFSIZ); 414 mesg, BUFSIZ);
427 else if (event->error_code == BadAtom) 415 else if (event->error_code == BadAtom)
428 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 416 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
429 mesg, BUFSIZ); 417 mesg, BUFSIZ);
430 else 418 else
431 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 419 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
432 mesg, BUFSIZ); 420 mesg, BUFSIZ);
433 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
434 } 422 }
435 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 423 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
436 mesg, BUFSIZ); 424 mesg, BUFSIZ);
437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 425 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
438} 426}
439#endif 427#endif
440 428
441int 429int
… …
488 rxvt_emergency_cleanup (); 476 rxvt_emergency_cleanup ();
489 w.stop (); 477 w.stop ();
490 kill (getpid (), w.signum); 478 kill (getpid (), w.signum);
491} 479}
492 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
517# if VMIN != VEOF
518 tio->c_cc[VMIN] = 1;
519# endif
520# if VTIME != VEOL
521 tio->c_cc[VTIME] = 0;
522# endif
523
524 /* input modes */
525 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
526# ifdef IMAXBEL
527 | IMAXBEL
528# endif
529 | IXON);
530
531 /* output modes */
532 tio->c_oflag = (OPOST | ONLCR);
533
534 /* control modes */
535 tio->c_cflag = (CS8 | CREAD);
536
537 /* local modes */
538 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
539# if defined (ECHOCTL) && defined (ECHOKE)
540 | ECHOCTL | ECHOKE
541# endif
542 | ECHOE | ECHOK);
543}
544
493char **rxvt_environ; // startup environment 545char **rxvt_environ; // startup environment
494 546
495void 547void
496rxvt_init () 548rxvt_init ()
497{ 549{
550 assert (("fontMask must not overlap other RS masks",
551 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
552
553 rxvt_get_ttymode (&rxvt_term::def_tio);
554
555 // get rid of stdin/stdout as we don't need them, to free resources
556 dup2 (STDERR_FILENO, STDIN_FILENO);
557 dup2 (STDERR_FILENO, STDOUT_FILENO);
558
498 ptytty::init (); 559 ptytty::init ();
499 560
500 if (!ev_default_loop (0)) 561 if (!ev_default_loop ())
501 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 562 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
502 563
503 rxvt_environ = environ; 564 rxvt_environ = environ;
504 565
505 signal (SIGHUP, SIG_IGN); 566 signal (SIGHUP, SIG_IGN);
506 signal (SIGPIPE, SIG_IGN); 567 signal (SIGPIPE, SIG_IGN);
507 568
508 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 569 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
509 sig_handlers.sw_int.start (SIGINT); ev_unref (); 570 sig_handlers.sw_int.start (SIGINT); ev_unref ();
510
511 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
512 /* signal (SIGURG, SIG_DFL); */
513 571
514 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 572 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
515 // TODO: handle this with exceptions and tolerate the memory loss 573 // TODO: handle this with exceptions and tolerate the memory loss
516 XSetIOErrorHandler (rxvt_xioerror_handler); 574 XSetIOErrorHandler (rxvt_xioerror_handler);
517 575
… …
525 */ 583 */
526void 584void
527rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 585rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
528{ 586{
529 short recalc_x, recalc_y; 587 short recalc_x, recalc_y;
530 int x, y, sb_w, flags; 588 int x, y, flags;
531 unsigned int w, h; 589 unsigned int w, h;
532 unsigned int max_width, max_height; 590 unsigned int max_width, max_height;
533 591
534 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 592 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
535 szHint.win_gravity = NorthWestGravity; 593 szHint.win_gravity = NorthWestGravity;
… …
545 if (rs[Rs_geometry]) 603 if (rs[Rs_geometry])
546 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 604 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
547 605
548 if (flags & WidthValue) 606 if (flags & WidthValue)
549 { 607 {
608 if (!w)
609 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
610
550 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 611 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
551 szHint.flags |= USSize; 612 szHint.flags |= USSize;
552 } 613 }
553 614
554 if (flags & HeightValue) 615 if (flags & HeightValue)
555 { 616 {
617 if (!h)
618 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
619
556 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 620 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
557 szHint.flags |= USSize; 621 szHint.flags |= USSize;
558 } 622 }
559 623
560 if (flags & XValue) 624 if (flags & XValue)
561 { 625 {
… …
592 max_width = MAX_COLS * fwidth; 656 max_width = MAX_COLS * fwidth;
593 max_height = MAX_ROWS * fheight; 657 max_height = MAX_ROWS * fheight;
594 658
595 szHint.base_width = szHint.base_height = 2 * int_bwidth; 659 szHint.base_width = szHint.base_height = 2 * int_bwidth;
596 660
597 sb_w = 0;
598 window_vt_x = window_vt_y = int_bwidth; 661 window_vt_x = window_vt_y = int_bwidth;
599 662
600 if (scrollBar.state) 663 if (scrollBar.state)
601 { 664 {
602 sb_w = scrollBar.total_width (); 665 int sb_w = scrollBar.total_width ();
603 szHint.base_width += sb_w; 666 szHint.base_width += sb_w;
604 667
605 if (!option (Opt_scrollBar_right)) 668 if (!option (Opt_scrollBar_right))
606 window_vt_x += sb_w; 669 window_vt_x += sb_w;
607 } 670 }
… …
631 { 694 {
632 min_it (height, max_height); 695 min_it (height, max_height);
633 szHint.height = szHint.base_height + height; 696 szHint.height = szHint.base_height + height;
634 } 697 }
635 698
636 if (scrollBar.state && option (Opt_scrollBar_right))
637 window_sb_x = szHint.width - sb_w;
638
639 if (recalc_x) 699 if (recalc_x)
640 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 700 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
641 701
642 if (recalc_y) 702 if (recalc_y)
643 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 703 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
644 704
645 ncol = width / fwidth; 705 ncol = width / fwidth;
646 nrow = height / fheight; 706 nrow = height / fheight;
647} 707}
648 708
649/*----------------------------------------------------------------------*/ 709/*----------------------------------------------------------------------*/
650/* 710/*
… …
661 721
662 ws.ws_col = ncol; 722 ws.ws_col = ncol;
663 ws.ws_row = nrow; 723 ws.ws_row = nrow;
664 ws.ws_xpixel = width; 724 ws.ws_xpixel = width;
665 ws.ws_ypixel = height; 725 ws.ws_ypixel = height;
666 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 726 ioctl (pty->pty, TIOCSWINSZ, &ws);
667 727
668#if 0 728#if 0
669 // TIOCSWINSZ is supposed to do this automatically and correctly 729 // TIOCSWINSZ is supposed to do this automatically and correctly
670 if (cmd_pid) /* force through to the command */ 730 if (cmd_pid) /* force through to the command */
671 kill (-cmd_pid, SIGWINCH); 731 kill (-cmd_pid, SIGWINCH);
… …
701#endif 761#endif
702 762
703 delete fontset[0]; 763 delete fontset[0];
704 fontset[0] = fs; 764 fontset[0] = fs;
705 765
706 prop = (*fs)[1]->properties (); 766 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
707 prop.height += lineSpace; 767 prop.height += lineSpace;
768 prop.width += letterSpace;
708 769
709 fs->set_prop (prop, false); 770 fs->set_prop (prop, false);
710 771
711 fwidth = prop.width; 772 fwidth = prop.width;
712 fheight = prop.height; 773 fheight = prop.height;
… …
762 prop, XA_STRING, 8, PropModeReplace, 823 prop, XA_STRING, 8, PropModeReplace,
763 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 824 (const unsigned char *)str, len >= 0 ? len : strlen (str));
764} 825}
765 826
766void 827void
828rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
829{
830 XTextProperty ct;
831
832 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
833 {
834 XSetTextProperty (dpy, parent[0], &ct, prop);
835 XFree (ct.value);
836 }
837}
838
839void
767rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 840rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
768{ 841{
769 wchar_t *ws = rxvt_mbstowcs (str, len); 842 wchar_t *ws = rxvt_mbstowcs (str, len);
770 char *s = rxvt_wcstoutf8 (ws); 843 char *s = rxvt_wcstoutf8 (ws);
771 844
… …
781/*----------------------------------------------------------------------*/ 854/*----------------------------------------------------------------------*/
782/* xterm sequences - title, iconName, color (exptl) */ 855/* xterm sequences - title, iconName, color (exptl) */
783void 856void
784rxvt_term::set_title (const char *str) 857rxvt_term::set_title (const char *str)
785{ 858{
786 set_string_property (XA_WM_NAME, str); 859 set_mbstring_property (XA_WM_NAME, str);
787#if ENABLE_EWMH 860#if ENABLE_EWMH
788 set_utf8_property (xa[XA_NET_WM_NAME], str); 861 set_utf8_property (xa[XA_NET_WM_NAME], str);
789#endif 862#endif
790} 863}
791 864
792void 865void
793rxvt_term::set_icon_name (const char *str) 866rxvt_term::set_icon_name (const char *str)
794{ 867{
795 set_string_property (XA_WM_ICON_NAME, str); 868 set_mbstring_property (XA_WM_ICON_NAME, str);
796#if ENABLE_EWMH 869#if ENABLE_EWMH
797 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 870 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
798#endif 871#endif
799} 872}
800 873
… …
926 int old_width = szHint.width; 999 int old_width = szHint.width;
927 int old_height = szHint.height; 1000 int old_height = szHint.height;
928 1001
929 window_calc (newwidth, newheight); 1002 window_calc (newwidth, newheight);
930 1003
931 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1004 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1005
1006 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1007 if (set_hint)
1008 {
1009 szHint.flags &= ~(PBaseSize | PResizeInc);
932 XSetWMNormalHints (dpy, parent[0], &szHint); 1010 XSetWMNormalHints (dpy, parent[0], &szHint);
1011 szHint.flags |= PBaseSize | PResizeInc;
1012 }
933 1013
934 if (!ignoreparent) 1014 if (!ignoreparent)
935 { 1015 {
936#ifdef SMART_RESIZE 1016#ifdef SMART_RESIZE
937 /* 1017 /*
… …
977#else 1057#else
978 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1058 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
979#endif 1059#endif
980 } 1060 }
981 1061
1062 if (set_hint)
1063 XSetWMNormalHints (dpy, parent[0], &szHint);
1064
982 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1065 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
983 1066
984 if (fix_screen || newwidth != old_width || newheight != old_height) 1067 if (fix_screen || newwidth != old_width || newheight != old_height)
985 { 1068 {
986 if (scrollBar.state) 1069 if (scrollBar.state)
987 { 1070 scrollBar.resize ();
988 XMoveResizeWindow (dpy, scrollBar.win,
989 window_sb_x, 0,
990 scrollBar.total_width (), szHint.height);
991 resize_scrollbar ();
992 }
993 1071
994 XMoveResizeWindow (dpy, vt, 1072 XMoveResizeWindow (dpy, vt,
995 window_vt_x, window_vt_y, 1073 window_vt_x, window_vt_y,
996 width, height); 1074 width, height);
997 1075
998#ifdef HAVE_BG_PIXMAP 1076#ifdef HAVE_BG_PIXMAP
999 if (bgPixmap.window_size_sensitive ()) 1077 if (bgPixmap.window_size_sensitive ())
1000 update_background (); 1078 update_background ();
1001#endif 1079#endif
1002
1003 scr_clear ();
1004 } 1080 }
1005 1081
1006 if (fix_screen || old_height == 0) 1082 if (fix_screen || old_height == 0)
1007 scr_reset (); 1083 scr_reset ();
1008
1009 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1010 //scr_touch (false);
1011 1084
1012#ifdef HAVE_BG_PIXMAP 1085#ifdef HAVE_BG_PIXMAP
1013// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ? 1086// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1014// if (bgPixmap.pixmap) 1087// if (bgPixmap.pixmap)
1015// scr_touch (false); 1088// scr_touch (false);
… …
1087 1160
1088/* Checking whether input method is running. */ 1161/* Checking whether input method is running. */
1089bool 1162bool
1090rxvt_term::IMisRunning () 1163rxvt_term::IMisRunning ()
1091{ 1164{
1092 char *p;
1093 Atom atom; 1165 Atom atom;
1094 Window win; 1166 Window win;
1095 char server[IMBUFSIZ]; 1167 char server[IMBUFSIZ];
1096 1168
1097 /* get current locale modifier */ 1169 /* get current locale modifier */
1098 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1170 if (char *p = XSetLocaleModifiers (0))
1099 { 1171 {
1100 strcpy (server, "@server="); 1172 strcpy (server, "@server=");
1101 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1173 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1102 1174
1103 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1175 if (p = strchr (server + 1, '@')) /* first one only */
1104 *p = '\0'; 1176 *p = '\0';
1105 1177
1106 atom = XInternAtom (dpy, server, False); 1178 atom = XInternAtom (dpy, server, False);
1107 win = XGetSelectionOwner (dpy, atom); 1179 win = XGetSelectionOwner (dpy, atom);
1108 1180
… …
1175 1247
1176 term->make_current (); 1248 term->make_current ();
1177 1249
1178 if (text) 1250 if (text)
1179 { 1251 {
1180 void *str; 1252 wchar_t *str;
1181 1253
1182 if (!text->encoding_is_wchar && text->string.multi_byte) 1254 if (!text->encoding_is_wchar && text->string.multi_byte)
1183 { 1255 {
1184 // of course, X makes it ugly again 1256 // of course, X makes it ugly again
1185 if (term->rs[Rs_imLocale]) 1257 if (term->rs[Rs_imLocale])
1186 SET_LOCALE (term->rs[Rs_imLocale]); 1258 SET_LOCALE (term->rs[Rs_imLocale]);
1187 1259
1188 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1260 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1189 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1261 mbstowcs (str, text->string.multi_byte, text->length + 1);
1190 1262
1191 if (term->rs[Rs_imLocale]) 1263 if (term->rs[Rs_imLocale])
1192 SET_LOCALE (term->locale); 1264 SET_LOCALE (term->locale);
1193 } 1265 }
1194 else 1266 else
1195 str = (void *)text->string.wide_char; 1267 str = text->string.wide_char;
1196 1268
1197 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1269 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1198 DT_INT, call_data->caret, 1270 DT_INT, call_data->caret,
1199 DT_INT, call_data->chg_first, 1271 DT_INT, call_data->chg_first,
1200 DT_INT, call_data->chg_length, 1272 DT_INT, call_data->chg_length,

Diff Legend

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