Mercurial > hg > xemacs-beta

comparison src/redisplay-output.c @ 5581:56144c8593a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Mechanically change INT to FIXNUM in our sources. src/ChangeLog addition: 2011-10-09 Aidan Kehoe <kehoea@parhasard.net> [...] Mechanically change INT (where it refers to non-bignum Lisp integers) to FIXNUM in our sources. Done for the following functions, enums, and macros: Lisp_Type_Int_Even, Lisp_Type_Int_Odd, INT_GCBITS, INT_VALBITS, make_int(), INTP(), XINT(), CHECK_INT(), XREALINT(), INT_PLUS(), INT_MINUS(), EMACS_INT_MAX (to MOST_POSITIVE_FIXNUM), EMACS_INT_MIN (to MOST_NEGATIVE_FIXNUM), NUMBER_FITS_IN_AN_EMACS_INT() to NUMBER_FITS_IN_A_FIXNUM(), XFLOATINT, XCHAR_OR_INT, INT_OR_FLOAT. The EMACS_INT typedef was not changed, it does not describe non-bignum Lisp integers. Script that did the change available in http://mid.gmane.org/20067.17650.181273.12014@parhasard.net . modules/ChangeLog addition: 2011-10-09 Aidan Kehoe <kehoea@parhasard.net> [...] Mechanically change INT to FIXNUM, where the usage describes non-bignum Lisp integers. See the src/ChangeLog entry for more details. man/ChangeLog addition: 2011-10-09 Aidan Kehoe <kehoea@parhasard.net> * internals/internals.texi (How Lisp Objects Are Represented in C): * internals/internals.texi (Integers and Characters): Mechanically change INT to FIXNUM, where the usage describes non-bignum Lisp integers.
author Aidan Kehoe <kehoea@parhasard.net>
date Sun, 09 Oct 2011 09:51:57 +0100
parents f87be7ddd60d
children b0d712bbc2a6
comparison
equal deleted inserted replaced
5580:a0e81357194e 5581:56144c8593a8
986 || (ADJ_ENDPOS && (new_point >= ADJ_CHARPOS) 986 || (ADJ_ENDPOS && (new_point >= ADJ_CHARPOS)
987 && (new_point <= ADJ_ENDPOS))) 987 && (new_point <= ADJ_ENDPOS)))
988 { 988 {
989 w->last_point_x[CURRENT_DISP] = x; 989 w->last_point_x[CURRENT_DISP] = x;
990 w->last_point_y[CURRENT_DISP] = y; 990 w->last_point_y[CURRENT_DISP] = y;
991 Fset_marker (w->last_point[CURRENT_DISP], make_int (ADJ_CHARPOS), 991 Fset_marker (w->last_point[CURRENT_DISP], make_fixnum (ADJ_CHARPOS),
992 w->buffer); 992 w->buffer);
993 dl->cursor_elt = x; 993 dl->cursor_elt = x;
994 return 1; 994 return 1;
995 } 995 }
996 else 996 else
1097 rb->xpos + rb->width); 1097 rb->xpos + rb->width);
1098 1098
1099 w->last_point_x[CURRENT_DISP] = cur_rb; 1099 w->last_point_x[CURRENT_DISP] = cur_rb;
1100 w->last_point_y[CURRENT_DISP] = cur_dl; 1100 w->last_point_y[CURRENT_DISP] = cur_dl;
1101 Fset_marker (w->last_point[CURRENT_DISP], 1101 Fset_marker (w->last_point[CURRENT_DISP],
1102 make_int (ADJ_CHARPOS), w->buffer); 1102 make_fixnum (ADJ_CHARPOS), w->buffer);
1103 1103
1104 if (!no_output_end) 1104 if (!no_output_end)
1105 { 1105 {
1106 MAYBE_DEVMETH (d, window_output_end, (w)); 1106 MAYBE_DEVMETH (d, window_output_end, (w));
1107 MAYBE_DEVMETH (d, frame_output_end, (f)); 1107 MAYBE_DEVMETH (d, frame_output_end, (f));
1472 style = EDGE_ETCHED_IN; 1472 style = EDGE_ETCHED_IN;
1473 else if (EQ (IMAGE_INSTANCE_LAYOUT_BORDER (p), Qetched_out)) 1473 else if (EQ (IMAGE_INSTANCE_LAYOUT_BORDER (p), Qetched_out))
1474 style = EDGE_ETCHED_OUT; 1474 style = EDGE_ETCHED_OUT;
1475 else if (EQ (IMAGE_INSTANCE_LAYOUT_BORDER (p), Qbevel_in)) 1475 else if (EQ (IMAGE_INSTANCE_LAYOUT_BORDER (p), Qbevel_in))
1476 style = EDGE_BEVEL_IN; 1476 style = EDGE_BEVEL_IN;
1477 else if (INTP (IMAGE_INSTANCE_LAYOUT_BORDER (p))) 1477 else if (FIXNUMP (IMAGE_INSTANCE_LAYOUT_BORDER (p)))
1478 { 1478 {
1479 style = EDGE_ETCHED_IN; 1479 style = EDGE_ETCHED_IN;
1480 if (edges & EDGE_TOP) 1480 if (edges & EDGE_TOP)
1481 { 1481 {
1482 ypos += XINT (IMAGE_INSTANCE_LAYOUT_BORDER (p)); 1482 ypos += XFIXNUM (IMAGE_INSTANCE_LAYOUT_BORDER (p));
1483 height -= XINT (IMAGE_INSTANCE_LAYOUT_BORDER (p)); 1483 height -= XFIXNUM (IMAGE_INSTANCE_LAYOUT_BORDER (p));
1484 } 1484 }
1485 } 1485 }
1486 else 1486 else
1487 style = EDGE_BEVEL_OUT; 1487 style = EDGE_BEVEL_OUT;
1488 1488
2496 need_to_clear_end); 2496 need_to_clear_end);
2497 } 2497 }
2498 2498
2499 w->window_end_pos[CURRENT_DISP] = w->window_end_pos[DESIRED_DISP]; 2499 w->window_end_pos[CURRENT_DISP] = w->window_end_pos[DESIRED_DISP];
2500 Fset_marker (w->start[CURRENT_DISP], 2500 Fset_marker (w->start[CURRENT_DISP],
2501 make_int (marker_position (w->start[DESIRED_DISP])), 2501 make_fixnum (marker_position (w->start[DESIRED_DISP])),
2502 w->buffer); 2502 w->buffer);
2503 Fset_marker (w->pointm[CURRENT_DISP], 2503 Fset_marker (w->pointm[CURRENT_DISP],
2504 make_int (marker_position (w->pointm[DESIRED_DISP])), 2504 make_fixnum (marker_position (w->pointm[DESIRED_DISP])),
2505 w->buffer); 2505 w->buffer);
2506 w->last_modified[CURRENT_DISP] = w->last_modified[DESIRED_DISP]; 2506 w->last_modified[CURRENT_DISP] = w->last_modified[DESIRED_DISP];
2507 w->last_facechange[CURRENT_DISP] = w->last_facechange[DESIRED_DISP]; 2507 w->last_facechange[CURRENT_DISP] = w->last_facechange[DESIRED_DISP];
2508 Fset_marker (w->last_start[CURRENT_DISP], 2508 Fset_marker (w->last_start[CURRENT_DISP],
2509 Fmarker_position (w->last_start[DESIRED_DISP]), w->buffer); 2509 Fmarker_position (w->last_start[DESIRED_DISP]), w->buffer);
2639 static void 2639 static void
2640 redisplay_redraw_exposed_area_1 (Lisp_Object arg) 2640 redisplay_redraw_exposed_area_1 (Lisp_Object arg)
2641 { 2641 {
2642 assert (!in_display); 2642 assert (!in_display);
2643 redisplay_redraw_exposed_area (XFRAME (X1ST (arg)), 2643 redisplay_redraw_exposed_area (XFRAME (X1ST (arg)),
2644 XINT (X2ND (arg)), 2644 XFIXNUM (X2ND (arg)),
2645 XINT (X3RD (arg)), 2645 XFIXNUM (X3RD (arg)),
2646 XINT (X4TH (arg)), 2646 XFIXNUM (X4TH (arg)),
2647 XINT (X5TH (arg))); 2647 XFIXNUM (X5TH (arg)));
2648 free_list (arg); 2648 free_list (arg);
2649 } 2649 }
2650 2650
2651 /***************************************************************************** 2651 /*****************************************************************************
2652 redisplay_redraw_exposed_area 2652 redisplay_redraw_exposed_area
2662 2662
2663 if (in_display) 2663 if (in_display)
2664 { 2664 {
2665 /* Not safe to do it now, so delay it */ 2665 /* Not safe to do it now, so delay it */
2666 register_post_redisplay_action (redisplay_redraw_exposed_area_1, 2666 register_post_redisplay_action (redisplay_redraw_exposed_area_1,
2667 list5 (wrap_frame (f), make_int (x), 2667 list5 (wrap_frame (f), make_fixnum (x),
2668 make_int (y), make_int (width), 2668 make_fixnum (y), make_fixnum (width),
2669 make_int (height))); 2669 make_fixnum (height)));
2670 return; 2670 return;
2671 } 2671 }
2672 2672
2673 depth = enter_redisplay_critical_section (); 2673 depth = enter_redisplay_critical_section ();
2674 2674
2716 x = WINDOW_MODELINE_LEFT (w); 2716 x = WINDOW_MODELINE_LEFT (w);
2717 width = WINDOW_MODELINE_RIGHT (w) - x; 2717 width = WINDOW_MODELINE_RIGHT (w) - x;
2718 y = dl->ypos - dl->ascent - shadow_thickness; 2718 y = dl->ypos - dl->ascent - shadow_thickness;
2719 height = dl->ascent + dl->descent + 2 * shadow_thickness; 2719 height = dl->ascent + dl->descent + 2 * shadow_thickness;
2720 2720
2721 if (XINT (w->modeline_shadow_thickness) < 0) 2721 if (XFIXNUM (w->modeline_shadow_thickness) < 0)
2722 { 2722 {
2723 style = EDGE_BEVEL_IN; 2723 style = EDGE_BEVEL_IN;
2724 } 2724 }
2725 else 2725 else
2726 { 2726 {