/[emacs]/emacs/src/dispnew.c
ViewVC logotype

Diff of /emacs/src/dispnew.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.356 by monnier, Thu Sep 1 14:16:19 2005 UTC revision 1.357 by mituharu, Fri Oct 7 07:38:47 2005 UTC
# Line 4035  redraw_overlapping_rows (w, yb) Line 4035  redraw_overlapping_rows (w, yb)
4035    
4036        if (row->overlapping_p && i > 0 && bottom_y < yb)        if (row->overlapping_p && i > 0 && bottom_y < yb)
4037          {          {
4038            if (row->used[LEFT_MARGIN_AREA])            int overlaps = 0;
             rif->fix_overlapping_area (w, row, LEFT_MARGIN_AREA);  
4039    
4040            if (row->used[TEXT_AREA])            if (MATRIX_ROW_OVERLAPS_PRED_P (row)
4041              rif->fix_overlapping_area (w, row, TEXT_AREA);                && !MATRIX_ROW (w->current_matrix, i - 1)->overlapped_p)
4042                overlaps |= OVERLAPS_PRED;
4043              if (MATRIX_ROW_OVERLAPS_SUCC_P (row)
4044                  && !MATRIX_ROW (w->current_matrix, i + 1)->overlapped_p)
4045                overlaps |= OVERLAPS_SUCC;
4046    
4047            if (row->used[RIGHT_MARGIN_AREA])            if (overlaps)
4048              rif->fix_overlapping_area (w, row, RIGHT_MARGIN_AREA);              {
4049                  if (row->used[LEFT_MARGIN_AREA])
4050                    rif->fix_overlapping_area (w, row, LEFT_MARGIN_AREA, overlaps);
4051    
4052            /* Record in neighbour rows that ROW overwrites part of their                if (row->used[TEXT_AREA])
4053               display.  */                  rif->fix_overlapping_area (w, row, TEXT_AREA, overlaps);
4054            if (row->phys_ascent > row->ascent && i > 0)  
4055              MATRIX_ROW (w->current_matrix, i - 1)->overlapped_p = 1;                if (row->used[RIGHT_MARGIN_AREA])
4056            if ((row->phys_height - row->phys_ascent                  rif->fix_overlapping_area (w, row, RIGHT_MARGIN_AREA, overlaps);
4057                 > row->height - row->ascent)  
4058                && bottom_y < yb)                /* Record in neighbour rows that ROW overwrites part of
4059              MATRIX_ROW (w->current_matrix, i + 1)->overlapped_p = 1;                   their display.  */
4060                  if (overlaps & OVERLAPS_PRED)
4061                    MATRIX_ROW (w->current_matrix, i - 1)->overlapped_p = 1;
4062                  if (overlaps & OVERLAPS_SUCC)
4063                    MATRIX_ROW (w->current_matrix, i + 1)->overlapped_p = 1;
4064                }
4065          }          }
4066    
4067        if (bottom_y >= yb)        if (bottom_y >= yb)

Legend:
Removed from v.1.356  
changed lines
  Added in v.1.357

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26