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.376 by root, Mon Feb 21 07:41:03 2011 UTC vs.
Revision 1.381 by sf-exg, Fri Apr 22 10:01:39 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 return;
2755 }
2756 else if (!selection_req) 2752 if (!selection_req)
2757 { 2753 {
2758 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);
2759 selection_req->run (); 2755 selection_req->run ();
2760 } 2756 }
2761} 2757}
… …
3409 * EXT: SelectionRequest 3405 * EXT: SelectionRequest
3410 */ 3406 */
3411void 3407void
3412rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3408rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3413{ 3409{
3410 Atom property = rq.property == None ? rq.target : rq.property;
3414 XSelectionEvent ev; 3411 XSelectionEvent ev;
3415 3412
3416 ev.type = SelectionNotify; 3413 ev.type = SelectionNotify;
3417 ev.property = None; 3414 ev.property = None;
3418 ev.display = rq.display; 3415 ev.display = rq.display;
… …
3433 *target++ = xa[XA_COMPOUND_TEXT]; 3430 *target++ = xa[XA_COMPOUND_TEXT];
3434#if X_HAVE_UTF8_STRING 3431#if X_HAVE_UTF8_STRING
3435 *target++ = xa[XA_UTF8_STRING]; 3432 *target++ = xa[XA_UTF8_STRING];
3436#endif 3433#endif
3437 3434
3438 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3435 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3439 32, PropModeReplace, 3436 32, PropModeReplace,
3440 (unsigned char *)target_list, target - target_list); 3437 (unsigned char *)target_list, target - target_list);
3441 ev.property = rq.property; 3438 ev.property = property;
3442 } 3439 }
3443#if TODO // TODO 3440#if TODO // TODO
3444 else if (rq.target == xa[XA_MULTIPLE]) 3441 else if (rq.target == xa[XA_MULTIPLE])
3445 { 3442 {
3446 /* TODO: Handle MULTIPLE */ 3443 /* TODO: Handle MULTIPLE */
3447 } 3444 }
3448#endif 3445#endif
3449 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) 3446 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3450 { 3447 {
3451 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3448 XChangeProperty (dpy, rq.requestor, property, rq.target,
3452 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3449 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3453 ev.property = rq.property; 3450 ev.property = property;
3454 } 3451 }
3455 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) 3452 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3456 { 3453 {
3457 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3454 XChangeProperty (dpy, rq.requestor, property, rq.target,
3458 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3455 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3459 ev.property = rq.property; 3456 ev.property = property;
3460 } 3457 }
3461 else if (rq.target == XA_STRING 3458 else if (rq.target == XA_STRING
3462 || rq.target == xa[XA_TEXT] 3459 || rq.target == xa[XA_TEXT]
3463 || rq.target == xa[XA_COMPOUND_TEXT] 3460 || rq.target == xa[XA_COMPOUND_TEXT]
3464 || rq.target == xa[XA_UTF8_STRING] 3461 || rq.target == xa[XA_UTF8_STRING]
… …
3535 ct.value = (unsigned char *)cl; 3532 ct.value = (unsigned char *)cl;
3536 ct.nitems = selectlen; 3533 ct.nitems = selectlen;
3537 ct.encoding = target; 3534 ct.encoding = target;
3538 } 3535 }
3539 3536
3540 XChangeProperty (dpy, rq.requestor, rq.property, 3537 XChangeProperty (dpy, rq.requestor, property,
3541 ct.encoding, 8, PropModeReplace, 3538 ct.encoding, 8, PropModeReplace,
3542 ct.value, (int)ct.nitems); 3539 ct.value, (int)ct.nitems);
3543 ev.property = rq.property; 3540 ev.property = property;
3544 3541
3545 if (freect) 3542 if (freect)
3546 XFree (ct.value); 3543 XFree (ct.value);
3547 } 3544 }
3548 3545

Diff Legend

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