Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
2f4b24c3
Commit
2f4b24c3
authored
Apr 01, 2003
by
Andrew Choi
Browse files
Fix build on Mac OS X with Carbon.
parent
f2029233
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
2 deletions
+21
-2
src/ChangeLog
src/ChangeLog
+10
-0
src/frame.c
src/frame.c
+3
-0
src/macfns.c
src/macfns.c
+0
-2
src/macterm.h
src/macterm.h
+8
-0
No files found.
src/ChangeLog
View file @
2f4b24c3
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>
2003-04-01 Kim F. Storm <storm@cua.dk>
* Makefile.in (frame.o): Add dependency on blockinput.h and files
* Makefile.in (frame.o): Add dependency on blockinput.h and files
...
...
src/frame.c
View file @
2f4b24c3
...
@@ -2967,11 +2967,14 @@ x_report_frame_params (f, alistptr)
...
@@ -2967,11 +2967,14 @@ x_report_frame_params (f, alistptr)
store_in_alist
(
alistptr
,
Qdisplay
,
store_in_alist
(
alistptr
,
Qdisplay
,
XCAR
(
FRAME_X_DISPLAY_INFO
(
f
)
->
name_list_element
));
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
)
if
(
FRAME_X_OUTPUT
(
f
)
->
parent_desc
==
FRAME_X_DISPLAY_INFO
(
f
)
->
root_window
)
tem
=
Qnil
;
tem
=
Qnil
;
else
else
XSETFASTINT
(
tem
,
FRAME_X_OUTPUT
(
f
)
->
parent_desc
);
XSETFASTINT
(
tem
,
FRAME_X_OUTPUT
(
f
)
->
parent_desc
);
store_in_alist
(
alistptr
,
Qparent_id
,
tem
);
store_in_alist
(
alistptr
,
Qparent_id
,
tem
);
#endif
}
}
...
...
src/macfns.c
View file @
2f4b24c3
...
@@ -8803,8 +8803,6 @@ syms_of_macfns ()
...
@@ -8803,8 +8803,6 @@ syms_of_macfns ()
Fput (Qundefined_color, Qerror_message,
Fput (Qundefined_color, Qerror_message,
build_string ("Undefined color"));
build_string ("Undefined color"));
init_x_parm_symbols ();
DEFVAR_LISP ("x-bitmap-file-path", &Vx_bitmap_file_path,
DEFVAR_LISP ("x-bitmap-file-path", &Vx_bitmap_file_path,
doc: /* List of directories to search for window system bitmap files. */);
doc: /* List of directories to search for window system bitmap files. */);
Vx_bitmap_file_path = decode_env_path ((char *) 0, "PATH");
Vx_bitmap_file_path = decode_env_path ((char *) 0, "PATH");
...
...
src/macterm.h
View file @
2f4b24c3
...
@@ -432,6 +432,14 @@ struct mac_output {
...
@@ -432,6 +432,14 @@ struct mac_output {
/* See enum below */
/* See enum below */
int
want_fullscreen
;
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
;
typedef
struct
mac_output
mac_output
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment