procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix build on Mac OS X with Carbon.

Browse source
This commit is contained in:
Andrew Choi 2003-04-01 01:09:13 +00:00
parent f202923389
commit 2f4b24c371
4 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/ChangeLog
View file

@ -1,3 +1,13 @@
2003-03-31 Andrew Choi <akochoi@shaw.ca>
* frame.c (x_report_frame_params) [HAVE_CARBON]: Do not report
parent window ID.
* macfns.c (syms_of_macfns): Remove call to init_x_parm_symbols.
* macterm.h (struct mac_output): Define x_pixels_diff and
y_pixels_diff.
2003-04-01 Kim F. Storm <storm@cua.dk>
* Makefile.in (frame.o): Add dependency on blockinput.h and files

3
src/frame.c
View file

@ -2967,11 +2967,14 @@ x_report_frame_params (f, alistptr)
store_in_alist (alistptr, Qdisplay,
XCAR (FRAME_X_DISPLAY_INFO (f)->name_list_element));
#ifndef HAVE_CARBON
/* A Mac Window is identified by a struct, not an integer. */
if (FRAME_X_OUTPUT (f)->parent_desc == FRAME_X_DISPLAY_INFO (f)->root_window)
tem = Qnil;
else
XSETFASTINT (tem, FRAME_X_OUTPUT (f)->parent_desc);
store_in_alist (alistptr, Qparent_id, tem);
#endif
}

2
src/macfns.c
View file

@ -8803,8 +8803,6 @@ syms_of_macfns ()
Fput (Qundefined_color, Qerror_message,
build_string ("Undefined color"));
init_x_parm_symbols ();
DEFVAR_LISP ("x-bitmap-file-path", &Vx_bitmap_file_path,
doc: /* List of directories to search for window system bitmap files. */);
Vx_bitmap_file_path = decode_env_path ((char *) 0, "PATH");

8
src/macterm.h
View file

@ -432,6 +432,14 @@ struct mac_output {
/* See enum below */
int want_fullscreen;
/* This many pixels are the difference between the outer window (i.e. the
left of the window manager decoration) and FRAME_X_WINDOW. */
int x_pixels_diff;
/* This many pixels are the difference between the outer window (i.e. the
top of the window manager titlebar) and FRAME_X_WINDOW. */
int y_pixels_diff;
};
typedef struct mac_output mac_output;