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.280 by ayin, Wed Dec 12 11:35:56 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.
… …
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/*----------------------------------------------------------------------*/
478void
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 init_vars ();
488
489 init_secondary ();
490
491 const char **cmd_argv = init_resources (argc, argv);
492
493#ifdef KEYSYM_RESOURCE
494 keyboard->register_done ();
495#endif
496
497#ifdef HAVE_SCROLLBARS
498 if (option (Opt_scrollBar))
499 scrollBar.setIdle (); /* set existence for size calculations */
500#endif
501
502 pty = ptytty::create ();
503
504 create_windows (argc, argv);
505
506 init_xlocale ();
507
508 scr_reset (); // initialize screen
509
510#if 0
511 XSynchronize (dpy, True);
512#endif
513
514#ifdef HAVE_SCROLLBARS
515 if (option (Opt_scrollBar))
516 resize_scrollbar (); /* create and map scrollbar */
517#endif
518#ifdef HAVE_BG_PIXMAP
519 {
520 bgPixmap.set_target (this);
521
522#ifdef ENABLE_TRANSPARENCY
523 if (option (Opt_transparent))
524 {
525 bgPixmap.set_transparent ();
526#ifdef HAVE_AFTERIMAGE
527 if (rs [Rs_blurradius])
528 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
529#endif
530 if (ISSET_PIXCOLOR (Color_tint))
531 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
532 if (rs [Rs_shade])
533 bgPixmap.set_shade (rs [Rs_shade]);
534
535 bgPixmap.set_root_pixmap ();
536 XSelectInput (dpy, display->root, PropertyChangeMask);
537 rootwin_ev.start (display, display->root);
538 }
539#endif
540
541#ifdef BG_IMAGE_FROM_FILE
542 if (rs[Rs_backgroundPixmap] != NULL)
543 {
544 const char *p = rs[Rs_backgroundPixmap];
545
546 if ((p = strchr (p, ';')) != NULL)
547 {
548 p++;
549 bgPixmap.set_geometry (p);
550 }
551 else
552 bgPixmap.set_defaultGeometry ();
553
554 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
555 if (!bgPixmap.window_position_sensitive ())
556 update_background ();
557 }
558#endif
559 }
560#endif
561
562#if ENABLE_PERL
563 rootwin_ev.start (display, display->root);
564#endif
565
566 set_colorfgbg ();
567
568 init_command (cmd_argv);
569
570 free (cmd_argv);
571
572 if (pty->pty >= 0)
573 pty_ev.start (pty->pty, ev::READ);
574
575 prepare_ev.start ();
576
577 HOOK_INVOKE ((this, HOOK_START, DT_END));
578
579#if ENABLE_XEMBED
580 if (rs[Rs_embed])
581 {
582 long info[2] = { 0, XEMBED_MAPPED };
583
584 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
585 32, PropModeReplace, (unsigned char *)&info, 2);
586 }
587#endif
588
589 XMapWindow (dpy, vt);
590 XMapWindow (dpy, parent[0]);
591}
592
593static struct sig_handlers 454static struct sig_handlers
594{ 455{
595 ev::sig sw_term, sw_int; 456 ev::sig sw_term, sw_int;
596 457
597 /* 458 /*
… …
640 XSetIOErrorHandler (rxvt_xioerror_handler); 501 XSetIOErrorHandler (rxvt_xioerror_handler);
641 502
642 XrmInitialize (); 503 XrmInitialize ();
643} 504}
644 505
645/* ------------------------------------------------------------------------- *
646 * MEMORY ALLOCATION WRAPPERS *
647 * ------------------------------------------------------------------------- */
648void *
649rxvt_malloc (size_t size)
650{
651 void *p = malloc (size);
652
653 if (!p)
654 rxvt_fatal ("memory allocation failure. aborting.\n");
655
656 return p;
657}
658
659void *
660rxvt_calloc (size_t number, size_t size)
661{
662 void *p = calloc (number, size);
663
664 if (!p)
665 rxvt_fatal ("memory allocation failure. aborting.\n");
666
667 return p;
668}
669
670void *
671rxvt_realloc (void *ptr, size_t size)
672{
673 void *p = realloc (ptr, size);
674
675 if (!p)
676 rxvt_fatal ("memory allocation failure. aborting.\n");
677
678 return p;
679}
680
681/*----------------------------------------------------------------------*/ 506/*----------------------------------------------------------------------*/
682/* 507/*
683 * window size/position calculations for XSizeHint and other storage. 508 * window size/position calculations for XSizeHint and other storage.
684 * if width/height are non-zero then override calculated width/height 509 * if width/height are non-zero then override calculated width/height
685 */ 510 */
686void 511void
687rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 512rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
688{ 513{
689 short recalc_x, recalc_y; 514 short recalc_x, recalc_y;
690 int x, y, sb_w, flags; 515 int x, y, flags;
691 unsigned int w, h; 516 unsigned int w, h;
692 unsigned int max_width, max_height; 517 unsigned int max_width, max_height;
693 518
694 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 519 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
695 szHint.win_gravity = NorthWestGravity; 520 szHint.win_gravity = NorthWestGravity;
… …
705 if (rs[Rs_geometry]) 530 if (rs[Rs_geometry])
706 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 531 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
707 532
708 if (flags & WidthValue) 533 if (flags & WidthValue)
709 { 534 {
535 if (!w)
536 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
537
710 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 538 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
711 szHint.flags |= USSize; 539 szHint.flags |= USSize;
712 } 540 }
713 541
714 if (flags & HeightValue) 542 if (flags & HeightValue)
715 { 543 {
544 if (!h)
545 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
546
716 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 547 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
717 szHint.flags |= USSize; 548 szHint.flags |= USSize;
718 } 549 }
719 550
720 if (flags & XValue) 551 if (flags & XValue)
721 { 552 {
… …
752 max_width = MAX_COLS * fwidth; 583 max_width = MAX_COLS * fwidth;
753 max_height = MAX_ROWS * fheight; 584 max_height = MAX_ROWS * fheight;
754 585
755 szHint.base_width = szHint.base_height = 2 * int_bwidth; 586 szHint.base_width = szHint.base_height = 2 * int_bwidth;
756 587
757 sb_w = 0;
758 window_vt_x = window_vt_y = int_bwidth; 588 window_vt_x = window_vt_y = int_bwidth;
759 589
760 if (scrollBar.state) 590 if (scrollBar.state)
761 { 591 {
762 sb_w = scrollbar_TotalWidth (); 592 int sb_w = scrollBar.total_width ();
763 szHint.base_width += sb_w; 593 szHint.base_width += sb_w;
764 594
765 if (!option (Opt_scrollBar_right)) 595 if (!option (Opt_scrollBar_right))
766 window_vt_x += sb_w; 596 window_vt_x += sb_w;
767 } 597 }
… …
791 { 621 {
792 min_it (height, max_height); 622 min_it (height, max_height);
793 szHint.height = szHint.base_height + height; 623 szHint.height = szHint.base_height + height;
794 } 624 }
795 625
796 if (scrollBar.state && option (Opt_scrollBar_right))
797 window_sb_x = szHint.width - sb_w;
798
799 if (recalc_x) 626 if (recalc_x)
800 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 627 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
801 628
802 if (recalc_y) 629 if (recalc_y)
803 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 630 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
804 631
805 ncol = width / fwidth; 632 ncol = width / fwidth;
806 nrow = height / fheight; 633 nrow = height / fheight;
807} 634}
808 635
809/*----------------------------------------------------------------------*/ 636/*----------------------------------------------------------------------*/
810/* 637/*
… …
821 648
822 ws.ws_col = ncol; 649 ws.ws_col = ncol;
823 ws.ws_row = nrow; 650 ws.ws_row = nrow;
824 ws.ws_xpixel = width; 651 ws.ws_xpixel = width;
825 ws.ws_ypixel = height; 652 ws.ws_ypixel = height;
826 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 653 ioctl (pty->pty, TIOCSWINSZ, &ws);
827 654
828#if 0 655#if 0
829 // TIOCSWINSZ is supposed to do this automatically and correctly 656 // TIOCSWINSZ is supposed to do this automatically and correctly
830 if (cmd_pid) /* force through to the command */ 657 if (cmd_pid) /* force through to the command */
831 kill (-cmd_pid, SIGWINCH); 658 kill (-cmd_pid, SIGWINCH);
… …
863 delete fontset[0]; 690 delete fontset[0];
864 fontset[0] = fs; 691 fontset[0] = fs;
865 692
866 prop = (*fs)[1]->properties (); 693 prop = (*fs)[1]->properties ();
867 prop.height += lineSpace; 694 prop.height += lineSpace;
695 prop.width += letterSpace;
868 696
869 fs->set_prop (prop, false); 697 fs->set_prop (prop, false);
870 698
871 fwidth = prop.width; 699 fwidth = prop.width;
872 fheight = prop.height; 700 fheight = prop.height;
… …
961void 789void
962rxvt_term::set_window_color (int idx, const char *color) 790rxvt_term::set_window_color (int idx, const char *color)
963{ 791{
964#ifdef XTERM_COLOR_CHANGE 792#ifdef XTERM_COLOR_CHANGE
965 rxvt_color xcol; 793 rxvt_color xcol;
966 int i;
967 794
968 if (color == NULL || *color == '\0') 795 if (color == NULL || *color == '\0')
969 return; 796 return;
970 797
971 color = strdup (color); 798 color = strdup (color);
… …
973 rs[Rs_color + idx] = color; 800 rs[Rs_color + idx] = color;
974 801
975 /* handle color aliases */ 802 /* handle color aliases */
976 if (isdigit (*color)) 803 if (isdigit (*color))
977 { 804 {
978 i = atoi (color); 805 int i = atoi (color);
979 806
980 if (i >= 8 && i <= 15) 807 if (i >= 8 && i <= 15)
981 { 808 {
982 /* bright colors */ 809 /* bright colors */
983 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 810 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
… …
1087 int old_width = szHint.width; 914 int old_width = szHint.width;
1088 int old_height = szHint.height; 915 int old_height = szHint.height;
1089 916
1090 window_calc (newwidth, newheight); 917 window_calc (newwidth, newheight);
1091 918
1092 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);
1093 XSetWMNormalHints (dpy, parent[0], &szHint); 925 XSetWMNormalHints (dpy, parent[0], &szHint);
926 szHint.flags |= PBaseSize | PResizeInc;
927 }
1094 928
1095 if (!ignoreparent) 929 if (!ignoreparent)
1096 { 930 {
1097#ifdef SMART_RESIZE 931#ifdef SMART_RESIZE
1098 /* 932 /*
… …
1138#else 972#else
1139 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 973 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1140#endif 974#endif
1141 } 975 }
1142 976
977 if (set_hint)
978 XSetWMNormalHints (dpy, parent[0], &szHint);
979
1143 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 980 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1144 981
1145 if (fix_screen || newwidth != old_width || newheight != old_height) 982 if (fix_screen || newwidth != old_width || newheight != old_height)
1146 { 983 {
1147 if (scrollBar.state) 984 if (scrollBar.state)
1148 { 985 scrollBar.resize ();
1149 XMoveResizeWindow (dpy, scrollBar.win,
1150 window_sb_x, 0,
1151 scrollbar_TotalWidth (), szHint.height);
1152 resize_scrollbar ();
1153 }
1154 986
1155 XMoveResizeWindow (dpy, vt, 987 XMoveResizeWindow (dpy, vt,
1156 window_vt_x, window_vt_y, 988 window_vt_x, window_vt_y,
1157 width, height); 989 width, height);
1158 990
1159#ifdef HAVE_BG_PIXMAP 991#ifdef HAVE_BG_PIXMAP
1160 if (bgPixmap.window_size_sensitive ()) 992 if (bgPixmap.window_size_sensitive ())
1161 update_background (); 993 update_background ();
1162#endif 994#endif
1163
1164 scr_clear ();
1165 } 995 }
1166 996
1167 if (fix_screen || old_height == 0) 997 if (fix_screen || old_height == 0)
1168 scr_reset (); 998 scr_reset ();
1169 999
… …
1248 1078
1249/* Checking whether input method is running. */ 1079/* Checking whether input method is running. */
1250bool 1080bool
1251rxvt_term::IMisRunning () 1081rxvt_term::IMisRunning ()
1252{ 1082{
1253 char *p;
1254 Atom atom; 1083 Atom atom;
1255 Window win; 1084 Window win;
1256 char server[IMBUFSIZ]; 1085 char server[IMBUFSIZ];
1257 1086
1258 /* get current locale modifier */ 1087 /* get current locale modifier */
1259 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1088 if (char *p = XSetLocaleModifiers (0))
1260 { 1089 {
1261 strcpy (server, "@server="); 1090 strcpy (server, "@server=");
1262 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1091 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1263 1092
1264 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1093 if (p = strchr (server + 1, '@')) /* first one only */
1265 *p = '\0'; 1094 *p = '\0';
1266 1095
1267 atom = XInternAtom (dpy, server, False); 1096 atom = XInternAtom (dpy, server, False);
1268 win = XGetSelectionOwner (dpy, atom); 1097 win = XGetSelectionOwner (dpy, atom);
1269 1098
… …
1715void 1544void
1716rxvt_term::get_window_origin (int &x, int &y) 1545rxvt_term::get_window_origin (int &x, int &y)
1717{ 1546{
1718 Window cr; 1547 Window cr;
1719 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1548 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1720/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/ 1549/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1721} 1550}
1722 1551
1723Pixmap 1552Pixmap
1724rxvt_term::get_pixmap_property (int prop_id) 1553rxvt_term::get_pixmap_property (int prop_id)
1725{ 1554{
… …
1732 unsigned char *prop = NULL; 1561 unsigned char *prop = NULL;
1733 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1562 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1734 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1563 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1735 &nitems, &bytes_after, &prop); 1564 &nitems, &bytes_after, &prop);
1736 if (result == Success && prop && atype == XA_PIXMAP) 1565 if (result == Success && prop && atype == XA_PIXMAP)
1737 {
1738 return *(Pixmap *)prop; 1566 return *(Pixmap *)prop;
1739 }
1740 } 1567 }
1568
1741 return None; 1569 return None;
1742} 1570}
1743 1571
1744#ifdef HAVE_BG_PIXMAP 1572#ifdef HAVE_BG_PIXMAP
1745# if TRACE_PIXMAPS 1573# if TRACE_PIXMAPS
1746# undef update_background 1574# undef update_background
1575void
1747int rxvt_term::trace_update_background (const char *file, int line) 1576rxvt_term::trace_update_background (const char *file, int line)
1748{ 1577{
1749 fprintf (stderr, "%s:%d:update_background()\n", file, line); 1578 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1750 update_background (); 1579 update_background ();
1751} 1580}
1752# endif 1581# endif
1753 1582
1754int 1583void
1755rxvt_term::update_background () 1584rxvt_term::update_background ()
1756{ 1585{
1586 if (update_background_ev.is_active ())
1587 return;
1588
1757 bgPixmap.invalidate (); 1589 bgPixmap.invalidate ();
1758 1590
1759 /* no chance of real time refresh if we are blurring! */ 1591 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1760 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1592
1593 if (to_wait <= 0.)
1761 bgPixmap.render (); 1594 bgPixmap.render ();
1762 else 1595 else
1763 {
1764 update_background_ev.stop ();
1765
1766 if (!bgPixmap.need_client_side_rendering())
1767 update_background_ev.start (.05); 1596 update_background_ev.start (to_wait);
1768 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1769 update_background_ev.start (.20); /* very slow !!! */
1770 else
1771 update_background_ev.start (.07);
1772 }
1773
1774 return 0;
1775} 1597}
1776 1598
1777void 1599void
1778rxvt_term::update_background_cb (ev::timer &w, int revents) 1600rxvt_term::update_background_cb (ev::timer &w, int revents)
1779{ 1601{
1602 make_current ();
1603
1604 update_background_ev.stop ();
1780 bgPixmap.render (); 1605 bgPixmap.render ();
1606 refresh_check ();
1781} 1607}
1782 1608
1783#endif /* HAVE_BG_PIXMAP */ 1609#endif /* HAVE_BG_PIXMAP */
1784 1610
1785/*----------------------- end-of-file (C source) -----------------------*/ 1611/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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