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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.279 by sasha, Tue Sep 18 22:01:36 2007 UTC vs.
Revision 1.294 by root, Wed Jan 9 00:51:50 2008 UTC

 /*---------------------------------------------------------------------------*
  * File:        screen.C
  *---------------------------------------------------------------------------*
  *
  * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
- * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
           drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
         }
       line_t *old_buf = row_buf;
       row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
       int p    = MOD (term_start + prev_nrow, prev_total_rows);  // previous row
       int pend = MOD (term_start + top_row  , prev_total_rows);
       int q    = total_rows; // rewrapped row
       if (top_row)
                   int qcol = 0;
                   // see below for cursor adjustment rationale
                   if (p == ocur.row)
                     screen.cur.row = q - (total_rows - nrow);
                   // fill a single destination line
                   while (lofs < llen && qcol < ncol)
                     {
                       int prow = lofs / prev_ncol;
                       int pcol = lofs % prev_ncol;
             }
           while (p != pend && q > 0);
           term_start = total_rows - nrow;
           top_row = q - term_start;
           // make sure all terminal lines exist
           while (top_row > 0)
             scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
         }
       else
         {
           // if no scrollback exists (yet), wing, instead of wrap
           for (int row = min (nrow, prev_nrow); row--; )
             {
               line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
               line_t &qline = row_buf [row];
 /*
  * Change the rendition style for following text
  */
 void
 rxvt_term::scr_rendition (int set, int style) NOTHROW
-  {
+{
-    if (set)
+  if (set)
-      rstyle |= style;
+    rstyle |= style;
-    else if (style == ~RS_None)
+  else if (style == ~RS_None)
-      rstyle = DEFAULT_RSTYLE;
+    rstyle = DEFAULT_RSTYLE;
-    else
+  else
-      rstyle &= ~style;
+    rstyle &= ~style;
-  }
+}
 /* ------------------------------------------------------------------------- */
 /*
  * Scroll text between <row1> and <row2> inclusive, by <count> lines
  * count positive ==> scroll up
           line_t &l2 = ROW(i);
           ::swap (l1, l2);
           l2.touch ();
         }
       // move and/or clear selection, if any
       if (selection.op && current_screen == selection.screen)
         {
           selection.beg.row  -= count;
           selection.end.row  -= count;
             {
               /* move selected region too */
               selection.beg.row  -= count;
               selection.end.row  -= count;
               selection.mark.row -= count;
               selection_check (0);
             }
         }
       // use a simple and robust scrolling algorithm, this
         }
       if (screen.flags & Screen_WrapNext)
         {
           scr_do_wrap ();
           line->l = ncol;
           line->is_longer (1);
           row = screen.cur.row;
           line = &ROW(row);   /* _must_ refresh */
           screen.cur.row--;
           return;
 #endif
         }
     }
-  else if (!(screen.flags & Screen_WrapNext))
+  else
     scr_gotorc (0, -1, RELATIVE);
   screen.flags &= ~Screen_WrapNext;
 }
             x = i;
             if (!--count)
               break;
           }
         else
           ht &= l.t[i] == ' '
                 && RS_SAME (l.r[i], base_rend);
       if (count)
         x = ncol - 1;
         }
     }
   else
     {
       if (screen.flags & Screen_Relative)
+        {
-        {        /* relative origin mode */
+          /* relative origin mode */
           screen.cur.row = row + screen.tscroll;
           min_it (screen.cur.row, screen.bscroll);
         }
       else
         screen.cur.row = row;
           {
             if (selection.end.row != screen.cur.row
                 || (selection.end.col + count >= ncol))
               CLEAR_SELECTION ();
             else
+              {
-              {              /* shift selection */
+                /* shift selection */
                 selection.beg.col  += count;
                 selection.mark.col += count; /* XXX: yes? */
                 selection.end.col  += count;
               }
           }
   return true;
 }
 #ifndef NO_BELL
 void
-rxvt_term::bell_cb (time_watcher &w)
+rxvt_term::bell_cb (ev::timer &w, int revents)
 {
   rvideo_bell = false;
   scr_rvideo_mode (rvideo_mode);
+  refresh_check ();
 }
 #endif
 /* ------------------------------------------------------------------------- */
 void
   if (option (Opt_visualBell))
     {
       rvideo_bell = true;
       scr_rvideo_mode (rvideo_mode);
-      display->flush ();
+      flush ();
-      bell_ev.start (NOW + VISUAL_BELL_DURATION);
+      bell_ev.start (VISUAL_BELL_DURATION);
     }
   else
     XBell (dpy, 0);
 #endif
 }
           if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
             {
               bool invert = rend & RS_RVid;
 #ifndef NO_BOLD_UNDERLINE_REVERSE
-              if (rend & RS_Bold
-                  && fore == Color_fg)
+              if (rend & RS_Bold && fore == Color_fg)
                 {
                   if (ISSET_PIXCOLOR (Color_BD))
                     fore = Color_BD;
 # if !ENABLE_STYLES
                   else
                     invert = !invert;
 # endif
                 }
-              if (rend & RS_Italic
+              if (rend & RS_Italic && fore == Color_fg)
-                  && fore == Color_fg)
                 {
                   if (ISSET_PIXCOLOR (Color_IT))
                     fore = Color_IT;
 # if !ENABLE_STYLES
                   else
                 }
 #ifdef TEXT_BLINK
               if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
                 {
-                  if (!text_blink_ev.active)
+                  if (!text_blink_ev.is_active ())
                     {
-                      text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
+                      text_blink_ev.again ();
                       hidden_text = 0;
                     }
                   else if (hidden_text)
                     fore = back;
                 }
 rxvt_term::scr_recolour () NOTHROW
 {
 #ifdef HAVE_BG_PIXMAP
   bgPixmap.apply ();
 #else
   XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
   XClearWindow (dpy, parent[0]);
   XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
 # if HAVE_SCROLLBARS
   if (scrollBar.win)
    {
      XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
      scrollBar.setIdle ();
      scrollbar_show (0);
    }
 # endif
   scr_clear ();
   scr_touch (true);
   want_refresh = 1;
 #endif
 }
 /* ------------------------------------------------------------------------- */
 void
 rxvt_term::scr_clear (bool really) NOTHROW
       if (!delete_prop)
         XDeleteProperty (dpy, win, prop);
       selection_wait = Sel_incr;
       incr_buf_fill = 0;
-      incr_ev.start (NOW + 10);
+      incr_ev.start (10);
       goto bailout;
     }
   if (ct.nitems == 0)
           ct.nitems = incr_buf_fill;
           incr_buf = 0;
           incr_buf_size = 0;
           incr_ev.stop ();
         }
       else
         {
           if (selection_wait == Sel_normal
               && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
             {
               /*
           goto bailout;
         }
     }
   else if (selection_wait == Sel_incr)
     {
-      incr_ev.start (NOW + 10);
+      incr_ev.start (10);
       while (incr_buf_fill + ct.nitems > incr_buf_size)
         {
           incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
           incr_buf = (char *)realloc (incr_buf, incr_buf_size);
   if (selection_wait == Sel_normal)
     selection_wait = Sel_none;
 }
 void
-rxvt_term::incr_cb (time_watcher &w) NOTHROW
+rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
 {
   selection_wait = Sel_none;
   incr_buf_size = 0;
   free (incr_buf);
   selection_paste (win, prop, true);
 }
 /* ------------------------------------------------------------------------- */
 /*
  * Request the current selection:
  * Order: > internal selection if available
  *        > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
  *        > CUT_BUFFER0
  * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
  *     will auto fallback to CUT_BUFFER0
  */
 void
 rxvt_term::selection_request (Time tm, int selnum) NOTHROW
 {
   if (selection.text && selnum == Sel_Primary)
+    {
-    { /* internal selection */
+      /* internal selection */
       char *str = rxvt_wcstombs (selection.text, selection.len);
       paste (str, strlen (str));
       free (str);
       return;
     }
   selection.mark.col = clamp (selection.mark.col,       0, ncol - 1);
   while (selection.mark.col > 0
          && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
     --selection.mark.col;
   if (selection.op)
+    {
-    {      /* clear the old selection */
+      /* clear the old selection */
       selection.beg.row = selection.end.row = selection.mark.row;
       selection.beg.col = selection.end.col = selection.mark.col;
     }
   selection.op = SELECTION_INIT;
    *     a point/word/line which is either the start or end of the selection
    *     and it was decided by whichever point/word/line was `fixed' at the
    *     time of the most recent button3 press
    */
   if (button3 && buttonpress)
+    {
-    { /* button3 press */
+      /* button3 press */
       /*
        * first determine which edge of the selection we are closest to
        */
       if (ROWCOL_IS_BEFORE (pos, selection.beg)
           || (!ROWCOL_IS_AFTER (pos, selection.end)
           selection.mark.row = selection.beg.row;
           selection.mark.col = selection.beg.col;
         }
     }
   else
+    {
-    { /* button1 drag or button3 drag */
+      /* button1 drag or button3 drag */
       if (ROWCOL_IS_AFTER (selection.mark, pos))
         {
           if (selection.mark.row == selection.end.row
               && selection.mark.col == selection.end.col
               && clickchange
             selection.end.row++;
         }
     }
   if (button3 && buttonpress)
+    {
-    { /* mark may need to be changed */
+      /* mark may need to be changed */
       if (closeto == LEFT)
         {
           selection.mark.row = selection.end.row;
           selection.mark.col = selection.end.col - (selection.clicks == 2);
         }
         XFree (ct.value);
     }
   XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
 }
-/* ------------------------------------------------------------------------- *
- *                              MOUSE ROUTINES                               *
- * ------------------------------------------------------------------------- */
-/*
- * return col/row values corresponding to x/y pixel values
- */
-void
-rxvt_term::pixel_position (int *x, int *y) NOTHROW
-{
-  *x = Pixel2Col (*x);
-  /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
-  *y = Pixel2Row (*y);
-  /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
-}
 /* ------------------------------------------------------------------------- */
 #ifdef USE_XIM
 void
 rxvt_term::im_set_position (XPoint &pos) NOTHROW

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.279 by sasha, Tue Sep 18 22:01:36 2007 UTC vs. Revision 1.294 by root, Wed Jan 9 00:51:50 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.279 by sasha, Tue Sep 18 22:01:36 2007 UTC vs.
Revision 1.294 by root, Wed Jan 9 00:51:50 2008 UTC