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

Diff Legend

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