Commit 2e875e36 authored by Andrew Choi's avatar Andrew Choi
Browse files

* src/macfns.c: Rename everything containing *busy_cursor* and

	similar to *hourglass*.
	Change IMAGE_POSITIVE_INTEGER_VALUE to
	IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR throughout.
	(x_set_font): If font hasn't changed, avoid recomputing faces and
	other things, as in xfns.c.
	(Qcancel_timer): New variable.
	(syms_of_macfns): Rename x-busy-pointer-shape to
	x-hourglass-pointer-shape, display-busy-cursor to
	display-hourglass, busy-cursor-delay to hourglass-delay, as in
	xfns.c.
	(x_set_tool_bar_lines): Modify as in xfns.c
	(x_change_window_heights): New function.

	* inc/macterm.h (struct x_output): Rename busy_cursor to
	hourglass_cursor, busy_window to hourglass_window, busy_p to
	hourglass_p, as in xterm.h.

	* src/macmenu.c (set_frame_menubar): Run activate-menu-bar-hook with
	safe_run_hooks, as in xmenu.c.

	* src/macterm.c (do_check_ram_size): New function.

	* src/Emacs.r: Add ALRT resource #129 for alert when there is over
	256 MB RAM.
parent c0cb1027
2001-02-27 Andrew Choi <akochoi@i-cable.com>
* src/macfns.c: Rename everything containing *busy_cursor* and
similar to *hourglass*.
Change IMAGE_POSITIVE_INTEGER_VALUE to
IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR throughout.
(x_set_font): If font hasn't changed, avoid recomputing faces and
other things, as in xfns.c.
(Qcancel_timer): New variable.
(syms_of_macfns): Rename x-busy-pointer-shape to
x-hourglass-pointer-shape, display-busy-cursor to
display-hourglass, busy-cursor-delay to hourglass-delay, as in
xfns.c.
(x_set_tool_bar_lines): Modify as in xfns.c
(x_change_window_heights): New function.
* inc/macterm.h (struct x_output): Rename busy_cursor to
hourglass_cursor, busy_window to hourglass_window, busy_p to
hourglass_p, as in xterm.h.
* src/macmenu.c (set_frame_menubar): Run activate-menu-bar-hook with
safe_run_hooks, as in xmenu.c.
* src/macterm.c (do_check_ram_size): New function.
* src/Emacs.r: Add ALRT resource #129 for alert when there is over
256 MB RAM.
2001-02-20 Andrew Choi <akochoi@i-cable.com>
* mac/INSTALL:
......
......@@ -319,14 +319,14 @@ struct mac_output {
Cursor nontext_cursor;
Cursor modeline_cursor;
Cursor cross_cursor;
Cursor busy_cursor;
Cursor hourglass_cursor;
#if 0
/* Window whose cursor is busy_cursor. This window is temporarily
mapped to display a busy-cursor. */
Window busy_window;
/* Window whose cursor is hourglass_cursor. This window is temporarily
mapped to display a hourglass-cursor. */
Window hourglass_window;
/* Non-zero means busy cursor is currently displayed. */
unsigned busy_p : 1;
/* Non-zero means hourglass cursor is currently displayed. */
unsigned hourglass_p : 1;
/* Flag to set when the window needs to be completely repainted. */
int needs_exposure;
......
......@@ -139,9 +139,42 @@ resource 'DITL' (128, purgeable) {
{10, 60, 72, 278},
StaticText {
disabled,
"GNU Emacs 21.0.90 for Mac OS\n"
"(11 October 2000 release)\n"
"Report bugs to akochoi@users.sourceforge.net"
"GNU Emacs 21.0.99 for Mac OS\n"
"(27 February 2001 release)\n"
"Report bugs to emacs-pretest-bug@gnu.org"
}
}
};
resource 'ALRT' (129, "Ram Too Large", purgeable) {
{40, 20, 160, 297},
129,
{ /* array: 4 elements */
/* [1] */
OK, visible, silent,
/* [2] */
OK, visible, silent,
/* [3] */
OK, visible, silent,
/* [4] */
OK, visible, silent
},
centerMainScreen
};
resource 'DITL' (129, purgeable) {
{ /* array DITLarray: 2 elements */
/* [1] */
{88, 185, 108, 265},
Button {
enabled,
"OK"
},
/* [2] */
{10, 60, 72, 278},
StaticText {
disabled,
"Emacs does not run on a Macintosh with more than 256 MB of physical or virtual memory"
}
}
};
......
This diff is collapsed.
......@@ -1345,7 +1345,7 @@ set_frame_menubar (f, first_time, deep_p)
set_buffer_internal_1 (XBUFFER (buffer));
/* Run the Lucid hook. */
call1 (Vrun_hooks, Qactivate_menubar_hook);
safe_run_hooks (Qactivate_menubar_hook);
/* If it has changed current-menubar from previous value,
really recompute the menubar from the value. */
if (! NILP (Vlucid_menu_bar_dirty_flag))
......
......@@ -540,7 +540,7 @@ XDrawLine (display, w, gc, x1, y1, x2, y2)
/* Mac version of XClearArea. */
static void
void
XClearArea (display, w, x, y, width, height, exposures)
Display *display;
WindowPtr w;
......@@ -11101,6 +11101,7 @@ static long app_sleep_time = WNE_SLEEP_AT_RESUME;
#define ARGV_STRING_LIST_ID 129
#define ABOUT_ALERT_ID 128
#define RAM_TOO_LARGE_ALERT_ID 129
Boolean terminate_flag = false;
......@@ -11177,6 +11178,22 @@ do_init_managers (void)
}
static void
do_check_ram_size (void)
{
SInt32 physical_ram_size, logical_ram_size;
if (Gestalt (gestaltPhysicalRAMSize, &physical_ram_size) != noErr
|| Gestalt (gestaltLogicalRAMSize, &logical_ram_size) != noErr
|| physical_ram_size > 256 * 1024 * 1024
|| logical_ram_size > 256 * 1024 * 1024)
{
StopAlert (RAM_TOO_LARGE_ALERT_ID, NULL);
exit (1);
}
}
static void
do_window_update (WindowPtr win)
{
......@@ -11644,6 +11661,8 @@ main (void)
do_get_menus ();
do_check_ram_size ();
init_emacs_passwd_dir ();
init_environ ();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment