Mercurial > hg > xemacs-beta

comparison src/frame.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 4dee0387b9de
children 3fde0e346ad7
comparison
equal deleted inserted replaced
5580:a0e81357194e 5581:56144c8593a8
1050 CONSOLE_STREAM_P (XCONSOLE (Fselected_console ()))) 1050 CONSOLE_STREAM_P (XCONSOLE (Fselected_console ())))
1051 Fselect_console (DEVICE_CONSOLE (d)); 1051 Fselect_console (DEVICE_CONSOLE (d));
1052 1052
1053 first_frame_on_console = 1053 first_frame_on_console =
1054 (first_frame_on_device && 1054 (first_frame_on_device &&
1055 XINT (Flength (CONSOLE_DEVICE_LIST (XCONSOLE (DEVICE_CONSOLE (d))))) 1055 XFIXNUM (Flength (CONSOLE_DEVICE_LIST (XCONSOLE (DEVICE_CONSOLE (d)))))
1056 == 1); 1056 == 1);
1057 1057
1058 /* #### all this calling of frame methods at various odd times 1058 /* #### all this calling of frame methods at various odd times
1059 is somewhat of a mess. It's necessary to do it this way due 1059 is somewhat of a mess. It's necessary to do it this way due
1060 to strange console-type-specific things that need to be done. */ 1060 to strange console-type-specific things that need to be done. */
1905 } 1905 }
1906 1906
1907 /* Call the delete-device-hook and delete-console-hook now if 1907 /* Call the delete-device-hook and delete-console-hook now if
1908 appropriate, before we do any dangerous things -- they too could 1908 appropriate, before we do any dangerous things -- they too could
1909 signal an error. */ 1909 signal an error. */
1910 if (XINT (Flength (DEVICE_FRAME_LIST (d))) == 1) 1910 if (XFIXNUM (Flength (DEVICE_FRAME_LIST (d))) == 1)
1911 { 1911 {
1912 va_run_hook_with_args (Qdelete_device_hook, 1, device); 1912 va_run_hook_with_args (Qdelete_device_hook, 1, device);
1913 if (!FRAME_LIVE_P (f)) /* Make sure the delete-device-hook didn't */ 1913 if (!FRAME_LIVE_P (f)) /* Make sure the delete-device-hook didn't */
1914 { /* go ahead and delete anything. */ 1914 { /* go ahead and delete anything. */
1915 UNGCPRO; 1915 UNGCPRO;
1916 return; 1916 return;
1917 } 1917 }
1918 1918
1919 if (XINT (Flength (CONSOLE_DEVICE_LIST (con))) == 1) 1919 if (XFIXNUM (Flength (CONSOLE_DEVICE_LIST (con))) == 1)
1920 { 1920 {
1921 va_run_hook_with_args (Qdelete_console_hook, 1, console); 1921 va_run_hook_with_args (Qdelete_console_hook, 1, console);
1922 if (!FRAME_LIVE_P (f)) /* Make sure the delete-console-hook didn't */ 1922 if (!FRAME_LIVE_P (f)) /* Make sure the delete-console-hook didn't */
1923 { /* go ahead and delete anything. */ 1923 { /* go ahead and delete anything. */
1924 UNGCPRO; 1924 UNGCPRO;
2274 window = wrap_window (w); 2274 window = wrap_window (w);
2275 2275
2276 /* Adjust the position to be relative to the window. */ 2276 /* Adjust the position to be relative to the window. */
2277 intx -= w->pixel_left; 2277 intx -= w->pixel_left;
2278 inty -= w->pixel_top; 2278 inty -= w->pixel_top;
2279 x = make_int (intx); 2279 x = make_fixnum (intx);
2280 y = make_int (inty); 2280 y = make_fixnum (inty);
2281 } 2281 }
2282 } 2282 }
2283 else if (FRAMEP (frame)) 2283 else if (FRAMEP (frame))
2284 window = FRAME_SELECTED_WINDOW (XFRAME (frame)); 2284 window = FRAME_SELECTED_WINDOW (XFRAME (frame));
2285 2285
2315 &obj_x, &obj_y, &w, &charbpos, 2315 &obj_x, &obj_y, &w, &charbpos,
2316 &closest, &modeline_closest, 2316 &closest, &modeline_closest,
2317 &obj1, &obj2); 2317 &obj1, &obj2);
2318 if (res == OVER_TEXT) 2318 if (res == OVER_TEXT)
2319 { 2319 {
2320 lisp_x = make_int (x); 2320 lisp_x = make_fixnum (x);
2321 lisp_y = make_int (y); 2321 lisp_y = make_fixnum (y);
2322 window = wrap_window (w); 2322 window = wrap_window (w);
2323 } 2323 }
2324 } 2324 }
2325 else if (FRAMEP (frame)) 2325 else if (FRAMEP (frame))
2326 window = FRAME_SELECTED_WINDOW (XFRAME (frame)); 2326 window = FRAME_SELECTED_WINDOW (XFRAME (frame));
2369 { 2369 {
2370 struct window *w; 2370 struct window *w;
2371 int pix_x, pix_y; 2371 int pix_x, pix_y;
2372 2372
2373 CHECK_LIVE_WINDOW (window); 2373 CHECK_LIVE_WINDOW (window);
2374 CHECK_INT (x); 2374 CHECK_FIXNUM (x);
2375 CHECK_INT (y); 2375 CHECK_FIXNUM (y);
2376 2376
2377 /* Warping the mouse will cause EnterNotify and Focus events under X. */ 2377 /* Warping the mouse will cause EnterNotify and Focus events under X. */
2378 w = XWINDOW (window); 2378 w = XWINDOW (window);
2379 glyph_to_pixel_translation (w, XINT (x), XINT (y), &pix_x, &pix_y); 2379 glyph_to_pixel_translation (w, XFIXNUM (x), XFIXNUM (y), &pix_x, &pix_y);
2380 2380
2381 MAYBE_FRAMEMETH (XFRAME (w->frame), set_mouse_position, (w, pix_x, pix_y)); 2381 MAYBE_FRAMEMETH (XFRAME (w->frame), set_mouse_position, (w, pix_x, pix_y));
2382 2382
2383 return Qnil; 2383 return Qnil;
2384 } 2384 }
2393 (window, x, y)) 2393 (window, x, y))
2394 { 2394 {
2395 struct window *w; 2395 struct window *w;
2396 2396
2397 CHECK_LIVE_WINDOW (window); 2397 CHECK_LIVE_WINDOW (window);
2398 CHECK_INT (x); 2398 CHECK_FIXNUM (x);
2399 CHECK_INT (y); 2399 CHECK_FIXNUM (y);
2400 2400
2401 /* Warping the mouse will cause EnterNotify and Focus events under X. */ 2401 /* Warping the mouse will cause EnterNotify and Focus events under X. */
2402 w = XWINDOW (window); 2402 w = XWINDOW (window);
2403 FRAMEMETH (XFRAME (w->frame), set_mouse_position, (w, XINT (x), XINT (y))); 2403 FRAMEMETH (XFRAME (w->frame), set_mouse_position, (w, XFIXNUM (x), XFIXNUM (y)));
2404 2404
2405 return Qnil; 2405 return Qnil;
2406 } 2406 }
2407 2407
2408 /**************************************************************************/ 2408 /**************************************************************************/
2615 Return current page number for the print job FRAME. 2615 Return current page number for the print job FRAME.
2616 */ 2616 */
2617 (frame)) 2617 (frame))
2618 { 2618 {
2619 CHECK_PRINTER_FRAME (frame); 2619 CHECK_PRINTER_FRAME (frame);
2620 return make_int (FRAME_PAGENUMBER (XFRAME (frame))); 2620 return make_fixnum (FRAME_PAGENUMBER (XFRAME (frame)));
2621 } 2621 }
2622 2622
2623 DEFUN ("print-job-eject-page", Fprint_job_eject_page, 1, 1, 0, /* 2623 DEFUN ("print-job-eject-page", Fprint_job_eject_page, 1, 1, 0, /*
2624 Eject page in the print job FRAME. 2624 Eject page in the print job FRAME.
2625 */ 2625 */
2661 anything else interesting has happened. It wraps around occasionally. 2661 anything else interesting has happened. It wraps around occasionally.
2662 No argument or nil as argument means use selected frame as FRAME. 2662 No argument or nil as argument means use selected frame as FRAME.
2663 */ 2663 */
2664 (frame)) 2664 (frame))
2665 { 2665 {
2666 return make_int (decode_frame (frame)->modiff); 2666 return make_fixnum (decode_frame (frame)->modiff);
2667 } 2667 }
2668 2668
2669 static void 2669 static void
2670 store_minibuf_frame_prop (struct frame *f, Lisp_Object val) 2670 store_minibuf_frame_prop (struct frame *f, Lisp_Object val)
2671 { 2671 {
2960 2960
2961 if (EQ (Qheight, property) || EQ (Qwidth, property)) 2961 if (EQ (Qheight, property) || EQ (Qwidth, property))
2962 { 2962 {
2963 int width, height; 2963 int width, height;
2964 get_frame_char_size (f, &width, &height); 2964 get_frame_char_size (f, &width, &height);
2965 return make_int (EQ (Qheight, property) ? height : width); 2965 return make_fixnum (EQ (Qheight, property) ? height : width);
2966 } 2966 }
2967 2967
2968 /* NOTE: FSF returns Qnil instead of Qt for FRAME_HAS_MINIBUF_P. 2968 /* NOTE: FSF returns Qnil instead of Qt for FRAME_HAS_MINIBUF_P.
2969 This is over-the-top bogosity, because it's inconsistent with 2969 This is over-the-top bogosity, because it's inconsistent with
2970 the semantics of `minibuffer' when passed to `make-frame'. 2970 the semantics of `minibuffer' when passed to `make-frame'.
3053 FRAME_MINIBUF_WINDOW (f)), 3053 FRAME_MINIBUF_WINDOW (f)),
3054 result); 3054 result);
3055 { 3055 {
3056 int width, height; 3056 int width, height;
3057 get_frame_char_size (f, &width, &height); 3057 get_frame_char_size (f, &width, &height);
3058 result = cons3 (Qwidth , make_int (width), result); 3058 result = cons3 (Qwidth , make_fixnum (width), result);
3059 result = cons3 (Qheight, make_int (height), result); 3059 result = cons3 (Qheight, make_fixnum (height), result);
3060 } 3060 }
3061 3061
3062 result = cons3 (Qname, f->name, result); 3062 result = cons3 (Qname, f->name, result);
3063 3063
3064 UNGCPRO; 3064 UNGCPRO;
3079 { 3079 {
3080 struct frame *f = decode_frame (frame); 3080 struct frame *f = decode_frame (frame);
3081 int width, height; 3081 int width, height;
3082 3082
3083 get_frame_new_total_pixel_size (f, &width, &height); 3083 get_frame_new_total_pixel_size (f, &width, &height);
3084 return make_int (height); 3084 return make_fixnum (height);
3085 } 3085 }
3086 3086
3087 DEFUN ("frame-displayable-pixel-height", Fframe_displayable_pixel_height, 0, 1, 0, /* 3087 DEFUN ("frame-displayable-pixel-height", Fframe_displayable_pixel_height, 0, 1, 0, /*
3088 Return the height of the displayable area in pixels of FRAME. 3088 Return the height of the displayable area in pixels of FRAME.
3089 */ 3089 */
3091 { 3091 {
3092 struct frame *f = decode_frame (frame); 3092 struct frame *f = decode_frame (frame);
3093 int width, height; 3093 int width, height;
3094 3094
3095 get_frame_new_displayable_pixel_size (f, &width, &height); 3095 get_frame_new_displayable_pixel_size (f, &width, &height);
3096 return make_int (height); 3096 return make_fixnum (height);
3097 } 3097 }
3098 3098
3099 DEFUN ("frame-pixel-width", Fframe_pixel_width, 0, 1, 0, /* 3099 DEFUN ("frame-pixel-width", Fframe_pixel_width, 0, 1, 0, /*
3100 Return the total width in pixels of FRAME. 3100 Return the total width in pixels of FRAME.
3101 */ 3101 */
3103 { 3103 {
3104 struct frame *f = decode_frame (frame); 3104 struct frame *f = decode_frame (frame);
3105 int width, height; 3105 int width, height;
3106 3106
3107 get_frame_new_total_pixel_size (f, &width, &height); 3107 get_frame_new_total_pixel_size (f, &width, &height);
3108 return make_int (width); 3108 return make_fixnum (width);
3109 } 3109 }
3110 3110
3111 DEFUN ("frame-displayable-pixel-width", Fframe_displayable_pixel_width, 0, 1, 0, /* 3111 DEFUN ("frame-displayable-pixel-width", Fframe_displayable_pixel_width, 0, 1, 0, /*
3112 Return the width of the displayable area in pixels of FRAME. 3112 Return the width of the displayable area in pixels of FRAME.
3113 */ 3113 */
3115 { 3115 {
3116 struct frame *f = decode_frame (frame); 3116 struct frame *f = decode_frame (frame);
3117 int width, height; 3117 int width, height;
3118 3118
3119 get_frame_new_displayable_pixel_size (f, &width, &height); 3119 get_frame_new_displayable_pixel_size (f, &width, &height);
3120 return make_int (width); 3120 return make_fixnum (width);
3121 } 3121 }
3122 3122
3123 DEFUN ("set-frame-height", Fset_frame_height, 2, 3, 0, /* 3123 DEFUN ("set-frame-height", Fset_frame_height, 2, 3, 0, /*
3124 Specify that the frame FRAME has LINES lines. 3124 Specify that the frame FRAME has LINES lines.
3125 Optional third arg non-nil means that redisplay should use LINES lines 3125 Optional third arg non-nil means that redisplay should use LINES lines
3130 /* This can call Lisp. */ 3130 /* This can call Lisp. */
3131 struct frame *f = decode_frame (frame); 3131 struct frame *f = decode_frame (frame);
3132 int cwidth, cheight; 3132 int cwidth, cheight;
3133 int guwidth, guheight; 3133 int guwidth, guheight;
3134 3134
3135 CHECK_INT (lines); 3135 CHECK_FIXNUM (lines);
3136 get_frame_char_size (f, &cwidth, &cheight); 3136 get_frame_char_size (f, &cwidth, &cheight);
3137 cheight = XINT (lines); 3137 cheight = XFIXNUM (lines);
3138 frame_conversion_internal (f, SIZE_CHAR_CELL, cwidth, cheight, 3138 frame_conversion_internal (f, SIZE_CHAR_CELL, cwidth, cheight,
3139 SIZE_FRAME_UNIT, &guwidth, &guheight); 3139 SIZE_FRAME_UNIT, &guwidth, &guheight);
3140 internal_set_frame_size (f, guwidth, guheight, !NILP (pretend)); 3140 internal_set_frame_size (f, guwidth, guheight, !NILP (pretend));
3141 return wrap_frame (f); 3141 return wrap_frame (f);
3142 } 3142 }
3151 /* This can call Lisp. */ 3151 /* This can call Lisp. */
3152 struct frame *f = decode_frame (frame); 3152 struct frame *f = decode_frame (frame);
3153 int pwidth, pheight; 3153 int pwidth, pheight;
3154 int guwidth, guheight; 3154 int guwidth, guheight;
3155 3155
3156 CHECK_INT (height); 3156 CHECK_FIXNUM (height);
3157 get_frame_new_total_pixel_size (f, &pwidth, &pheight); 3157 get_frame_new_total_pixel_size (f, &pwidth, &pheight);
3158 pheight = XINT (height); 3158 pheight = XFIXNUM (height);
3159 frame_conversion_internal (f, SIZE_TOTAL_PIXEL, pwidth, pheight, 3159 frame_conversion_internal (f, SIZE_TOTAL_PIXEL, pwidth, pheight,
3160 SIZE_FRAME_UNIT, &guwidth, &guheight); 3160 SIZE_FRAME_UNIT, &guwidth, &guheight);
3161 internal_set_frame_size (f, guwidth, guheight, !NILP (pretend)); 3161 internal_set_frame_size (f, guwidth, guheight, !NILP (pretend));
3162 return wrap_frame (f); 3162 return wrap_frame (f);
3163 } 3163 }
3172 /* This can call Lisp. */ 3172 /* This can call Lisp. */
3173 struct frame *f = decode_frame (frame); 3173 struct frame *f = decode_frame (frame);
3174 int pwidth, pheight; 3174 int pwidth, pheight;
3175 int guwidth, guheight; 3175 int guwidth, guheight;
3176 3176
3177 CHECK_INT (height); 3177 CHECK_FIXNUM (height);
3178 get_frame_new_displayable_pixel_size (f, &pwidth, &pheight); 3178 get_frame_new_displayable_pixel_size (f, &pwidth, &pheight);
3179 pheight = XINT (height); 3179 pheight = XFIXNUM (height);
3180 frame_conversion_internal (f, SIZE_DISPLAYABLE_PIXEL, pwidth, pheight, 3180 frame_conversion_internal (f, SIZE_DISPLAYABLE_PIXEL, pwidth, pheight,
3181 SIZE_FRAME_UNIT, &guwidth, &guheight); 3181 SIZE_FRAME_UNIT, &guwidth, &guheight);
3182 internal_set_frame_size (f, guwidth, guheight, !NILP (pretend)); 3182 internal_set_frame_size (f, guwidth, guheight, !NILP (pretend));
3183 return wrap_frame (f); 3183 return wrap_frame (f);
3184 } 3184 }
3194 /* This can call Lisp. */ 3194 /* This can call Lisp. */
3195 struct frame *f = decode_frame (frame); 3195 struct frame *f = decode_frame (frame);
3196 int cwidth, cheight; 3196 int cwidth, cheight;
3197 int guwidth, guheight; 3197 int guwidth, guheight;
3198 3198
3199 CHECK_INT (cols); 3199 CHECK_FIXNUM (cols);
3200 get_frame_char_size (f, &cwidth, &cheight); 3200 get_frame_char_size (f, &cwidth, &cheight);
3201 cwidth = XINT (cols); 3201 cwidth = XFIXNUM (cols);
3202 frame_conversion_internal (f, SIZE_CHAR_CELL, cwidth, cheight, 3202 frame_conversion_internal (f, SIZE_CHAR_CELL, cwidth, cheight,
3203 SIZE_FRAME_UNIT, &guwidth, &guheight); 3203 SIZE_FRAME_UNIT, &guwidth, &guheight);
3204 internal_set_frame_size (f, guwidth, guheight, !NILP (pretend)); 3204 internal_set_frame_size (f, guwidth, guheight, !NILP (pretend));
3205 return wrap_frame (f); 3205 return wrap_frame (f);
3206 } 3206 }
3215 /* This can call Lisp. */ 3215 /* This can call Lisp. */
3216 struct frame *f = decode_frame (frame); 3216 struct frame *f = decode_frame (frame);
3217 int pwidth, pheight; 3217 int pwidth, pheight;
3218 int guwidth, guheight; 3218 int guwidth, guheight;
3219 3219
3220 CHECK_INT (width); 3220 CHECK_FIXNUM (width);
3221 get_frame_new_total_pixel_size (f, &pwidth, &pheight); 3221 get_frame_new_total_pixel_size (f, &pwidth, &pheight);
3222 pwidth = XINT (width); 3222 pwidth = XFIXNUM (width);
3223 frame_conversion_internal (f, SIZE_TOTAL_PIXEL, pwidth, pheight, 3223 frame_conversion_internal (f, SIZE_TOTAL_PIXEL, pwidth, pheight,
3224 SIZE_FRAME_UNIT, &guwidth, &guheight); 3224 SIZE_FRAME_UNIT, &guwidth, &guheight);
3225 internal_set_frame_size (f, guwidth, guheight, !NILP (pretend)); 3225 internal_set_frame_size (f, guwidth, guheight, !NILP (pretend));
3226 return wrap_frame (f); 3226 return wrap_frame (f);
3227 } 3227 }
3236 /* This can call Lisp. */ 3236 /* This can call Lisp. */
3237 struct frame *f = decode_frame (frame); 3237 struct frame *f = decode_frame (frame);
3238 int pwidth, pheight; 3238 int pwidth, pheight;
3239 int guwidth, guheight; 3239 int guwidth, guheight;
3240 3240
3241 CHECK_INT (width); 3241 CHECK_FIXNUM (width);
3242 get_frame_new_displayable_pixel_size (f, &pwidth, &pheight); 3242 get_frame_new_displayable_pixel_size (f, &pwidth, &pheight);
3243 pwidth = XINT (width); 3243 pwidth = XFIXNUM (width);
3244 frame_conversion_internal (f, SIZE_DISPLAYABLE_PIXEL, pwidth, pheight, 3244 frame_conversion_internal (f, SIZE_DISPLAYABLE_PIXEL, pwidth, pheight,
3245 SIZE_FRAME_UNIT, &guwidth, &guheight); 3245 SIZE_FRAME_UNIT, &guwidth, &guheight);
3246 internal_set_frame_size (f, guwidth, guheight, !NILP (pretend)); 3246 internal_set_frame_size (f, guwidth, guheight, !NILP (pretend));
3247 return wrap_frame (f); 3247 return wrap_frame (f);
3248 } 3248 }
3256 { 3256 {
3257 /* This can call Lisp. */ 3257 /* This can call Lisp. */
3258 struct frame *f = decode_frame (frame); 3258 struct frame *f = decode_frame (frame);
3259 int guwidth, guheight; 3259 int guwidth, guheight;
3260 3260
3261 CHECK_INT (cols); 3261 CHECK_FIXNUM (cols);
3262 CHECK_INT (rows); 3262 CHECK_FIXNUM (rows);
3263 frame_conversion_internal (f, SIZE_CHAR_CELL, XINT (cols), XINT (rows), 3263 frame_conversion_internal (f, SIZE_CHAR_CELL, XFIXNUM (cols), XFIXNUM (rows),
3264 SIZE_FRAME_UNIT, &guwidth, &guheight); 3264 SIZE_FRAME_UNIT, &guwidth, &guheight);
3265 internal_set_frame_size (f, guwidth, guheight, !NILP (pretend)); 3265 internal_set_frame_size (f, guwidth, guheight, !NILP (pretend));
3266 return wrap_frame (f); 3266 return wrap_frame (f);
3267 } 3267 }
3268 3268
3275 { 3275 {
3276 /* This can call Lisp. */ 3276 /* This can call Lisp. */
3277 struct frame *f = decode_frame (frame); 3277 struct frame *f = decode_frame (frame);
3278 int guwidth, guheight; 3278 int guwidth, guheight;
3279 3279
3280 CHECK_INT (width); 3280 CHECK_FIXNUM (width);
3281 CHECK_INT (height); 3281 CHECK_FIXNUM (height);
3282 frame_conversion_internal (f, SIZE_TOTAL_PIXEL, XINT (width), XINT (height), 3282 frame_conversion_internal (f, SIZE_TOTAL_PIXEL, XFIXNUM (width), XFIXNUM (height),
3283 SIZE_FRAME_UNIT, &guwidth, &guheight); 3283 SIZE_FRAME_UNIT, &guwidth, &guheight);
3284 internal_set_frame_size (f, guwidth, guheight, !NILP (pretend)); 3284 internal_set_frame_size (f, guwidth, guheight, !NILP (pretend));
3285 return wrap_frame (f); 3285 return wrap_frame (f);
3286 } 3286 }
3287 3287
3294 { 3294 {
3295 /* This can call Lisp. */ 3295 /* This can call Lisp. */
3296 struct frame *f = decode_frame (frame); 3296 struct frame *f = decode_frame (frame);
3297 int guwidth, guheight; 3297 int guwidth, guheight;
3298 3298
3299 CHECK_INT (width); 3299 CHECK_FIXNUM (width);
3300 CHECK_INT (height); 3300 CHECK_FIXNUM (height);
3301 frame_conversion_internal (f, SIZE_DISPLAYABLE_PIXEL, 3301 frame_conversion_internal (f, SIZE_DISPLAYABLE_PIXEL,
3302 XINT (width), XINT (height), 3302 XFIXNUM (width), XFIXNUM (height),
3303 SIZE_FRAME_UNIT, &guwidth, &guheight); 3303 SIZE_FRAME_UNIT, &guwidth, &guheight);
3304 internal_set_frame_size (f, guwidth, guheight, !NILP (pretend)); 3304 internal_set_frame_size (f, guwidth, guheight, !NILP (pretend));
3305 return wrap_frame (f); 3305 return wrap_frame (f);
3306 } 3306 }
3307 3307
3312 the rightmost or bottommost possible position (that stays within the screen). 3312 the rightmost or bottommost possible position (that stays within the screen).
3313 */ 3313 */
3314 (frame, xoffset, yoffset)) 3314 (frame, xoffset, yoffset))
3315 { 3315 {
3316 struct frame *f = decode_frame (frame); 3316 struct frame *f = decode_frame (frame);
3317 CHECK_INT (xoffset); 3317 CHECK_FIXNUM (xoffset);
3318 CHECK_INT (yoffset); 3318 CHECK_FIXNUM (yoffset);
3319 3319
3320 MAYBE_FRAMEMETH (f, set_frame_position, (f, XINT (xoffset), XINT (yoffset))); 3320 MAYBE_FRAMEMETH (f, set_frame_position, (f, XFIXNUM (xoffset), XFIXNUM (yoffset)));
3321 3321
3322 return Qt; 3322 return Qt;
3323 } 3323 }
3324 3324
3325 3325
3895 NILP (call1_trapping_problems ("Error in adjust-frame-function", 3895 NILP (call1_trapping_problems ("Error in adjust-frame-function",
3896 Vadjust_frame_function, frame, 3896 Vadjust_frame_function, frame,
3897 0)); 3897 0));
3898 3898
3899 if (keep_char_size) 3899 if (keep_char_size)
3900 Fset_frame_size (frame, make_int (FRAME_CHARWIDTH(f)), 3900 Fset_frame_size (frame, make_fixnum (FRAME_CHARWIDTH(f)),
3901 make_int (FRAME_CHARHEIGHT(f)), Qnil); 3901 make_fixnum (FRAME_CHARHEIGHT(f)), Qnil);
3902 } 3902 }
3903 3903
3904 if (!keep_char_size) 3904 if (!keep_char_size)
3905 { 3905 {
3906 int height, width; 3906 int height, width;