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.372 by sf-exg, Fri Feb 11 01:24:46 2011 UTC vs.
Revision 1.382 by sf-exg, Tue Apr 26 16:19:45 2011 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
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);
… …
2732 tt_paste (data, len); 2736 tt_paste (data, len);
2733} 2737}
2734 2738
2735/* ------------------------------------------------------------------------- */ 2739/* ------------------------------------------------------------------------- */
2736/* 2740/*
2737 * Request the current selection: 2741 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2738 * Order: > internal selection if available 2742 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2739 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2743 * as fallback
2740 * > CUT_BUFFER0
2741 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2742 * will auto fallback to CUT_BUFFER0
2743 * EXT: button 2 release 2744 * EXT: button 2 release
2744 */ 2745 */
2745
2746static void
2747selection_cb (char *data, unsigned int len, rxvt_selection *rs, void *ptr)
2748{
2749 if (data)
2750 {
2751 rxvt_term *term = (rxvt_term *)ptr;
2752 term->paste (data, len);
2753 }
2754 delete rs;
2755}
2756
2757void 2746void
2758rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2747rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2759{ 2748{
2760 if (selection.text && selnum == Sel_Primary) 2749 if (!selection_req)
2761 {
2762 /* internal selection */
2763 char *str = rxvt_wcstombs (selection.text, selection.len);
2764 paste (str, strlen (str));
2765 free (str);
2766 return;
2767 } 2750 {
2768 else
2769 {
2770 new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], selection_cb, this); 2751 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2752 selection_req->run ();
2771 } 2753 }
2772} 2754}
2773 2755
2774/* ------------------------------------------------------------------------- */ 2756/* ------------------------------------------------------------------------- */
2775/* 2757/*
… …
3420 * EXT: SelectionRequest 3402 * EXT: SelectionRequest
3421 */ 3403 */
3422void 3404void
3423rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3405rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3424{ 3406{
3407 Atom property = rq.property == None ? rq.target : rq.property;
3425 XSelectionEvent ev; 3408 XSelectionEvent ev;
3426 3409
3427 ev.type = SelectionNotify; 3410 ev.type = SelectionNotify;
3428 ev.property = None; 3411 ev.property = None;
3429 ev.display = rq.display; 3412 ev.display = rq.display;
… …
3444 *target++ = xa[XA_COMPOUND_TEXT]; 3427 *target++ = xa[XA_COMPOUND_TEXT];
3445#if X_HAVE_UTF8_STRING 3428#if X_HAVE_UTF8_STRING
3446 *target++ = xa[XA_UTF8_STRING]; 3429 *target++ = xa[XA_UTF8_STRING];
3447#endif 3430#endif
3448 3431
3449 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3432 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3450 32, PropModeReplace, 3433 32, PropModeReplace,
3451 (unsigned char *)target_list, target - target_list); 3434 (unsigned char *)target_list, target - target_list);
3452 ev.property = rq.property; 3435 ev.property = property;
3453 } 3436 }
3454#if TODO // TODO 3437#if TODO // TODO
3455 else if (rq.target == xa[XA_MULTIPLE]) 3438 else if (rq.target == xa[XA_MULTIPLE])
3456 { 3439 {
3457 /* TODO: Handle MULTIPLE */ 3440 /* TODO: Handle MULTIPLE */
3458 } 3441 }
3459#endif 3442#endif
3460 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) 3443 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3461 { 3444 {
3462 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3445 XChangeProperty (dpy, rq.requestor, property, rq.target,
3463 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3446 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3464 ev.property = rq.property; 3447 ev.property = property;
3465 } 3448 }
3466 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) 3449 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3467 { 3450 {
3468 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3451 XChangeProperty (dpy, rq.requestor, property, rq.target,
3469 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3452 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3470 ev.property = rq.property; 3453 ev.property = property;
3471 } 3454 }
3472 else if (rq.target == XA_STRING 3455 else if (rq.target == XA_STRING
3473 || rq.target == xa[XA_TEXT] 3456 || rq.target == xa[XA_TEXT]
3474 || rq.target == xa[XA_COMPOUND_TEXT] 3457 || rq.target == xa[XA_COMPOUND_TEXT]
3475 || rq.target == xa[XA_UTF8_STRING] 3458 || rq.target == xa[XA_UTF8_STRING]
… …
3546 ct.value = (unsigned char *)cl; 3529 ct.value = (unsigned char *)cl;
3547 ct.nitems = selectlen; 3530 ct.nitems = selectlen;
3548 ct.encoding = target; 3531 ct.encoding = target;
3549 } 3532 }
3550 3533
3551 XChangeProperty (dpy, rq.requestor, rq.property, 3534 XChangeProperty (dpy, rq.requestor, property,
3552 ct.encoding, 8, PropModeReplace, 3535 ct.encoding, 8, PropModeReplace,
3553 ct.value, (int)ct.nitems); 3536 ct.value, (int)ct.nitems);
3554 ev.property = rq.property; 3537 ev.property = property;
3555 3538
3556 if (freect) 3539 if (freect)
3557 XFree (ct.value); 3540 XFree (ct.value);
3558 } 3541 }
3559 3542

Diff Legend

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