ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.377 by root, Mon Mar 21 13:46:17 2011 UTC vs.
Revision 1.380 by sf-exg, Thu Apr 7 12:19:41 2011 UTC

159 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
160 160
161void 161void
162rxvt_term::scr_reset () 162rxvt_term::scr_reset ()
163{ 163{
164#if ENABLE_OVERLAY
165 scr_overlay_off ();
166#endif
167
164 view_start = 0; 168 view_start = 0;
165 num_scr = 0; 169 num_scr = 0;
166 170
167 if (ncol == 0) 171 if (ncol == 0)
168 ncol = 80; 172 ncol = 80;
1920 1924
1921# ifndef NO_MAPALERT 1925# ifndef NO_MAPALERT
1922# ifdef MAPALERT_OPTION 1926# ifdef MAPALERT_OPTION
1923 if (option (Opt_mapAlert)) 1927 if (option (Opt_mapAlert))
1924# endif 1928# endif
1925 XMapWindow (dpy, parent[0]); 1929 XMapWindow (dpy, parent);
1926# endif 1930# endif
1927 1931
1928# if ENABLE_FRILLS 1932# if ENABLE_FRILLS
1929 if (option (Opt_urgentOnBell)) 1933 if (option (Opt_urgentOnBell))
1930 set_urgency (1); 1934 set_urgency (1);
2516 if (bg_pixmap != None) 2520 if (bg_pixmap != None)
2517 { 2521 {
2518# ifdef ENABLE_TRANSPARENCY 2522# ifdef ENABLE_TRANSPARENCY
2519 if (bg_flags & BG_IS_TRANSPARENT) 2523 if (bg_flags & BG_IS_TRANSPARENT)
2520 { 2524 {
2521 XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap); 2525 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2522 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2526 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2523 2527
2524 transparent = true; 2528 transparent = true;
2525 } 2529 }
2526 else 2530 else
2527# endif 2531# endif
2528 { 2532 {
2529 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2533 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2530 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2534 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2531 } 2535 }
2532 } 2536 }
2533 else 2537 else
2534#endif 2538#endif
2535 { 2539 {
2536 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2540 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2537 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2541 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2538 } 2542 }
2539 2543
2540 XClearWindow (dpy, parent[0]); 2544 XClearWindow (dpy, parent);
2541 2545
2542 if (scrollBar.win) 2546 if (scrollBar.win)
2543 { 2547 {
2544 if (transparent) 2548 if (transparent)
2545 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2549 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2743 * EXT: button 2 release 2747 * EXT: button 2 release
2744 */ 2748 */
2745void 2749void
2746rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2750rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2747{ 2751{
2748 if (selection.text && selnum == Sel_Primary)
2749 {
2750 /* internal selection */
2751 char *str = rxvt_wcstombs (selection.text, selection.len);
2752 paste (str, strlen (str));
2753 free (str);
2754 }
2755 else if (!selection_req) 2752 if (!selection_req)
2756 { 2753 {
2757 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this); 2754 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2758 selection_req->run (); 2755 selection_req->run ();
2759 } 2756 }
2760} 2757}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines