Mercurial > hg > xemacs-beta
annotate src/EmacsFrameP.h @ 5632:bd80d9103fc8
Integrate CL code better into core, remove obsolete compatibility code.
lisp/ChangeLog addition:
2011-12-30 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el:
Call #'cl-compile-time-init explicitly here, don't rely on
bytecomp-load-hook for what is core functionality.
* cl-extra.el:
* cl-extra.el (require):
* cl-extra.el (make-random-state):
* cl-extra.el (random-state-p):
* cl-extra.el (make-hashtable): Removed.
* cl-extra.el (make-weak-hashtable): Removed.
* cl-extra.el (make-key-weak-hashtable): Removed.
* cl-extra.el (make-value-weak-hashtable): Removed.
* cl-extra.el ('hashtablep): Removed.
* cl-extra.el ('hashtable-fullness): Removed.
* cl-extra.el ('hashtable-test-function): Removed.
* cl-extra.el ('hashtable-type): Removed.
* cl-extra.el ('hashtable-size): Removed.
* cl-extra.el ('copy-hashtable): Removed.
* cl-extra.el (cl-builtin-gethash): Removed.
* cl-extra.el (cl-builtin-remhash): Removed.
* cl-extra.el (cl-builtin-clrhash): Removed.
* cl-extra.el (cl-builtin-maphash): Removed.
* cl-extra.el ('cl-gethash): Removed.
* cl-extra.el ('cl-puthash): Removed.
* cl-extra.el ('cl-remhash): Removed.
* cl-extra.el ('cl-clrhash): Removed.
* cl-extra.el ('cl-maphash): Removed.
* cl-extra.el ('cl-make-hash-table): Removed.
* cl-extra.el ('cl-hash-table-p): Removed.
* cl-extra.el ('cl-hash-table-count): Removed.
* cl-extra.el (cl-prettyexpand):
* cl-extra.el (names):
Remove compatibility aliases from this file.
In #'cl-prettyexpand, if FULL is nil, don't expand return-from
either, for symmetry with not expanding block.
Drop cl-extra-load-hook, it's useless when cl-extra is dumped
(since third-party code can't use it, and dumped code shouldn't
use it.)
* cl-macs.el:
* cl-macs.el (cl-pop2):
* cl-macs.el (defun*):
* cl-macs.el (cl-parse-loop-clause):
Remove some no-longer-needed compatibility kludges.
* cl.el:
* cl.el ('cl-map-extents): Removed.
* cl.el (cl-random-time):
* cl.el (list*): New, moved back from subr.el, given a shorter
implementation.
* cl.el ('cl-member): Removed.
* cl.el ('cl-floor): Removed.
* cl.el ('cl-ceiling): Removed.
* cl.el ('cl-truncate): Removed.
* cl.el ('cl-round): Removed.
* cl.el ('cl-mod): Removed.
Remove some compatibility aliases; these may conflict with
package usage, in which case the packages need to be updated, the
new names are available in 21.4, and that's the most recent
version we support.
* cl.el (cl-hacked-flag): Removed.
* cl.el (cl-hack-byte-compiler): Removed.
* subr.el:
* subr.el (list*): Moved back to cl.el.
* update-elc-2.el (batch-update-elc-2):
* update-elc.el (do-autoload-commands):
Add an autoload for cl-compile-time-init in these two files, they
run on bare temacs, auto-autoload isn't available to them, and now
bytecomp calls cl-compile-time-init explicitly.
* cl-compat.el: Removed. This file was long obsolete.
man/ChangeLog addition:
2011-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl.texi (Top):
* cl.texi (Usage):
* cl.texi (Organization):
* cl.texi (Efficiency Concerns):
* cl.texi (Common Lisp Compatibility):
Remove documentation of cl-compat, now it's deleted.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Fri, 30 Dec 2011 16:05:31 +0000 |
| parents | 308d34e9f07d |
| children |
| rev | line source |
|---|---|
| 428 | 1 /* Private header for the Emacs frame widget. |
| 2 Copyright (C) 1993-1995 Sun Microsystems, Inc. | |
| 3 Copyright (C) 1995 Ben Wing. | |
| 4 | |
| 5 This file is part of XEmacs. | |
| 6 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
3381
diff
changeset
|
7 XEmacs is free software: you can redistribute it and/or modify it |
| 428 | 8 under the terms of the GNU General Public License as published by the |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
3381
diff
changeset
|
9 Free Software Foundation, either version 3 of the License, or (at your |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
3381
diff
changeset
|
10 option) any later version. |
| 428 | 11 |
| 12 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
3381
diff
changeset
|
18 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 428 | 19 |
| 20 /* Synched up with: Not in FSF. */ | |
| 21 | |
| 440 | 22 #ifndef INCLUDED_EmacsFrameP_h_ |
| 23 #define INCLUDED_EmacsFrameP_h_ | |
| 428 | 24 |
| 25 #include "xintrinsicp.h" | |
| 26 #include <X11/CoreP.h> | |
| 27 #ifdef LWLIB_USES_MOTIF | |
| 28 #include "xmprimitivep.h" | |
| 29 #endif | |
| 30 #include "EmacsFrame.h" | |
| 31 | |
| 32 typedef struct { | |
| 1455 | 33 |
| 34 #ifdef LWLIB_USES_MOTIF | |
| 35 #if XmVERSION < 2 | |
| 36 /* It's easy to erroneously compile with Motif 1 headers, but link | |
| 37 with Motif 2 libraries. | |
| 38 | |
| 39 For example, AIX stupidly provides Motif headers in | |
| 40 /usr/dt/include, but fails to provide the corresponding libraries | |
| 41 in /usr/dt/lib. | |
| 42 | |
| 43 We actually try to survive such a version mismatch, since Motif 2 | |
| 44 is _almost_ binary compatible with Motif 1. Motif 2's | |
| 45 XmPrimitivePart has some trailing data members which overlay the | |
| 46 start of this struct. We create dummy members to make space for | |
| 47 XmPrimitivePart's added members. These must, of course, be at | |
| 48 the beginning of this struct. | |
| 49 | |
| 50 Delete this kludge when no one has Motif1 on their system anymore, | |
| 51 perhaps in 2010. */ | |
| 52 XtCallbackList Motif2_dummy_convert_callback; | |
| 53 XtCallbackList Motif2_dummy_popup_handler_callback; | |
| 54 long Motif2_dummy_layout_direction; | |
| 55 #endif | |
| 56 #endif | |
| 57 | |
| 428 | 58 struct frame* frame; /* the *emacs* frame object */ |
| 59 | |
| 60 /* Resources that can't be done from lisp. | |
| 61 */ | |
| 62 char* geometry; /* geometry spec of this frame */ | |
| 63 Boolean iconic; /* whether this frame is iconic */ | |
| 64 | |
| 65 /* The rest of this is crap and should be deleted. | |
| 3381 | 66 #### Comments that start with + are fields that actually get referred |
| 67 to somewhere aside from the init function. | |
| 68 I guess the "crap" has mostly moved to specifiers? | |
| 428 | 69 */ |
| 70 Boolean minibuffer; /* 0: normal frames with minibuffers. | |
| 71 * 1: frames without minibuffers | |
| 72 * 2: minibuffer only. */ | |
| 73 Boolean unsplittable; /* frame can only have one window */ | |
| 74 | |
| 3381 | 75 int internal_border_width; /* + internal borders */ |
| 428 | 76 int scrollbar_width; /* width of frame vertical sb's */ |
| 77 int scrollbar_height; /* height of frame horizontal sb's */ | |
| 78 int top_toolbar_height; /* height of top toolbar */ | |
| 79 int bottom_toolbar_height; /* height of bottom toolbar */ | |
| 80 int left_toolbar_width; /* width of left toolbar */ | |
| 81 int right_toolbar_width; /* width of right toolbar */ | |
| 82 int top_toolbar_border_width; /* border width */ | |
| 83 int bottom_toolbar_border_width; /* ... of bottom toolbar */ | |
| 84 int left_toolbar_border_width; /* ... of left toolbar */ | |
| 85 int right_toolbar_border_width; /* ... of right toolbar */ | |
| 3381 | 86 Dimension toolbar_shadow_thickness; /* + of shadows */ |
| 428 | 87 unsigned char scrollbar_placement; |
| 3381 | 88 int interline; /* + skips between lines */ |
| 428 | 89 |
| 90 XFontStruct* font; /* font */ | |
| 91 Pixel foreground_pixel; /* foreground */ | |
| 92 Pixel background_pixel; /* background */ | |
| 93 | |
| 94 Pixel cursor_color; /* text cursor color */ | |
| 95 Boolean bar_cursor; /* 1 if bar, 0 if block */ | |
| 96 | |
| 97 Boolean visual_bell; /* flash instead of beep */ | |
| 98 int bell_volume; /* how loud is beep */ | |
| 99 | |
| 100 Boolean menubar_p; /* initially show a menubar? */ | |
| 3381 | 101 Boolean initially_unmapped; /* + inhibit initial window mapping */ |
| 428 | 102 Boolean use_backing_store; /* backing store for menubar & ew? */ |
| 103 | |
| 104 Dimension preferred_width; /* if non-zero, preferred size for */ | |
| 105 Dimension preferred_height; /* QueryGeometry() */ | |
| 106 /* private state */ | |
| 107 | |
| 108 } EmacsFramePart; | |
| 109 | |
| 110 typedef struct _EmacsFrameRec { /* full instance record */ | |
| 111 CorePart core; | |
| 112 #ifdef LWLIB_USES_MOTIF | |
| 113 XmPrimitivePart primitive; | |
| 114 #endif | |
| 115 EmacsFramePart emacs_frame; | |
| 116 } EmacsFrameRec; | |
| 117 | |
| 118 typedef struct { /* new fields for EmacsFrame class */ | |
| 119 int dummy; | |
| 120 } EmacsFrameClassPart; | |
| 121 | |
| 122 typedef struct _EmacsFrameClassRec { /* full class record declaration */ | |
| 123 CoreClassPart core_class; | |
| 124 #ifdef LWLIB_USES_MOTIF | |
| 125 XmPrimitiveClassPart primitive_class; | |
| 126 #endif | |
| 127 EmacsFrameClassPart emacs_frame_class; | |
| 128 } EmacsFrameClassRec; | |
| 129 | |
| 130 extern EmacsFrameClassRec emacsFrameClassRec; /* class pointer */ | |
| 131 | |
| 440 | 132 #endif /* INCLUDED_EmacsFrameP_h_ */ |