Mercurial > hg > xemacs-beta
annotate src/gui-gtk.c @ 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 | 56144c8593a8 |
| children |
| rev | line source |
|---|---|
| 2168 | 1 /* General GUI code -- GTK-specific. (menubars, scrollbars, toolbars, dialogs) |
| 462 | 2 Copyright (C) 1995 Board of Trustees, University of Illinois. |
| 872 | 3 Copyright (C) 1995, 1996, 2002 Ben Wing. |
| 462 | 4 Copyright (C) 1995 Sun Microsystems, Inc. |
| 5 Copyright (C) 1998 Free Software Foundation, Inc. | |
| 6 | |
| 7 This file is part of XEmacs. | |
| 8 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
2552
diff
changeset
|
9 XEmacs is free software: you can redistribute it and/or modify it |
| 462 | 10 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:
2552
diff
changeset
|
11 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:
2552
diff
changeset
|
12 option) any later version. |
| 462 | 13 |
| 14 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 17 for more details. | |
| 18 | |
| 19 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:
2552
diff
changeset
|
20 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 462 | 21 |
| 22 /* Synched up with: Not in FSF. */ | |
| 23 | |
| 24 #include <config.h> | |
| 25 #include "lisp.h" | |
| 26 | |
| 27 #include "buffer.h" | |
| 872 | 28 #include "device-impl.h" |
| 462 | 29 #include "frame.h" |
| 30 #include "gui.h" | |
| 31 #include "opaque.h" | |
| 32 | |
| 872 | 33 #include "console-gtk-impl.h" |
| 34 | |
| 462 | 35 static GUI_ID gui_id_ctr = 0; |
| 36 | |
| 37 GUI_ID | |
| 38 new_gui_id (void) | |
| 39 { | |
| 40 return (++gui_id_ctr); | |
| 41 } | |
| 42 | |
| 43 /* This is like FRAME_MENUBAR_DATA (f), but contains an alist of | |
| 44 (id . popup-data) for GCPRO'ing the callbacks of the popup menus | |
| 45 and dialog boxes. */ | |
| 46 static Lisp_Object Vpopup_callbacks; | |
| 47 | |
| 48 void | |
| 49 gcpro_popup_callbacks (GUI_ID id, Lisp_Object data) | |
| 50 { | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
51 Vpopup_callbacks = Fcons (Fcons (make_fixnum (id), data), Vpopup_callbacks); |
| 462 | 52 } |
| 53 | |
| 54 void | |
| 55 ungcpro_popup_callbacks (GUI_ID id) | |
| 56 { | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
57 Lisp_Object lid = make_fixnum (id); |
| 2552 | 58 Lisp_Object this_callback = assq_no_quit (lid, Vpopup_callbacks); |
| 59 Vpopup_callbacks = delq_no_quit (this_callback, Vpopup_callbacks); | |
| 462 | 60 } |
| 61 | |
| 62 Lisp_Object | |
| 63 get_gcpro_popup_callbacks (GUI_ID id) | |
| 64 { | |
|
5581
56144c8593a8
Mechanically change INT to FIXNUM in our sources.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
65 Lisp_Object lid = make_fixnum (id); |
| 2552 | 66 Lisp_Object this_callback = assq_no_quit (lid, Vpopup_callbacks); |
| 462 | 67 |
| 2552 | 68 if (!NILP (this_callback)) |
| 462 | 69 { |
| 2552 | 70 return (XCDR (this_callback)); |
| 462 | 71 } |
| 72 return (Qnil); | |
| 73 } | |
| 74 | |
| 75 void | |
| 76 syms_of_gui_gtk (void) | |
| 77 { | |
| 78 #ifdef HAVE_POPUPS | |
| 563 | 79 DEFSYMBOL (Qmenu_no_selection_hook); |
| 462 | 80 #endif |
| 81 } | |
| 82 | |
| 83 void | |
| 84 vars_of_gui_gtk (void) | |
| 85 { | |
| 86 staticpro (&Vpopup_callbacks); | |
| 87 Vpopup_callbacks = Qnil; | |
| 88 #ifdef HAVE_POPUPS | |
| 89 popup_up_p = 0; | |
| 90 | |
| 91 #if 0 | |
| 92 /* This DEFVAR_LISP is just for the benefit of make-docfile. */ | |
| 93 /* #### misnamed */ | |
| 94 DEFVAR_LISP ("menu-no-selection-hook", &Vmenu_no_selection_hook /* | |
| 95 Function or functions to call when a menu or dialog box is dismissed | |
| 96 without a selection having been made. | |
| 97 */ ); | |
| 98 #endif | |
| 99 | |
| 100 Fset (Qmenu_no_selection_hook, Qnil); | |
| 101 #endif /* HAVE_POPUPS */ | |
| 102 } |