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.279 by ayin, Wed Dec 12 09:33:48 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.
… …
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 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 return true;
593}
594
595static struct sig_handlers 454static struct sig_handlers
596{ 455{
597 ev::sig sw_term, sw_int; 456 ev::sig sw_term, sw_int;
598 457
599 /* 458 /*
… …
642 XSetIOErrorHandler (rxvt_xioerror_handler); 501 XSetIOErrorHandler (rxvt_xioerror_handler);
643 502
644 XrmInitialize (); 503 XrmInitialize ();
645} 504}
646 505
647/* ------------------------------------------------------------------------- *
648 * MEMORY ALLOCATION WRAPPERS *
649 * ------------------------------------------------------------------------- */
650void *
651rxvt_malloc (size_t size)
652{
653 void *p = malloc (size);
654
655 if (!p)
656 rxvt_fatal ("memory allocation failure. aborting.\n");
657
658 return p;
659}
660
661void *
662rxvt_calloc (size_t number, size_t size)
663{
664 void *p = calloc (number, size);
665
666 if (!p)
667 rxvt_fatal ("memory allocation failure. aborting.\n");
668
669 return p;
670}
671
672void *
673rxvt_realloc (void *ptr, size_t size)
674{
675 void *p = realloc (ptr, size);
676
677 if (!p)
678 rxvt_fatal ("memory allocation failure. aborting.\n");
679
680 return p;
681}
682
683/*----------------------------------------------------------------------*/ 506/*----------------------------------------------------------------------*/
684/* 507/*
685 * window size/position calculations for XSizeHint and other storage. 508 * window size/position calculations for XSizeHint and other storage.
686 * if width/height are non-zero then override calculated width/height 509 * if width/height are non-zero then override calculated width/height
687 */ 510 */
688void 511void
689rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 512rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
690{ 513{
691 short recalc_x, recalc_y; 514 short recalc_x, recalc_y;
692 int x, y, sb_w, flags; 515 int x, y, flags;
693 unsigned int w, h; 516 unsigned int w, h;
694 unsigned int max_width, max_height; 517 unsigned int max_width, max_height;
695 518
696 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 519 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
697 szHint.win_gravity = NorthWestGravity; 520 szHint.win_gravity = NorthWestGravity;
… …
707 if (rs[Rs_geometry]) 530 if (rs[Rs_geometry])
708 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 531 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
709 532
710 if (flags & WidthValue) 533 if (flags & WidthValue)
711 { 534 {
535 if (!w)
536 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
537
712 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 538 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
713 szHint.flags |= USSize; 539 szHint.flags |= USSize;
714 } 540 }
715 541
716 if (flags & HeightValue) 542 if (flags & HeightValue)
717 { 543 {
544 if (!h)
545 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
546
718 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 547 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
719 szHint.flags |= USSize; 548 szHint.flags |= USSize;
720 } 549 }
721 550
722 if (flags & XValue) 551 if (flags & XValue)
723 { 552 {
… …
754 max_width = MAX_COLS * fwidth; 583 max_width = MAX_COLS * fwidth;
755 max_height = MAX_ROWS * fheight; 584 max_height = MAX_ROWS * fheight;
756 585
757 szHint.base_width = szHint.base_height = 2 * int_bwidth; 586 szHint.base_width = szHint.base_height = 2 * int_bwidth;
758 587
759 sb_w = 0;
760 window_vt_x = window_vt_y = int_bwidth; 588 window_vt_x = window_vt_y = int_bwidth;
761 589
762 if (scrollBar.state) 590 if (scrollBar.state)
763 { 591 {
764 sb_w = scrollbar_TotalWidth (); 592 int sb_w = scrollBar.total_width ();
765 szHint.base_width += sb_w; 593 szHint.base_width += sb_w;
766 594
767 if (!option (Opt_scrollBar_right)) 595 if (!option (Opt_scrollBar_right))
768 window_vt_x += sb_w; 596 window_vt_x += sb_w;
769 } 597 }
… …
793 { 621 {
794 min_it (height, max_height); 622 min_it (height, max_height);
795 szHint.height = szHint.base_height + height; 623 szHint.height = szHint.base_height + height;
796 } 624 }
797 625
798 if (scrollBar.state && option (Opt_scrollBar_right))
799 window_sb_x = szHint.width - sb_w;
800
801 if (recalc_x) 626 if (recalc_x)
802 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 627 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
803 628
804 if (recalc_y) 629 if (recalc_y)
805 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 630 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
806 631
807 ncol = width / fwidth; 632 ncol = width / fwidth;
808 nrow = height / fheight; 633 nrow = height / fheight;
809} 634}
810 635
811/*----------------------------------------------------------------------*/ 636/*----------------------------------------------------------------------*/
812/* 637/*
… …
823 648
824 ws.ws_col = ncol; 649 ws.ws_col = ncol;
825 ws.ws_row = nrow; 650 ws.ws_row = nrow;
826 ws.ws_xpixel = width; 651 ws.ws_xpixel = width;
827 ws.ws_ypixel = height; 652 ws.ws_ypixel = height;
828 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 653 ioctl (pty->pty, TIOCSWINSZ, &ws);
829 654
830#if 0 655#if 0
831 // TIOCSWINSZ is supposed to do this automatically and correctly 656 // TIOCSWINSZ is supposed to do this automatically and correctly
832 if (cmd_pid) /* force through to the command */ 657 if (cmd_pid) /* force through to the command */
833 kill (-cmd_pid, SIGWINCH); 658 kill (-cmd_pid, SIGWINCH);
… …
865 delete fontset[0]; 690 delete fontset[0];
866 fontset[0] = fs; 691 fontset[0] = fs;
867 692
868 prop = (*fs)[1]->properties (); 693 prop = (*fs)[1]->properties ();
869 prop.height += lineSpace; 694 prop.height += lineSpace;
695 prop.width += letterSpace;
870 696
871 fs->set_prop (prop, false); 697 fs->set_prop (prop, false);
872 698
873 fwidth = prop.width; 699 fwidth = prop.width;
874 fheight = prop.height; 700 fheight = prop.height;
… …
963void 789void
964rxvt_term::set_window_color (int idx, const char *color) 790rxvt_term::set_window_color (int idx, const char *color)
965{ 791{
966#ifdef XTERM_COLOR_CHANGE 792#ifdef XTERM_COLOR_CHANGE
967 rxvt_color xcol; 793 rxvt_color xcol;
968 int i;
969 794
970 if (color == NULL || *color == '\0') 795 if (color == NULL || *color == '\0')
971 return; 796 return;
972 797
973 color = strdup (color); 798 color = strdup (color);
… …
975 rs[Rs_color + idx] = color; 800 rs[Rs_color + idx] = color;
976 801
977 /* handle color aliases */ 802 /* handle color aliases */
978 if (isdigit (*color)) 803 if (isdigit (*color))
979 { 804 {
980 i = atoi (color); 805 int i = atoi (color);
981 806
982 if (i >= 8 && i <= 15) 807 if (i >= 8 && i <= 15)
983 { 808 {
984 /* bright colors */ 809 /* bright colors */
985 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 810 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
… …
1089 int old_width = szHint.width; 914 int old_width = szHint.width;
1090 int old_height = szHint.height; 915 int old_height = szHint.height;
1091 916
1092 window_calc (newwidth, newheight); 917 window_calc (newwidth, newheight);
1093 918
1094 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);
1095 XSetWMNormalHints (dpy, parent[0], &szHint); 925 XSetWMNormalHints (dpy, parent[0], &szHint);
926 szHint.flags |= PBaseSize | PResizeInc;
927 }
1096 928
1097 if (!ignoreparent) 929 if (!ignoreparent)
1098 { 930 {
1099#ifdef SMART_RESIZE 931#ifdef SMART_RESIZE
1100 /* 932 /*
… …
1140#else 972#else
1141 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 973 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1142#endif 974#endif
1143 } 975 }
1144 976
977 if (set_hint)
978 XSetWMNormalHints (dpy, parent[0], &szHint);
979
1145 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 980 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1146 981
1147 if (fix_screen || newwidth != old_width || newheight != old_height) 982 if (fix_screen || newwidth != old_width || newheight != old_height)
1148 { 983 {
1149 if (scrollBar.state) 984 if (scrollBar.state)
1150 { 985 scrollBar.resize ();
1151 XMoveResizeWindow (dpy, scrollBar.win,
1152 window_sb_x, 0,
1153 scrollbar_TotalWidth (), szHint.height);
1154 resize_scrollbar ();
1155 }
1156 986
1157 XMoveResizeWindow (dpy, vt, 987 XMoveResizeWindow (dpy, vt,
1158 window_vt_x, window_vt_y, 988 window_vt_x, window_vt_y,
1159 width, height); 989 width, height);
1160 990
1161#ifdef HAVE_BG_PIXMAP 991#ifdef HAVE_BG_PIXMAP
1162 if (bgPixmap.window_size_sensitive ()) 992 if (bgPixmap.window_size_sensitive ())
1163 update_background (); 993 update_background ();
1164#endif 994#endif
1165
1166 scr_clear ();
1167 } 995 }
1168 996
1169 if (fix_screen || old_height == 0) 997 if (fix_screen || old_height == 0)
1170 scr_reset (); 998 scr_reset ();
1171
1172 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1173 //scr_touch (false);
1174 999
1175#ifdef HAVE_BG_PIXMAP 1000#ifdef HAVE_BG_PIXMAP
1176// 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 ?
1177// if (bgPixmap.pixmap) 1002// if (bgPixmap.pixmap)
1178// scr_touch (false); 1003// scr_touch (false);
… …
1250 1075
1251/* Checking whether input method is running. */ 1076/* Checking whether input method is running. */
1252bool 1077bool
1253rxvt_term::IMisRunning () 1078rxvt_term::IMisRunning ()
1254{ 1079{
1255 char *p;
1256 Atom atom; 1080 Atom atom;
1257 Window win; 1081 Window win;
1258 char server[IMBUFSIZ]; 1082 char server[IMBUFSIZ];
1259 1083
1260 /* get current locale modifier */ 1084 /* get current locale modifier */
1261 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1085 if (char *p = XSetLocaleModifiers (0))
1262 { 1086 {
1263 strcpy (server, "@server="); 1087 strcpy (server, "@server=");
1264 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1088 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1265 1089
1266 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1090 if (p = strchr (server + 1, '@')) /* first one only */
1267 *p = '\0'; 1091 *p = '\0';
1268 1092
1269 atom = XInternAtom (dpy, server, False); 1093 atom = XInternAtom (dpy, server, False);
1270 win = XGetSelectionOwner (dpy, atom); 1094 win = XGetSelectionOwner (dpy, atom);
1271 1095
… …
1338 1162
1339 term->make_current (); 1163 term->make_current ();
1340 1164
1341 if (text) 1165 if (text)
1342 { 1166 {
1343 void *str; 1167 wchar_t *str;
1344 1168
1345 if (!text->encoding_is_wchar && text->string.multi_byte) 1169 if (!text->encoding_is_wchar && text->string.multi_byte)
1346 { 1170 {
1347 // of course, X makes it ugly again 1171 // of course, X makes it ugly again
1348 if (term->rs[Rs_imLocale]) 1172 if (term->rs[Rs_imLocale])
1349 SET_LOCALE (term->rs[Rs_imLocale]); 1173 SET_LOCALE (term->rs[Rs_imLocale]);
1350 1174
1351 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1175 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1352 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1176 mbstowcs (str, text->string.multi_byte, text->length + 1);
1353 1177
1354 if (term->rs[Rs_imLocale]) 1178 if (term->rs[Rs_imLocale])
1355 SET_LOCALE (term->locale); 1179 SET_LOCALE (term->locale);
1356 } 1180 }
1357 else 1181 else
1358 str = (void *)text->string.wide_char; 1182 str = text->string.wide_char;
1359 1183
1360 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1184 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1361 DT_INT, call_data->caret, 1185 DT_INT, call_data->caret,
1362 DT_INT, call_data->chg_first, 1186 DT_INT, call_data->chg_first,
1363 DT_INT, call_data->chg_length, 1187 DT_INT, call_data->chg_length,
… …
1717void 1541void
1718rxvt_term::get_window_origin (int &x, int &y) 1542rxvt_term::get_window_origin (int &x, int &y)
1719{ 1543{
1720 Window cr; 1544 Window cr;
1721 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1545 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1722/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/ 1546/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1723} 1547}
1724 1548
1725Pixmap 1549Pixmap
1726rxvt_term::get_pixmap_property (int prop_id) 1550rxvt_term::get_pixmap_property (int prop_id)
1727{ 1551{
… …
1734 unsigned char *prop = NULL; 1558 unsigned char *prop = NULL;
1735 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1559 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1736 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1560 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1737 &nitems, &bytes_after, &prop); 1561 &nitems, &bytes_after, &prop);
1738 if (result == Success && prop && atype == XA_PIXMAP) 1562 if (result == Success && prop && atype == XA_PIXMAP)
1739 {
1740 return *(Pixmap *)prop; 1563 return *(Pixmap *)prop;
1741 }
1742 } 1564 }
1565
1743 return None; 1566 return None;
1744} 1567}
1745 1568
1746#ifdef HAVE_BG_PIXMAP 1569#ifdef HAVE_BG_PIXMAP
1747# if TRACE_PIXMAPS 1570# if TRACE_PIXMAPS
1748# undef update_background 1571# undef update_background
1572void
1749int rxvt_term::trace_update_background (const char *file, int line) 1573rxvt_term::trace_update_background (const char *file, int line)
1750{ 1574{
1751 fprintf (stderr, "%s:%d:update_background()\n", file, line); 1575 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1752 update_background (); 1576 update_background ();
1753} 1577}
1754# endif 1578# endif
1755 1579
1756int 1580void
1757rxvt_term::update_background () 1581rxvt_term::update_background ()
1758{ 1582{
1583 if (update_background_ev.is_active ())
1584 return;
1585
1759 bgPixmap.invalidate (); 1586 bgPixmap.invalidate ();
1760 1587
1761 /* no chance of real time refresh if we are blurring! */ 1588 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1762 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1589
1590 if (to_wait <= 0.)
1763 bgPixmap.render (); 1591 bgPixmap.render ();
1764 else 1592 else
1765 {
1766 update_background_ev.stop ();
1767
1768 if (!bgPixmap.need_client_side_rendering())
1769 update_background_ev.start (.05); 1593 update_background_ev.start (to_wait);
1770 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1771 update_background_ev.start (.20); /* very slow !!! */
1772 else
1773 update_background_ev.start (.07);
1774 }
1775
1776 return 0;
1777} 1594}
1778 1595
1779void 1596void
1780rxvt_term::update_background_cb (ev::timer &w, int revents) 1597rxvt_term::update_background_cb (ev::timer &w, int revents)
1781{ 1598{
1599 make_current ();
1600
1601 update_background_ev.stop ();
1782 bgPixmap.render (); 1602 bgPixmap.render ();
1603 refresh_check ();
1783} 1604}
1784 1605
1785#endif /* HAVE_BG_PIXMAP */ 1606#endif /* HAVE_BG_PIXMAP */
1786 1607
1787/*----------------------- end-of-file (C source) -----------------------*/ 1608/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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