1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-17 17:58:46 +00:00

Drop FRAME_PTR typedef.

* composite.c, font.c, font.h, fontset.c, fontset.h, frame.c, frame.h:
* ftfont.c, ftxfont.c, gtkutil.c, gtkutil.h, image.c, keyboard.c:
* menu.c, menu.h, msdos.c, nsfns.m, nsfont.m, nsmenu.m, nsterm.h:
* nsterm.m, scroll.c, term.c, w32fns.c, w32font.c, w32font.h:
* w32inevt.c, w32inevt.h, w32menu.c, w32notify.c, w32term.c, w32term.h:
* w32uniscribe.c, w32xfns.c, widget.c, window.c, xdisp.c, xfaces.c:
* xfns.c, xfont.c, xftfont.c, xmenu.c, xselect.c, xterm.c:
All related users changed.
This commit is contained in:
Dmitry Antipov 2013-08-03 07:29:03 +04:00
parent 0372256bed
commit a10c82694e
45 changed files with 410 additions and 395 deletions

View File

@ -1,3 +1,15 @@
2013-08-03 Dmitry Antipov <dmantipov@yandex.ru>
Drop FRAME_PTR typedef.
* composite.c, font.c, font.h, fontset.c, fontset.h, frame.c, frame.h:
* ftfont.c, ftxfont.c, gtkutil.c, gtkutil.h, image.c, keyboard.c:
* menu.c, menu.h, msdos.c, nsfns.m, nsfont.m, nsmenu.m, nsterm.h:
* nsterm.m, scroll.c, term.c, w32fns.c, w32font.c, w32font.h:
* w32inevt.c, w32inevt.h, w32menu.c, w32notify.c, w32term.c, w32term.h:
* w32uniscribe.c, w32xfns.c, widget.c, window.c, xdisp.c, xfaces.c:
* xfns.c, xfont.c, xftfont.c, xmenu.c, xselect.c, xterm.c:
All related users changed.
2013-08-02 Stefan Monnier <monnier@iro.umontreal.ca>
* eval.c (default_toplevel_binding): New function.

View File

@ -901,7 +901,7 @@ autocmp_chars (Lisp_Object rule, ptrdiff_t charpos, ptrdiff_t bytepos,
Lisp_Object string)
{
ptrdiff_t count = SPECPDL_INDEX ();
FRAME_PTR f = XFRAME (win->frame);
struct frame *f = XFRAME (win->frame);
Lisp_Object pos = make_number (charpos);
ptrdiff_t to;
ptrdiff_t pt = PT, pt_byte = PT_BYTE;

View File

@ -204,9 +204,9 @@ font_make_object (int size, Lisp_Object entity, int pixelsize)
static int font_pixel_size (FRAME_PTR f, Lisp_Object);
static Lisp_Object font_open_entity (FRAME_PTR, Lisp_Object, int);
static Lisp_Object font_matching_entity (FRAME_PTR, Lisp_Object *,
static int font_pixel_size (struct frame *f, Lisp_Object);
static Lisp_Object font_open_entity (struct frame *, Lisp_Object, int);
static Lisp_Object font_matching_entity (struct frame *, Lisp_Object *,
Lisp_Object);
static unsigned font_encode_char (Lisp_Object, int);
@ -269,7 +269,7 @@ font_intern_prop (const char *str, ptrdiff_t len, bool force_symbol)
/* Return a pixel size of font-spec SPEC on frame F. */
static int
font_pixel_size (FRAME_PTR f, Lisp_Object spec)
font_pixel_size (struct frame *f, Lisp_Object spec)
{
#ifdef HAVE_WINDOW_SYSTEM
Lisp_Object size = AREF (spec, FONT_SIZE_INDEX);
@ -2497,14 +2497,14 @@ font_match_p (Lisp_Object spec, Lisp_Object font)
is a number frames sharing this cache, and FONT-CACHE-DATA is a
cons (FONT-SPEC FONT-ENTITY ...). */
static void font_prepare_cache (FRAME_PTR, struct font_driver *);
static void font_finish_cache (FRAME_PTR, struct font_driver *);
static Lisp_Object font_get_cache (FRAME_PTR, struct font_driver *);
static void font_clear_cache (FRAME_PTR, Lisp_Object,
static void font_prepare_cache (struct frame *, struct font_driver *);
static void font_finish_cache (struct frame *, struct font_driver *);
static Lisp_Object font_get_cache (struct frame *, struct font_driver *);
static void font_clear_cache (struct frame *, Lisp_Object,
struct font_driver *);
static void
font_prepare_cache (FRAME_PTR f, struct font_driver *driver)
font_prepare_cache (struct frame *f, struct font_driver *driver)
{
Lisp_Object cache, val;
@ -2526,7 +2526,7 @@ font_prepare_cache (FRAME_PTR f, struct font_driver *driver)
static void
font_finish_cache (FRAME_PTR f, struct font_driver *driver)
font_finish_cache (struct frame *f, struct font_driver *driver)
{
Lisp_Object cache, val, tmp;
@ -2547,7 +2547,7 @@ font_finish_cache (FRAME_PTR f, struct font_driver *driver)
static Lisp_Object
font_get_cache (FRAME_PTR f, struct font_driver *driver)
font_get_cache (struct frame *f, struct font_driver *driver)
{
Lisp_Object val = driver->get_cache (f);
Lisp_Object type = driver->type;
@ -2562,7 +2562,7 @@ font_get_cache (FRAME_PTR f, struct font_driver *driver)
static void
font_clear_cache (FRAME_PTR f, Lisp_Object cache, struct font_driver *driver)
font_clear_cache (struct frame *f, Lisp_Object cache, struct font_driver *driver)
{
Lisp_Object tail, elt;
Lisp_Object tail2, entity;
@ -2760,7 +2760,7 @@ font_list_entities (struct frame *f, Lisp_Object spec)
font-related attributes. */
static Lisp_Object
font_matching_entity (FRAME_PTR f, Lisp_Object *attrs, Lisp_Object spec)
font_matching_entity (struct frame *f, Lisp_Object *attrs, Lisp_Object spec)
{
struct font_driver_list *driver_list = f->font_driver_list;
Lisp_Object ftype, size, entity;
@ -2806,7 +2806,7 @@ font_matching_entity (FRAME_PTR f, Lisp_Object *attrs, Lisp_Object spec)
opened font object. */
static Lisp_Object
font_open_entity (FRAME_PTR f, Lisp_Object entity, int pixel_size)
font_open_entity (struct frame *f, Lisp_Object entity, int pixel_size)
{
struct font_driver_list *driver_list;
Lisp_Object objlist, size, val, font_object;
@ -2884,7 +2884,7 @@ font_open_entity (FRAME_PTR f, Lisp_Object entity, int pixel_size)
/* Close FONT_OBJECT that is opened on frame F. */
static void
font_close_object (FRAME_PTR f, Lisp_Object font_object)
font_close_object (struct frame *f, Lisp_Object font_object)
{
struct font *font = XFONT_OBJECT (font_object);
@ -2904,7 +2904,7 @@ font_close_object (FRAME_PTR f, Lisp_Object font_object)
FONT is a font-entity and it must be opened to check. */
int
font_has_char (FRAME_PTR f, Lisp_Object font, int c)
font_has_char (struct frame *f, Lisp_Object font, int c)
{
struct font *fontp;
@ -3075,7 +3075,7 @@ font_select_entity (struct frame *f, Lisp_Object entities,
character that the entity must support. */
Lisp_Object
font_find_for_lface (FRAME_PTR f, Lisp_Object *attrs, Lisp_Object spec, int c)
font_find_for_lface (struct frame *f, Lisp_Object *attrs, Lisp_Object spec, int c)
{
Lisp_Object work;
Lisp_Object entities, val;
@ -3222,7 +3222,7 @@ font_find_for_lface (FRAME_PTR f, Lisp_Object *attrs, Lisp_Object spec, int c)
Lisp_Object
font_open_for_lface (FRAME_PTR f, Lisp_Object entity, Lisp_Object *attrs, Lisp_Object spec)
font_open_for_lface (struct frame *f, Lisp_Object entity, Lisp_Object *attrs, Lisp_Object spec)
{
int size;
@ -3269,7 +3269,7 @@ font_open_for_lface (FRAME_PTR f, Lisp_Object entity, Lisp_Object *attrs, Lisp_O
font-object. */
Lisp_Object
font_load_for_lface (FRAME_PTR f, Lisp_Object *attrs, Lisp_Object spec)
font_load_for_lface (struct frame *f, Lisp_Object *attrs, Lisp_Object spec)
{
Lisp_Object entity, name;
@ -3298,7 +3298,7 @@ font_load_for_lface (FRAME_PTR f, Lisp_Object *attrs, Lisp_Object spec)
/* Make FACE on frame F ready to use the font opened for FACE. */
void
font_prepare_for_face (FRAME_PTR f, struct face *face)
font_prepare_for_face (struct frame *f, struct face *face)
{
if (face->font->driver->prepare_face)
face->font->driver->prepare_face (f, face);
@ -3308,7 +3308,7 @@ font_prepare_for_face (FRAME_PTR f, struct face *face)
/* Make FACE on frame F stop using the font opened for FACE. */
void
font_done_for_face (FRAME_PTR f, struct face *face)
font_done_for_face (struct frame *f, struct face *face)
{
if (face->font->driver->done_face)
face->font->driver->done_face (f, face);
@ -3320,7 +3320,7 @@ font_done_for_face (FRAME_PTR f, struct face *face)
font is found, return Qnil. */
Lisp_Object
font_open_by_spec (FRAME_PTR f, Lisp_Object spec)
font_open_by_spec (struct frame *f, Lisp_Object spec)
{
Lisp_Object attrs[LFACE_VECTOR_SIZE];
@ -3344,7 +3344,7 @@ font_open_by_spec (FRAME_PTR f, Lisp_Object spec)
found, return Qnil. */
Lisp_Object
font_open_by_name (FRAME_PTR f, Lisp_Object name)
font_open_by_name (struct frame *f, Lisp_Object name)
{
Lisp_Object args[2];
Lisp_Object spec, ret;
@ -3374,7 +3374,7 @@ font_open_by_name (FRAME_PTR f, Lisp_Object name)
(e.g. syms_of_xfont). */
void
register_font_driver (struct font_driver *driver, FRAME_PTR f)
register_font_driver (struct font_driver *driver, struct frame *f)
{
struct font_driver_list *root = f ? f->font_driver_list : font_driver_list;
struct font_driver_list *prev, *list;
@ -3402,7 +3402,7 @@ register_font_driver (struct font_driver *driver, FRAME_PTR f)
}
void
free_font_driver_list (FRAME_PTR f)
free_font_driver_list (struct frame *f)
{
struct font_driver_list *list, *next;
@ -3424,7 +3424,7 @@ free_font_driver_list (FRAME_PTR f)
F. */
Lisp_Object
font_update_drivers (FRAME_PTR f, Lisp_Object new_drivers)
font_update_drivers (struct frame *f, Lisp_Object new_drivers)
{
Lisp_Object active_drivers = Qnil;
struct font_driver_list *list;
@ -3513,7 +3513,7 @@ font_update_drivers (FRAME_PTR f, Lisp_Object new_drivers)
}
int
font_put_frame_data (FRAME_PTR f, struct font_driver *driver, void *data)
font_put_frame_data (struct frame *f, struct font_driver *driver, void *data)
{
struct font_data_list *list, *prev;
@ -3547,7 +3547,7 @@ font_put_frame_data (FRAME_PTR f, struct font_driver *driver, void *data)
void *
font_get_frame_data (FRAME_PTR f, struct font_driver *driver)
font_get_frame_data (struct frame *f, struct font_driver *driver)
{
struct font_data_list *list;
@ -3621,7 +3621,7 @@ static Lisp_Object
font_at (int c, ptrdiff_t pos, struct face *face, struct window *w,
Lisp_Object string)
{
FRAME_PTR f;
struct frame *f;
bool multibyte;
Lisp_Object font_object;
@ -4234,7 +4234,7 @@ DEFUN ("clear-font-cache", Fclear_font_cache, Sclear_font_cache, 0, 0, 0,
FOR_EACH_FRAME (list, frame)
{
FRAME_PTR f = XFRAME (frame);
struct frame *f = XFRAME (frame);
struct font_driver_list *driver_list = f->font_driver_list;
for (; driver_list; driver_list = driver_list->next)
@ -4782,7 +4782,7 @@ Type C-l to recover what previously shown. */)
(Lisp_Object font_object, Lisp_Object string)
{
Lisp_Object frame = selected_frame;
FRAME_PTR f = XFRAME (frame);
struct frame *f = XFRAME (frame);
struct font *font;
struct face *face;
int i, len, width;

View File

@ -504,7 +504,7 @@ struct font_driver
/* Return a cache of font-entities on frame F. The cache must be a
cons whose cdr part is the actual cache area. */
Lisp_Object (*get_cache) (FRAME_PTR F);
Lisp_Object (*get_cache) (struct frame *f);
/* List fonts exactly matching with FONT_SPEC on FRAME. The value
is a list of font-entities. The font properties to be considered
@ -549,21 +549,21 @@ struct font_driver
/* Open a font specified by FONT_ENTITY on frame F. If the font is
scalable, open it with PIXEL_SIZE. */
Lisp_Object (*open) (FRAME_PTR f, Lisp_Object font_entity,
Lisp_Object (*open) (struct frame *f, Lisp_Object font_entity,
int pixel_size);
/* Close FONT on frame F. */
void (*close) (FRAME_PTR f, struct font *font);
void (*close) (struct frame *f, struct font *font);
/* Optional (if FACE->extra is not used).
Prepare FACE for displaying characters by FONT on frame F by
storing some data in FACE->extra. If successful, return 0.
Otherwise, return -1. */
int (*prepare_face) (FRAME_PTR f, struct face *face);
int (*prepare_face) (struct frame *f, struct face *face);
/* Optional.
Done FACE for displaying characters by FACE->font on frame F. */
void (*done_face) (FRAME_PTR f, struct face *face);
void (*done_face) (struct frame *f, struct face *face);
/* Optional.
If FONT (FONT-ENTITY or FONT-OBJECT) has a glyph for character C
@ -646,12 +646,12 @@ struct font_driver
Make the font driver ready for frame F. Usually this function
makes some data specific to F and stores it in F by calling
font_put_frame_data (). */
int (*start_for_frame) (FRAME_PTR f);
int (*start_for_frame) (struct frame *f);
/* Optional.
End using the driver for frame F. Usually this function free
some data stored for F. */
int (*end_for_frame) (FRAME_PTR f);
int (*end_for_frame) (struct frame *f);
/* Optional.
@ -674,7 +674,7 @@ struct font_driver
If FONT is usable on frame F, return 0. Otherwise return -1.
This method is used only for debugging. If this method is NULL,
Emacs assumes that the font is usable on any frame. */
int (*check) (FRAME_PTR F, struct font *font);
int (*check) (struct frame *f, struct font *font);
/* Optional.
@ -698,8 +698,8 @@ struct font_driver
/* Chain of font drivers. There's one global font driver list
(font_driver_list in font.c). In addition, each frame has its own
font driver list at FRAME_PTR->font_driver_list. */
(font_driver_list in font.c). In addition, each frame has
its own font driver list at F->font_driver_list. */
struct font_driver_list
{
@ -713,8 +713,8 @@ struct font_driver_list
};
/* Chain of arbitrary data specific to each font driver. Each frame
has its own font data list at FRAME_PTR->font_data_list. */
/* Chain of arbitrary data specific to each font driver.
Each frame has its own font data list at F->font_data_list. */
struct font_data_list
{
@ -747,22 +747,22 @@ extern Lisp_Object font_list_entities (struct frame *, Lisp_Object);
extern Lisp_Object font_get_name (Lisp_Object font_object);
extern Lisp_Object font_spec_from_name (Lisp_Object font_name);
extern Lisp_Object font_get_frame (Lisp_Object font_object);
extern int font_has_char (FRAME_PTR, Lisp_Object, int);
extern int font_has_char (struct frame *, Lisp_Object, int);
extern void font_clear_prop (Lisp_Object *attrs,
enum font_property_index prop);
extern Lisp_Object font_find_for_lface (FRAME_PTR f, Lisp_Object *lface,
extern Lisp_Object font_find_for_lface (struct frame *f, Lisp_Object *lface,
Lisp_Object spec, int c);
extern Lisp_Object font_open_for_lface (FRAME_PTR f, Lisp_Object entity,
extern Lisp_Object font_open_for_lface (struct frame *f, Lisp_Object entity,
Lisp_Object *lface,
Lisp_Object spec);
extern Lisp_Object font_load_for_lface (FRAME_PTR f, Lisp_Object *lface,
extern Lisp_Object font_load_for_lface (struct frame *f, Lisp_Object *lface,
Lisp_Object spec);
extern void font_prepare_for_face (FRAME_PTR f, struct face *face);
extern void font_done_for_face (FRAME_PTR f, struct face *face);
extern void font_prepare_for_face (struct frame *f, struct face *face);
extern void font_done_for_face (struct frame *f, struct face *face);
extern Lisp_Object font_open_by_spec (FRAME_PTR f, Lisp_Object spec);
extern Lisp_Object font_open_by_name (FRAME_PTR f, Lisp_Object name);
extern Lisp_Object font_open_by_spec (struct frame *f, Lisp_Object spec);
extern Lisp_Object font_open_by_name (struct frame *f, Lisp_Object name);
extern Lisp_Object font_intern_prop (const char *str, ptrdiff_t len,
bool force_symbol);
@ -777,9 +777,9 @@ extern ptrdiff_t font_unparse_xlfd (Lisp_Object font, int pixel_size,
char *name, int bytes);
extern int font_unparse_fcname (Lisp_Object font, int pixel_size,
char *name, int bytes);
extern void register_font_driver (struct font_driver *driver, FRAME_PTR f);
extern void free_font_driver_list (FRAME_PTR f);
extern Lisp_Object font_update_drivers (FRAME_PTR f, Lisp_Object list);
extern void register_font_driver (struct font_driver *driver, struct frame *f);
extern void free_font_driver_list (struct frame *f);
extern Lisp_Object font_update_drivers (struct frame *f, Lisp_Object list);
extern Lisp_Object font_range (ptrdiff_t, ptrdiff_t, ptrdiff_t *,
struct window *, struct face *,
Lisp_Object);
@ -788,10 +788,10 @@ extern void font_fill_lglyph_metrics (Lisp_Object, Lisp_Object);
extern Lisp_Object font_put_extra (Lisp_Object font, Lisp_Object prop,
Lisp_Object val);
extern int font_put_frame_data (FRAME_PTR f,
extern int font_put_frame_data (struct frame *f,
struct font_driver *driver,
void *data);
extern void *font_get_frame_data (FRAME_PTR f,
extern void *font_get_frame_data (struct frame *f,
struct font_driver *driver);
extern void font_filter_properties (Lisp_Object font,

View File

@ -539,8 +539,9 @@ fontset_find_font (Lisp_Object fontset, int c, struct face *face, int id,
{
Lisp_Object vec, font_group;
int i, charset_matched = 0, found_index;
FRAME_PTR f = (FRAMEP (FONTSET_FRAME (fontset))
? XFRAME (FONTSET_FRAME (fontset)) : XFRAME (selected_frame));
struct frame *f = (FRAMEP (FONTSET_FRAME (fontset))
? XFRAME (FONTSET_FRAME (fontset))
: XFRAME (selected_frame));
Lisp_Object rfont_def;
font_group = fontset_get_font_group (fontset, fallback ? -1 : c);
@ -859,7 +860,7 @@ fontset_ascii (int id)
}
static void
free_realized_fontset (FRAME_PTR f, Lisp_Object fontset)
free_realized_fontset (struct frame *f, Lisp_Object fontset)
{
#if 0
Lisp_Object tail;
@ -877,7 +878,7 @@ free_realized_fontset (FRAME_PTR f, Lisp_Object fontset)
free_realized_face. */
void
free_face_fontset (FRAME_PTR f, struct face *face)
free_face_fontset (struct frame *f, struct face *face)
{
Lisp_Object fontset;
@ -930,7 +931,7 @@ face_suitable_for_char_p (struct face *face, int c)
the macro FACE_FOR_CHAR. */
int
face_for_char (FRAME_PTR f, struct face *face, int c, int pos, Lisp_Object object)
face_for_char (struct frame *f, struct face *face, int c, int pos, Lisp_Object object)
{
Lisp_Object fontset, rfont_def, charset;
int face_id;
@ -1048,7 +1049,7 @@ font_for_char (struct face *face, int c, int pos, Lisp_Object object)
Called from realize_x_face. */
int
make_fontset_for_ascii_face (FRAME_PTR f, int base_fontset_id, struct face *face)
make_fontset_for_ascii_face (struct frame *f, int base_fontset_id, struct face *face)
{
Lisp_Object base_fontset, fontset, frame;
@ -1227,7 +1228,7 @@ If REGEXPP is non-nil, PATTERN is a regular expression. */)
/* Return a list of base fontset names matching PATTERN on frame F. */
Lisp_Object
list_fontsets (FRAME_PTR f, Lisp_Object pattern, int size)
list_fontsets (struct frame *f, Lisp_Object pattern, int size)
{
Lisp_Object frame, regexp, val;
int id;
@ -1284,7 +1285,7 @@ free_realized_fontsets (Lisp_Object base)
for (tail = FONTSET_FACE_ALIST (this); CONSP (tail);
tail = XCDR (tail))
{
FRAME_PTR f = XFRAME (FONTSET_FRAME (this));
struct frame *f = XFRAME (FONTSET_FRAME (this));
int face_id = XINT (XCDR (XCAR (tail)));
struct face *face = FACE_FROM_ID (f, face_id);
@ -1612,7 +1613,7 @@ appended. By default, FONT-SPEC overrides the previous settings. */)
name = FONTSET_NAME (fontset);
FOR_EACH_FRAME (tail, fr)
{
FRAME_PTR f = XFRAME (fr);
struct frame *f = XFRAME (fr);
Lisp_Object font_object;
struct face *face;
@ -2140,7 +2141,7 @@ dump_fontset (Lisp_Object fontset)
frame = FONTSET_FRAME (fontset);
if (FRAMEP (frame))
{
FRAME_PTR f = XFRAME (frame);
struct frame *f = XFRAME (frame);
if (FRAME_LIVE_P (f))
ASET (vec, 1,

View File

@ -28,12 +28,12 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
struct face;
extern void free_face_fontset (FRAME_PTR, struct face *);
extern int face_for_char (FRAME_PTR, struct face *, int,
extern void free_face_fontset (struct frame *, struct face *);
extern int face_for_char (struct frame *, struct face *, int,
int, Lisp_Object);
extern Lisp_Object font_for_char (struct face *, int, int, Lisp_Object);
extern int make_fontset_for_ascii_face (FRAME_PTR, int, struct face *);
extern int make_fontset_for_ascii_face (struct frame *, int, struct face *);
extern int fontset_from_font (Lisp_Object);
extern int fs_query_fontset (Lisp_Object, int);
extern Lisp_Object list_fontsets (struct frame *, Lisp_Object, int);

View File

@ -1093,7 +1093,7 @@ Otherwise, include all frames. */)
(Exception: if F is the terminal frame, and we are using X, return 1.) */
static int
other_visible_frames (FRAME_PTR f)
other_visible_frames (struct frame *f)
{
Lisp_Object frames, this;
@ -1467,7 +1467,7 @@ passing the normal return value to that function as an argument,
and returns whatever that function returns. */)
(void)
{
FRAME_PTR f;
struct frame *f;
Lisp_Object lispy_dummy;
Lisp_Object x, y, retval;
struct gcpro gcpro1;
@ -1513,7 +1513,7 @@ to read the mouse position, it returns the selected frame for FRAME
and nil for X and Y. */)
(void)
{
FRAME_PTR f;
struct frame *f;
Lisp_Object lispy_dummy;
Lisp_Object x, y;
@ -2610,7 +2610,7 @@ x_fullscreen_adjust (struct frame *f, int *width, int *height, int *top_pos, int
to store the new value in the parameter alist. */
void
x_set_frame_parameters (FRAME_PTR f, Lisp_Object alist)
x_set_frame_parameters (struct frame *f, Lisp_Object alist)
{
Lisp_Object tail;
@ -3348,7 +3348,7 @@ x_set_scroll_bar_width (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
/* Return non-nil if frame F wants a bitmap icon. */
Lisp_Object
x_icon_type (FRAME_PTR f)
x_icon_type (struct frame *f)
{
Lisp_Object tem;

View File

@ -591,8 +591,6 @@ default_pixels_per_inch_y (void)
/* Return a pointer to the image cache of frame F. */
#define FRAME_IMAGE_CACHE(F) ((F)->terminal->image_cache)
typedef struct frame *FRAME_PTR;
#define XFRAME(p) \
(eassert (FRAMEP (p)), (struct frame *) XUNTAG (p, Lisp_Vectorlike))
#define XSETFRAME(a, b) (XSETPSEUDOVECTOR (a, b, PVEC_FRAME))
@ -1206,7 +1204,7 @@ extern Lisp_Object Qrun_hook_with_args;
extern void x_set_scroll_bar_default_width (struct frame *);
extern void x_set_offset (struct frame *, int, int, int);
extern void x_wm_set_size_hint (FRAME_PTR f, long flags, bool user_position);
extern void x_wm_set_size_hint (struct frame *f, long flags, bool user_position);
extern Lisp_Object x_new_font (struct frame *, Lisp_Object, int);

View File

@ -493,12 +493,12 @@ ftfont_get_otf (struct ftfont_info *ftfont_info)
}
#endif /* HAVE_LIBOTF */
static Lisp_Object ftfont_get_cache (FRAME_PTR);
static Lisp_Object ftfont_get_cache (struct frame *);
static Lisp_Object ftfont_list (struct frame *, Lisp_Object);
static Lisp_Object ftfont_match (struct frame *, Lisp_Object);
static Lisp_Object ftfont_list_family (struct frame *);
static Lisp_Object ftfont_open (FRAME_PTR, Lisp_Object, int);
static void ftfont_close (FRAME_PTR, struct font *);
static Lisp_Object ftfont_open (struct frame *, Lisp_Object, int);
static void ftfont_close (struct frame *, struct font *);
static int ftfont_has_char (Lisp_Object, int);
static unsigned ftfont_encode_char (struct font *, int);
static int ftfont_text_extents (struct font *, unsigned *, int,
@ -568,7 +568,7 @@ struct font_driver ftfont_driver =
};
static Lisp_Object
ftfont_get_cache (FRAME_PTR f)
ftfont_get_cache (struct frame *f)
{
return freetype_font_cache;
}
@ -1173,7 +1173,7 @@ ftfont_list_family (struct frame *f)
static Lisp_Object
ftfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size)
ftfont_open (struct frame *f, Lisp_Object entity, int pixel_size)
{
struct ftfont_info *ftfont_info;
struct font *font;
@ -1317,7 +1317,7 @@ ftfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size)
}
static void
ftfont_close (FRAME_PTR f, struct font *font)
ftfont_close (struct frame *f, struct font *font)
{
struct ftfont_info *ftfont_info = (struct ftfont_info *) font;
Lisp_Object val, cache;

View File

@ -57,7 +57,7 @@ struct ftxfont_frame_data
/* Return an array of 6 GCs for antialiasing. */
static GC *
ftxfont_get_gcs (FRAME_PTR f, long unsigned int foreground, long unsigned int background)
ftxfont_get_gcs (struct frame *f, long unsigned int foreground, long unsigned int background)
{
XColor color;
XGCValues xgcv;
@ -134,7 +134,7 @@ ftxfont_get_gcs (FRAME_PTR f, long unsigned int foreground, long unsigned int ba
}
static int
ftxfont_draw_bitmap (FRAME_PTR f, GC gc_fore, GC *gcs, struct font *font,
ftxfont_draw_bitmap (struct frame *f, GC gc_fore, GC *gcs, struct font *font,
unsigned int code, int x, int y, XPoint *p, int size,
int *n, bool flush)
{
@ -212,7 +212,7 @@ ftxfont_draw_bitmap (FRAME_PTR f, GC gc_fore, GC *gcs, struct font *font,
}
static void
ftxfont_draw_background (FRAME_PTR f, struct font *font, GC gc, int x, int y,
ftxfont_draw_background (struct frame *f, struct font *font, GC gc, int x, int y,
int width)
{
XGCValues xgcv;
@ -246,7 +246,7 @@ ftxfont_match (struct frame *f, Lisp_Object spec)
}
static Lisp_Object
ftxfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size)
ftxfont_open (struct frame *f, Lisp_Object entity, int pixel_size)
{
Lisp_Object font_object;
struct font *font;
@ -260,7 +260,7 @@ ftxfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size)
}
static void
ftxfont_close (FRAME_PTR f, struct font *font)
ftxfont_close (struct frame *f, struct font *font)
{
ftfont_driver.close (f, font);
}
@ -269,7 +269,7 @@ static int
ftxfont_draw (struct glyph_string *s, int from, int to, int x, int y,
bool with_background)
{
FRAME_PTR f = s->f;
struct frame *f = s->f;
struct face *face = s->face;
struct font *font = s->font;
XPoint p[0x700];
@ -338,7 +338,7 @@ ftxfont_draw (struct glyph_string *s, int from, int to, int x, int y,
}
static int
ftxfont_end_for_frame (FRAME_PTR f)
ftxfont_end_for_frame (struct frame *f)
{
struct ftxfont_frame_data *data = font_get_frame_data (f, &ftxfont_driver);

View File

@ -136,7 +136,7 @@ static GdkDisplay *gdpy_def;
W can be a GtkMenu or a GtkWindow widget. */
static void
xg_set_screen (GtkWidget *w, FRAME_PTR f)
xg_set_screen (GtkWidget *w, struct frame *f)
{
if (FRAME_X_DISPLAY (f) != DEFAULT_GDK_DISPLAY ())
{
@ -280,7 +280,7 @@ xg_create_default_cursor (Display *dpy)
}
static GdkPixbuf *
xg_get_pixbuf_from_pixmap (FRAME_PTR f, Pixmap pix)
xg_get_pixbuf_from_pixmap (struct frame *f, Pixmap pix)
{
int iunused;
GdkPixbuf *tmp_buf;
@ -311,7 +311,7 @@ xg_get_pixbuf_from_pixmap (FRAME_PTR f, Pixmap pix)
/* Apply GMASK to GPIX and return a GdkPixbuf with an alpha channel. */
static GdkPixbuf *
xg_get_pixbuf_from_pix_and_mask (FRAME_PTR f,
xg_get_pixbuf_from_pix_and_mask (struct frame *f,
Pixmap pix,
Pixmap mask)
{
@ -387,7 +387,7 @@ file_for_image (Lisp_Object image)
If OLD_WIDGET is not NULL, that widget is modified. */
static GtkWidget *
xg_get_image_for_pixmap (FRAME_PTR f,
xg_get_image_for_pixmap (struct frame *f,
struct image *img,
GtkWidget *widget,
GtkImage *old_widget)
@ -641,7 +641,7 @@ hierarchy_ch_cb (GtkWidget *widget,
GtkWidget *previous_toplevel,
gpointer user_data)
{
FRAME_PTR f = (FRAME_PTR) user_data;
struct frame *f = (struct frame *) user_data;
struct x_output *x = f->output_data.x;
GtkWidget *top = gtk_widget_get_toplevel (x->ttip_lbl);
@ -663,7 +663,7 @@ qttip_cb (GtkWidget *widget,
GtkTooltip *tooltip,
gpointer user_data)
{
FRAME_PTR f = (FRAME_PTR) user_data;
struct frame *f = (struct frame *) user_data;
struct x_output *x = f->output_data.x;
if (x->ttip_widget == NULL)
{
@ -707,7 +707,7 @@ qttip_cb (GtkWidget *widget,
Return true if a system tooltip is available. */
bool
xg_prepare_tooltip (FRAME_PTR f,
xg_prepare_tooltip (struct frame *f,
Lisp_Object string,
int *width,
int *height)
@ -764,7 +764,7 @@ xg_prepare_tooltip (FRAME_PTR f,
xg_prepare_tooltip must have been called before this function. */
void
xg_show_tooltip (FRAME_PTR f, int root_x, int root_y)
xg_show_tooltip (struct frame *f, int root_x, int root_y)
{
#ifdef USE_GTK_TOOLTIP
struct x_output *x = f->output_data.x;
@ -783,7 +783,7 @@ xg_show_tooltip (FRAME_PTR f, int root_x, int root_y)
system tooltips). */
bool
xg_hide_tooltip (FRAME_PTR f)
xg_hide_tooltip (struct frame *f)
{
bool ret = 0;
#ifdef USE_GTK_TOOLTIP
@ -827,7 +827,7 @@ my_log_handler (const gchar *log_domain, GLogLevelFlags log_level,
F is the frame we shall set geometry for. */
static void
xg_set_geometry (FRAME_PTR f)
xg_set_geometry (struct frame *f)
{
if (f->size_hint_flags & (USPosition | PPosition))
{
@ -865,7 +865,7 @@ xg_set_geometry (FRAME_PTR f)
and use a GtkFixed widget, this doesn't happen automatically. */
static void
xg_clear_under_internal_border (FRAME_PTR f)
xg_clear_under_internal_border (struct frame *f)
{
if (FRAME_INTERNAL_BORDER_WIDTH (f) > 0)
{
@ -903,7 +903,7 @@ xg_clear_under_internal_border (FRAME_PTR f)
PIXELWIDTH, PIXELHEIGHT is the new size in pixels. */
void
xg_frame_resized (FRAME_PTR f, int pixelwidth, int pixelheight)
xg_frame_resized (struct frame *f, int pixelwidth, int pixelheight)
{
int rows, columns;
@ -939,7 +939,7 @@ xg_frame_resized (FRAME_PTR f, int pixelwidth, int pixelheight)
COLUMNS/ROWS is the size the edit area shall have after the resize. */
void
xg_frame_set_char_size (FRAME_PTR f, int cols, int rows)
xg_frame_set_char_size (struct frame *f, int cols, int rows)
{
int pixelheight = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, rows)
+ FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f);
@ -1002,7 +1002,7 @@ xg_frame_set_char_size (FRAME_PTR f, int cols, int rows)
The policy is to keep the number of editable lines. */
static void
xg_height_or_width_changed (FRAME_PTR f)
xg_height_or_width_changed (struct frame *f)
{
gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
FRAME_TOTAL_PIXEL_WIDTH (f),
@ -1042,7 +1042,7 @@ xg_win_to_widget (Display *dpy, Window wdesc)
/* Set the background of widget W to PIXEL. */
static void
xg_set_widget_bg (FRAME_PTR f, GtkWidget *w, long unsigned int pixel)
xg_set_widget_bg (struct frame *f, GtkWidget *w, long unsigned int pixel)
{
#ifdef HAVE_GTK3
GdkRGBA bg;
@ -1093,7 +1093,7 @@ style_changed_cb (GObject *go,
Lisp_Object rest, frame;
FOR_EACH_FRAME (rest, frame)
{
FRAME_PTR f = XFRAME (frame);
struct frame *f = XFRAME (frame);
if (FRAME_LIVE_P (f)
&& FRAME_X_P (f)
&& FRAME_X_DISPLAY (f) == dpy)
@ -1115,7 +1115,7 @@ delete_cb (GtkWidget *widget,
#ifdef HAVE_GTK3
/* The event doesn't arrive in the normal event loop. Send event
here. */
FRAME_PTR f = (FRAME_PTR) user_data;
struct frame *f = (struct frame *) user_data;
struct input_event ie;
EVENT_INIT (ie);
@ -1131,7 +1131,7 @@ delete_cb (GtkWidget *widget,
Return true if creation succeeded. */
bool
xg_create_frame_widgets (FRAME_PTR f)
xg_create_frame_widgets (struct frame *f)
{
GtkWidget *wtop;
GtkWidget *wvbox, *whbox;
@ -1300,7 +1300,7 @@ xg_create_frame_widgets (FRAME_PTR f)
}
void
xg_free_frame_widgets (FRAME_PTR f)
xg_free_frame_widgets (struct frame *f)
{
if (FRAME_GTK_OUTER_WIDGET (f))
{
@ -1332,7 +1332,7 @@ xg_free_frame_widgets (FRAME_PTR f)
flag (this is useful when FLAGS is 0). */
void
x_wm_set_size_hint (FRAME_PTR f, long int flags, bool user_position)
x_wm_set_size_hint (struct frame *f, long int flags, bool user_position)
{
/* Must use GTK routines here, otherwise GTK resets the size hints
to its own defaults. */
@ -1432,7 +1432,7 @@ x_wm_set_size_hint (FRAME_PTR f, long int flags, bool user_position)
BG is the pixel value to change to. */
void
xg_set_background_color (FRAME_PTR f, long unsigned int bg)
xg_set_background_color (struct frame *f, long unsigned int bg)
{
if (FRAME_GTK_WIDGET (f))
{
@ -1447,7 +1447,7 @@ xg_set_background_color (FRAME_PTR f, long unsigned int bg)
functions so GTK does not overwrite the icon. */
void
xg_set_frame_icon (FRAME_PTR f, Pixmap icon_pixmap, Pixmap icon_mask)
xg_set_frame_icon (struct frame *f, Pixmap icon_pixmap, Pixmap icon_mask)
{
GdkPixbuf *gp = xg_get_pixbuf_from_pix_and_mask (f,
icon_pixmap,
@ -1693,7 +1693,7 @@ xg_maybe_add_timer (gpointer data)
The dialog W is not destroyed when this function returns. */
static int
xg_dialog_run (FRAME_PTR f, GtkWidget *w)
xg_dialog_run (struct frame *f, GtkWidget *w)
{
ptrdiff_t count = SPECPDL_INDEX ();
struct xg_dialog_data dd;
@ -1813,7 +1813,7 @@ xg_toggle_notify_cb (GObject *gobject, GParamSpec *arg1, gpointer user_data)
Returns the created widget. */
static GtkWidget *
xg_get_file_with_chooser (FRAME_PTR f,
xg_get_file_with_chooser (struct frame *f,
char *prompt,
char *default_filename,
bool mustmatch_p, bool only_dir_p,
@ -1935,7 +1935,7 @@ xg_get_file_name_from_selector (GtkWidget *w)
Returns the created widget. */
static GtkWidget *
xg_get_file_with_selection (FRAME_PTR f,
xg_get_file_with_selection (struct frame *f,
char *prompt,
char *default_filename,
bool mustmatch_p, bool only_dir_p,
@ -1977,7 +1977,7 @@ xg_get_file_with_selection (FRAME_PTR f,
The returned string must be freed by the caller. */
char *
xg_get_file_name (FRAME_PTR f,
xg_get_file_name (struct frame *f,
char *prompt,
char *default_filename,
bool mustmatch_p,
@ -2051,7 +2051,7 @@ extern Lisp_Object Qxft;
DEFAULT_NAME, if non-zero, is the default font name. */
Lisp_Object
xg_get_font (FRAME_PTR f, const char *default_name)
xg_get_font (struct frame *f, const char *default_name)
{
GtkWidget *w;
int done = 0;
@ -2169,7 +2169,7 @@ static xg_list_node xg_menu_item_cb_list;
allocated xg_menu_cb_data if CL_DATA is NULL. */
static xg_menu_cb_data *
make_cl_data (xg_menu_cb_data *cl_data, FRAME_PTR f, GCallback highlight_cb)
make_cl_data (xg_menu_cb_data *cl_data, struct frame *f, GCallback highlight_cb)
{
if (! cl_data)
{
@ -2201,7 +2201,7 @@ make_cl_data (xg_menu_cb_data *cl_data, FRAME_PTR f, GCallback highlight_cb)
static void
update_cl_data (xg_menu_cb_data *cl_data,
FRAME_PTR f,
struct frame *f,
GCallback highlight_cb)
{
if (cl_data)
@ -2251,7 +2251,7 @@ xg_mark_data (void)
FOR_EACH_FRAME (rest, frame)
{
FRAME_PTR f = XFRAME (frame);
struct frame *f = XFRAME (frame);
if (FRAME_X_P (f) && FRAME_GTK_OUTER_WIDGET (f))
{
@ -2480,7 +2480,7 @@ xg_have_tear_offs (void)
static GtkWidget *
xg_create_one_menuitem (widget_value *item,
FRAME_PTR f,
struct frame *f,
GCallback select_cb,
GCallback highlight_cb,
xg_menu_cb_data *cl_data,
@ -2551,7 +2551,7 @@ xg_create_one_menuitem (widget_value *item,
static GtkWidget *
create_menus (widget_value *data,
FRAME_PTR f,
struct frame *f,
GCallback select_cb,
GCallback deactivate_cb,
GCallback highlight_cb,
@ -2694,9 +2694,9 @@ create_menus (widget_value *data,
Returns the widget created. */
GtkWidget *
xg_create_widget (const char *type, const char *name, FRAME_PTR f, widget_value *val,
GCallback select_cb, GCallback deactivate_cb,
GCallback highlight_cb)
xg_create_widget (const char *type, const char *name, struct frame *f,
widget_value *val, GCallback select_cb,
GCallback deactivate_cb, GCallback highlight_cb)
{
GtkWidget *w = 0;
bool menu_bar_p = strcmp (type, "menubar") == 0;
@ -2802,7 +2802,7 @@ xg_destroy_widgets (GList *list)
static void
xg_update_menubar (GtkWidget *menubar,
FRAME_PTR f,
struct frame *f,
GList **list,
GList *iter,
int pos,
@ -3119,7 +3119,7 @@ xg_update_radio_item (widget_value *val, GtkWidget *w)
static GtkWidget *
xg_update_submenu (GtkWidget *submenu,
FRAME_PTR f,
struct frame *f,
widget_value *val,
GCallback select_cb,
GCallback deactivate_cb,
@ -3261,8 +3261,8 @@ xg_update_submenu (GtkWidget *submenu,
HIGHLIGHT_CB is the callback to call when entering/leaving menu items. */
void
xg_modify_menubar_widgets (GtkWidget *menubar, FRAME_PTR f, widget_value *val,
bool deep_p,
xg_modify_menubar_widgets (GtkWidget *menubar, struct frame *f,
widget_value *val, bool deep_p,
GCallback select_cb, GCallback deactivate_cb,
GCallback highlight_cb)
{
@ -3336,7 +3336,7 @@ static void
menubar_map_cb (GtkWidget *w, gpointer user_data)
{
GtkRequisition req;
FRAME_PTR f = (FRAME_PTR) user_data;
struct frame *f = (struct frame *) user_data;
gtk_widget_get_preferred_size (w, NULL, &req);
if (FRAME_MENUBAR_HEIGHT (f) != req.height)
{
@ -3349,7 +3349,7 @@ menubar_map_cb (GtkWidget *w, gpointer user_data)
changed. */
void
xg_update_frame_menubar (FRAME_PTR f)
xg_update_frame_menubar (struct frame *f)
{
struct x_output *x = f->output_data.x;
GtkRequisition req;
@ -3387,7 +3387,7 @@ xg_update_frame_menubar (FRAME_PTR f)
This is used when deleting a frame, and when turning off the menu bar. */
void
free_frame_menubar (FRAME_PTR f)
free_frame_menubar (struct frame *f)
{
struct x_output *x = f->output_data.x;
@ -3406,7 +3406,7 @@ free_frame_menubar (FRAME_PTR f)
}
bool
xg_event_is_for_menubar (FRAME_PTR f, XEvent *event)
xg_event_is_for_menubar (struct frame *f, XEvent *event)
{
struct x_output *x = f->output_data.x;
GList *iter;
@ -3619,7 +3619,7 @@ xg_gtk_scroll_destroy (GtkWidget *widget, gpointer data)
to set resources for the widget. */
void
xg_create_scroll_bar (FRAME_PTR f,
xg_create_scroll_bar (struct frame *f,
struct scroll_bar *bar,
GCallback scroll_callback,
GCallback end_callback,
@ -3681,7 +3681,7 @@ xg_create_scroll_bar (FRAME_PTR f,
/* Remove the scroll bar represented by SCROLLBAR_ID from the frame F. */
void
xg_remove_scroll_bar (FRAME_PTR f, ptrdiff_t scrollbar_id)
xg_remove_scroll_bar (struct frame *f, ptrdiff_t scrollbar_id)
{
GtkWidget *w = xg_get_widget_from_map (scrollbar_id);
if (w)
@ -3699,7 +3699,7 @@ xg_remove_scroll_bar (FRAME_PTR f, ptrdiff_t scrollbar_id)
WIDTH, HEIGHT is the size in pixels the bar shall have. */
void
xg_update_scrollbar_pos (FRAME_PTR f,
xg_update_scrollbar_pos (struct frame *f,
ptrdiff_t scrollbar_id,
int top,
int left,
@ -3781,7 +3781,7 @@ xg_set_toolkit_scroll_bar_thumb (struct scroll_bar *bar,
{
GtkWidget *wscroll = xg_get_widget_from_map (bar->x_window);
FRAME_PTR f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window)));
struct frame *f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window)));
if (wscroll && NILP (bar->dragging))
{
@ -3861,7 +3861,7 @@ xg_set_toolkit_scroll_bar_thumb (struct scroll_bar *bar,
frame. This function does additional checks. */
bool
xg_event_is_for_scrollbar (FRAME_PTR f, XEvent *event)
xg_event_is_for_scrollbar (struct frame *f, XEvent *event)
{
bool retval = 0;
@ -3946,7 +3946,8 @@ xg_tool_bar_callback (GtkWidget *w, gpointer client_data)
gpointer gmod = g_object_get_data (G_OBJECT (w), XG_TOOL_BAR_LAST_MODIFIER);
intptr_t mod = (intptr_t) gmod;
FRAME_PTR f = (FRAME_PTR) g_object_get_data (G_OBJECT (w), XG_FRAME_DATA);
struct frame *f = (struct frame *) g_object_get_data (G_OBJECT (w),
XG_FRAME_DATA);
Lisp_Object key, frame;
struct input_event event;
EVENT_INIT (event);
@ -4149,7 +4150,7 @@ xg_tool_bar_detach_callback (GtkHandleBox *wbox,
GtkWidget *w,
gpointer client_data)
{
FRAME_PTR f = (FRAME_PTR) client_data;
struct frame *f = (struct frame *) client_data;
g_object_set (G_OBJECT (w), "show-arrow", !x_gtk_whole_detached_tool_bar,
NULL);
@ -4186,7 +4187,7 @@ xg_tool_bar_attach_callback (GtkHandleBox *wbox,
GtkWidget *w,
gpointer client_data)
{
FRAME_PTR f = (FRAME_PTR) client_data;
struct frame *f = (struct frame *) client_data;
g_object_set (G_OBJECT (w), "show-arrow", TRUE, NULL);
if (f)
@ -4224,7 +4225,8 @@ xg_tool_bar_help_callback (GtkWidget *w,
gpointer client_data)
{
intptr_t idx = (intptr_t) client_data;
FRAME_PTR f = (FRAME_PTR) g_object_get_data (G_OBJECT (w), XG_FRAME_DATA);
struct frame *f = (struct frame *) g_object_get_data (G_OBJECT (w),
XG_FRAME_DATA);
Lisp_Object help, frame;
if (! f || ! f->n_tool_bar_items || NILP (f->tool_bar_items))
@ -4297,7 +4299,7 @@ xg_tool_bar_item_expose_callback (GtkWidget *w,
/* Attach a tool bar to frame F. */
static void
xg_pack_tool_bar (FRAME_PTR f, Lisp_Object pos)
xg_pack_tool_bar (struct frame *f, Lisp_Object pos)
{
struct x_output *x = f->output_data.x;
bool into_hbox = EQ (pos, Qleft) || EQ (pos, Qright);
@ -4354,7 +4356,7 @@ xg_pack_tool_bar (FRAME_PTR f, Lisp_Object pos)
x->toolbar_is_packed = true;
}
static bool xg_update_tool_bar_sizes (FRAME_PTR f);
static bool xg_update_tool_bar_sizes (struct frame *f);
static void
tb_size_cb (GtkWidget *widget,
@ -4364,7 +4366,7 @@ tb_size_cb (GtkWidget *widget,
/* When tool bar is created it has one preferred size. But when size is
allocated between widgets, it may get another. So we must update
size hints if tool bar size changes. Seen on Fedora 18 at least. */
FRAME_PTR f = (FRAME_PTR) user_data;
struct frame *f = (struct frame *) user_data;
if (xg_update_tool_bar_sizes (f))
x_wm_set_size_hint (f, 0, 0);
}
@ -4372,7 +4374,7 @@ tb_size_cb (GtkWidget *widget,
/* Create a tool bar for frame F. */
static void
xg_create_tool_bar (FRAME_PTR f)
xg_create_tool_bar (struct frame *f)
{
struct x_output *x = f->output_data.x;
#if GTK_CHECK_VERSION (3, 3, 6)
@ -4415,7 +4417,7 @@ xg_create_tool_bar (FRAME_PTR f)
Returns IMAGE if RTL is not found. */
static Lisp_Object
find_rtl_image (FRAME_PTR f, Lisp_Object image, Lisp_Object rtl)
find_rtl_image (struct frame *f, Lisp_Object image, Lisp_Object rtl)
{
int i;
Lisp_Object file, rtl_name;
@ -4443,7 +4445,7 @@ find_rtl_image (FRAME_PTR f, Lisp_Object image, Lisp_Object rtl)
}
static GtkToolItem *
xg_make_tool_item (FRAME_PTR f,
xg_make_tool_item (struct frame *f,
GtkWidget *wimage,
GtkWidget **wbutton,
const char *label,
@ -4606,7 +4608,7 @@ xg_tool_item_stale_p (GtkWidget *wbutton, const char *stock_name,
}
static bool
xg_update_tool_bar_sizes (FRAME_PTR f)
xg_update_tool_bar_sizes (struct frame *f)
{
struct x_output *x = f->output_data.x;
GtkRequisition req;
@ -4654,7 +4656,7 @@ xg_update_tool_bar_sizes (FRAME_PTR f)
/* Update the tool bar for frame F. Add new buttons and remove old. */
void
update_frame_tool_bar (FRAME_PTR f)
update_frame_tool_bar (struct frame *f)
{
int i, j;
struct x_output *x = f->output_data.x;
@ -4929,7 +4931,7 @@ update_frame_tool_bar (FRAME_PTR f)
Remove the tool bar. */
void
free_frame_tool_bar (FRAME_PTR f)
free_frame_tool_bar (struct frame *f)
{
struct x_output *x = f->output_data.x;
@ -4976,7 +4978,7 @@ free_frame_tool_bar (FRAME_PTR f)
}
void
xg_change_toolbar_position (FRAME_PTR f, Lisp_Object pos)
xg_change_toolbar_position (struct frame *f, Lisp_Object pos)
{
struct x_output *x = f->output_data.x;
GtkWidget *top_widget = TOOLBAR_TOP_WIDGET (x);

View File

@ -55,7 +55,7 @@ typedef struct xg_menu_cb_data_
{
xg_list_node ptrs;
FRAME_PTR f;
struct frame *f;
Lisp_Object menu_bar_vector;
int menu_bar_items_used;
GCallback highlight_cb;
@ -81,46 +81,46 @@ extern void free_widget_value (struct _widget_value *);
extern bool xg_uses_old_file_dialog (void) ATTRIBUTE_CONST;
extern char *xg_get_file_name (FRAME_PTR f,
extern char *xg_get_file_name (struct frame *f,
char *prompt,
char *default_filename,
bool mustmatch_p,
bool only_dir_p);
extern Lisp_Object xg_get_font (FRAME_PTR f, const char *);
extern Lisp_Object xg_get_font (struct frame *f, const char *);
extern GtkWidget *xg_create_widget (const char *type,
const char *name,
FRAME_PTR f,
struct frame *f,
struct _widget_value *val,
GCallback select_cb,
GCallback deactivate_cb,
GCallback highlight_cb);
extern void xg_modify_menubar_widgets (GtkWidget *menubar,
FRAME_PTR f,
struct frame *f,
struct _widget_value *val,
bool deep_p,
GCallback select_cb,
GCallback deactivate_cb,
GCallback highlight_cb);
extern void xg_update_frame_menubar (FRAME_PTR f);
extern void xg_update_frame_menubar (struct frame *f);
extern bool xg_event_is_for_menubar (FRAME_PTR f, XEvent *event);
extern bool xg_event_is_for_menubar (struct frame *f, XEvent *event);
extern bool xg_have_tear_offs (void);
extern ptrdiff_t xg_get_scroll_id_for_window (Display *dpy, Window wid);
extern void xg_create_scroll_bar (FRAME_PTR f,
extern void xg_create_scroll_bar (struct frame *f,
struct scroll_bar *bar,
GCallback scroll_callback,
GCallback end_callback,
const char *scroll_bar_name);
extern void xg_remove_scroll_bar (FRAME_PTR f, ptrdiff_t scrollbar_id);
extern void xg_remove_scroll_bar (struct frame *f, ptrdiff_t scrollbar_id);
extern void xg_update_scrollbar_pos (FRAME_PTR f,
extern void xg_update_scrollbar_pos (struct frame *f,
ptrdiff_t scrollbar_id,
int top,
int left,
@ -131,40 +131,40 @@ extern void xg_set_toolkit_scroll_bar_thumb (struct scroll_bar *bar,
int portion,
int position,
int whole);
extern bool xg_event_is_for_scrollbar (FRAME_PTR f, XEvent *event);
extern bool xg_event_is_for_scrollbar (struct frame *f, XEvent *event);
extern int xg_get_default_scrollbar_width (void);
extern void update_frame_tool_bar (FRAME_PTR f);
extern void free_frame_tool_bar (FRAME_PTR f);
extern void xg_change_toolbar_position (FRAME_PTR f, Lisp_Object pos);
extern void update_frame_tool_bar (struct frame *f);
extern void free_frame_tool_bar (struct frame *f);
extern void xg_change_toolbar_position (struct frame *f, Lisp_Object pos);
extern void xg_frame_resized (FRAME_PTR f,
extern void xg_frame_resized (struct frame *f,
int pixelwidth,
int pixelheight);
extern void xg_frame_set_char_size (FRAME_PTR f, int cols, int rows);
extern void xg_frame_set_char_size (struct frame *f, int cols, int rows);
extern GtkWidget * xg_win_to_widget (Display *dpy, Window wdesc);
extern void xg_display_open (char *display_name, Display **dpy);
extern void xg_display_close (Display *dpy);
extern GdkCursor * xg_create_default_cursor (Display *dpy);
extern bool xg_create_frame_widgets (FRAME_PTR f);
extern void xg_free_frame_widgets (FRAME_PTR f);
extern void xg_set_background_color (FRAME_PTR f, unsigned long bg);
extern bool xg_create_frame_widgets (struct frame *f);
extern void xg_free_frame_widgets (struct frame *f);
extern void xg_set_background_color (struct frame *f, unsigned long bg);
extern bool xg_check_special_colors (struct frame *f,
const char *color_name,
XColor *color);
extern void xg_set_frame_icon (FRAME_PTR f,
extern void xg_set_frame_icon (struct frame *f,
Pixmap icon_pixmap,
Pixmap icon_mask);
extern bool xg_prepare_tooltip (FRAME_PTR f,
extern bool xg_prepare_tooltip (struct frame *f,
Lisp_Object string,
int *width,
int *height);
extern void xg_show_tooltip (FRAME_PTR f, int root_x, int root_y);
extern bool xg_hide_tooltip (FRAME_PTR f);
extern void xg_show_tooltip (struct frame *f, int root_x, int root_y);
extern bool xg_hide_tooltip (struct frame *f);
/* Mark all callback data that are Lisp_object:s during GC. */

View File

@ -164,20 +164,20 @@ XPutPixel (XImagePtr ximage, int x, int y, unsigned long pixel)
/* Functions to access the contents of a bitmap, given an id. */
int
x_bitmap_height (FRAME_PTR f, ptrdiff_t id)
x_bitmap_height (struct frame *f, ptrdiff_t id)
{
return FRAME_X_DISPLAY_INFO (f)->bitmaps[id - 1].height;
}
int
x_bitmap_width (FRAME_PTR f, ptrdiff_t id)
x_bitmap_width (struct frame *f, ptrdiff_t id)
{
return FRAME_X_DISPLAY_INFO (f)->bitmaps[id - 1].width;
}
#if defined (HAVE_X_WINDOWS) || defined (HAVE_NTGUI)
ptrdiff_t
x_bitmap_pixmap (FRAME_PTR f, ptrdiff_t id)
x_bitmap_pixmap (struct frame *f, ptrdiff_t id)
{
/* HAVE_NTGUI needs the explicit cast here. */
return (ptrdiff_t) FRAME_X_DISPLAY_INFO (f)->bitmaps[id - 1].pixmap;
@ -186,7 +186,7 @@ x_bitmap_pixmap (FRAME_PTR f, ptrdiff_t id)
#ifdef HAVE_X_WINDOWS
int
x_bitmap_mask (FRAME_PTR f, ptrdiff_t id)
x_bitmap_mask (struct frame *f, ptrdiff_t id)
{
return FRAME_X_DISPLAY_INFO (f)->bitmaps[id - 1].mask;
}
@ -195,7 +195,7 @@ x_bitmap_mask (FRAME_PTR f, ptrdiff_t id)
/* Allocate a new bitmap record. Returns index of new record. */
static ptrdiff_t
x_allocate_bitmap_record (FRAME_PTR f)
x_allocate_bitmap_record (struct frame *f)
{
Display_Info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
ptrdiff_t i;
@ -216,7 +216,7 @@ x_allocate_bitmap_record (FRAME_PTR f)
/* Add one reference to the reference count of the bitmap with id ID. */
void
x_reference_bitmap (FRAME_PTR f, ptrdiff_t id)
x_reference_bitmap (struct frame *f, ptrdiff_t id)
{
++FRAME_X_DISPLAY_INFO (f)->bitmaps[id - 1].refcount;
}
@ -384,7 +384,7 @@ free_bitmap_record (Display_Info *dpyinfo, Bitmap_Record *bm)
/* Remove reference to bitmap with id number ID. */
void
x_destroy_bitmap (FRAME_PTR f, ptrdiff_t id)
x_destroy_bitmap (struct frame *f, ptrdiff_t id)
{
Display_Info *dpyinfo = FRAME_X_DISPLAY_INFO (f);

View File

@ -1281,7 +1281,7 @@ static
#endif
bool ignore_mouse_drag_p;
static FRAME_PTR
static struct frame *
some_mouse_moved (void)
{
Lisp_Object tail, frame;
@ -2163,7 +2163,7 @@ show_help_echo (Lisp_Object help, Lisp_Object window, Lisp_Object object,
This causes trouble if we are trying to read a mouse motion
event (i.e., if we are inside a `track-mouse' form), so we
restore the mouse_moved flag. */
FRAME_PTR f = NILP (do_mouse_tracking) ? NULL : some_mouse_moved ();
struct frame *f = NILP (do_mouse_tracking) ? NULL : some_mouse_moved ();
help = call1 (Qmouse_fixup_help_message, help);
if (f)
f->mouse_moved = 1;
@ -4152,7 +4152,7 @@ kbd_buffer_get_event (KBOARD **kbp,
/* Try generating a mouse motion event. */
else if (!NILP (do_mouse_tracking) && some_mouse_moved ())
{
FRAME_PTR f = some_mouse_moved ();
struct frame *f = some_mouse_moved ();
Lisp_Object bar_window;
enum scroll_bar_part part;
Lisp_Object x, y;
@ -5898,7 +5898,7 @@ make_lispy_event (struct input_event *event)
case DRAG_N_DROP_EVENT:
{
FRAME_PTR f;
struct frame *f;
Lisp_Object head, position;
Lisp_Object files;
@ -5977,7 +5977,7 @@ make_lispy_event (struct input_event *event)
#ifdef HAVE_GPM
case GPM_CLICK_EVENT:
{
FRAME_PTR f = XFRAME (event->frame_or_window);
struct frame *f = XFRAME (event->frame_or_window);
Lisp_Object head, position;
Lisp_Object *start_pos_ptr;
Lisp_Object start_pos;
@ -6031,7 +6031,7 @@ make_lispy_event (struct input_event *event)
}
static Lisp_Object
make_lispy_movement (FRAME_PTR frame, Lisp_Object bar_window, enum scroll_bar_part part,
make_lispy_movement (struct frame *frame, Lisp_Object bar_window, enum scroll_bar_part part,
Lisp_Object x, Lisp_Object y, Time t)
{
/* Is it a scroll bar movement? */

View File

@ -867,7 +867,8 @@ update_submenu_strings (widget_value *first_wv)
VECTOR is an array of menu events for the whole menu. */
void
find_and_call_menu_selection (FRAME_PTR f, int menu_bar_items_used, Lisp_Object vector, void *client_data)
find_and_call_menu_selection (struct frame *f, int menu_bar_items_used,
Lisp_Object vector, void *client_data)
{
Lisp_Object prefix, entry;
Lisp_Object *subprefix_stack;
@ -950,7 +951,7 @@ find_and_call_menu_selection (FRAME_PTR f, int menu_bar_items_used, Lisp_Object
/* As above, but return the menu selection instead of storing in kb buffer.
If KEYMAPS, return full prefixes to selection. */
Lisp_Object
find_and_return_menu_selection (FRAME_PTR f, bool keymaps, void *client_data)
find_and_return_menu_selection (struct frame *f, bool keymaps, void *client_data)
{
Lisp_Object prefix, entry;
int i;
@ -1060,7 +1061,7 @@ no quit occurs and `x-popup-menu' returns nil. */)
Lisp_Object title;
const char *error_name = NULL;
Lisp_Object selection = Qnil;
FRAME_PTR f = NULL;
struct frame *f = NULL;
Lisp_Object x, y, window;
bool keymaps = 0;
bool for_click = 0;
@ -1116,7 +1117,7 @@ no quit occurs and `x-popup-menu' returns nil. */)
if (get_current_pos_p)
{
/* Use the mouse's current position. */
FRAME_PTR new_f = SELECTED_FRAME ();
struct frame *new_f = SELECTED_FRAME ();
#ifdef HAVE_X_WINDOWS
/* Can't use mouse_position_hook for X since it returns
coordinates relative to the window the mouse is in,

View File

@ -35,20 +35,20 @@ extern void list_of_panes (Lisp_Object);
|| defined (HAVE_NS)
extern void free_menubar_widget_value_tree (widget_value *);
extern void update_submenu_strings (widget_value *);
extern void find_and_call_menu_selection (FRAME_PTR, int,
extern void find_and_call_menu_selection (struct frame *, int,
Lisp_Object, void *);
extern widget_value *xmalloc_widget_value (void);
extern widget_value *digest_single_submenu (int, int, bool);
#endif
#ifdef HAVE_X_WINDOWS
extern void mouse_position_for_popup (FRAME_PTR f, int *x, int *y);
extern void mouse_position_for_popup (struct frame *f, int *x, int *y);
#endif
extern Lisp_Object w32_menu_show (FRAME_PTR, int, int, int, int,
extern Lisp_Object w32_menu_show (struct frame *, int, int, int, int,
Lisp_Object, const char **);
extern Lisp_Object ns_menu_show (FRAME_PTR, int, int, bool, bool,
extern Lisp_Object ns_menu_show (struct frame *, int, int, bool, bool,
Lisp_Object, const char **);
extern Lisp_Object xmenu_show (FRAME_PTR, int, int, bool, bool,
extern Lisp_Object xmenu_show (struct frame *, int, int, bool, bool,
Lisp_Object, const char **, Time);
#endif /* MENU_H */

View File

@ -298,7 +298,7 @@ mouse_button_depressed (int b, int *xp, int *yp)
}
void
mouse_get_pos (FRAME_PTR *f, int insist, Lisp_Object *bar_window,
mouse_get_pos (struct frame **f, int insist, Lisp_Object *bar_window,
enum scroll_bar_part *part, Lisp_Object *x, Lisp_Object *y,
Time *time)
{
@ -1158,7 +1158,7 @@ IT_display_cursor (int on)
to put the cursor at the end of the text displayed there. */
static void
IT_cmgoto (FRAME_PTR f)
IT_cmgoto (struct frame *f)
{
/* Only set the cursor to where it should be if the display is
already in sync with the window contents. */
@ -1760,7 +1760,7 @@ IT_set_frame_parameters (struct frame *f, Lisp_Object alist)
}
}
extern void init_frame_faces (FRAME_PTR);
extern void init_frame_faces (struct frame *);
#endif /* !HAVE_X_WINDOWS */

View File

@ -143,7 +143,7 @@ Updated by Christian Limpach (chris@nice.ch)
dpyinfo = ns_display_info_for_name (object);
else
{
FRAME_PTR f = decode_window_system_frame (object);
struct frame *f = decode_window_system_frame (object);
dpyinfo = FRAME_NS_DISPLAY_INFO (f);
}
@ -431,7 +431,7 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side
}
static void
ns_set_name_internal (FRAME_PTR f, Lisp_Object name)
ns_set_name_internal (struct frame *f, Lisp_Object name)
{
struct gcpro gcpro1;
Lisp_Object encoded_name, encoded_icon_name;
@ -503,7 +503,7 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side
specified a name for the frame; the name will override any set by the
redisplay code. */
static void
x_explicitly_set_name (FRAME_PTR f, Lisp_Object arg, Lisp_Object oldval)
x_explicitly_set_name (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
{
NSTRACE (x_explicitly_set_name);
ns_set_name (f, arg, 1);
@ -514,7 +514,7 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side
name; names set this way will never override names set by the user's
lisp code. */
void
x_implicitly_set_name (FRAME_PTR f, Lisp_Object arg, Lisp_Object oldval)
x_implicitly_set_name (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
{
NSTRACE (x_implicitly_set_name);
@ -857,7 +857,7 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side
/* This is the same as the xfns.c definition. */
static void
x_set_cursor_type (FRAME_PTR f, Lisp_Object arg, Lisp_Object oldval)
x_set_cursor_type (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
{
set_frame_cursor_types (f, arg);

View File

@ -619,13 +619,13 @@ but also for ascii (which causes unnecessary font substitution). */
========================================================================== */
static Lisp_Object nsfont_get_cache (FRAME_PTR frame);
static Lisp_Object nsfont_get_cache (struct frame *frame);
static Lisp_Object nsfont_list (struct frame *, Lisp_Object);
static Lisp_Object nsfont_match (struct frame *, Lisp_Object);
static Lisp_Object nsfont_list_family (struct frame *);
static Lisp_Object nsfont_open (FRAME_PTR f, Lisp_Object font_entity,
static Lisp_Object nsfont_open (struct frame *f, Lisp_Object font_entity,
int pixel_size);
static void nsfont_close (FRAME_PTR f, struct font *font);
static void nsfont_close (struct frame *f, struct font *font);
static int nsfont_has_char (Lisp_Object entity, int c);
static unsigned int nsfont_encode_char (struct font *font, int c);
static int nsfont_text_extents (struct font *font, unsigned int *code,
@ -659,7 +659,7 @@ static int nsfont_draw (struct glyph_string *s, int from, int to, int x, int y,
/* Return a cache of font-entities on FRAME. The cache must be a
cons whose cdr part is the actual cache area. */
static Lisp_Object
nsfont_get_cache (FRAME_PTR frame)
nsfont_get_cache (struct frame *frame)
{
Display_Info *dpyinfo = FRAME_NS_DISPLAY_INFO (frame);
return (dpyinfo->name_list_element);
@ -724,7 +724,7 @@ Properties to be considered are same as for list(). */
/* Open a font specified by FONT_ENTITY on frame F. If the font is
scalable, open it with PIXEL_SIZE. */
static Lisp_Object
nsfont_open (FRAME_PTR f, Lisp_Object font_entity, int pixel_size)
nsfont_open (struct frame *f, Lisp_Object font_entity, int pixel_size)
{
BOOL synthItal;
unsigned int traits = 0;
@ -931,7 +931,7 @@ when setting family in ns_spec_to_descriptor(). */
/* Close FONT on frame F. */
static void
nsfont_close (FRAME_PTR f, struct font *font)
nsfont_close (struct frame *f, struct font *font)
{
struct nsfont_info *font_info = (struct nsfont_info *)font;
int i;

View File

@ -806,7 +806,7 @@ - (Lisp_Object)runMenuAt: (NSPoint)p forFrame: (struct frame *)f
========================================================================== */
Lisp_Object
ns_menu_show (FRAME_PTR f, int x, int y, bool for_click, bool keymaps,
ns_menu_show (struct frame *f, int x, int y, bool for_click, bool keymaps,
Lisp_Object title, const char **error)
{
EmacsMenu *pmenu;
@ -1028,7 +1028,7 @@ - (Lisp_Object)runMenuAt: (NSPoint)p forFrame: (struct frame *)f
========================================================================== */
void
free_frame_tool_bar (FRAME_PTR f)
free_frame_tool_bar (struct frame *f)
/* --------------------------------------------------------------------------
Under NS we just hide the toolbar until it might be needed again.
-------------------------------------------------------------------------- */
@ -1040,7 +1040,7 @@ - (Lisp_Object)runMenuAt: (NSPoint)p forFrame: (struct frame *)f
}
void
update_frame_tool_bar (FRAME_PTR f)
update_frame_tool_bar (struct frame *f)
/* --------------------------------------------------------------------------
Update toolbar contents
-------------------------------------------------------------------------- */

View File

@ -781,7 +781,7 @@ void ns_dump_glyphstring (struct glyph_string *s);
/* Implemented in nsterm, published in or needed from nsfns. */
extern Lisp_Object Qfontsize;
extern Lisp_Object ns_list_fonts (FRAME_PTR f, Lisp_Object pattern,
extern Lisp_Object ns_list_fonts (struct frame *f, Lisp_Object pattern,
int size, int maxnames);
extern void ns_clear_frame (struct frame *f);
@ -827,11 +827,11 @@ extern void ns_release_autorelease_pool (void *);
extern const char *ns_get_defaults_value (const char *key);
/* in nsmenu */
extern void update_frame_tool_bar (FRAME_PTR f);
extern void free_frame_tool_bar (FRAME_PTR f);
extern void find_and_call_menu_selection (FRAME_PTR f,
extern void update_frame_tool_bar (struct frame *f);
extern void free_frame_tool_bar (struct frame *f);
extern void find_and_call_menu_selection (struct frame *f,
int menu_bar_items_used, Lisp_Object vector, void *client_data);
extern Lisp_Object find_and_return_menu_selection (FRAME_PTR f,
extern Lisp_Object find_and_return_menu_selection (struct frame *f,
bool keymaps,
void *client_data);
extern Lisp_Object ns_popup_dialog (Lisp_Object position, Lisp_Object contents,

View File

@ -1353,7 +1353,7 @@ Free a pool and temporary objects it refers to (callable from C)
static void
ns_fullscreen_hook (FRAME_PTR f)
ns_fullscreen_hook (struct frame *f)
{
EmacsView *view = (EmacsView *)FRAME_NS_VIEW (f);

View File

@ -86,7 +86,7 @@ static void do_scrolling (struct frame *,
new contents appears. */
static void
calculate_scrolling (FRAME_PTR frame,
calculate_scrolling (struct frame *frame,
/* matrix is of size window_size + 1 on each side. */
struct matrix_elt *matrix,
int window_size, int lines_below,
@ -422,7 +422,7 @@ do_scrolling (struct frame *frame, struct glyph_matrix *current_matrix,
is the equivalent of draw_cost for the old line contents */
static void
calculate_direct_scrolling (FRAME_PTR frame,
calculate_direct_scrolling (struct frame *frame,
/* matrix is of size window_size + 1 on each side. */
struct matrix_elt *matrix,
int window_size, int lines_below,
@ -793,7 +793,7 @@ do_direct_scrolling (struct frame *frame, struct glyph_matrix *current_matrix,
void
scrolling_1 (FRAME_PTR frame, int window_size, int unchanged_at_top,
scrolling_1 (struct frame *frame, int window_size, int unchanged_at_top,
int unchanged_at_bottom, int *draw_cost, int *old_draw_cost,
int *old_hash, int *new_hash, int free_at_end)
{
@ -883,7 +883,7 @@ scrolling_max_lines_saved (int start, int end,
overhead and multiply factor values */
static void
line_ins_del (FRAME_PTR frame, int ov1, int pf1, int ovn, int pfn,
line_ins_del (struct frame *frame, int ov1, int pf1, int ovn, int pfn,
register int *ov, register int *mf)
{
register int i;
@ -901,7 +901,7 @@ line_ins_del (FRAME_PTR frame, int ov1, int pf1, int ovn, int pfn,
}
static void
ins_del_costs (FRAME_PTR frame,
ins_del_costs (struct frame *frame,
const char *one_line_string, const char *multi_string,
const char *setup_string, const char *cleanup_string,
int *costvec, int *ncostvec,
@ -957,7 +957,7 @@ ins_del_costs (FRAME_PTR frame,
*/
void
do_line_insertion_deletion_costs (FRAME_PTR frame,
do_line_insertion_deletion_costs (struct frame *frame,
const char *ins_line_string,
const char *multi_ins_string,
const char *del_line_string,

View File

@ -2522,7 +2522,7 @@ tty_draw_row_with_mouse_face (struct window *w, struct glyph_row *row,
}
static bool
term_mouse_movement (FRAME_PTR frame, Gpm_Event *event)
term_mouse_movement (struct frame *frame, Gpm_Event *event)
{
/* Has the mouse moved off the glyph it was on at the last sighting? */
if (event->x != last_mouse_x || event->y != last_mouse_y)
@ -2563,7 +2563,7 @@ timeval_to_Time (struct timeval const *t)
This clears mouse_moved until the next motion
event arrives. */
static void
term_mouse_position (FRAME_PTR *fp, int insist, Lisp_Object *bar_window,
term_mouse_position (struct frame **fp, int insist, Lisp_Object *bar_window,
enum scroll_bar_part *part, Lisp_Object *x,
Lisp_Object *y, Time *timeptr)
{

View File

@ -285,7 +285,7 @@ check_x_display_info (Lisp_Object frame)
return x_display_info_for_name (frame);
else
{
FRAME_PTR f;
struct frame *f;
CHECK_LIVE_FRAME (frame);
f = XFRAME (frame);
@ -344,7 +344,7 @@ void x_set_tool_bar_lines (struct frame *, Lisp_Object, Lisp_Object);
not Emacs's own window. */
void
x_real_positions (FRAME_PTR f, int *xptr, int *yptr)
x_real_positions (struct frame *f, int *xptr, int *yptr)
{
POINT pt;
RECT rect;
@ -1019,7 +1019,7 @@ x_to_w32_color (const char * colorname)
}
void
w32_regenerate_palette (FRAME_PTR f)
w32_regenerate_palette (struct frame *f)
{
struct w32_palette_entry * list;
LOGPALETTE * log_palette;
@ -1069,7 +1069,7 @@ w32_regenerate_palette (FRAME_PTR f)
#if 0
/* Keep these around in case we ever want to track color usage. */
void
w32_map_color (FRAME_PTR f, COLORREF color)
w32_map_color (struct frame *f, COLORREF color)
{
struct w32_palette_entry * list = FRAME_W32_DISPLAY_INFO (f)->color_list;
@ -1100,7 +1100,7 @@ w32_map_color (FRAME_PTR f, COLORREF color)
}
void
w32_unmap_color (FRAME_PTR f, COLORREF color)
w32_unmap_color (struct frame *f, COLORREF color)
{
struct w32_palette_entry * list = FRAME_W32_DISPLAY_INFO (f)->color_list;
struct w32_palette_entry **prev = &FRAME_W32_DISPLAY_INFO (f)->color_list;
@ -1153,7 +1153,7 @@ gamma_correct (struct frame *f, COLORREF *color)
If ALLOC is nonzero, allocate a new colormap cell. */
int
w32_defined_color (FRAME_PTR f, const char *color, XColor *color_def, int alloc)
w32_defined_color (struct frame *f, const char *color, XColor *color_def, int alloc)
{
register Lisp_Object tem;
COLORREF w32_color_ref;
@ -1224,7 +1224,7 @@ w32_defined_color (FRAME_PTR f, const char *color, XColor *color_def, int alloc)
ARG says. */
int
x_decode_color (FRAME_PTR f, Lisp_Object arg, int def)
x_decode_color (struct frame *f, Lisp_Object arg, int def)
{
XColor cdef;
@ -1525,7 +1525,7 @@ x_set_border_color (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
void
x_set_cursor_type (FRAME_PTR f, Lisp_Object arg, Lisp_Object oldval)
x_set_cursor_type (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
{
set_frame_cursor_types (f, arg);
@ -1787,7 +1787,7 @@ x_set_name (struct frame *f, Lisp_Object name, int explicit)
specified a name for the frame; the name will override any set by the
redisplay code. */
void
x_explicitly_set_name (FRAME_PTR f, Lisp_Object arg, Lisp_Object oldval)
x_explicitly_set_name (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
{
x_set_name (f, arg, 1);
}
@ -1796,7 +1796,7 @@ x_explicitly_set_name (FRAME_PTR f, Lisp_Object arg, Lisp_Object oldval)
name; names set this way will never override names set by the user's
lisp code. */
void
x_implicitly_set_name (FRAME_PTR f, Lisp_Object arg, Lisp_Object oldval)
x_implicitly_set_name (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
{
x_set_name (f, arg, 0);
}
@ -4645,7 +4645,7 @@ DEFUN ("xw-color-defined-p", Fxw_color_defined_p, Sxw_color_defined_p, 1, 2, 0,
(Lisp_Object color, Lisp_Object frame)
{
XColor foo;
FRAME_PTR f = decode_window_system_frame (frame);
struct frame *f = decode_window_system_frame (frame);
CHECK_STRING (color);
@ -4660,7 +4660,7 @@ DEFUN ("xw-color-values", Fxw_color_values, Sxw_color_values, 1, 2, 0,
(Lisp_Object color, Lisp_Object frame)
{
XColor foo;
FRAME_PTR f = decode_window_system_frame (frame);
struct frame *f = decode_window_system_frame (frame);
CHECK_STRING (color);
@ -6610,7 +6610,7 @@ screen saver if defined.
If optional parameter FRAME is not specified, use selected frame. */)
(Lisp_Object command, Lisp_Object frame)
{
FRAME_PTR f = decode_window_system_frame (frame);
struct frame *f = decode_window_system_frame (frame);
CHECK_NUMBER (command);

View File

@ -99,7 +99,7 @@ static Lisp_Object Qw32_charset_thai, Qw32_charset_johab, Qw32_charset_mac;
/* Font spacing symbols - defined in font.c. */
extern Lisp_Object Qc, Qp, Qm;
static void fill_in_logfont (FRAME_PTR, LOGFONT *, Lisp_Object);
static void fill_in_logfont (struct frame *, LOGFONT *, Lisp_Object);
static BYTE w32_antialias_type (Lisp_Object);
static Lisp_Object lispy_antialias_type (BYTE);
@ -297,7 +297,7 @@ intern_font_name (char * string)
Return a cache of font-entities on FRAME. The cache must be a
cons whose cdr part is the actual cache area. */
Lisp_Object
w32font_get_cache (FRAME_PTR f)
w32font_get_cache (struct frame *f)
{
struct w32_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
@ -355,7 +355,7 @@ w32font_list_family (struct frame *f)
Open a font specified by FONT_ENTITY on frame F.
If the font is scalable, open it with PIXEL_SIZE. */
static Lisp_Object
w32font_open (FRAME_PTR f, Lisp_Object font_entity, int pixel_size)
w32font_open (struct frame *f, Lisp_Object font_entity, int pixel_size)
{
Lisp_Object font_object
= font_make_object (VECSIZE (struct w32font_info),
@ -379,7 +379,7 @@ w32font_open (FRAME_PTR f, Lisp_Object font_entity, int pixel_size)
/* w32 implementation of close for font_backend.
Close FONT on frame F. */
void
w32font_close (FRAME_PTR f, struct font *font)
w32font_close (struct frame *f, struct font *font)
{
int i;
struct w32font_info *w32_font = (struct w32font_info *) font;
@ -731,13 +731,13 @@ w32font_free_entity (Lisp_Object entity);
storing some data in FACE->extra. If successful, return 0.
Otherwise, return -1.
static int
w32font_prepare_face (FRAME_PTR f, struct face *face);
w32font_prepare_face (struct frame *f, struct face *face);
*/
/* w32 implementation of done_face for font backend.
Optional.
Done FACE for displaying characters by FACE->font on frame F.
static void
w32font_done_face (FRAME_PTR f, struct face *face); */
w32font_done_face (struct frame *f, struct face *face); */
/* w32 implementation of get_bitmap for font backend.
Optional.
@ -889,7 +889,7 @@ w32font_match_internal (struct frame *f, Lisp_Object font_spec, int opentype_onl
}
int
w32font_open_internal (FRAME_PTR f, Lisp_Object font_entity,
w32font_open_internal (struct frame *f, Lisp_Object font_entity,
int pixel_size, Lisp_Object font_object)
{
int len, size;
@ -1961,7 +1961,7 @@ w32_to_fc_weight (int n)
/* Fill in all the available details of LOGFONT from FONT_SPEC. */
static void
fill_in_logfont (FRAME_PTR f, LOGFONT *logfont, Lisp_Object font_spec)
fill_in_logfont (struct frame *f, LOGFONT *logfont, Lisp_Object font_spec)
{
Lisp_Object tmp, extra;
int dpi = FRAME_RES_Y (f);
@ -2464,7 +2464,7 @@ If EXCLUDE-PROPORTIONAL is non-nil, exclude proportional fonts
in the font selection dialog. */)
(Lisp_Object frame, Lisp_Object exclude_proportional)
{
FRAME_PTR f = decode_window_system_frame (frame);
struct frame *f = decode_window_system_frame (frame);
CHOOSEFONT cf;
LOGFONT lf;
TEXTMETRIC tm;

View File

@ -63,16 +63,16 @@ struct w32font_info
#define CACHE_BLOCKSIZE 128
Lisp_Object w32font_get_cache (FRAME_PTR fe);
Lisp_Object w32font_get_cache (struct frame *fe);
Lisp_Object w32font_list_internal (struct frame *f,
Lisp_Object font_spec,
int opentype_only);
Lisp_Object w32font_match_internal (struct frame *f,
Lisp_Object font_spec,
int opentype_only);
int w32font_open_internal (FRAME_PTR f, Lisp_Object font_entity,
int w32font_open_internal (struct frame *f, Lisp_Object font_entity,
int pixel_size, Lisp_Object font_object);
void w32font_close (FRAME_PTR f, struct font *font);
void w32font_close (struct frame *f, struct font *font);
int w32font_has_char (Lisp_Object entity, int c);
int w32font_text_extents (struct font *font, unsigned *code, int nglyphs,
struct font_metrics *metrics);

View File

@ -103,10 +103,10 @@ fill_queue (BOOL block)
}
/* In a generic, multi-frame world this should take a console handle
and return the frame for it
and return the frame for it.
Right now, there's only one frame so return it. */
static FRAME_PTR
static struct frame *
get_frame (void)
{
return SELECTED_FRAME ();
@ -394,7 +394,7 @@ key_event (KEY_EVENT_RECORD *event, struct input_event *emacs_ev, int *isdead)
/* Mouse position hook. */
void
w32_console_mouse_position (FRAME_PTR *f,
w32_console_mouse_position (struct frame **f,
int insist,
Lisp_Object *bar_window,
enum scroll_bar_part *part,
@ -461,7 +461,7 @@ do_mouse_event (MOUSE_EVENT_RECORD *event,
if (event->dwEventFlags == MOUSE_MOVED)
{
FRAME_PTR f = SELECTED_FRAME ();
struct frame *f = SELECTED_FRAME ();
Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (f);
int mx = event->dwMousePosition.X, my = event->dwMousePosition.Y;
@ -555,7 +555,7 @@ do_mouse_event (MOUSE_EVENT_RECORD *event,
static void
resize_event (WINDOW_BUFFER_SIZE_RECORD *event)
{
FRAME_PTR f = get_frame ();
struct frame *f = get_frame ();
change_frame_size (f, event->dwSize.Y, event->dwSize.X, 0, 1, 0);
SET_FRAME_GARBAGED (f);
@ -565,7 +565,7 @@ static void
maybe_generate_resize_event (void)
{
CONSOLE_SCREEN_BUFFER_INFO info;
FRAME_PTR f = get_frame ();
struct frame *f = get_frame ();
GetConsoleScreenBufferInfo (GetStdHandle (STD_OUTPUT_HANDLE), &info);

View File

@ -23,7 +23,7 @@ extern int w32_console_unicode_input;
extern int w32_console_read_socket (struct terminal *term,
struct input_event *hold_quit);
extern void w32_console_mouse_position (FRAME_PTR *f, int insist,
extern void w32_console_mouse_position (struct frame **f, int insist,
Lisp_Object *bar_window,
enum scroll_bar_part *part,
Lisp_Object *x, Lisp_Object *y,

View File

@ -100,13 +100,13 @@ MessageBoxW_Proc unicode_message_box = NULL;
Lisp_Object Qdebug_on_next_call;
void set_frame_menubar (FRAME_PTR, bool, bool);
void set_frame_menubar (struct frame *, bool, bool);
#ifdef HAVE_DIALOGS
static Lisp_Object w32_dialog_show (FRAME_PTR, int, Lisp_Object, char**);
static Lisp_Object w32_dialog_show (struct frame *, int, Lisp_Object, char**);
#else
static int is_simple_dialog (Lisp_Object);
static Lisp_Object simple_dialog_show (FRAME_PTR, Lisp_Object, Lisp_Object);
static Lisp_Object simple_dialog_show (struct frame *, Lisp_Object, Lisp_Object);
#endif
static void utf8to16 (unsigned char *, int, WCHAR *);
@ -137,7 +137,7 @@ If HEADER is non-nil, the frame title for the box is "Information",
otherwise it is "Question". */)
(Lisp_Object position, Lisp_Object contents, Lisp_Object header)
{
FRAME_PTR f = NULL;
struct frame *f = NULL;
Lisp_Object window;
/* Decode the first argument: find the window or frame to use. */
@ -147,7 +147,7 @@ otherwise it is "Question". */)
{
#if 0 /* Using the frame the mouse is on may not be right. */
/* Use the mouse's current position. */
FRAME_PTR new_f = SELECTED_FRAME ();
struct frame *new_f = SELECTED_FRAME ();
Lisp_Object bar_window;
enum scroll_bar_part part;
Time time;
@ -252,7 +252,7 @@ otherwise it is "Question". */)
This way we can safely execute Lisp code. */
void
x_activate_menubar (FRAME_PTR f)
x_activate_menubar (struct frame *f)
{
set_frame_menubar (f, 0, 1);
@ -269,7 +269,7 @@ x_activate_menubar (FRAME_PTR f)
and put the appropriate events into the keyboard buffer. */
void
menubar_selection_callback (FRAME_PTR f, void * client_data)
menubar_selection_callback (struct frame *f, void * client_data)
{
Lisp_Object prefix, entry;
Lisp_Object vector;
@ -361,7 +361,7 @@ menubar_selection_callback (FRAME_PTR f, void * client_data)
it is set the first time this is called, from initialize_frame_menubar. */
void
set_frame_menubar (FRAME_PTR f, bool first_time, bool deep_p)
set_frame_menubar (struct frame *f, bool first_time, bool deep_p)
{
HMENU menubar_widget = f->output_data.w32->menubar_widget;
Lisp_Object items;
@ -613,7 +613,7 @@ set_frame_menubar (FRAME_PTR f, bool first_time, bool deep_p)
is visible. */
void
initialize_frame_menubar (FRAME_PTR f)
initialize_frame_menubar (struct frame *f)
{
/* This function is called before the first chance to redisplay
the frame. It has to be, so the frame will have the right size. */
@ -625,7 +625,7 @@ initialize_frame_menubar (FRAME_PTR f)
This is used when deleting a frame, and when turning off the menu bar. */
void
free_frame_menubar (FRAME_PTR f)
free_frame_menubar (struct frame *f)
{
block_input ();
@ -656,7 +656,7 @@ free_frame_menubar (FRAME_PTR f)
(We return nil on failure, but the value doesn't actually matter.) */
Lisp_Object
w32_menu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
w32_menu_show (struct frame *f, int x, int y, int for_click, int keymaps,
Lisp_Object title, const char **error)
{
int i;
@ -983,7 +983,7 @@ static char * button_names [] = {
"button6", "button7", "button8", "button9", "button10" };
static Lisp_Object
w32_dialog_show (FRAME_PTR f, int keymaps,
w32_dialog_show (struct frame *f, int keymaps,
Lisp_Object title, Lisp_Object header,
char **error)
{
@ -1219,7 +1219,7 @@ is_simple_dialog (Lisp_Object contents)
}
static Lisp_Object
simple_dialog_show (FRAME_PTR f, Lisp_Object contents, Lisp_Object header)
simple_dialog_show (struct frame *f, Lisp_Object contents, Lisp_Object header)
{
int answer;
UINT type;
@ -1699,7 +1699,7 @@ DEFUN ("menu-or-popup-active-p", Fmenu_or_popup_active_p, Smenu_or_popup_active_
(void)
{
#ifdef HAVE_MENUS
FRAME_PTR f;
struct frame *f;
f = SELECTED_FRAME ();
return (f->output_data.w32->menubar_active > 0) ? Qt : Qnil;
#else

View File

@ -129,7 +129,7 @@ send_notifications (BYTE *info, DWORD info_size, void *desc,
volatile int *terminate)
{
int done = 0;
FRAME_PTR f = SELECTED_FRAME ();
struct frame *f = SELECTED_FRAME ();
/* A single buffer is used to communicate all notifications to the
main thread. Since both the main thread and several watcher

View File

@ -181,7 +181,7 @@ int w32_keyboard_codepage;
/* Where the mouse was last time we reported a mouse event. */
static RECT last_mouse_glyph;
static FRAME_PTR last_mouse_glyph_frame;
static struct frame *last_mouse_glyph_frame;
/* The scroll bar in which the last motion event occurred.
@ -249,7 +249,7 @@ static void my_set_focus (struct frame *, HWND);
#endif
static void my_set_foreground_window (HWND);
static void my_destroy_window (struct frame *, HWND);
static void w32fullscreen_hook (FRAME_PTR);
static void w32fullscreen_hook (struct frame *);
#ifdef GLYPH_DEBUG
static void x_check_font (struct frame *, struct font *);
@ -450,7 +450,7 @@ w32_draw_rectangle (HDC hdc, XGCValues *gc, int x, int y,
/* Draw a filled rectangle at the specified position. */
void
w32_fill_rect (FRAME_PTR f, HDC hdc, COLORREF pix, RECT *lprect)
w32_fill_rect (struct frame *f, HDC hdc, COLORREF pix, RECT *lprect)
{
HBRUSH hb;
@ -460,7 +460,7 @@ w32_fill_rect (FRAME_PTR f, HDC hdc, COLORREF pix, RECT *lprect)
}
void
w32_clear_window (FRAME_PTR f)
w32_clear_window (struct frame *f)
{
RECT rect;
HDC hdc = get_frame_dc (f);
@ -3370,7 +3370,7 @@ static MSG last_mouse_motion_event;
static Lisp_Object last_mouse_motion_frame;
static int
note_mouse_movement (FRAME_PTR frame, MSG *msg)
note_mouse_movement (struct frame *frame, MSG *msg)
{
int mouse_x = LOWORD (msg->lParam);
int mouse_y = HIWORD (msg->lParam);
@ -3419,7 +3419,7 @@ note_mouse_movement (FRAME_PTR frame, MSG *msg)
************************************************************************/
static struct scroll_bar *x_window_to_scroll_bar (Window);
static void x_scroll_bar_report_motion (FRAME_PTR *, Lisp_Object *,
static void x_scroll_bar_report_motion (struct frame **, Lisp_Object *,
enum scroll_bar_part *,
Lisp_Object *, Lisp_Object *,
unsigned long *);
@ -3461,11 +3461,11 @@ w32_define_cursor (Window window, Cursor cursor)
movement. */
static void
w32_mouse_position (FRAME_PTR *fp, int insist, Lisp_Object *bar_window,
w32_mouse_position (struct frame **fp, int insist, Lisp_Object *bar_window,
enum scroll_bar_part *part, Lisp_Object *x, Lisp_Object *y,
unsigned long *time)
{
FRAME_PTR f1;
struct frame *f1;
block_input ();
@ -3696,7 +3696,7 @@ my_create_scrollbar (struct frame * f, struct scroll_bar * bar)
/*#define ATTACH_THREADS*/
static BOOL
my_show_window (FRAME_PTR f, HWND hwnd, int how)
my_show_window (struct frame *f, HWND hwnd, int how)
{
#ifndef ATTACH_THREADS
return SendMessage (FRAME_W32_WINDOW (f), WM_EMACS_SHOWWINDOW,
@ -3816,7 +3816,7 @@ x_scroll_bar_create (struct window *w, int top, int left, int width, int height)
static void
x_scroll_bar_remove (struct scroll_bar *bar)
{
FRAME_PTR f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window)));
struct frame *f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window)));
block_input ();
@ -3979,7 +3979,7 @@ w32_set_vertical_scroll_bar (struct window *w,
`*redeem_scroll_bar_hook' is applied to its window before the judgment. */
static void
w32_condemn_scroll_bars (FRAME_PTR frame)
w32_condemn_scroll_bars (struct frame *frame)
{
/* Transfer all the scroll bars to FRAME_CONDEMNED_SCROLL_BARS. */
while (! NILP (FRAME_SCROLL_BARS (frame)))
@ -4047,7 +4047,7 @@ w32_redeem_scroll_bar (struct window *window)
last call to `*condemn_scroll_bars_hook'. */
static void
w32_judge_scroll_bars (FRAME_PTR f)
w32_judge_scroll_bars (struct frame *f)
{
Lisp_Object bar, next;
@ -4185,14 +4185,14 @@ w32_scroll_bar_handle_click (struct scroll_bar *bar, W32Msg *msg,
on the scroll bar. */
static void
x_scroll_bar_report_motion (FRAME_PTR *fp, Lisp_Object *bar_window,
x_scroll_bar_report_motion (struct frame **fp, Lisp_Object *bar_window,
enum scroll_bar_part *part,
Lisp_Object *x, Lisp_Object *y,
unsigned long *time)
{
struct scroll_bar *bar = XSCROLL_BAR (last_mouse_scroll_bar);
Window w = SCROLL_BAR_W32_WINDOW (bar);
FRAME_PTR f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window)));
struct frame *f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window)));
int pos;
int top_range = VERTICAL_SCROLL_BAR_TOP_RANGE (f, XINT (bar->height));
SCROLLINFO si;
@ -4244,7 +4244,7 @@ x_scroll_bar_report_motion (FRAME_PTR *fp, Lisp_Object *bar_window,
redraw them. */
void
x_scroll_bar_clear (FRAME_PTR f)
x_scroll_bar_clear (struct frame *f)
{
Lisp_Object bar;
@ -4974,7 +4974,7 @@ w32_read_socket (struct terminal *terminal,
if (f)
{
extern void menubar_selection_callback
(FRAME_PTR f, void * client_data);
(struct frame *f, void * client_data);
menubar_selection_callback (f, (void *)msg.msg.wParam);
}
@ -5071,7 +5071,7 @@ w32_read_socket (struct terminal *terminal,
FOR_EACH_FRAME (tail, frame)
{
FRAME_PTR f = XFRAME (frame);
struct frame *f = XFRAME (frame);
/* The tooltip has been drawn already. Avoid the
SET_FRAME_GARBAGED below. */
if (EQ (frame, tip_frame))
@ -5692,7 +5692,7 @@ x_check_fullscreen (struct frame *f)
}
static void
w32fullscreen_hook (FRAME_PTR f)
w32fullscreen_hook (struct frame *f)
{
if (FRAME_VISIBLE_P (f))
{
@ -5964,7 +5964,7 @@ x_lower_frame (struct frame *f)
}
static void
w32_frame_raise_lower (FRAME_PTR f, int raise_flag)
w32_frame_raise_lower (struct frame *f, int raise_flag)
{
if (! FRAME_W32_P (f))
return;

View File

@ -205,7 +205,7 @@ extern void x_focus_on_frame (struct frame *f);
extern struct w32_display_info *w32_term_init (Lisp_Object,
char *, char *);
extern int w32_defined_color (FRAME_PTR f, const char *color,
extern int w32_defined_color (struct frame *f, const char *color,
XColor *color_def, int alloc);
extern void x_set_window_size (struct frame *f, int change_grav,
int cols, int rows);

View File

@ -106,7 +106,7 @@ uniscribe_list_family (struct frame *f)
}
static Lisp_Object
uniscribe_open (FRAME_PTR f, Lisp_Object font_entity, int pixel_size)
uniscribe_open (struct frame *f, Lisp_Object font_entity, int pixel_size)
{
Lisp_Object font_object
= font_make_object (VECSIZE (struct uniscribe_font_info),
@ -135,7 +135,7 @@ uniscribe_open (FRAME_PTR f, Lisp_Object font_entity, int pixel_size)
}
static void
uniscribe_close (FRAME_PTR f, struct font *font)
uniscribe_close (struct frame *f, struct font *font)
{
struct uniscribe_font_info *uniscribe_font
= (struct uniscribe_font_info *) font;
@ -599,8 +599,8 @@ uniscribe_encode_char (struct font *font, int c)
int x, int y, int with_background);
Unused:
int uniscribe_prepare_face (FRAME_PTR f, struct face *face);
void uniscribe_done_face (FRAME_PTR f, struct face *face);
int uniscribe_prepare_face (struct frame *f, struct face *face);
void uniscribe_done_face (struct frame *f, struct face *face);
int uniscribe_get_bitmap (struct font *font, unsigned code,
struct font_bitmap *bitmap, int bits_per_pixel);
void uniscribe_free_bitmap (struct font *font, struct font_bitmap *bitmap);
@ -608,8 +608,8 @@ uniscribe_encode_char (struct font *font, int c)
void uniscribe_free_outline (struct font *font, void *outline);
int uniscribe_anchor_point (struct font *font, unsigned code,
int index, int *x, int *y);
int uniscribe_start_for_frame (FRAME_PTR f);
int uniscribe_end_for_frame (FRAME_PTR f);
int uniscribe_start_for_frame (struct frame *f);
int uniscribe_end_for_frame (struct frame *f);
*/

View File

@ -90,7 +90,7 @@ signal_quit (void)
}
void
select_palette (FRAME_PTR f, HDC hdc)
select_palette (struct frame *f, HDC hdc)
{
struct w32_display_info *display_info = FRAME_W32_DISPLAY_INFO (f);
@ -117,7 +117,7 @@ select_palette (FRAME_PTR f, HDC hdc)
}
void
deselect_palette (FRAME_PTR f, HDC hdc)
deselect_palette (struct frame *f, HDC hdc)
{
if (f->output_data.w32->old_palette)
SelectPalette (hdc, f->output_data.w32->old_palette, FALSE);
@ -126,7 +126,7 @@ deselect_palette (FRAME_PTR f, HDC hdc)
/* Get a DC for frame and select palette for drawing; force an update of
all frames if palette's mapping changes. */
HDC
get_frame_dc (FRAME_PTR f)
get_frame_dc (struct frame *f)
{
HDC hdc;
@ -146,7 +146,7 @@ get_frame_dc (FRAME_PTR f)
}
int
release_frame_dc (FRAME_PTR f, HDC hdc)
release_frame_dc (struct frame *f, HDC hdc)
{
int ret;

View File

@ -806,7 +806,7 @@ void
widget_store_internal_border (Widget widget)
{
EmacsFrame ew = (EmacsFrame) widget;
FRAME_PTR f = ew->emacs_frame.frame;
struct frame *f = ew->emacs_frame.frame;
ew->emacs_frame.internal_border_width = f->internal_border_width;
}

View File

@ -3019,7 +3019,7 @@ replace_buffer_in_windows_safely (Lisp_Object buffer)
minimum allowable size. */
void
check_frame_size (FRAME_PTR frame, int *rows, int *cols)
check_frame_size (struct frame *frame, int *rows, int *cols)
{
/* For height, we have to see:
how many windows the frame has at minimum (one or two),
@ -5516,7 +5516,7 @@ the return value is nil. Otherwise the value is t. */)
struct Lisp_Vector *saved_windows;
Lisp_Object new_current_buffer;
Lisp_Object frame;
FRAME_PTR f;
struct frame *f;
ptrdiff_t old_point = -1;
CHECK_WINDOW_CONFIGURATION (configuration);

View File

@ -1854,7 +1854,7 @@ estimate_mode_line_height (struct frame *f, enum face_id face_id)
not force the value into range. */
void
pixel_to_glyph_coords (FRAME_PTR f, register int pix_x, register int pix_y,
pixel_to_glyph_coords (struct frame *f, register int pix_x, register int pix_y,
int *x, int *y, NativeRectangle *bounds, int noclip)
{
@ -11449,7 +11449,7 @@ x_cursor_to (int vpos, int hpos, int y, int x)
/* Where the mouse was last time we reported a mouse event. */
FRAME_PTR last_mouse_frame;
struct frame *last_mouse_frame;
/* Tool-bar item index of the item on which a mouse button was pressed
or -1. */

View File

@ -869,7 +869,7 @@ the pixmap. Bits are stored row by row, each row occupies
if these pointers are not null. */
static ptrdiff_t
load_pixmap (FRAME_PTR f, Lisp_Object name, unsigned int *w_ptr,
load_pixmap (struct frame *f, Lisp_Object name, unsigned int *w_ptr,
unsigned int *h_ptr)
{
ptrdiff_t bitmap_id;
@ -3075,7 +3075,7 @@ FRAME 0 means change the face on all frames, and change the default
{
if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value))
{
FRAME_PTR f;
struct frame *f;
old_value = LFACE_FONT (lface);
if (! FONTP (value))

View File

@ -176,7 +176,7 @@ check_x_display_info (Lisp_Object object)
dpyinfo = x_display_info_for_name (object);
else
{
FRAME_PTR f = decode_window_system_frame (object);
struct frame *f = decode_window_system_frame (object);
dpyinfo = FRAME_X_DISPLAY_INFO (f);
}
@ -369,7 +369,7 @@ x_top_window_to_frame (struct x_display_info *dpyinfo, int wdesc)
not Emacs's own window. */
void
x_real_positions (FRAME_PTR f, int *xptr, int *yptr)
x_real_positions (struct frame *f, int *xptr, int *yptr)
{
int win_x, win_y, outer_x IF_LINT (= 0), outer_y IF_LINT (= 0);
int real_x = 0, real_y = 0;
@ -565,7 +565,7 @@ x_defined_color (struct frame *f, const char *color_name,
Signal an error if color can't be allocated. */
static int
x_decode_color (FRAME_PTR f, Lisp_Object color_name, int mono_color)
x_decode_color (struct frame *f, Lisp_Object color_name, int mono_color)
{
XColor cdef;
@ -626,7 +626,7 @@ x_set_tool_bar_position (struct frame *f,
may be any format that GdkPixbuf knows about, i.e. not just bitmaps. */
int
xg_set_icon (FRAME_PTR f, Lisp_Object file)
xg_set_icon (struct frame *f, Lisp_Object file)
{
int result = 0;
Lisp_Object found;
@ -660,7 +660,7 @@ xg_set_icon (FRAME_PTR f, Lisp_Object file)
}
int
xg_set_icon_from_xpm_data (FRAME_PTR f, const char **data)
xg_set_icon_from_xpm_data (struct frame *f, const char **data)
{
GdkPixbuf *pixbuf = gdk_pixbuf_new_from_xpm_data (data);
@ -1050,7 +1050,7 @@ x_set_border_color (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
static void
x_set_cursor_type (FRAME_PTR f, Lisp_Object arg, Lisp_Object oldval)
x_set_cursor_type (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
{
set_frame_cursor_types (f, arg);
@ -1449,7 +1449,7 @@ x_encode_text (Lisp_Object string, Lisp_Object coding_system, int selectionp,
icon name to NAME. */
static void
x_set_name_internal (FRAME_PTR f, Lisp_Object name)
x_set_name_internal (struct frame *f, Lisp_Object name)
{
if (FRAME_X_WINDOW (f))
{
@ -1608,7 +1608,7 @@ x_set_name (struct frame *f, Lisp_Object name, int explicit)
specified a name for the frame; the name will override any set by the
redisplay code. */
static void
x_explicitly_set_name (FRAME_PTR f, Lisp_Object arg, Lisp_Object oldval)
x_explicitly_set_name (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
{
x_set_name (f, arg, 1);
}
@ -1617,7 +1617,7 @@ x_explicitly_set_name (FRAME_PTR f, Lisp_Object arg, Lisp_Object oldval)
name; names set this way will never override names set by the user's
lisp code. */
void
x_implicitly_set_name (FRAME_PTR f, Lisp_Object arg, Lisp_Object oldval)
x_implicitly_set_name (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
{
x_set_name (f, arg, 0);
}
@ -1730,7 +1730,7 @@ x_default_scroll_bar_color_parameter (struct frame *f,
for example, but Xt doesn't). */
static void
hack_wm_protocols (FRAME_PTR f, Widget widget)
hack_wm_protocols (struct frame *f, Widget widget)
{
Display *dpy = XtDisplay (widget);
Window w = XtWindow (widget);
@ -2538,7 +2538,7 @@ x_window (struct frame *f, long window_prompting, int minibuffer_only)
#else /* not USE_X_TOOLKIT */
#ifdef USE_GTK
static void
x_window (FRAME_PTR f)
x_window (struct frame *f)
{
if (! xg_create_frame_widgets (f))
error ("Unable to create window");
@ -3485,7 +3485,7 @@ DEFUN ("xw-color-defined-p", Fxw_color_defined_p, Sxw_color_defined_p, 1, 2, 0,
(Lisp_Object color, Lisp_Object frame)
{
XColor foo;
FRAME_PTR f = decode_window_system_frame (frame);
struct frame *f = decode_window_system_frame (frame);
CHECK_STRING (color);
@ -3500,7 +3500,7 @@ DEFUN ("xw-color-values", Fxw_color_values, Sxw_color_values, 1, 2, 0,
(Lisp_Object color, Lisp_Object frame)
{
XColor foo;
FRAME_PTR f = decode_window_system_frame (frame);
struct frame *f = decode_window_system_frame (frame);
CHECK_STRING (color);
@ -4586,7 +4586,7 @@ If TERMINAL is omitted or nil, that stands for the selected frame's display. */
/* Wait for responses to all X commands issued so far for frame F. */
void
x_sync (FRAME_PTR f)
x_sync (struct frame *f)
{
block_input ();
XSync (FRAME_X_DISPLAY (f), False);
@ -5770,7 +5770,8 @@ or directory must exist.
This function is only defined on NS, MS Windows, and X Windows with the
Motif or Gtk toolkits. With the Motif toolkit, ONLY-DIR-P is ignored.
Otherwise, if ONLY-DIR-P is non-nil, the user can only select directories. */)
(Lisp_Object prompt, Lisp_Object dir, Lisp_Object default_filename, Lisp_Object mustmatch, Lisp_Object only_dir_p)
(Lisp_Object prompt, Lisp_Object dir, Lisp_Object default_filename,
Lisp_Object mustmatch, Lisp_Object only_dir_p)
{
int result;
struct frame *f = SELECTED_FRAME ();
@ -5943,7 +5944,7 @@ Motif or Gtk toolkits. With the Motif toolkit, ONLY-DIR-P is ignored.
Otherwise, if ONLY-DIR-P is non-nil, the user can only select directories. */)
(Lisp_Object prompt, Lisp_Object dir, Lisp_Object default_filename, Lisp_Object mustmatch, Lisp_Object only_dir_p)
{
FRAME_PTR f = SELECTED_FRAME ();
struct frame *f = SELECTED_FRAME ();
char *fn;
Lisp_Object file = Qnil;
Lisp_Object decoded_file;
@ -6006,7 +6007,7 @@ FRAME is the frame on which to pop up the font chooser. If omitted or
nil, it defaults to the selected frame. */)
(Lisp_Object frame, Lisp_Object ignored)
{
FRAME_PTR f = decode_window_system_frame (frame);
struct frame *f = decode_window_system_frame (frame);
Lisp_Object font;
Lisp_Object font_param;
char *default_name = NULL;

View File

@ -114,19 +114,19 @@ xfont_get_pcm (XFontStruct *xfont, XChar2b *char2b)
? NULL : pcm);
}
static Lisp_Object xfont_get_cache (FRAME_PTR);
static Lisp_Object xfont_get_cache (struct frame *);
static Lisp_Object xfont_list (struct frame *, Lisp_Object);
static Lisp_Object xfont_match (struct frame *, Lisp_Object);
static Lisp_Object xfont_list_family (struct frame *);
static Lisp_Object xfont_open (FRAME_PTR, Lisp_Object, int);
static void xfont_close (FRAME_PTR, struct font *);
static int xfont_prepare_face (FRAME_PTR, struct face *);
static Lisp_Object xfont_open (struct frame *, Lisp_Object, int);
static void xfont_close (struct frame *, struct font *);
static int xfont_prepare_face (struct frame *, struct face *);
static int xfont_has_char (Lisp_Object, int);
static unsigned xfont_encode_char (struct font *, int);
static int xfont_text_extents (struct font *, unsigned *, int,
struct font_metrics *);
static int xfont_draw (struct glyph_string *, int, int, int, int, bool);
static int xfont_check (FRAME_PTR, struct font *);
static int xfont_check (struct frame *, struct font *);
struct font_driver xfont_driver =
{
@ -152,7 +152,7 @@ struct font_driver xfont_driver =
};
static Lisp_Object
xfont_get_cache (FRAME_PTR f)
xfont_get_cache (struct frame *f)
{
Display_Info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
@ -676,7 +676,7 @@ xfont_list_family (struct frame *f)
}
static Lisp_Object
xfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size)
xfont_open (struct frame *f, Lisp_Object entity, int pixel_size)
{
Display_Info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
Display *display = dpyinfo->display;
@ -892,7 +892,7 @@ xfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size)
}
static void
xfont_close (FRAME_PTR f, struct font *font)
xfont_close (struct frame *f, struct font *font)
{
block_input ();
XFreeFont (FRAME_X_DISPLAY (f), ((struct xfont_info *) font)->xfont);
@ -900,7 +900,7 @@ xfont_close (FRAME_PTR f, struct font *font)
}
static int
xfont_prepare_face (FRAME_PTR f, struct face *face)
xfont_prepare_face (struct frame *f, struct face *face)
{
block_input ();
XSetFont (FRAME_X_DISPLAY (f), face->gc,
@ -1089,7 +1089,7 @@ xfont_draw (struct glyph_string *s, int from, int to, int x, int y,
}
static int
xfont_check (FRAME_PTR f, struct font *font)
xfont_check (struct frame *f, struct font *font)
{
struct xfont_info *xfont = (struct xfont_info *) font;

View File

@ -70,7 +70,7 @@ struct xftface_info
XftColor xft_bg; /* color for face->background */
};
static void xftfont_get_colors (FRAME_PTR, struct face *, GC gc,
static void xftfont_get_colors (struct frame *, struct face *, GC gc,
struct xftface_info *,
XftColor *fg, XftColor *bg);
@ -80,7 +80,9 @@ static void xftfont_get_colors (FRAME_PTR, struct face *, GC gc,
may be NULL. */
static void
xftfont_get_colors (FRAME_PTR f, struct face *face, GC gc, struct xftface_info *xftface_info, XftColor *fg, XftColor *bg)
xftfont_get_colors (struct frame *f, struct face *face, GC gc,
struct xftface_info *xftface_info,
XftColor *fg, XftColor *bg)
{
if (xftface_info && face->gc == gc)
{
@ -262,7 +264,7 @@ xftfont_add_rendering_parameters (FcPattern *pat, Lisp_Object entity)
}
static Lisp_Object
xftfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size)
xftfont_open (struct frame *f, Lisp_Object entity, int pixel_size)
{
FcResult result;
Display *display = FRAME_X_DISPLAY (f);
@ -484,7 +486,7 @@ xftfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size)
}
static void
xftfont_close (FRAME_PTR f, struct font *font)
xftfont_close (struct frame *f, struct font *font)
{
struct xftfont_info *xftfont_info = (struct xftfont_info *) font;
@ -499,7 +501,7 @@ xftfont_close (FRAME_PTR f, struct font *font)
}
static int
xftfont_prepare_face (FRAME_PTR f, struct face *face)
xftfont_prepare_face (struct frame *f, struct face *face)
{
struct xftface_info *xftface_info;
@ -522,7 +524,7 @@ xftfont_prepare_face (FRAME_PTR f, struct face *face)
}
static void
xftfont_done_face (FRAME_PTR f, struct face *face)
xftfont_done_face (struct frame *f, struct face *face)
{
struct xftface_info *xftface_info;
@ -595,7 +597,7 @@ xftfont_text_extents (struct font *font, unsigned int *code, int nglyphs, struct
}
static XftDraw *
xftfont_get_xft_draw (FRAME_PTR f)
xftfont_get_xft_draw (struct frame *f)
{
XftDraw *xft_draw = font_get_frame_data (f, &xftfont_driver);
@ -617,7 +619,7 @@ static int
xftfont_draw (struct glyph_string *s, int from, int to, int x, int y,
bool with_background)
{
FRAME_PTR f = s->f;
struct frame *f = s->f;
struct face *face = s->face;
struct xftfont_info *xftfont_info = (struct xftfont_info *) s->font;
struct xftface_info *xftface_info = NULL;
@ -677,7 +679,7 @@ xftfont_shape (Lisp_Object lgstring)
#endif
static int
xftfont_end_for_frame (FRAME_PTR f)
xftfont_end_for_frame (struct frame *f)
{
XftDraw *xft_draw;

View File

@ -111,7 +111,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
static Lisp_Object Qdebug_on_next_call;
#if defined (USE_X_TOOLKIT) || defined (USE_GTK)
static Lisp_Object xdialog_show (FRAME_PTR, bool, Lisp_Object, Lisp_Object,
static Lisp_Object xdialog_show (struct frame *, bool, Lisp_Object, Lisp_Object,
const char **);
#endif
@ -130,7 +130,7 @@ static struct frame *
menubar_id_to_frame (LWLIB_ID id)
{
Lisp_Object tail, frame;
FRAME_PTR f;
struct frame *f;
FOR_EACH_FRAME (tail, frame)
{
@ -154,7 +154,7 @@ menubar_id_to_frame (LWLIB_ID id)
the scroll bar or the edit window. Fx_popup_menu needs to be
sure it is the edit window. */
void
mouse_position_for_popup (FRAME_PTR f, int *x, int *y)
mouse_position_for_popup (struct frame *f, int *x, int *y)
{
Window root, dummy_window;
int dummy;
@ -219,7 +219,7 @@ for instance using the window manager, then this produces a quit and
`x-popup-dialog' does not return. */)
(Lisp_Object position, Lisp_Object contents, Lisp_Object header)
{
FRAME_PTR f = NULL;
struct frame *f = NULL;
Lisp_Object window;
/* Decode the first argument: find the window or frame to use. */
@ -229,7 +229,7 @@ for instance using the window manager, then this produces a quit and
{
#if 0 /* Using the frame the mouse is on may not be right. */
/* Use the mouse's current position. */
FRAME_PTR new_f = SELECTED_FRAME ();
struct frame *new_f = SELECTED_FRAME ();
Lisp_Object bar_window;
enum scroll_bar_part part;
Time time;
@ -481,7 +481,7 @@ If FRAME is nil or not given, use the selected frame. */)
(Lisp_Object frame)
{
XEvent ev;
FRAME_PTR f = decode_window_system_frame (frame);
struct frame *f = decode_window_system_frame (frame);
Widget menubar;
block_input ();
@ -559,10 +559,7 @@ If FRAME is nil or not given, use the selected frame. */)
(Lisp_Object frame)
{
GtkWidget *menubar;
FRAME_PTR f;
/* gcc 2.95 doesn't accept the FRAME_PTR declaration after
block_input (). */
struct frame *f;
block_input ();
f = decode_window_system_frame (frame);
@ -620,7 +617,7 @@ popup_widget_loop (int do_timers, GtkWidget *widget)
execute Lisp code. */
void
x_activate_menubar (FRAME_PTR f)
x_activate_menubar (struct frame *f)
{
eassert (FRAME_X_P (f));
@ -682,7 +679,7 @@ popup_deactivate_callback (
for that widget.
F is the frame if known, or NULL if not known. */
static void
show_help_event (FRAME_PTR f, xt_or_gtk_widget widget, Lisp_Object help)
show_help_event (struct frame *f, xt_or_gtk_widget widget, Lisp_Object help)
{
Lisp_Object frame;
@ -815,7 +812,7 @@ menubar_selection_callback (GtkWidget *widget, gpointer client_data)
static void
menubar_selection_callback (Widget widget, LWLIB_ID id, XtPointer client_data)
{
FRAME_PTR f;
struct frame *f;
f = menubar_id_to_frame (id);
if (!f)
@ -829,7 +826,7 @@ menubar_selection_callback (Widget widget, LWLIB_ID id, XtPointer client_data)
changed. */
static void
update_frame_menubar (FRAME_PTR f)
update_frame_menubar (struct frame *f)
{
#ifdef USE_GTK
xg_update_frame_menubar (f);
@ -911,7 +908,7 @@ apply_systemfont_to_menu (struct frame *f, Widget w)
it is set the first time this is called, from initialize_frame_menubar. */
void
set_frame_menubar (FRAME_PTR f, bool first_time, bool deep_p)
set_frame_menubar (struct frame *f, bool first_time, bool deep_p)
{
xt_or_gtk_widget menubar_widget;
#ifdef USE_X_TOOLKIT
@ -1263,7 +1260,7 @@ set_frame_menubar (FRAME_PTR f, bool first_time, bool deep_p)
is visible. */
void
initialize_frame_menubar (FRAME_PTR f)
initialize_frame_menubar (struct frame *f)
{
/* This function is called before the first chance to redisplay
the frame. It has to be, so the frame will have the right size. */
@ -1278,7 +1275,7 @@ initialize_frame_menubar (FRAME_PTR f)
#ifndef USE_GTK
void
free_frame_menubar (FRAME_PTR f)
free_frame_menubar (struct frame *f)
{
Widget menubar_widget;
@ -1355,7 +1352,7 @@ static Lisp_Object *volatile menu_item_selection;
create_and_show_popup_menu below. */
struct next_popup_x_y
{
FRAME_PTR f;
struct frame *f;
int x;
int y;
};
@ -1413,7 +1410,7 @@ pop_down_menu (void *arg)
menu pops down.
menu_item_selection will be set to the selection. */
static void
create_and_show_popup_menu (FRAME_PTR f, widget_value *first_wv, int x, int y,
create_and_show_popup_menu (struct frame *f, widget_value *first_wv, int x, int y,
bool for_click, Time timestamp)
{
int i;
@ -1522,7 +1519,7 @@ pop_down_menu (Lisp_Object arg)
menu pops down.
menu_item_selection will be set to the selection. */
static void
create_and_show_popup_menu (FRAME_PTR f, widget_value *first_wv,
create_and_show_popup_menu (struct frame *f, widget_value *first_wv,
int x, int y, bool for_click, Time timestamp)
{
int i;
@ -1601,7 +1598,7 @@ cleanup_widget_value_tree (void *arg)
}
Lisp_Object
xmenu_show (FRAME_PTR f, int x, int y, bool for_click, bool keymaps,
xmenu_show (struct frame *f, int x, int y, bool for_click, bool keymaps,
Lisp_Object title, const char **error_name, Time timestamp)
{
int i;
@ -1894,7 +1891,7 @@ dialog_selection_callback (GtkWidget *widget, gpointer client_data)
dialog pops down.
menu_item_selection will be set to the selection. */
static void
create_and_show_dialog (FRAME_PTR f, widget_value *first_wv)
create_and_show_dialog (struct frame *f, widget_value *first_wv)
{
GtkWidget *menu;
@ -1940,7 +1937,7 @@ dialog_selection_callback (Widget widget, LWLIB_ID id, XtPointer client_data)
dialog pops down.
menu_item_selection will be set to the selection. */
static void
create_and_show_dialog (FRAME_PTR f, widget_value *first_wv)
create_and_show_dialog (struct frame *f, widget_value *first_wv)
{
LWLIB_ID dialog_id;
@ -1984,7 +1981,7 @@ static const char * button_names [] = {
"button6", "button7", "button8", "button9", "button10" };
static Lisp_Object
xdialog_show (FRAME_PTR f,
xdialog_show (struct frame *f,
bool keymaps,
Lisp_Object title,
Lisp_Object header,
@ -2214,7 +2211,7 @@ menu_help_callback (char const *help_string, int pane, int item)
static void
pop_down_menu (Lisp_Object arg)
{
FRAME_PTR f = XSAVE_POINTER (arg, 0);
struct frame *f = XSAVE_POINTER (arg, 0);
XMenu *menu = XSAVE_POINTER (arg, 1);
block_input ();
@ -2242,7 +2239,7 @@ pop_down_menu (Lisp_Object arg)
Lisp_Object
xmenu_show (FRAME_PTR f, int x, int y, bool for_click, bool keymaps,
xmenu_show (struct frame *f, int x, int y, bool for_click, bool keymaps,
Lisp_Object title, const char **error_name, Time timestamp)
{
Window root;

View File

@ -993,7 +993,7 @@ x_handle_selection_event (struct input_event *event)
We do this when about to delete a frame. */
void
x_clear_frame_selections (FRAME_PTR f)
x_clear_frame_selections (struct frame *f)
{
Lisp_Object frame;
Lisp_Object rest;
@ -2377,7 +2377,7 @@ x_property_data_to_lisp (struct frame *f, const unsigned char *data,
/* Get the mouse position in frame relative coordinates. */
static void
mouse_position_for_drop (FRAME_PTR f, int *x, int *y)
mouse_position_for_drop (struct frame *f, int *x, int *y)
{
Window root, dummy_window;
int dummy;

View File

@ -212,7 +212,7 @@ static unsigned long ignore_next_mouse_click_timeout;
/* Where the mouse was last time we reported a mouse event. */
static XRectangle last_mouse_glyph;
static FRAME_PTR last_mouse_glyph_frame;
static struct frame *last_mouse_glyph_frame;
/* The scroll bar in which the last X motion event occurred.
@ -3188,7 +3188,7 @@ XTflash (struct frame *f)
static void
XTtoggle_invisible_pointer (FRAME_PTR f, int invisible)
XTtoggle_invisible_pointer (struct frame *f, int invisible)
{
block_input ();
if (invisible)
@ -3797,7 +3797,7 @@ static XMotionEvent last_mouse_motion_event;
static Lisp_Object last_mouse_motion_frame;
static int
note_mouse_movement (FRAME_PTR frame, XMotionEvent *event)
note_mouse_movement (struct frame *frame, XMotionEvent *event)
{
last_mouse_movement_time = event->time;
last_mouse_motion_event = *event;
@ -3873,11 +3873,11 @@ redo_mouse_highlight (void)
movement. */
static void
XTmouse_position (FRAME_PTR *fp, int insist, Lisp_Object *bar_window,
XTmouse_position (struct frame **fp, int insist, Lisp_Object *bar_window,
enum scroll_bar_part *part, Lisp_Object *x, Lisp_Object *y,
Time *timestamp)
{
FRAME_PTR f1;
struct frame *f1;
block_input ();
@ -4416,7 +4416,8 @@ xg_scroll_callback (GtkRange *range,
gdouble position;
int part = -1, whole = 0, portion = 0;
GtkAdjustment *adj = GTK_ADJUSTMENT (gtk_range_get_adjustment (range));
FRAME_PTR f = (FRAME_PTR) g_object_get_data (G_OBJECT (range), XG_FRAME_DATA);
struct frame *f = (struct frame *) g_object_get_data (G_OBJECT (range),
XG_FRAME_DATA);
if (xg_ignore_gtk_scrollbar) return FALSE;
position = gtk_adjustment_get_value (adj);
@ -5033,7 +5034,7 @@ x_scroll_bar_set_handle (struct scroll_bar *bar, int start, int end, int rebuild
{
int dragging = ! NILP (bar->dragging);
Window w = bar->x_window;
FRAME_PTR f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window)));
struct frame *f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window)));
GC gc = f->output_data.x->normal_gc;
/* If the display is already accurate, do nothing. */
@ -5374,7 +5375,7 @@ XTset_vertical_scroll_bar (struct window *w, int portion, int whole, int positio
`*redeem_scroll_bar_hook' is applied to its window before the judgment. */
static void
XTcondemn_scroll_bars (FRAME_PTR frame)
XTcondemn_scroll_bars (struct frame *frame)
{
/* Transfer all the scroll bars to FRAME_CONDEMNED_SCROLL_BARS. */
while (! NILP (FRAME_SCROLL_BARS (frame)))
@ -5442,7 +5443,7 @@ XTredeem_scroll_bar (struct window *window)
last call to `*condemn_scroll_bars_hook'. */
static void
XTjudge_scroll_bars (FRAME_PTR f)
XTjudge_scroll_bars (struct frame *f)
{
Lisp_Object bar, next;
@ -5478,7 +5479,7 @@ static void
x_scroll_bar_expose (struct scroll_bar *bar, XEvent *event)
{
Window w = bar->x_window;
FRAME_PTR f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window)));
struct frame *f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window)));
GC gc = f->output_data.x->normal_gc;
int width_trim = VERTICAL_SCROLL_BAR_WIDTH_TRIM;
@ -5577,7 +5578,7 @@ x_scroll_bar_handle_click (struct scroll_bar *bar, XEvent *event, struct input_e
static void
x_scroll_bar_note_movement (struct scroll_bar *bar, XEvent *event)
{
FRAME_PTR f = XFRAME (XWINDOW (bar->window)->frame);
struct frame *f = XFRAME (XWINDOW (bar->window)->frame);
last_mouse_movement_time = event->xmotion.time;
@ -5605,13 +5606,13 @@ x_scroll_bar_note_movement (struct scroll_bar *bar, XEvent *event)
on the scroll bar. */
static void
x_scroll_bar_report_motion (FRAME_PTR *fp, Lisp_Object *bar_window,
x_scroll_bar_report_motion (struct frame **fp, Lisp_Object *bar_window,
enum scroll_bar_part *part, Lisp_Object *x,
Lisp_Object *y, Time *timestamp)
{
struct scroll_bar *bar = XSCROLL_BAR (last_mouse_scroll_bar);
Window w = bar->x_window;
FRAME_PTR f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window)));
struct frame *f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window)));
int win_x, win_y;
Window dummy_window;
int dummy_coord;
@ -5679,7 +5680,7 @@ x_scroll_bar_report_motion (FRAME_PTR *fp, Lisp_Object *bar_window,
redraw them. */
static void
x_scroll_bar_clear (FRAME_PTR f)
x_scroll_bar_clear (struct frame *f)
{
#ifndef USE_TOOLKIT_SCROLL_BARS
Lisp_Object bar;
@ -8524,7 +8525,7 @@ do_ewmh_fullscreen (struct frame *f)
}
static void
XTfullscreen_hook (FRAME_PTR f)
XTfullscreen_hook (struct frame *f)
{
if (FRAME_VISIBLE_P (f))
{
@ -8925,7 +8926,7 @@ x_lower_frame (struct frame *f)
/* Request focus with XEmbed */
void
xembed_request_focus (FRAME_PTR f)
xembed_request_focus (struct frame *f)
{
/* See XEmbed Protocol Specification at
http://freedesktop.org/wiki/Specifications/xembed-spec */
@ -8937,7 +8938,7 @@ xembed_request_focus (FRAME_PTR f)
/* Activate frame with Extended Window Manager Hints */
void
x_ewmh_activate_frame (FRAME_PTR f)
x_ewmh_activate_frame (struct frame *f)
{
/* See Window Manager Specification/Extended Window Manager Hints at
http://freedesktop.org/wiki/Specifications/wm-spec */
@ -8955,7 +8956,7 @@ x_ewmh_activate_frame (FRAME_PTR f)
}
static void
XTframe_raise_lower (FRAME_PTR f, int raise_flag)
XTframe_raise_lower (struct frame *f, int raise_flag)
{
if (raise_flag)
x_raise_frame (f);