diff options
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/src/xterm.c b/src/xterm.c index a1beab492ee..68670795fa3 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -1401,7 +1401,7 @@ x_draw_glyph_string_foreground (s) of S to the right of that box line. */ if (s->face->box != FACE_NO_BOX && s->first_glyph->left_box_line_p) - x = s->x + abs (s->face->box_line_width); + x = s->x + eabs (s->face->box_line_width); else x = s->x; @@ -1503,7 +1503,7 @@ x_draw_composite_glyph_string_foreground (s) of S to the right of that box line. */ if (s->face && s->face->box != FACE_NO_BOX && s->first_glyph->left_box_line_p) - x = s->x + abs (s->face->box_line_width); + x = s->x + eabs (s->face->box_line_width); else x = s->x; @@ -2357,7 +2357,7 @@ x_draw_glyph_string_box (s) ? s->first_glyph : s->first_glyph + s->nchars - 1); - width = abs (s->face->box_line_width); + width = eabs (s->face->box_line_width); raised_p = s->face->box == FACE_RAISED_BOX; left_x = s->x; right_x = (s->row->full_width_p && s->extends_to_end_of_line_p @@ -2403,7 +2403,7 @@ x_draw_image_foreground (s) if (s->face->box != FACE_NO_BOX && s->first_glyph->left_box_line_p && s->slice.x == 0) - x += abs (s->face->box_line_width); + x += eabs (s->face->box_line_width); /* If there is a margin around the image, adjust x- and y-position by that margin. */ @@ -2496,7 +2496,7 @@ x_draw_image_relief (s) if (s->face->box != FACE_NO_BOX && s->first_glyph->left_box_line_p && s->slice.x == 0) - x += abs (s->face->box_line_width); + x += eabs (s->face->box_line_width); /* If there is a margin around the image, adjust x- and y-position by that margin. */ @@ -2513,7 +2513,7 @@ x_draw_image_relief (s) } else { - thick = abs (s->img->relief); + thick = eabs (s->img->relief); raised_p = s->img->relief > 0; } @@ -2548,7 +2548,7 @@ x_draw_image_foreground_1 (s, pixmap) if (s->face->box != FACE_NO_BOX && s->first_glyph->left_box_line_p && s->slice.x == 0) - x += abs (s->face->box_line_width); + x += eabs (s->face->box_line_width); /* If there is a margin around the image, adjust x- and y-position by that margin. */ @@ -2648,7 +2648,7 @@ static void x_draw_image_glyph_string (s) struct glyph_string *s; { - int box_line_hwidth = abs (s->face->box_line_width); + int box_line_hwidth = eabs (s->face->box_line_width); int box_line_vwidth = max (s->face->box_line_width, 0); int height; Pixmap pixmap = None; @@ -4630,7 +4630,7 @@ xaw_jump_callback (widget, client_data, call_data) whole = 10000000; portion = shown < 1 ? top * whole : 0; - if (shown < 1 && (abs (top + shown - 1) < 1.0/height)) + if (shown < 1 && (eabs (top + shown - 1) < 1.0/height)) /* Some derivatives of Xaw refuse to shrink the thumb when you reach the bottom, so we force the scrolling whenever we see that we're too close to the bottom (in x_set_toolkit_scroll_bar_thumb @@ -4671,12 +4671,12 @@ xaw_scroll_callback (widget, client_data, call_data) XtVaGetValues (widget, XtNheight, &height, NULL); UNBLOCK_INPUT; - if (abs (position) >= height) + if (eabs (position) >= height) part = (position < 0) ? scroll_bar_above_handle : scroll_bar_below_handle; /* If Xaw3d was compiled with ARROW_SCROLLBAR, it maps line-movement to call_data = max(5, height/20). */ - else if (xaw3d_arrow_scroll && abs (position) <= max (5, height / 20)) + else if (xaw3d_arrow_scroll && eabs (position) <= max (5, height / 20)) part = (position < 0) ? scroll_bar_up_arrow : scroll_bar_down_arrow; else part = scroll_bar_move_ratio; @@ -9044,7 +9044,8 @@ x_sync_with_move (f, left, top, fuzzy) /* The left fuzz-factor is 10 pixels. The top fuzz-factor is 40 pixels. */ - if (abs (current_left - left) <= 10 && abs (current_top - top) <= 40) + if (eabs (current_left - left) <= 10 + && eabs (current_top - top) <= 40) return; } else if (current_left == left && current_top == top) |