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.276 by root, Tue Dec 11 18:00:07 2007 UTC vs.
Revision 1.321 by sf-exg, Sun Feb 14 11:11:10 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-2006 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.
… …
38#include <limits> 38#include <limits>
39 39
40#include <csignal> 40#include <csignal>
41#include <cstring> 41#include <cstring>
42 42
43# include <termios.h> 43#include <termios.h>
44 44
45#ifdef HAVE_XSETLOCALE 45#ifdef HAVE_XSETLOCALE
46# define X_LOCALE 46# define X_LOCALE
47# include <X11/Xlocale.h> 47# include <X11/Xlocale.h>
48#else 48#else
… …
155{ 155{
156#if HAVE_BG_PIXMAP 156#if HAVE_BG_PIXMAP
157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this); 157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
158#endif 158#endif
159#ifdef CURSOR_BLINK 159#ifdef CURSOR_BLINK
160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); 160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
161#endif 161#endif
162#ifdef TEXT_BLINK 162#ifdef TEXT_BLINK
163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL); 163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
164#endif 164#endif
165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
… …
170#endif 170#endif
171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif 173#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL 174#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176#endif 176#endif
177#ifdef HAVE_SCROLLBARS
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 177 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#endif
180#ifdef USE_XIM 178#ifdef USE_XIM
181 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 179 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
182#endif 180#endif
183#ifdef POINTER_BLANK 181#ifdef POINTER_BLANK
184 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 182 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
185#endif 183#endif
186#ifndef NO_BELL 184#ifndef NO_BELL
187 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this); 185 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
188#endif 186#endif
189 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 187 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
190 prepare_ev.set <rxvt_term, &rxvt_term::prepare_cb> (this);
191 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 188 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
192 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 189 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
193 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 190 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
194 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this); 191 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
195 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
… …
227 if (fontset[i] != fontset[0]) 224 if (fontset[i] != fontset[0])
228 delete fontset[i]; 225 delete fontset[i];
229#endif 226#endif
230 delete fontset[0]; 227 delete fontset[0];
231 228
229#ifdef HAVE_BG_PIXMAP
230 bgPixmap.destroy ();
231#endif
232#ifdef HAVE_AFTERIMAGE
233 if (asv)
234 destroy_asvisual (asv, 0);
235 if (asimman)
236 destroy_image_manager (asimman, 0);
237#endif
238
232 if (display) 239 if (display)
233 { 240 {
234 selection_clear (); 241 selection_clear ();
242 selection_clear (true);
235 243
236#ifdef USE_XIM 244#ifdef USE_XIM
237 im_destroy (); 245 im_destroy ();
238#endif 246#endif
239#ifdef XTERM_SCROLLBAR 247 scrollBar.destroy ();
240 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
241 if (ShadowGC) XFreeGC (dpy, ShadowGC);
242#endif
243#ifdef PLAIN_SCROLLBAR
244 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
245#endif
246#ifdef NEXT_SCROLLBAR
247 if (blackGC) XFreeGC (dpy, blackGC);
248 if (whiteGC) XFreeGC (dpy, whiteGC);
249 if (grayGC) XFreeGC (dpy, grayGC);
250 if (darkGC) XFreeGC (dpy, darkGC);
251 if (stippleGC) XFreeGC (dpy, stippleGC);
252 if (dimple) XFreePixmap (dpy, dimple);
253 if (upArrow) XFreePixmap (dpy, upArrow);
254 if (downArrow) XFreePixmap (dpy, downArrow);
255 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
256 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
257#endif
258#ifdef RXVT_SCROLLBAR
259 if (topShadowGC) XFreeGC (dpy, topShadowGC);
260 if (botShadowGC) XFreeGC (dpy, botShadowGC);
261 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
262#endif
263 if (gc) XFreeGC (dpy, gc); 248 if (gc) XFreeGC (dpy, gc);
264 249
265 delete drawable; 250 delete drawable;
266 // destroy all windows 251 // destroy all windows
267 if (parent[0]) 252 if (parent[0])
… …
275 pix_colors_unfocused [i].free (this); 260 pix_colors_unfocused [i].free (this);
276#endif 261#endif
277 } 262 }
278 263
279 clear (); 264 clear ();
280 }
281 265
282 delete [] pix_colors_focused; 266 display->flush (); /* ideally .put should do this */
283#if OFF_FOCUS_FADING
284 delete [] pix_colors_unfocused;
285#endif
286
287#ifdef HAVE_BG_PIXMAP
288 bgPixmap.destroy ();
289#endif
290 displays.put (display); 267 displays.put (display);
268 }
291 269
292 scr_release (); 270 scr_release ();
293 271
294 /* clear all resources */ 272 /* clear all resources */
295 for (int i = 0; i < allocated.size (); i++) 273 for (int i = 0; i < allocated.size (); i++)
296 free (allocated [i]); 274 free (allocated [i]);
297 275
298 free (selection.text); 276 free (selection.text);
277 free (selection.clip_text);
299 // TODO: manage env vars in child only(!) 278 // TODO: manage env vars in child only(!)
300 free (env_display); 279 free (env_display);
301 free (env_term); 280 free (env_term);
302 free (locale); 281 free (locale);
303 free (v_buffer); 282 free (v_buffer);
… …
327} 306}
328 307
329void 308void
330rxvt_term::destroy () 309rxvt_term::destroy ()
331{ 310{
332 if (ev_is_active (&destroy_ev)) 311 if (destroy_ev.is_active ())
333 return; 312 return;
334 313
335 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 314 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
336 315
337#if ENABLE_OVERLAY 316#if ENABLE_OVERLAY
… …
341 if (display) 320 if (display)
342 { 321 {
343#if USE_XIM 322#if USE_XIM
344 im_ev.stop (display); 323 im_ev.stop (display);
345#endif 324#endif
346#if HAVE_SCROLLBARS
347 scrollbar_ev.stop (display); 325 scrollbar_ev.stop (display);
348#endif
349#if ENABLE_TRANSPARENCY || ENABLE_PERL 326#if ENABLE_TRANSPARENCY || ENABLE_PERL
350 rootwin_ev.stop (display); 327 rootwin_ev.stop (display);
351#endif 328#endif
352 incr_ev.stop (); 329 incr_ev.stop ();
353 termwin_ev.stop (display); 330 termwin_ev.stop (display);
354 vt_ev.stop (display); 331 vt_ev.stop (display);
355 } 332 }
356 333
357 prepare_ev.stop (); 334 flush_ev.stop ();
358 pty_ev.stop (); 335 pty_ev.stop ();
359#ifdef CURSOR_BLINK 336#ifdef CURSOR_BLINK
360 cursor_blink_ev.stop (); 337 cursor_blink_ev.stop ();
361#endif 338#endif
362#ifdef TEXT_BLINK 339#ifdef TEXT_BLINK
… …
472 DisplayString (display)); 449 DisplayString (display));
473 rxvt_emergency_cleanup (); 450 rxvt_emergency_cleanup ();
474 _exit (EXIT_FAILURE); 451 _exit (EXIT_FAILURE);
475} 452}
476 453
477/*----------------------------------------------------------------------*/
478bool
479rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
480{
481 this->envv = envv;
482
483 SET_R (this);
484 set_locale ("");
485 set_environ (envv); // few things in X do not call setlocale :(
486
487 if (!init_vars ())
488 return false;
489
490 init_secondary ();
491
492 const char **cmd_argv = init_resources (argc, argv);
493
494#ifdef KEYSYM_RESOURCE
495 keyboard->register_done ();
496#endif
497
498#ifdef HAVE_SCROLLBARS
499 if (option (Opt_scrollBar))
500 scrollBar.setIdle (); /* set existence for size calculations */
501#endif
502
503 pty = ptytty::create ();
504
505 create_windows (argc, argv);
506
507 init_xlocale ();
508
509 scr_reset (); // initialize screen
510
511#if 0
512 XSynchronize (dpy, True);
513#endif
514
515#ifdef HAVE_SCROLLBARS
516 if (option (Opt_scrollBar))
517 resize_scrollbar (); /* create and map scrollbar */
518#endif
519#ifdef HAVE_BG_PIXMAP
520 {
521 bgPixmap.set_target (this);
522
523#ifdef ENABLE_TRANSPARENCY
524 if (option (Opt_transparent))
525 {
526 bgPixmap.set_transparent ();
527#ifdef HAVE_AFTERIMAGE
528 if (rs [Rs_blurradius])
529 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
530#endif
531 if (ISSET_PIXCOLOR (Color_tint))
532 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
533 if (rs [Rs_shade])
534 bgPixmap.set_shade (rs [Rs_shade]);
535
536 bgPixmap.set_root_pixmap ();
537 XSelectInput (dpy, display->root, PropertyChangeMask);
538 rootwin_ev.start (display, display->root);
539 }
540#endif
541
542#ifdef BG_IMAGE_FROM_FILE
543 if (rs[Rs_backgroundPixmap] != NULL)
544 {
545 const char *p = rs[Rs_backgroundPixmap];
546
547 if ((p = strchr (p, ';')) != NULL)
548 {
549 p++;
550 bgPixmap.set_geometry (p);
551 }
552 else
553 bgPixmap.set_defaultGeometry ();
554
555 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
556 if (!bgPixmap.window_position_sensitive ())
557 update_background ();
558 }
559#endif
560 }
561#endif
562
563#if ENABLE_PERL
564 rootwin_ev.start (display, display->root);
565#endif
566
567 set_colorfgbg ();
568
569 init_command (cmd_argv);
570
571 free (cmd_argv);
572
573 if (pty->pty >= 0)
574 pty_ev.start (pty->pty, ev::READ);
575
576 prepare_ev.start ();
577
578 HOOK_INVOKE ((this, HOOK_START, DT_END));
579
580#if ENABLE_XEMBED
581 if (rs[Rs_embed])
582 {
583 long info[2] = { 0, XEMBED_MAPPED };
584
585 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
586 32, PropModeReplace, (unsigned char *)&info, 2);
587 }
588#endif
589
590 XMapWindow (dpy, vt);
591 XMapWindow (dpy, parent[0]);
592
593 return true;
594}
595
596static struct sig_handlers 454static struct sig_handlers
597{ 455{
598 ev::sig sw_term, sw_int; 456 ev::sig sw_term, sw_int;
599 457
600 /* 458 /*
… …
643 XSetIOErrorHandler (rxvt_xioerror_handler); 501 XSetIOErrorHandler (rxvt_xioerror_handler);
644 502
645 XrmInitialize (); 503 XrmInitialize ();
646} 504}
647 505
648/* ------------------------------------------------------------------------- *
649 * MEMORY ALLOCATION WRAPPERS *
650 * ------------------------------------------------------------------------- */
651void *
652rxvt_malloc (size_t size)
653{
654 void *p = malloc (size);
655
656 if (!p)
657 rxvt_fatal ("memory allocation failure. aborting.\n");
658
659 return p;
660}
661
662void *
663rxvt_calloc (size_t number, size_t size)
664{
665 void *p = calloc (number, size);
666
667 if (!p)
668 rxvt_fatal ("memory allocation failure. aborting.\n");
669
670 return p;
671}
672
673void *
674rxvt_realloc (void *ptr, size_t size)
675{
676 void *p = realloc (ptr, size);
677
678 if (!p)
679 rxvt_fatal ("memory allocation failure. aborting.\n");
680
681 return p;
682}
683
684/*----------------------------------------------------------------------*/ 506/*----------------------------------------------------------------------*/
685/* 507/*
686 * window size/position calculations for XSizeHint and other storage. 508 * window size/position calculations for XSizeHint and other storage.
687 * if width/height are non-zero then override calculated width/height 509 * if width/height are non-zero then override calculated width/height
688 */ 510 */
689void 511void
690rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 512rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
691{ 513{
692 short recalc_x, recalc_y; 514 short recalc_x, recalc_y;
693 int x, y, sb_w, flags; 515 int x, y, flags;
694 unsigned int w, h; 516 unsigned int w, h;
695 unsigned int max_width, max_height; 517 unsigned int max_width, max_height;
696 518
697 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 519 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
698 szHint.win_gravity = NorthWestGravity; 520 szHint.win_gravity = NorthWestGravity;
… …
708 if (rs[Rs_geometry]) 530 if (rs[Rs_geometry])
709 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 531 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
710 532
711 if (flags & WidthValue) 533 if (flags & WidthValue)
712 { 534 {
535 if (!w)
536 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
537
713 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 538 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
714 szHint.flags |= USSize; 539 szHint.flags |= USSize;
715 } 540 }
716 541
717 if (flags & HeightValue) 542 if (flags & HeightValue)
718 { 543 {
544 if (!h)
545 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
546
719 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 547 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
720 szHint.flags |= USSize; 548 szHint.flags |= USSize;
721 } 549 }
722 550
723 if (flags & XValue) 551 if (flags & XValue)
724 { 552 {
… …
755 max_width = MAX_COLS * fwidth; 583 max_width = MAX_COLS * fwidth;
756 max_height = MAX_ROWS * fheight; 584 max_height = MAX_ROWS * fheight;
757 585
758 szHint.base_width = szHint.base_height = 2 * int_bwidth; 586 szHint.base_width = szHint.base_height = 2 * int_bwidth;
759 587
760 sb_w = 0;
761 window_vt_x = window_vt_y = int_bwidth; 588 window_vt_x = window_vt_y = int_bwidth;
762 589
763 if (scrollBar.state) 590 if (scrollBar.state)
764 { 591 {
765 sb_w = scrollbar_TotalWidth (); 592 int sb_w = scrollBar.total_width ();
766 szHint.base_width += sb_w; 593 szHint.base_width += sb_w;
767 594
768 if (!option (Opt_scrollBar_right)) 595 if (!option (Opt_scrollBar_right))
769 window_vt_x += sb_w; 596 window_vt_x += sb_w;
770 } 597 }
… …
794 { 621 {
795 min_it (height, max_height); 622 min_it (height, max_height);
796 szHint.height = szHint.base_height + height; 623 szHint.height = szHint.base_height + height;
797 } 624 }
798 625
799 if (scrollBar.state && option (Opt_scrollBar_right))
800 window_sb_x = szHint.width - sb_w;
801
802 if (recalc_x) 626 if (recalc_x)
803 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 627 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
804 628
805 if (recalc_y) 629 if (recalc_y)
806 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 630 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
807 631
808 ncol = width / fwidth; 632 ncol = width / fwidth;
809 nrow = height / fheight; 633 nrow = height / fheight;
810} 634}
811 635
812/*----------------------------------------------------------------------*/ 636/*----------------------------------------------------------------------*/
813/* 637/*
… …
824 648
825 ws.ws_col = ncol; 649 ws.ws_col = ncol;
826 ws.ws_row = nrow; 650 ws.ws_row = nrow;
827 ws.ws_xpixel = width; 651 ws.ws_xpixel = width;
828 ws.ws_ypixel = height; 652 ws.ws_ypixel = height;
829 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 653 ioctl (pty->pty, TIOCSWINSZ, &ws);
830 654
831#if 0 655#if 0
832 // TIOCSWINSZ is supposed to do this automatically and correctly 656 // TIOCSWINSZ is supposed to do this automatically and correctly
833 if (cmd_pid) /* force through to the command */ 657 if (cmd_pid) /* force through to the command */
834 kill (-cmd_pid, SIGWINCH); 658 kill (-cmd_pid, SIGWINCH);
… …
866 delete fontset[0]; 690 delete fontset[0];
867 fontset[0] = fs; 691 fontset[0] = fs;
868 692
869 prop = (*fs)[1]->properties (); 693 prop = (*fs)[1]->properties ();
870 prop.height += lineSpace; 694 prop.height += lineSpace;
695 prop.width += letterSpace;
871 696
872 fs->set_prop (prop, false); 697 fs->set_prop (prop, false);
873 698
874 fwidth = prop.width; 699 fwidth = prop.width;
875 fheight = prop.height; 700 fheight = prop.height;
… …
964void 789void
965rxvt_term::set_window_color (int idx, const char *color) 790rxvt_term::set_window_color (int idx, const char *color)
966{ 791{
967#ifdef XTERM_COLOR_CHANGE 792#ifdef XTERM_COLOR_CHANGE
968 rxvt_color xcol; 793 rxvt_color xcol;
969 int i;
970 794
971 if (color == NULL || *color == '\0') 795 if (color == NULL || *color == '\0')
972 return; 796 return;
973 797
974 color = strdup (color); 798 color = strdup (color);
… …
976 rs[Rs_color + idx] = color; 800 rs[Rs_color + idx] = color;
977 801
978 /* handle color aliases */ 802 /* handle color aliases */
979 if (isdigit (*color)) 803 if (isdigit (*color))
980 { 804 {
981 i = atoi (color); 805 int i = atoi (color);
982 806
983 if (i >= 8 && i <= 15) 807 if (i >= 8 && i <= 15)
984 { 808 {
985 /* bright colors */ 809 /* bright colors */
986 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 810 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
… …
1090 int old_width = szHint.width; 914 int old_width = szHint.width;
1091 int old_height = szHint.height; 915 int old_height = szHint.height;
1092 916
1093 window_calc (newwidth, newheight); 917 window_calc (newwidth, newheight);
1094 918
1095 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 919 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
920
921 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
922 if (set_hint)
923 {
924 szHint.flags &= ~(PBaseSize | PResizeInc);
1096 XSetWMNormalHints (dpy, parent[0], &szHint); 925 XSetWMNormalHints (dpy, parent[0], &szHint);
926 szHint.flags |= PBaseSize | PResizeInc;
927 }
1097 928
1098 if (!ignoreparent) 929 if (!ignoreparent)
1099 { 930 {
1100#ifdef SMART_RESIZE 931#ifdef SMART_RESIZE
1101 /* 932 /*
… …
1141#else 972#else
1142 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 973 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1143#endif 974#endif
1144 } 975 }
1145 976
977 if (set_hint)
978 XSetWMNormalHints (dpy, parent[0], &szHint);
979
1146 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 980 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1147 981
1148 if (fix_screen || newwidth != old_width || newheight != old_height) 982 if (fix_screen || newwidth != old_width || newheight != old_height)
1149 { 983 {
1150 if (scrollBar.state) 984 if (scrollBar.state)
1151 { 985 scrollBar.resize ();
1152 XMoveResizeWindow (dpy, scrollBar.win,
1153 window_sb_x, 0,
1154 scrollbar_TotalWidth (), szHint.height);
1155 resize_scrollbar ();
1156 }
1157 986
1158 XMoveResizeWindow (dpy, vt, 987 XMoveResizeWindow (dpy, vt,
1159 window_vt_x, window_vt_y, 988 window_vt_x, window_vt_y,
1160 width, height); 989 width, height);
1161 990
1162#ifdef HAVE_BG_PIXMAP 991#ifdef HAVE_BG_PIXMAP
1163 if (bgPixmap.window_size_sensitive ()) 992 if (bgPixmap.window_size_sensitive ())
1164 update_background (); 993 update_background ();
1165#endif 994#endif
1166
1167 scr_clear ();
1168 } 995 }
1169 996
1170 if (fix_screen || old_height == 0) 997 if (fix_screen || old_height == 0)
1171 scr_reset (); 998 scr_reset ();
1172
1173 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1174 //scr_touch (false);
1175 999
1176#ifdef HAVE_BG_PIXMAP 1000#ifdef HAVE_BG_PIXMAP
1177// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ? 1001// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1178// if (bgPixmap.pixmap) 1002// if (bgPixmap.pixmap)
1179// scr_touch (false); 1003// scr_touch (false);
… …
1251 1075
1252/* Checking whether input method is running. */ 1076/* Checking whether input method is running. */
1253bool 1077bool
1254rxvt_term::IMisRunning () 1078rxvt_term::IMisRunning ()
1255{ 1079{
1256 char *p;
1257 Atom atom; 1080 Atom atom;
1258 Window win; 1081 Window win;
1259 char server[IMBUFSIZ]; 1082 char server[IMBUFSIZ];
1260 1083
1261 /* get current locale modifier */ 1084 /* get current locale modifier */
1262 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1085 if (char *p = XSetLocaleModifiers (0))
1263 { 1086 {
1264 strcpy (server, "@server="); 1087 strcpy (server, "@server=");
1265 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1088 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1266 1089
1267 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1090 if (p = strchr (server + 1, '@')) /* first one only */
1268 *p = '\0'; 1091 *p = '\0';
1269 1092
1270 atom = XInternAtom (dpy, server, False); 1093 atom = XInternAtom (dpy, server, False);
1271 win = XGetSelectionOwner (dpy, atom); 1094 win = XGetSelectionOwner (dpy, atom);
1272 1095
… …
1339 1162
1340 term->make_current (); 1163 term->make_current ();
1341 1164
1342 if (text) 1165 if (text)
1343 { 1166 {
1344 void *str; 1167 wchar_t *str;
1345 1168
1346 if (!text->encoding_is_wchar && text->string.multi_byte) 1169 if (!text->encoding_is_wchar && text->string.multi_byte)
1347 { 1170 {
1348 // of course, X makes it ugly again 1171 // of course, X makes it ugly again
1349 if (term->rs[Rs_imLocale]) 1172 if (term->rs[Rs_imLocale])
1350 SET_LOCALE (term->rs[Rs_imLocale]); 1173 SET_LOCALE (term->rs[Rs_imLocale]);
1351 1174
1352 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1175 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1353 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1176 mbstowcs (str, text->string.multi_byte, text->length + 1);
1354 1177
1355 if (term->rs[Rs_imLocale]) 1178 if (term->rs[Rs_imLocale])
1356 SET_LOCALE (term->locale); 1179 SET_LOCALE (term->locale);
1357 } 1180 }
1358 else 1181 else
1359 str = (void *)text->string.wide_char; 1182 str = text->string.wide_char;
1360 1183
1361 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1184 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1362 DT_INT, call_data->caret, 1185 DT_INT, call_data->caret,
1363 DT_INT, call_data->chg_first, 1186 DT_INT, call_data->chg_first,
1364 DT_INT, call_data->chg_length, 1187 DT_INT, call_data->chg_length,
… …
1718void 1541void
1719rxvt_term::get_window_origin (int &x, int &y) 1542rxvt_term::get_window_origin (int &x, int &y)
1720{ 1543{
1721 Window cr; 1544 Window cr;
1722 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1545 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1723/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/ 1546/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1724} 1547}
1725 1548
1726Pixmap 1549Pixmap
1727rxvt_term::get_pixmap_property (int prop_id) 1550rxvt_term::get_pixmap_property (int prop_id)
1728{ 1551{
… …
1735 unsigned char *prop = NULL; 1558 unsigned char *prop = NULL;
1736 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1559 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1737 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1560 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1738 &nitems, &bytes_after, &prop); 1561 &nitems, &bytes_after, &prop);
1739 if (result == Success && prop && atype == XA_PIXMAP) 1562 if (result == Success && prop && atype == XA_PIXMAP)
1740 {
1741 return *(Pixmap *)prop; 1563 return *(Pixmap *)prop;
1742 }
1743 } 1564 }
1565
1744 return None; 1566 return None;
1745} 1567}
1746 1568
1747#ifdef HAVE_BG_PIXMAP 1569#ifdef HAVE_BG_PIXMAP
1748# if TRACE_PIXMAPS 1570# if TRACE_PIXMAPS
1749# undef update_background 1571# undef update_background
1572void
1750int rxvt_term::trace_update_background (const char *file, int line) 1573rxvt_term::trace_update_background (const char *file, int line)
1751{ 1574{
1752 fprintf (stderr, "%s:%d:update_background()\n", file, line); 1575 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1753 update_background (); 1576 update_background ();
1754} 1577}
1755# endif 1578# endif
1756 1579
1757int 1580void
1758rxvt_term::update_background () 1581rxvt_term::update_background ()
1759{ 1582{
1583 if (update_background_ev.is_active ())
1584 return;
1585
1760 bgPixmap.invalidate (); 1586 bgPixmap.invalidate ();
1761 1587
1762 /* no chance of real time refresh if we are blurring! */ 1588 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1763 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1589
1590 if (to_wait <= 0.)
1764 bgPixmap.render (); 1591 bgPixmap.render ();
1765 else 1592 else
1766 {
1767 update_background_ev.stop ();
1768
1769 if (!bgPixmap.need_client_side_rendering())
1770 update_background_ev.start (.05); 1593 update_background_ev.start (to_wait);
1771 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1772 update_background_ev.start (.20); /* very slow !!! */
1773 else
1774 update_background_ev.start (.07);
1775 }
1776
1777 return 0;
1778} 1594}
1779 1595
1780void 1596void
1781rxvt_term::update_background_cb (ev::timer &w, int revents) 1597rxvt_term::update_background_cb (ev::timer &w, int revents)
1782{ 1598{
1599 make_current ();
1600
1601 update_background_ev.stop ();
1783 bgPixmap.render (); 1602 bgPixmap.render ();
1603 refresh_check ();
1784} 1604}
1785 1605
1786#endif /* HAVE_BG_PIXMAP */ 1606#endif /* HAVE_BG_PIXMAP */
1787 1607
1788/*----------------------- end-of-file (C source) -----------------------*/ 1608/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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