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.301 by ayin, Sat Jan 19 13:00:10 2008 UTC vs.
Revision 1.330 by sf-exg, Mon Jul 26 09:57:53 2010 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
35#include "keyboard.h" 35#include "keyboard.h"
36#include "rxvtperl.h" 36#include "rxvtperl.h"
37 37
38#include <limits> 38#include <limits>
39 39
40#include <cassert>
40#include <csignal> 41#include <csignal>
41#include <cstring> 42#include <cstring>
42 43
43#include <termios.h> 44#include <termios.h>
44 45
… …
101 { 102 {
102 if (cc->c2 == c2) return c1; 103 if (cc->c2 == c2) return c1;
103 cc = (*this)[cc->c1]; 104 cc = (*this)[cc->c1];
104 } 105 }
105 106
106 // check to see wether this combination already exists otherwise 107 // check to see whether this combination already exists otherwise
107 for (cc = v.end (); cc-- > v.begin (); ) 108 for (cc = v.end (); cc-- > v.begin (); )
108 { 109 {
109 if (cc->c1 == c1 && cc->c2 == c2) 110 if (cc->c1 == c1 && cc->c2 == c2)
110 return COMPOSE_LO + (cc - v.begin ()); 111 return COMPOSE_LO + (cc - v.begin ());
111 } 112 }
… …
172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 173 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif 174#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL 175#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 176 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176#endif 177#endif
177#ifdef HAVE_SCROLLBARS
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#endif
180#ifdef USE_XIM 179#ifdef USE_XIM
181 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 180 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
182#endif 181#endif
183#ifdef POINTER_BLANK 182#ifdef POINTER_BLANK
184 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 183 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
… …
229 delete fontset[0]; 228 delete fontset[0];
230 229
231#ifdef HAVE_BG_PIXMAP 230#ifdef HAVE_BG_PIXMAP
232 bgPixmap.destroy (); 231 bgPixmap.destroy ();
233#endif 232#endif
233#ifdef HAVE_AFTERIMAGE
234 if (asv)
235 destroy_asvisual (asv, 0);
236 if (asimman)
237 destroy_image_manager (asimman, 0);
238#endif
234 239
235 if (display) 240 if (display)
236 { 241 {
237 selection_clear (); 242 selection_clear ();
243 selection_clear (true);
238 244
239#ifdef USE_XIM 245#ifdef USE_XIM
240 im_destroy (); 246 im_destroy ();
241#endif 247#endif
242#ifdef XTERM_SCROLLBAR 248 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); 249 if (gc) XFreeGC (dpy, gc);
267 250
268 delete drawable; 251 delete drawable;
269 // destroy all windows 252 // destroy all windows
270 if (parent[0]) 253 if (parent[0])
… …
290 /* clear all resources */ 273 /* clear all resources */
291 for (int i = 0; i < allocated.size (); i++) 274 for (int i = 0; i < allocated.size (); i++)
292 free (allocated [i]); 275 free (allocated [i]);
293 276
294 free (selection.text); 277 free (selection.text);
278 free (selection.clip_text);
295 // TODO: manage env vars in child only(!) 279 // TODO: manage env vars in child only(!)
296 free (env_display); 280 free (env_display);
297 free (env_term); 281 free (env_term);
298 free (locale); 282 free (locale);
299 free (v_buffer); 283 free (v_buffer);
… …
337 if (display) 321 if (display)
338 { 322 {
339#if USE_XIM 323#if USE_XIM
340 im_ev.stop (display); 324 im_ev.stop (display);
341#endif 325#endif
342#if HAVE_SCROLLBARS
343 scrollbar_ev.stop (display); 326 scrollbar_ev.stop (display);
344#endif
345#if ENABLE_TRANSPARENCY || ENABLE_PERL 327#if ENABLE_TRANSPARENCY || ENABLE_PERL
346 rootwin_ev.stop (display); 328 rootwin_ev.stop (display);
347#endif 329#endif
348 incr_ev.stop (); 330 incr_ev.stop ();
349 termwin_ev.stop (display); 331 termwin_ev.stop (display);
… …
401 char mesg[BUFSIZ]; 383 char mesg[BUFSIZ];
402 char number[32]; 384 char number[32];
403 char *mtype = "XlibMessage"; 385 char *mtype = "XlibMessage";
404 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 386 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
405 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 387 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
406 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 388 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
407 rxvt_warn ("%s: %s\n", mesg, buffer); 389 rxvt_warn ("%s: %s\n", mesg, buffer);
408 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 390 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
409 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 391 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
410 sprintf(number, "%d", event->request_code); 392 sprintf(number, "%d", event->request_code);
411 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 393 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
412 rxvt_warn ("(which is %s)\n", buffer); 394 rxvt_warn ("(which is %s)\n", buffer);
413 if (event->request_code >= 128) { 395 if (event->request_code >= 128) {
414 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 396 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
415 mesg, BUFSIZ); 397 mesg, BUFSIZ);
416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 398 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
417 } 399 }
418 if ((event->error_code == BadWindow) || 400 if ((event->error_code == BadWindow) ||
419 (event->error_code == BadPixmap) || 401 (event->error_code == BadPixmap) ||
420 (event->error_code == BadCursor) || 402 (event->error_code == BadCursor) ||
421 (event->error_code == BadFont) || 403 (event->error_code == BadFont) ||
422 (event->error_code == BadDrawable) || 404 (event->error_code == BadDrawable) ||
423 (event->error_code == BadColor) || 405 (event->error_code == BadColor) ||
424 (event->error_code == BadGC) || 406 (event->error_code == BadGC) ||
425 (event->error_code == BadIDChoice) || 407 (event->error_code == BadIDChoice) ||
426 (event->error_code == BadValue) || 408 (event->error_code == BadValue) ||
427 (event->error_code == BadAtom)) { 409 (event->error_code == BadAtom)) {
428 if (event->error_code == BadValue) 410 if (event->error_code == BadValue)
429 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 411 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
430 mesg, BUFSIZ); 412 mesg, BUFSIZ);
431 else if (event->error_code == BadAtom) 413 else if (event->error_code == BadAtom)
432 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 414 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
433 mesg, BUFSIZ); 415 mesg, BUFSIZ);
434 else 416 else
435 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 417 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
436 mesg, BUFSIZ); 418 mesg, BUFSIZ);
437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 419 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
438 } 420 }
439 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 421 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
440 mesg, BUFSIZ); 422 mesg, BUFSIZ);
441 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
442} 424}
443#endif 425#endif
444 426
445int 427int
… …
497char **rxvt_environ; // startup environment 479char **rxvt_environ; // startup environment
498 480
499void 481void
500rxvt_init () 482rxvt_init ()
501{ 483{
484 assert (("fontMask must not overlap other RS masks",
485 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
486
502 ptytty::init (); 487 ptytty::init ();
503 488
504 if (!ev_default_loop (0)) 489 if (!ev_default_loop (0))
505 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 490 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
506 491
… …
509 signal (SIGHUP, SIG_IGN); 494 signal (SIGHUP, SIG_IGN);
510 signal (SIGPIPE, SIG_IGN); 495 signal (SIGPIPE, SIG_IGN);
511 496
512 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 497 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
513 sig_handlers.sw_int.start (SIGINT); ev_unref (); 498 sig_handlers.sw_int.start (SIGINT); ev_unref ();
514
515 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
516 /* signal (SIGURG, SIG_DFL); */
517 499
518 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 500 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
519 // TODO: handle this with exceptions and tolerate the memory loss 501 // TODO: handle this with exceptions and tolerate the memory loss
520 XSetIOErrorHandler (rxvt_xioerror_handler); 502 XSetIOErrorHandler (rxvt_xioerror_handler);
521 503
… …
529 */ 511 */
530void 512void
531rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 513rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
532{ 514{
533 short recalc_x, recalc_y; 515 short recalc_x, recalc_y;
534 int x, y, sb_w, flags; 516 int x, y, flags;
535 unsigned int w, h; 517 unsigned int w, h;
536 unsigned int max_width, max_height; 518 unsigned int max_width, max_height;
537 519
538 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 520 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
539 szHint.win_gravity = NorthWestGravity; 521 szHint.win_gravity = NorthWestGravity;
… …
549 if (rs[Rs_geometry]) 531 if (rs[Rs_geometry])
550 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 532 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
551 533
552 if (flags & WidthValue) 534 if (flags & WidthValue)
553 { 535 {
536 if (!w)
537 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
538
554 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 539 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
555 szHint.flags |= USSize; 540 szHint.flags |= USSize;
556 } 541 }
557 542
558 if (flags & HeightValue) 543 if (flags & HeightValue)
559 { 544 {
545 if (!h)
546 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
547
560 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 548 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
561 szHint.flags |= USSize; 549 szHint.flags |= USSize;
562 } 550 }
563 551
564 if (flags & XValue) 552 if (flags & XValue)
565 { 553 {
… …
596 max_width = MAX_COLS * fwidth; 584 max_width = MAX_COLS * fwidth;
597 max_height = MAX_ROWS * fheight; 585 max_height = MAX_ROWS * fheight;
598 586
599 szHint.base_width = szHint.base_height = 2 * int_bwidth; 587 szHint.base_width = szHint.base_height = 2 * int_bwidth;
600 588
601 sb_w = 0;
602 window_vt_x = window_vt_y = int_bwidth; 589 window_vt_x = window_vt_y = int_bwidth;
603 590
604 if (scrollBar.state) 591 if (scrollBar.state)
605 { 592 {
606 sb_w = scrollbar_TotalWidth (); 593 int sb_w = scrollBar.total_width ();
607 szHint.base_width += sb_w; 594 szHint.base_width += sb_w;
608 595
609 if (!option (Opt_scrollBar_right)) 596 if (!option (Opt_scrollBar_right))
610 window_vt_x += sb_w; 597 window_vt_x += sb_w;
611 } 598 }
… …
635 { 622 {
636 min_it (height, max_height); 623 min_it (height, max_height);
637 szHint.height = szHint.base_height + height; 624 szHint.height = szHint.base_height + height;
638 } 625 }
639 626
640 if (scrollBar.state && option (Opt_scrollBar_right))
641 window_sb_x = szHint.width - sb_w;
642
643 if (recalc_x) 627 if (recalc_x)
644 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 628 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
645 629
646 if (recalc_y) 630 if (recalc_y)
647 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 631 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
648 632
649 ncol = width / fwidth; 633 ncol = width / fwidth;
650 nrow = height / fheight; 634 nrow = height / fheight;
651} 635}
652 636
653/*----------------------------------------------------------------------*/ 637/*----------------------------------------------------------------------*/
654/* 638/*
… …
665 649
666 ws.ws_col = ncol; 650 ws.ws_col = ncol;
667 ws.ws_row = nrow; 651 ws.ws_row = nrow;
668 ws.ws_xpixel = width; 652 ws.ws_xpixel = width;
669 ws.ws_ypixel = height; 653 ws.ws_ypixel = height;
670 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 654 ioctl (pty->pty, TIOCSWINSZ, &ws);
671 655
672#if 0 656#if 0
673 // TIOCSWINSZ is supposed to do this automatically and correctly 657 // TIOCSWINSZ is supposed to do this automatically and correctly
674 if (cmd_pid) /* force through to the command */ 658 if (cmd_pid) /* force through to the command */
675 kill (-cmd_pid, SIGWINCH); 659 kill (-cmd_pid, SIGWINCH);
… …
705#endif 689#endif
706 690
707 delete fontset[0]; 691 delete fontset[0];
708 fontset[0] = fs; 692 fontset[0] = fs;
709 693
710 prop = (*fs)[1]->properties (); 694 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
711 prop.height += lineSpace; 695 prop.height += lineSpace;
696 prop.width += letterSpace;
712 697
713 fs->set_prop (prop, false); 698 fs->set_prop (prop, false);
714 699
715 fwidth = prop.width; 700 fwidth = prop.width;
716 fheight = prop.height; 701 fheight = prop.height;
… …
766 prop, XA_STRING, 8, PropModeReplace, 751 prop, XA_STRING, 8, PropModeReplace,
767 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 752 (const unsigned char *)str, len >= 0 ? len : strlen (str));
768} 753}
769 754
770void 755void
756rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
757{
758 XTextProperty ct;
759
760 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
761 {
762 XSetTextProperty (dpy, parent[0], &ct, prop);
763 XFree (ct.value);
764 }
765}
766
767void
771rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 768rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
772{ 769{
773 wchar_t *ws = rxvt_mbstowcs (str, len); 770 wchar_t *ws = rxvt_mbstowcs (str, len);
774 char *s = rxvt_wcstoutf8 (ws); 771 char *s = rxvt_wcstoutf8 (ws);
775 772
… …
785/*----------------------------------------------------------------------*/ 782/*----------------------------------------------------------------------*/
786/* xterm sequences - title, iconName, color (exptl) */ 783/* xterm sequences - title, iconName, color (exptl) */
787void 784void
788rxvt_term::set_title (const char *str) 785rxvt_term::set_title (const char *str)
789{ 786{
790 set_string_property (XA_WM_NAME, str); 787 set_mbstring_property (XA_WM_NAME, str);
791#if ENABLE_EWMH 788#if ENABLE_EWMH
792 set_utf8_property (xa[XA_NET_WM_NAME], str); 789 set_utf8_property (xa[XA_NET_WM_NAME], str);
793#endif 790#endif
794} 791}
795 792
796void 793void
797rxvt_term::set_icon_name (const char *str) 794rxvt_term::set_icon_name (const char *str)
798{ 795{
799 set_string_property (XA_WM_ICON_NAME, str); 796 set_mbstring_property (XA_WM_ICON_NAME, str);
800#if ENABLE_EWMH 797#if ENABLE_EWMH
801 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 798 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
802#endif 799#endif
803} 800}
804 801
805void 802void
806rxvt_term::set_window_color (int idx, const char *color) 803rxvt_term::set_window_color (int idx, const char *color)
807{ 804{
808#ifdef XTERM_COLOR_CHANGE 805#ifdef XTERM_COLOR_CHANGE
809 rxvt_color xcol; 806 rxvt_color xcol;
810 int i;
811 807
812 if (color == NULL || *color == '\0') 808 if (color == NULL || *color == '\0')
813 return; 809 return;
814 810
815 color = strdup (color); 811 color = strdup (color);
… …
817 rs[Rs_color + idx] = color; 813 rs[Rs_color + idx] = color;
818 814
819 /* handle color aliases */ 815 /* handle color aliases */
820 if (isdigit (*color)) 816 if (isdigit (*color))
821 { 817 {
822 i = atoi (color); 818 int i = atoi (color);
823 819
824 if (i >= 8 && i <= 15) 820 if (i >= 8 && i <= 15)
825 { 821 {
826 /* bright colors */ 822 /* bright colors */
827 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 823 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
… …
931 int old_width = szHint.width; 927 int old_width = szHint.width;
932 int old_height = szHint.height; 928 int old_height = szHint.height;
933 929
934 window_calc (newwidth, newheight); 930 window_calc (newwidth, newheight);
935 931
936 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 932 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
933
934 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
935 if (set_hint)
936 {
937 szHint.flags &= ~(PBaseSize | PResizeInc);
937 XSetWMNormalHints (dpy, parent[0], &szHint); 938 XSetWMNormalHints (dpy, parent[0], &szHint);
939 szHint.flags |= PBaseSize | PResizeInc;
940 }
938 941
939 if (!ignoreparent) 942 if (!ignoreparent)
940 { 943 {
941#ifdef SMART_RESIZE 944#ifdef SMART_RESIZE
942 /* 945 /*
… …
982#else 985#else
983 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 986 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
984#endif 987#endif
985 } 988 }
986 989
990 if (set_hint)
991 XSetWMNormalHints (dpy, parent[0], &szHint);
992
987 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 993 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
988 994
989 if (fix_screen || newwidth != old_width || newheight != old_height) 995 if (fix_screen || newwidth != old_width || newheight != old_height)
990 { 996 {
991 if (scrollBar.state) 997 if (scrollBar.state)
992 { 998 scrollBar.resize ();
993 XMoveResizeWindow (dpy, scrollBar.win,
994 window_sb_x, 0,
995 scrollbar_TotalWidth (), szHint.height);
996 resize_scrollbar ();
997 }
998 999
999 XMoveResizeWindow (dpy, vt, 1000 XMoveResizeWindow (dpy, vt,
1000 window_vt_x, window_vt_y, 1001 window_vt_x, window_vt_y,
1001 width, height); 1002 width, height);
1002 1003
1003#ifdef HAVE_BG_PIXMAP 1004#ifdef HAVE_BG_PIXMAP
1004 if (bgPixmap.window_size_sensitive ()) 1005 if (bgPixmap.window_size_sensitive ())
1005 update_background (); 1006 update_background ();
1006#endif 1007#endif
1007
1008 scr_clear ();
1009 } 1008 }
1010 1009
1011 if (fix_screen || old_height == 0) 1010 if (fix_screen || old_height == 0)
1012 scr_reset (); 1011 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 1012
1017#ifdef HAVE_BG_PIXMAP 1013#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 ? 1014// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1019// if (bgPixmap.pixmap) 1015// if (bgPixmap.pixmap)
1020// scr_touch (false); 1016// scr_touch (false);
… …
1092 1088
1093/* Checking whether input method is running. */ 1089/* Checking whether input method is running. */
1094bool 1090bool
1095rxvt_term::IMisRunning () 1091rxvt_term::IMisRunning ()
1096{ 1092{
1097 char *p;
1098 Atom atom; 1093 Atom atom;
1099 Window win; 1094 Window win;
1100 char server[IMBUFSIZ]; 1095 char server[IMBUFSIZ];
1101 1096
1102 /* get current locale modifier */ 1097 /* get current locale modifier */
1103 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1098 if (char *p = XSetLocaleModifiers (0))
1104 { 1099 {
1105 strcpy (server, "@server="); 1100 strcpy (server, "@server=");
1106 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1101 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1107 1102
1108 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1103 if (p = strchr (server + 1, '@')) /* first one only */
1109 *p = '\0'; 1104 *p = '\0';
1110 1105
1111 atom = XInternAtom (dpy, server, False); 1106 atom = XInternAtom (dpy, server, False);
1112 win = XGetSelectionOwner (dpy, atom); 1107 win = XGetSelectionOwner (dpy, atom);
1113 1108
… …
1180 1175
1181 term->make_current (); 1176 term->make_current ();
1182 1177
1183 if (text) 1178 if (text)
1184 { 1179 {
1185 void *str; 1180 wchar_t *str;
1186 1181
1187 if (!text->encoding_is_wchar && text->string.multi_byte) 1182 if (!text->encoding_is_wchar && text->string.multi_byte)
1188 { 1183 {
1189 // of course, X makes it ugly again 1184 // of course, X makes it ugly again
1190 if (term->rs[Rs_imLocale]) 1185 if (term->rs[Rs_imLocale])
1191 SET_LOCALE (term->rs[Rs_imLocale]); 1186 SET_LOCALE (term->rs[Rs_imLocale]);
1192 1187
1193 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1188 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1194 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1189 mbstowcs (str, text->string.multi_byte, text->length + 1);
1195 1190
1196 if (term->rs[Rs_imLocale]) 1191 if (term->rs[Rs_imLocale])
1197 SET_LOCALE (term->locale); 1192 SET_LOCALE (term->locale);
1198 } 1193 }
1199 else 1194 else
1200 str = (void *)text->string.wide_char; 1195 str = text->string.wide_char;
1201 1196
1202 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1197 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1203 DT_INT, call_data->caret, 1198 DT_INT, call_data->caret,
1204 DT_INT, call_data->chg_first, 1199 DT_INT, call_data->chg_first,
1205 DT_INT, call_data->chg_length, 1200 DT_INT, call_data->chg_length,

Diff Legend

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