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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.264 by root, Thu Jul 6 18:56:10 2006 UTC vs.
Revision 1.269 by ayin, Wed May 2 23:06:32 2007 UTC

 /* ------------------------------------------------------------------------- *
  *             GENERAL SCREEN AND SELECTION UPDATE ROUTINES                  *
  * ------------------------------------------------------------------------- */
 #define ZERO_SCROLLBACK()                                              \
-    if (OPTION (Opt_scrollTtyOutput))                                  \
+    if (option (Opt_scrollTtyOutput))                                  \
         view_start = 0
 #define CLEAR_SELECTION()                                              \
     selection.beg.row = selection.beg.col                              \
         = selection.end.row = selection.end.col = 0
 #define CLEAR_ALL_SELECTION()                                          \
   prev_nrow = nrow;
   prev_ncol = ncol;
   tabs = (char *)rxvt_malloc (ncol * sizeof (char));
-  for (int col = ncol; col--; )
+  for (int col = ncol; --col; )
     tabs [col] = col % TABSIZE == 0;
   if (current_screen != PRIMARY)
     scr_swap_screen ();
 }
 void
 rxvt_term::scr_swap_screen ()
 {
-  if (!OPTION (Opt_secondaryScreen))
+  if (!option (Opt_secondaryScreen))
     return;
   for (int i = prev_nrow; i--; )
     ::swap (ROW(i), swap_buf [i]);
   selection_check (2);        /* check for boundary cross */
   int i = current_screen; current_screen = scrn; scrn = i;
 #if NSCREENS
-  if (OPTION (Opt_secondaryScreen))
+  if (option (Opt_secondaryScreen))
     {
       num_scr = 0;
       scr_swap_screen ();
       screen.flags |= Screen_VisibleCursor;
       swap.flags   |= Screen_VisibleCursor;
     }
   else
 #endif
-    if (OPTION (Opt_secondaryScroll))
+    if (option (Opt_secondaryScroll))
       scr_scroll_text (0, prev_nrow - 1, prev_nrow);
 }
 // clear WrapNext indicator, solidifying position on next line
 void
   want_refresh = 1;
   num_scr += count;
   if (count > 0
       && row1 == 0
-      && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
+      && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
     {
       top_row = max (top_row - count, -saveLines);
       // scroll everything up 'count' lines
       term_start = (term_start + count) % total_rows;
               selection.op = SELECTION_CLEAR;
             }
         }
       // finally move the view window, if desired
-      if (OPTION (Opt_scrollWithBuffer)
+      if (option (Opt_scrollWithBuffer)
           && view_start != 0
           && view_start != -saveLines)
         scr_page (UP, count);
       if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
       if (count)
         x = ncol - 1;
       // store horizontal tab commands as characters inside the text
       // buffer so they can be selected and pasted.
-      if (ht && OPTION (Opt_pastableTabs))
+      if (ht && option (Opt_pastableTabs))
         {
           base_rend = SET_FONT (base_rend, 0);
           l.touch (x);
       ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
 #if XPM_BACKGROUND
       if (bgPixmap.pixmap == None)
 #endif
 #if TRANSPARENT
-        if (!OPTION (Opt_transparent) || am_transparent == 0)
+        if (!option (Opt_transparent) || am_transparent == 0)
 #endif
           XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
       XGCValues gcvalue;
       gcvalue.foreground = pix_colors[Color_fg];
 {
 #ifndef NO_BELL
 # ifndef NO_MAPALERT
 #  ifdef MAPALERT_OPTION
-  if (OPTION (Opt_mapAlert))
+  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 (h != NULL)
+        {
+          h->flags |= XUrgencyHint;
+          XSetWMHints(dpy, parent[0], h);
+        }
+    }
+# endif
-  if (OPTION (Opt_visualBell))
+  if (option (Opt_visualBell))
     {
       rvideo_bell = true;
       scr_rvideo_mode (rvideo_mode);
       display->flush ();
   int i;              /* tmp                                       */
 #ifndef NO_CURSORCOLOR
   rend_t cc1;         /* store colours at cursor position (s)      */
 #endif
   rend_t *crp;        // cursor rendition pointer
+  rend_t ccol1,  /* Cursor colour       */
+         ccol2;  /* Cursor colour2      */
   want_refresh = 0;        /* screen is current */
   if (refresh_type == NO_REFRESH || !mapped)
     return;
 #if XPM_BACKGROUND
   have_bg |= bgPixmap.pixmap != None;
 #endif
 #if TRANSPARENT
-  have_bg |= OPTION (Opt_transparent) && am_transparent;
+  have_bg |= option (Opt_transparent) && am_transparent;
 #endif
   ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
   /*
    * B: reverse any characters which are selected
   /*
    * C: set the cursor character (s)
    */
   {
     unsigned char setoldcursor;
-    rend_t ccol1,  /* Cursor colour       */
-           ccol2;  /* Cursor colour2      */
     showcursor = (screen.flags & Screen_VisibleCursor);
 #ifdef CURSOR_BLINK
     if (hidden_cursor)
       showcursor = 0;
         while (col && ROW(screen.cur.row).t[col] == NOCHAR)
           col--;
         crp = &ROW(screen.cur.row).r[col];
+#ifndef NO_CURSORCOLOR
+        cc1 = *crp & (RS_fgMask | RS_bgMask);
+        if (ISSET_PIXCOLOR (Color_cursor))
+          ccol1 = Color_cursor;
+        else
+#endif
+#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
+          ccol1 = fgcolor_of (rstyle);
+#else
+          ccol1 = Color_fg;
+#endif
+#ifndef NO_CURSORCOLOR
+        if (ISSET_PIXCOLOR (Color_cursor2))
+          ccol2 = Color_cursor2;
+        else
+#endif
+#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
+          ccol2 = bgcolor_of (rstyle);
+#else
+          ccol2 = Color_bg;
+#endif
         if (showcursor && focus)
           {
-            if (OPTION (Opt_cursorUnderline))
+            if (option (Opt_cursorUnderline))
               *crp ^= RS_Uline;
             else
               {
                 *crp ^= RS_RVid;
-#ifndef NO_CURSORCOLOR
-                cc1 = *crp & (RS_fgMask | RS_bgMask);
-                if (ISSET_PIXCOLOR (Color_cursor))
-                  ccol1 = Color_cursor;
-                else
-#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
-                  ccol1 = fgcolor_of (rstyle);
-#else
-                  ccol1 = Color_fg;
-#endif
-                if (ISSET_PIXCOLOR (Color_cursor2))
-                  ccol2 = Color_cursor2;
-                else
-#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
-                  ccol2 = bgcolor_of (rstyle);
-#else
-                  ccol2 = Color_bg;
-#endif
                 *crp = SET_FGCOLOR (*crp, ccol1);
                 *crp = SET_BGCOLOR (*crp, ccol2);
-#endif
               }
           }
       }
     /* make sure no outline cursor is left around */
           /*
            * Actually do the drawing of the string here
            */
           rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
-          if (back == fore)
+          if (have_bg && back == Color_bg)
-            font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back);
-          else if (back == Color_bg && have_bg)
             {
               // this is very ugly, maybe push it into ->draw?
               for (i = 0; i < count; i++) /* don't draw empty strings */
                 if (text[i] != ' ')
                   {
-                    font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);
+                    font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
                     goto did_clear;
                   }
               CLEAR_CHARS (xpixel, ypixel, count);
               did_clear: ;
    */
   if (showcursor)
     {
       if (focus)
         {
-          if (OPTION (Opt_cursorUnderline))
+          if (option (Opt_cursorUnderline))
             *crp ^= RS_Uline;
           else
             {
               *crp ^= RS_RVid;
 #ifndef NO_CURSORCOLOR
             cursorwidth++;
 #ifndef NO_CURSORCOLOR
           if (ISSET_PIXCOLOR (Color_cursor))
             XSetForeground (dpy, gc, pix_colors[Color_cursor]);
+          else
 #endif
+            XSetForeground (dpy, gc, pix_colors[ccol1]);
           XDrawRectangle (dpy, drawBuffer, gc,
                           Col2Pixel (col),
                           Row2Pixel (oldcursor.row),
                           (unsigned int) (Width2Pixel (cursorwidth) - 1),
       selection_delimit_word (DN, &selection.end, &selection.end);
     }
   else if (selection.clicks == 3)
     {
 #if ENABLE_FRILLS
-      if (OPTION (Opt_tripleclickwords))
+      if (option (Opt_tripleclickwords))
         {
           selection_delimit_word (UP, &selection.beg, &selection.beg);
           for (int end_row = selection.mark.row; end_row < nrow; end_row++)
             {

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.264 by root, Thu Jul 6 18:56:10 2006 UTC vs. Revision 1.269 by ayin, Wed May 2 23:06:32 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.264 by root, Thu Jul 6 18:56:10 2006 UTC vs.
Revision 1.269 by ayin, Wed May 2 23:06:32 2007 UTC