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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.275 by sasha, Wed Aug 15 22:41:52 2007 UTC vs.
Revision 1.282 by ayin, Wed Oct 31 10:06:42 2007 UTC

 #include <inttypes.h>
 #include "salloc.C" // HACK, should be a seperate compile!
-inline void fill_text (text_t *start, text_t value, int len)
+static inline void fill_text (text_t *start, text_t value, int len)
 {
   while (len--)
     *start++ = value;
 }
           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];
   CLEAR_ALL_SELECTION ();
   prev_nrow = nrow;
   prev_ncol = ncol;
-  tabs = (char *)rxvt_malloc (ncol * sizeof (char));
+  tabs = (char *)rxvt_malloc (ncol);
   for (int col = ncol; --col; )
     tabs [col] = col % TABSIZE == 0;
   if (current_screen != PRIMARY)
           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 */
             x = i;
             if (!--count)
               break;
           }
         else
           ht &= l.t[i] == ' '
                 && RS_SAME (l.r[i], base_rend);
       if (count)
         x = ncol - 1;
  */
 void
 rxvt_term::scr_set_tab (int mode) NOTHROW
 {
   if (mode < 0)
-    memset (tabs, 0, ncol * sizeof (char));
+    memset (tabs, 0, ncol);
   else if (screen.cur.col < ncol)
     tabs [screen.cur.col] = !!mode;
 }
 /* ------------------------------------------------------------------------- */
 #  ifdef MAPALERT_OPTION
   if (option (Opt_mapAlert))
 #  endif
     XMapWindow (dpy, parent[0]);
 # endif
 # if ENABLE_FRILLS
   if (option (Opt_urgentOnBell))
     {
-      XWMHints *h;
-      h = XGetWMHints(dpy, parent[0]);
+      if (XWMHints *h = XGetWMHints(dpy, parent[0]))
-      if (h != NULL)
         {
           h->flags |= XUrgencyHint;
-          XSetWMHints(dpy, parent[0], h);
+          XSetWMHints (dpy, parent[0], h);
         }
     }
 # endif
   if (option (Opt_visualBell))
      XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
      scrollBar.setIdle ();
      scrollbar_show (0);
    }
 # endif
-#endif
   scr_clear ();
   scr_touch (true);
   want_refresh = 1;
+#endif
 }
 /* ------------------------------------------------------------------------- */
 void
 rxvt_term::scr_clear (bool really) NOTHROW
           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
             {
               /*
   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
   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 */
       selection.beg.row = selection.end.row = selection.mark.row;
       selection.beg.col = selection.end.col = selection.mark.col;
     }
         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.275 by sasha, Wed Aug 15 22:41:52 2007 UTC vs. Revision 1.282 by ayin, Wed Oct 31 10:06:42 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.275 by sasha, Wed Aug 15 22:41:52 2007 UTC vs.
Revision 1.282 by ayin, Wed Oct 31 10:06:42 2007 UTC