Mercurial > emacs
comparison mac/inc/macterm.h @ 36417:350e6092a4c4
* 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.
| author | Andrew Choi <akochoi@shaw.ca> |
|---|---|
| date | Tue, 27 Feb 2001 14:33:20 +0000 |
| parents | 923b8d6d8277 |
| children | af9f5dd840a3 |
comparison
equal
deleted
inserted
replaced
| 36416:e8200ba10907 | 36417:350e6092a4c4 |
|---|---|
| 317 /* Descriptor for the cursor in use for this window. */ | 317 /* Descriptor for the cursor in use for this window. */ |
| 318 Cursor text_cursor; | 318 Cursor text_cursor; |
| 319 Cursor nontext_cursor; | 319 Cursor nontext_cursor; |
| 320 Cursor modeline_cursor; | 320 Cursor modeline_cursor; |
| 321 Cursor cross_cursor; | 321 Cursor cross_cursor; |
| 322 Cursor busy_cursor; | 322 Cursor hourglass_cursor; |
| 323 #if 0 | 323 #if 0 |
| 324 /* Window whose cursor is busy_cursor. This window is temporarily | 324 /* Window whose cursor is hourglass_cursor. This window is temporarily |
| 325 mapped to display a busy-cursor. */ | 325 mapped to display a hourglass-cursor. */ |
| 326 Window busy_window; | 326 Window hourglass_window; |
| 327 | 327 |
| 328 /* Non-zero means busy cursor is currently displayed. */ | 328 /* Non-zero means hourglass cursor is currently displayed. */ |
| 329 unsigned busy_p : 1; | 329 unsigned hourglass_p : 1; |
| 330 | 330 |
| 331 /* Flag to set when the window needs to be completely repainted. */ | 331 /* Flag to set when the window needs to be completely repainted. */ |
| 332 int needs_exposure; | 332 int needs_exposure; |
| 333 | 333 |
| 334 #endif | 334 #endif |