[ViewVC] Diff of: cvs/rxvt-unicode/src/screen.C

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.203 by root, Sat Dec 31 19:30:25 2005 UTC vs.
Revision 1.208 by root, Wed Jan 4 05:24:55 2006 UTC

  * This file handles _all_ screen updates and selections
  */
 #include "../config.h"          /* NECESSARY */
 #include "rxvt.h"               /* NECESSARY */
+#include "rxvtperl.h"           /* NECESSARY */
 #include <X11/Xmd.h>            /* get the typedef for CARD32 */
 #include <inttypes.h>
   for (int col = ncol; col--; )
     tabs [col] = col % TABSIZE == 0;
   tt_winch ();
+  PERL_INVOKE ((this, HOOK_RESET, DT_END));
 }
 /* ------------------------------------------------------------------------- */
 /*
  * Free everything.  That way malloc debugging can find leakage.
       && row1 == 0
       && row2 == nrow - 1
       && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
     {
       nsaved = min (nsaved + count, saveLines);
+      PERL_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));
       term_start = (term_start + count) % total_rows;
       if (selection.op && current_screen == selection.screen)
         {
           selection.beg.row  -= count;
 }
 int
 rxvt_term::scr_changeview (unsigned int oldviewstart)
 {
+  PERL_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
   if (view_start != oldviewstart)
     {
       want_refresh = 1;
       num_scr -= (view_start - oldviewstart);
     }
             oldcursor.col = screen.cur.col;
           }
       }
   }
+  PERL_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
 #if ENABLE_OVERLAY
   scr_swap_overlay ();
 #endif
 #ifndef NO_SLOW_LINK_SUPPORT
               if (wlen < len)
                 ::swap (wlen, len);
               XCopyArea (display->display, vt, vt,
                          gc, 0, Row2Pixel (len + i),
-                         (unsigned int)TermWin_TotalWidth (),
+                         (unsigned int)this->width,
                          (unsigned int)Height2Pixel (wlen - len + 1),
                          0, Row2Pixel (len));
               len = -1;
             }
         }
     }                         /* for (row....) */
 #if ENABLE_OVERLAY
   scr_swap_overlay ();
 #endif
+  PERL_INVOKE ((this, HOOK_REFRESH_END, DT_END));
   /*
    * G: cleanup cursor and display outline cursor if necessary
    */
   if (showcursor)
 /* ------------------------------------------------------------------------- */
 /*
  * Paste a selection direct to the command fd
  */
 void
-rxvt_term::paste (unsigned char *data, unsigned int len)
+rxvt_term::paste (char *data, unsigned int len)
 {
   /* convert normal newline chars into common keyboard Return key sequence */
   for (unsigned int i = 0; i < len; i++)
     if (data[i] == C0_LF)
       data[i] = C0_CR;
     {
       wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
       char *s = rxvt_wcstombs (w);
       free (w);
       // TODO: strlen == only the first element will be converted. well...
-      paste ((unsigned char *)s, strlen (s));
+      paste (s, strlen (s));
       free (s);
     }
   else
 #endif
   if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
       && cl)
     {
       for (int i = 0; i < cr; i++)
-        paste ((unsigned char *)cl[i], strlen (cl[i]));
+        paste (cl[i], strlen (cl[i]));
       XFreeStringList (cl);
     }
   else
-    paste (ct.value, ct.nitems); // paste raw
+    paste ((char *)ct.value, ct.nitems); // paste raw
 bailout:
   XFree (ct.value);
   if (selection_wait == Sel_normal)
     return;                 /* outside window */
   if (selection.text)
     { /* internal selection */
       char *str = rxvt_wcstombs (selection.text, selection.len);
-      paste ((unsigned char *)str, strlen (str));
+      paste (str, strlen (str));
       free (str);
       return;
     }
   else
     {
   selection.op = SELECTION_DONE;
   if (selection.clicks == 4)
     return;                 /* nothing selected, go away */
+  if (PERL_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
+    return;
   i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
   new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
   int ofs = 0;
   int extra = 0;
   // we usually allocate much more than necessary, so realloc it smaller again
   selection.len = ofs;
   selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
+  if (PERL_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
+    return;
+  selection_grab (tm);
+}
+bool
+rxvt_term::selection_grab (Time tm)
+{
+  selection_time = tm;
   XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
   if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
+    {
-    display->set_selection_owner (this);
+      display->set_selection_owner (this);
+      return true;
+    }
   else
-    rxvt_warn ("can't get primary selection, ignoring.\n");
+    return false;
 #if 0
   XTextProperty ct;
   if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
     {
       set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
       XFree (ct.value);
     }
 #endif
-  selection_time = tm;
 }
 /* ------------------------------------------------------------------------- */
 /*
  * Mark or select text based upon number of clicks: 1, 2, or 3
             }
         }
       break;
     }
-Old_Word_Selection_You_Die:
   if (dirn == DN)
     col++;                  /* put us on one past the end */
   /* Poke the values back in */
   ret->row = row;
   else if (selection.clicks == 2)
     {
       if (ROWCOL_IS_AFTER (selection.end, selection.beg))
         selection.end.col--;
+      if (!PERL_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
+        {
-      selection_delimit_word (UP, &selection.beg, &selection.beg);
+          selection_delimit_word (UP, &selection.beg, &selection.beg);
-      selection_delimit_word (DN, &selection.end, &selection.end);
+          selection_delimit_word (DN, &selection.end, &selection.end);
+        }
     }
   else if (selection.clicks == 3)
     {
 #if ENABLE_FRILLS
       if (OPTION (Opt_tripleclickwords))
 #if ENABLE_OVERLAY
 void
 rxvt_term::scr_overlay_new (int x, int y, int w, int h)
 {
-  if (nrow < 3 || ncol < 3)
+  if (nrow < 1 || ncol < 1)
     return;
   want_refresh = 1;
   scr_overlay_off ();

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.203 by root, Sat Dec 31 19:30:25 2005 UTC vs. Revision 1.208 by root, Wed Jan 4 05:24:55 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.203 by root, Sat Dec 31 19:30:25 2005 UTC vs.
Revision 1.208 by root, Wed Jan 4 05:24:55 2006 UTC