From: root <root>
Date: Thu, 19 Jan 2006 17:37:01 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=27d854e6301e4d9eced1eff5ce9d4d3e6cdab9b3;p=dana%2Furxvt.git

*** empty log message ***
---

diff --git a/src/perl/selection-pastebin b/src/perl/selection-pastebin
index 13ecf03a..4701dbba 100644
--- a/src/perl/selection-pastebin
+++ b/src/perl/selection-pastebin
@@ -44,7 +44,7 @@ sub upload_paste {
       urxvt::timer
               ->new
               ->after (5)
-              ->cb (sub {undef $timer; undef $ov; });
+              ->cb (sub { undef $timer; undef $ov; });
 }
 
 sub on_start {
diff --git a/src/perl/urxvt-popup b/src/perl/urxvt-popup
index 8fd3bffb..a1f0c627 100644
--- a/src/perl/urxvt-popup
+++ b/src/perl/urxvt-popup
@@ -53,11 +53,6 @@ sub on_button_press {
 sub on_button_release {
    my ($self, $event) = @_;
 
-   if ($event->{button} == $self->{data}{event}{button}) {
-      $self->ungrab;
-      $self->destroy;
-   }
-
    $self->{press}[$event->{button}] = 0;
 
    my ($row, $col) = ($event->{row}, $event->{col});
@@ -69,6 +64,11 @@ sub on_button_release {
 
    $self->refresh;
 
+   if ($event->{button} == $self->{data}{event}{button}) {
+      $self->ungrab;
+      $self->destroy;
+   }
+
    1
 }
 
diff --git a/src/screen.C b/src/screen.C
index f998f641..0fd5a7ee 100644
--- a/src/screen.C
+++ b/src/screen.C
@@ -236,13 +236,10 @@ rxvt_term::scr_reset ()
       selection.op = SELECTION_CLEAR;
       selection.screen = PRIMARY;
       selection.clicks = 0;
-      CLEAR_ALL_SELECTION ();
       rvideo = 0;
     }
   else
     {
-      CLEAR_ALL_SELECTION ();
-
       /*
        * add or delete rows as appropriate
        */
@@ -352,8 +349,10 @@ rxvt_term::scr_reset ()
 
                       int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
 
+#if DEBUG_STRICT
                       assert (len);
                       assert (pline.t);
+#endif
 
                       memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
                       memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
@@ -408,6 +407,8 @@ rxvt_term::scr_reset ()
         free (tabs);
     }
 
+  CLEAR_ALL_SELECTION ();
+
   prev_nrow = nrow;
   prev_ncol = ncol;