Mercurial > hg > xemacs-beta

comparison src/frame-gtk.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
comparison
equal deleted inserted replaced
5580:a0e81357194e 5581:56144c8593a8
243 { 243 {
244 gint x, y; 244 gint x, y;
245 if (!GET_GTK_WIDGET_WINDOW(shell)) 245 if (!GET_GTK_WIDGET_WINDOW(shell))
246 return Qzero; 246 return Qzero;
247 gdk_window_get_deskrelative_origin (GET_GTK_WIDGET_WINDOW (shell), &x, &y); 247 gdk_window_get_deskrelative_origin (GET_GTK_WIDGET_WINDOW (shell), &x, &y);
248 if (EQ (Qleft, property)) return make_int (x); 248 if (EQ (Qleft, property)) return make_fixnum (x);
249 if (EQ (Qtop, property)) return make_int (y); 249 if (EQ (Qtop, property)) return make_fixnum (y);
250 } 250 }
251 if (EQ (Qshell_widget, property)) 251 if (EQ (Qshell_widget, property))
252 { 252 {
253 return (FRAME_GTK_LISP_WIDGETS (f)[0]); 253 return (FRAME_GTK_LISP_WIDGETS (f)[0]);
254 } 254 }
298 if (!GET_GTK_WIDGET_WINDOW (shell)) 298 if (!GET_GTK_WIDGET_WINDOW (shell))
299 x = y = 0; 299 x = y = 0;
300 else 300 else
301 gdk_window_get_deskrelative_origin (GET_GTK_WIDGET_WINDOW (shell), &x, &y); 301 gdk_window_get_deskrelative_origin (GET_GTK_WIDGET_WINDOW (shell), &x, &y);
302 302
303 props = cons3 (Qtop, make_int (y), props); 303 props = cons3 (Qtop, make_fixnum (y), props);
304 props = cons3 (Qleft, make_int (x), props); 304 props = cons3 (Qleft, make_fixnum (x), props);
305 305
306 return props; 306 return props;
307 } 307 }
308 308
309 309
426 } 426 }
427 continue; 427 continue;
428 } 428 }
429 else if (EQ (prop, Qwidth)) 429 else if (EQ (prop, Qwidth))
430 { 430 {
431 CHECK_INT (val); 431 CHECK_FIXNUM (val);
432 width = XINT (val); 432 width = XFIXNUM (val);
433 width_specified_p = TRUE; 433 width_specified_p = TRUE;
434 continue; 434 continue;
435 } 435 }
436 else if (EQ (prop, Qheight)) 436 else if (EQ (prop, Qheight))
437 { 437 {
438 CHECK_INT (val); 438 CHECK_FIXNUM (val);
439 height = XINT (val); 439 height = XFIXNUM (val);
440 height_specified_p = TRUE; 440 height_specified_p = TRUE;
441 continue; 441 continue;
442 } 442 }
443 /* Further kludge the x/y. */ 443 /* Further kludge the x/y. */
444 else if (EQ (prop, Qx)) 444 else if (EQ (prop, Qx))
445 { 445 {
446 CHECK_INT (val); 446 CHECK_FIXNUM (val);
447 x = (gint) XINT (val); 447 x = (gint) XFIXNUM (val);
448 x_position_specified_p = TRUE; 448 x_position_specified_p = TRUE;
449 continue; 449 continue;
450 } 450 }
451 else if (EQ (prop, Qy)) 451 else if (EQ (prop, Qy))
452 { 452 {
453 CHECK_INT (val); 453 CHECK_FIXNUM (val);
454 y = (gint) XINT (val); 454 y = (gint) XFIXNUM (val);
455 y_position_specified_p = TRUE; 455 y_position_specified_p = TRUE;
456 continue; 456 continue;
457 } 457 }
458 } 458 }
459 } 459 }
489 { 489 {
490 if (size_specified_p) 490 if (size_specified_p)
491 { 491 {
492 Lisp_Object frame = wrap_frame (f); 492 Lisp_Object frame = wrap_frame (f);
493 493
494 Fset_frame_size (frame, make_int (width), make_int (height), Qnil); 494 Fset_frame_size (frame, make_fixnum (width), make_fixnum (height), Qnil);
495 } 495 }
496 if (position_specified_p) 496 if (position_specified_p)
497 { 497 {
498 Lisp_Object frame = wrap_frame (f); 498 Lisp_Object frame = wrap_frame (f);
499 499
500 Fset_frame_position (frame, make_int (x), make_int (y)); 500 Fset_frame_position (frame, make_fixnum (x), make_fixnum (y));
501 } 501 }
502 } 502 }
503 } 503 }
504 } 504 }
505 505