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.300 by root, Sat Jan 19 00:24:53 2008 UTC vs.
Revision 1.328 by sf-exg, Mon Jul 19 16:43:21 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);
… …
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
… …
468 DisplayString (display)); 450 DisplayString (display));
469 rxvt_emergency_cleanup (); 451 rxvt_emergency_cleanup ();
470 _exit (EXIT_FAILURE); 452 _exit (EXIT_FAILURE);
471} 453}
472 454
473/*----------------------------------------------------------------------*/
474void
475rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
476{
477 this->envv = envv;
478
479 SET_R (this);
480 set_locale ("");
481 set_environ (envv); // few things in X do not call setlocale :(
482
483 init_vars ();
484
485 init_secondary ();
486
487 const char **cmd_argv = init_resources (argc, argv);
488
489#ifdef KEYSYM_RESOURCE
490 keyboard->register_done ();
491#endif
492
493#ifdef HAVE_SCROLLBARS
494 if (option (Opt_scrollBar))
495 scrollBar.setIdle (); /* set existence for size calculations */
496#endif
497
498 pty = ptytty::create ();
499
500 create_windows (argc, argv);
501
502 init_xlocale ();
503
504 scr_reset (); // initialize screen
505
506#if 0
507 XSynchronize (dpy, True);
508#endif
509
510#ifdef HAVE_SCROLLBARS
511 if (option (Opt_scrollBar))
512 resize_scrollbar (); /* create and map scrollbar */
513#endif
514#ifdef HAVE_BG_PIXMAP
515 {
516 bgPixmap.set_target (this);
517 bgPixmap.invalidate ();
518
519#ifdef ENABLE_TRANSPARENCY
520 if (option (Opt_transparent))
521 {
522 bgPixmap.set_transparent ();
523
524#ifdef HAVE_AFTERIMAGE
525 if (rs [Rs_blurradius])
526 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
527#endif
528 if (ISSET_PIXCOLOR (Color_tint))
529 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
530
531 if (rs [Rs_shade])
532 bgPixmap.set_shade (rs [Rs_shade]);
533
534 bgPixmap.set_root_pixmap ();
535 XSelectInput (dpy, display->root, PropertyChangeMask);
536 rootwin_ev.start (display, display->root);
537 }
538#endif
539
540#ifdef BG_IMAGE_FROM_FILE
541 if (rs[Rs_backgroundPixmap])
542 {
543 const char *p = rs[Rs_backgroundPixmap];
544
545 if ((p = strchr (p, ';')) != 0)
546 {
547 p++;
548 bgPixmap.set_geometry (p);
549 }
550 else
551 bgPixmap.set_defaultGeometry ();
552
553 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
554 if (!bgPixmap.window_position_sensitive ())
555 update_background ();
556 }
557#endif
558 }
559#endif
560
561#if ENABLE_PERL
562 rootwin_ev.start (display, display->root);
563#endif
564
565 set_colorfgbg ();
566
567 init_command (cmd_argv);
568
569 free (cmd_argv);
570
571 if (pty->pty >= 0)
572 pty_ev.start (pty->pty, ev::READ);
573
574 HOOK_INVOKE ((this, HOOK_START, DT_END));
575
576#if ENABLE_XEMBED
577 if (rs[Rs_embed])
578 {
579 long info[2] = { 0, XEMBED_MAPPED };
580
581 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
582 32, PropModeReplace, (unsigned char *)&info, 2);
583 }
584#endif
585
586 XMapWindow (dpy, vt);
587 XMapWindow (dpy, parent[0]);
588
589 refresh_check ();
590}
591
592static struct sig_handlers 455static struct sig_handlers
593{ 456{
594 ev::sig sw_term, sw_int; 457 ev::sig sw_term, sw_int;
595 458
596 /* 459 /*
… …
616char **rxvt_environ; // startup environment 479char **rxvt_environ; // startup environment
617 480
618void 481void
619rxvt_init () 482rxvt_init ()
620{ 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
621 ptytty::init (); 487 ptytty::init ();
622 488
623 if (!ev_default_loop (0)) 489 if (!ev_default_loop (0))
624 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 490 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
625 491
… …
648 */ 514 */
649void 515void
650rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 516rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
651{ 517{
652 short recalc_x, recalc_y; 518 short recalc_x, recalc_y;
653 int x, y, sb_w, flags; 519 int x, y, flags;
654 unsigned int w, h; 520 unsigned int w, h;
655 unsigned int max_width, max_height; 521 unsigned int max_width, max_height;
656 522
657 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 523 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
658 szHint.win_gravity = NorthWestGravity; 524 szHint.win_gravity = NorthWestGravity;
… …
668 if (rs[Rs_geometry]) 534 if (rs[Rs_geometry])
669 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 535 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
670 536
671 if (flags & WidthValue) 537 if (flags & WidthValue)
672 { 538 {
539 if (!w)
540 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
541
673 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 542 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
674 szHint.flags |= USSize; 543 szHint.flags |= USSize;
675 } 544 }
676 545
677 if (flags & HeightValue) 546 if (flags & HeightValue)
678 { 547 {
548 if (!h)
549 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
550
679 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 551 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
680 szHint.flags |= USSize; 552 szHint.flags |= USSize;
681 } 553 }
682 554
683 if (flags & XValue) 555 if (flags & XValue)
684 { 556 {
… …
715 max_width = MAX_COLS * fwidth; 587 max_width = MAX_COLS * fwidth;
716 max_height = MAX_ROWS * fheight; 588 max_height = MAX_ROWS * fheight;
717 589
718 szHint.base_width = szHint.base_height = 2 * int_bwidth; 590 szHint.base_width = szHint.base_height = 2 * int_bwidth;
719 591
720 sb_w = 0;
721 window_vt_x = window_vt_y = int_bwidth; 592 window_vt_x = window_vt_y = int_bwidth;
722 593
723 if (scrollBar.state) 594 if (scrollBar.state)
724 { 595 {
725 sb_w = scrollbar_TotalWidth (); 596 int sb_w = scrollBar.total_width ();
726 szHint.base_width += sb_w; 597 szHint.base_width += sb_w;
727 598
728 if (!option (Opt_scrollBar_right)) 599 if (!option (Opt_scrollBar_right))
729 window_vt_x += sb_w; 600 window_vt_x += sb_w;
730 } 601 }
… …
754 { 625 {
755 min_it (height, max_height); 626 min_it (height, max_height);
756 szHint.height = szHint.base_height + height; 627 szHint.height = szHint.base_height + height;
757 } 628 }
758 629
759 if (scrollBar.state && option (Opt_scrollBar_right))
760 window_sb_x = szHint.width - sb_w;
761
762 if (recalc_x) 630 if (recalc_x)
763 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 631 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
764 632
765 if (recalc_y) 633 if (recalc_y)
766 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 634 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
767 635
768 ncol = width / fwidth; 636 ncol = width / fwidth;
769 nrow = height / fheight; 637 nrow = height / fheight;
770} 638}
771 639
772/*----------------------------------------------------------------------*/ 640/*----------------------------------------------------------------------*/
773/* 641/*
… …
784 652
785 ws.ws_col = ncol; 653 ws.ws_col = ncol;
786 ws.ws_row = nrow; 654 ws.ws_row = nrow;
787 ws.ws_xpixel = width; 655 ws.ws_xpixel = width;
788 ws.ws_ypixel = height; 656 ws.ws_ypixel = height;
789 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 657 ioctl (pty->pty, TIOCSWINSZ, &ws);
790 658
791#if 0 659#if 0
792 // TIOCSWINSZ is supposed to do this automatically and correctly 660 // TIOCSWINSZ is supposed to do this automatically and correctly
793 if (cmd_pid) /* force through to the command */ 661 if (cmd_pid) /* force through to the command */
794 kill (-cmd_pid, SIGWINCH); 662 kill (-cmd_pid, SIGWINCH);
… …
824#endif 692#endif
825 693
826 delete fontset[0]; 694 delete fontset[0];
827 fontset[0] = fs; 695 fontset[0] = fs;
828 696
829 prop = (*fs)[1]->properties (); 697 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
830 prop.height += lineSpace; 698 prop.height += lineSpace;
699 prop.width += letterSpace;
831 700
832 fs->set_prop (prop, false); 701 fs->set_prop (prop, false);
833 702
834 fwidth = prop.width; 703 fwidth = prop.width;
835 fheight = prop.height; 704 fheight = prop.height;
… …
885 prop, XA_STRING, 8, PropModeReplace, 754 prop, XA_STRING, 8, PropModeReplace,
886 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 755 (const unsigned char *)str, len >= 0 ? len : strlen (str));
887} 756}
888 757
889void 758void
759rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
760{
761 XTextProperty ct;
762
763 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
764 {
765 XSetTextProperty (dpy, parent[0], &ct, prop);
766 XFree (ct.value);
767 }
768}
769
770void
890rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 771rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
891{ 772{
892 wchar_t *ws = rxvt_mbstowcs (str, len); 773 wchar_t *ws = rxvt_mbstowcs (str, len);
893 char *s = rxvt_wcstoutf8 (ws); 774 char *s = rxvt_wcstoutf8 (ws);
894 775
… …
904/*----------------------------------------------------------------------*/ 785/*----------------------------------------------------------------------*/
905/* xterm sequences - title, iconName, color (exptl) */ 786/* xterm sequences - title, iconName, color (exptl) */
906void 787void
907rxvt_term::set_title (const char *str) 788rxvt_term::set_title (const char *str)
908{ 789{
909 set_string_property (XA_WM_NAME, str); 790 set_mbstring_property (XA_WM_NAME, str);
910#if ENABLE_EWMH 791#if ENABLE_EWMH
911 set_utf8_property (xa[XA_NET_WM_NAME], str); 792 set_utf8_property (xa[XA_NET_WM_NAME], str);
912#endif 793#endif
913} 794}
914 795
915void 796void
916rxvt_term::set_icon_name (const char *str) 797rxvt_term::set_icon_name (const char *str)
917{ 798{
918 set_string_property (XA_WM_ICON_NAME, str); 799 set_mbstring_property (XA_WM_ICON_NAME, str);
919#if ENABLE_EWMH 800#if ENABLE_EWMH
920 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 801 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
921#endif 802#endif
922} 803}
923 804
924void 805void
925rxvt_term::set_window_color (int idx, const char *color) 806rxvt_term::set_window_color (int idx, const char *color)
926{ 807{
927#ifdef XTERM_COLOR_CHANGE 808#ifdef XTERM_COLOR_CHANGE
928 rxvt_color xcol; 809 rxvt_color xcol;
929 int i;
930 810
931 if (color == NULL || *color == '\0') 811 if (color == NULL || *color == '\0')
932 return; 812 return;
933 813
934 color = strdup (color); 814 color = strdup (color);
… …
936 rs[Rs_color + idx] = color; 816 rs[Rs_color + idx] = color;
937 817
938 /* handle color aliases */ 818 /* handle color aliases */
939 if (isdigit (*color)) 819 if (isdigit (*color))
940 { 820 {
941 i = atoi (color); 821 int i = atoi (color);
942 822
943 if (i >= 8 && i <= 15) 823 if (i >= 8 && i <= 15)
944 { 824 {
945 /* bright colors */ 825 /* bright colors */
946 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 826 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
… …
1050 int old_width = szHint.width; 930 int old_width = szHint.width;
1051 int old_height = szHint.height; 931 int old_height = szHint.height;
1052 932
1053 window_calc (newwidth, newheight); 933 window_calc (newwidth, newheight);
1054 934
1055 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 935 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
936
937 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
938 if (set_hint)
939 {
940 szHint.flags &= ~(PBaseSize | PResizeInc);
1056 XSetWMNormalHints (dpy, parent[0], &szHint); 941 XSetWMNormalHints (dpy, parent[0], &szHint);
942 szHint.flags |= PBaseSize | PResizeInc;
943 }
1057 944
1058 if (!ignoreparent) 945 if (!ignoreparent)
1059 { 946 {
1060#ifdef SMART_RESIZE 947#ifdef SMART_RESIZE
1061 /* 948 /*
… …
1101#else 988#else
1102 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 989 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1103#endif 990#endif
1104 } 991 }
1105 992
993 if (set_hint)
994 XSetWMNormalHints (dpy, parent[0], &szHint);
995
1106 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 996 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1107 997
1108 if (fix_screen || newwidth != old_width || newheight != old_height) 998 if (fix_screen || newwidth != old_width || newheight != old_height)
1109 { 999 {
1110 if (scrollBar.state) 1000 if (scrollBar.state)
1111 { 1001 scrollBar.resize ();
1112 XMoveResizeWindow (dpy, scrollBar.win,
1113 window_sb_x, 0,
1114 scrollbar_TotalWidth (), szHint.height);
1115 resize_scrollbar ();
1116 }
1117 1002
1118 XMoveResizeWindow (dpy, vt, 1003 XMoveResizeWindow (dpy, vt,
1119 window_vt_x, window_vt_y, 1004 window_vt_x, window_vt_y,
1120 width, height); 1005 width, height);
1121 1006
1122#ifdef HAVE_BG_PIXMAP 1007#ifdef HAVE_BG_PIXMAP
1123 if (bgPixmap.window_size_sensitive ()) 1008 if (bgPixmap.window_size_sensitive ())
1124 update_background (); 1009 update_background ();
1125#endif 1010#endif
1126
1127 scr_clear ();
1128 } 1011 }
1129 1012
1130 if (fix_screen || old_height == 0) 1013 if (fix_screen || old_height == 0)
1131 scr_reset (); 1014 scr_reset ();
1132
1133 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1134 //scr_touch (false);
1135 1015
1136#ifdef HAVE_BG_PIXMAP 1016#ifdef HAVE_BG_PIXMAP
1137// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ? 1017// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1138// if (bgPixmap.pixmap) 1018// if (bgPixmap.pixmap)
1139// scr_touch (false); 1019// scr_touch (false);
… …
1211 1091
1212/* Checking whether input method is running. */ 1092/* Checking whether input method is running. */
1213bool 1093bool
1214rxvt_term::IMisRunning () 1094rxvt_term::IMisRunning ()
1215{ 1095{
1216 char *p;
1217 Atom atom; 1096 Atom atom;
1218 Window win; 1097 Window win;
1219 char server[IMBUFSIZ]; 1098 char server[IMBUFSIZ];
1220 1099
1221 /* get current locale modifier */ 1100 /* get current locale modifier */
1222 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1101 if (char *p = XSetLocaleModifiers (0))
1223 { 1102 {
1224 strcpy (server, "@server="); 1103 strcpy (server, "@server=");
1225 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1104 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1226 1105
1227 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1106 if (p = strchr (server + 1, '@')) /* first one only */
1228 *p = '\0'; 1107 *p = '\0';
1229 1108
1230 atom = XInternAtom (dpy, server, False); 1109 atom = XInternAtom (dpy, server, False);
1231 win = XGetSelectionOwner (dpy, atom); 1110 win = XGetSelectionOwner (dpy, atom);
1232 1111
… …
1299 1178
1300 term->make_current (); 1179 term->make_current ();
1301 1180
1302 if (text) 1181 if (text)
1303 { 1182 {
1304 void *str; 1183 wchar_t *str;
1305 1184
1306 if (!text->encoding_is_wchar && text->string.multi_byte) 1185 if (!text->encoding_is_wchar && text->string.multi_byte)
1307 { 1186 {
1308 // of course, X makes it ugly again 1187 // of course, X makes it ugly again
1309 if (term->rs[Rs_imLocale]) 1188 if (term->rs[Rs_imLocale])
1310 SET_LOCALE (term->rs[Rs_imLocale]); 1189 SET_LOCALE (term->rs[Rs_imLocale]);
1311 1190
1312 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1191 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1313 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1192 mbstowcs (str, text->string.multi_byte, text->length + 1);
1314 1193
1315 if (term->rs[Rs_imLocale]) 1194 if (term->rs[Rs_imLocale])
1316 SET_LOCALE (term->locale); 1195 SET_LOCALE (term->locale);
1317 } 1196 }
1318 else 1197 else
1319 str = (void *)text->string.wide_char; 1198 str = text->string.wide_char;
1320 1199
1321 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1200 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1322 DT_INT, call_data->caret, 1201 DT_INT, call_data->caret,
1323 DT_INT, call_data->chg_first, 1202 DT_INT, call_data->chg_first,
1324 DT_INT, call_data->chg_length, 1203 DT_INT, call_data->chg_length,

Diff Legend

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