Mercurial > hg > xemacs-beta
annotate src/blocktype.c @ 4477:e34711681f30
Don't determine whether to call general device-type code at startup,
rather decide in the device-specific code itself.
lisp/ChangeLog addition:
2008-07-07 Aidan Kehoe <kehoea@parhasard.net>
Patch to make it up to the device-specific code whether
various Lisp functions should be called during device creation,
not relying on the startup code to decide this. Also, rename
initial-window-system to initial-device-type (which makes more
sense in this scheme), always set it.
* startup.el (command-line):
Use initial-device-type, not initial-window-system; just call
#'make-device, leave the special behaviour to be done the first
time a console type is initialised to be decided on by the
respective console code.
* x-init.el (x-app-defaults-directory): Declare that it should be
bound.
(x-define-dead-key): Have the macro take a DEVICE argument.
(x-initialize-compose): Have the function take a DEVICE argument,
and use it when checking if various keysyms are available on the
keyboard.
(x-initialize-keyboard): Have the function take a DEVICE argument,
allowing device-specific keyboard initialisation.
(make-device-early-x-entry-point-called-p): New.
(make-device-late-x-entry-point-called-p): New. Rename
pre-x-win-initted, x-win-initted.
(make-device-early-x-entry-point): Rename init-pre-x-win, take the
call to make-x-device out (it should be called from the
device-creation code, not vice-versa).
(make-device-late-x-entry-point): Rename init-post-x-win, have it
take a DEVICE argument, use that DEVICE argument when working out
what device-specific things need doing. Don't use
create-console-hook in core code.
* x-win-xfree86.el (x-win-init-xfree86): Take a DEVICE argument;
use it.
* x-win-sun.el (x-win-init-sun): Take a DEVICE argument; use it.
* mule/mule-x-init.el: Remove #'init-mule-x-win, an empty
function.
* tty-init.el (make-device-early-tty-entry-point-called-p): New.
Rename pre-tty-win-initted.
(make-device-early-tty-entry-point): New.
Rename init-pre-tty-win.
(make-frame-after-init-entry-point): New.
Rename init-post-tty-win to better reflect when it's called.
* gtk-init.el (gtk-early-lisp-options-file): New.
Move this path to a documented variable.
(gtk-command-switch-alist): Wrap the docstring to fewer than 79
columns.
(make-device-early-gtk-entry-point-called-p): New.
(make-device-late-gtk-entry-point-called-p): New.
Renamed gtk-pre-win-initted, gtk-post-win-initted to these.
(make-device-early-gtk-entry-point): New.
(make-device-late-gtk-entry-point): New.
Renamed init-pre-gtk-win, init-post-gtk-win to these.
Have make-device-late-gtk-entry-point take a device argument, and use
it; have make-device-early-gtk-entry-point load the GTK-specific
startup code, instead of doing that in C.
(init-gtk-win): Deleted, functionality moved to the GTK device
creation code.
(gtk-define-dead-key): Have it take a DEVICE argument; use this
argument.
(gtk-initialize-compose): Ditto.
* coding.el (set-terminal-coding-system):
Correct the docstring; the function isn't broken.
src/ChangeLog addition:
2008-07-07 Aidan Kehoe <kehoea@parhasard.net>
Patch to make it up to the device-specific code whether
various Lisp functions should be called during device creation,
not relying on the startup code to decide this. Also, rename
initial-window-system to initial-device-type (which makes more
sense in this scheme), always set it.
* redisplay.c (Vinitial_device_type): New.
(Vinitial_window_system): Removed.
Rename initial-window-system to initial-device type, making it
a stream if we're noninteractive. Update its docstring.
* device-x.c (Qmake_device_early_x_entry_point,
Qmake_device_late_x_entry_point): New.
Rename Qinit_pre_x_win, Qinit_post_x_win.
(x_init_device): Call #'make-device-early-x-entry-point earlier,
now we rely on it to find the application class and the
app-defaults directory.
(x_finish_init_device): Call #'make-device-late-x-entry-point with
the created device.
(Vx_app_defaults_directory): Always make this available, to
simplify code in x-init.el.
* device-tty.c (Qmake_device_early_tty_entry_point): New.
Rename Qinit_pre_tty_win, rename Qinit_post_tty_win and move to
frame-tty.c as Qmake_frame_after_init_entry_point.
(tty_init_device): Call #'make-device-early-tty-entry-point before
doing anything.
* frame-tty.c (Qmake_frame_after_init_entry_point): New.
* frame-tty.c (tty_after_init_frame): Have it call the
better-named #'make-frame-after-init-entry-point function
instead of #'init-post-tty-win (since it's called after frame, not
device, creation).
* device-msw.c (Qmake_device_early_mswindows_entry_point,
Qmake_device_late_mswindows_entry_point): New.
Rename Qinit_pre_mswindows_win, Qinit_post_mswindows_win.
(mswindows_init_device): Call
#'make-device-early-mswindows-entry-point here, instead of having
its predecessor call us.
(mswindows_finish_init_device): Call
#'make-device-early-mswindows-entry-point, for symmetry with the
other device types (though it's an empty function).
* device-gtk.c (Qmake_device_early_gtk_entry_point,
Qmake_device_late_gtk_entry_point): New.
Rename Qinit_pre_gtk_win, Qinit_post_gtk_win.
(gtk_init_device): Call #'make-device-early-gtk-entry-point; don't
load ~/.xemacs/gtk-options.el ourselves, leave that to lisp.
(gtk_finish_init_device): Call #'make-device-late-gtk-entry-point
with the created device as an argument.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Wed, 09 Jul 2008 20:46:22 +0200 |
| parents | fdefd0186b75 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 /* Fixed-size block allocator. |
| 2 Copyright (C) 1994 Free Software Foundation, Inc. | |
| 3 | |
| 4 This file is part of XEmacs. | |
| 5 | |
| 6 XEmacs is free software; you can redistribute it and/or modify it | |
| 7 under the terms of the GNU General Public License as published by the | |
| 8 Free Software Foundation; either version 2, or (at your option) any | |
| 9 later version. | |
| 10 | |
| 11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 14 for more details. | |
| 15 | |
| 16 You should have received a copy of the GNU General Public License | |
| 17 along with XEmacs; see the file COPYING. If not, write to | |
| 18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 19 Boston, MA 02111-1307, USA. | |
| 20 */ | |
| 21 | |
| 22 /* Synched up with: Not in FSF. */ | |
| 23 | |
| 24 /* Authorship: | |
| 25 | |
| 26 Ben Wing: December 1994, for 19.12. | |
| 27 */ | |
| 28 | |
| 29 /* | |
| 30 | |
| 31 ------------------------------------------------------------------------------ | |
| 32 | |
| 33 A "block-type object" is used to efficiently allocate and free blocks | |
| 34 of a particular size. Freed blocks are remembered in a free list and | |
| 35 are reused as necessary to allocate new blocks, so as to avoid as | |
| 36 much as possible making calls to malloc() and free(). | |
| 37 | |
| 38 This is a container object. Declare a block-type object of a specific type | |
| 39 as follows: | |
| 40 | |
| 41 struct mytype_blocktype { | |
| 42 Blocktype_declare (mytype); | |
| 43 }; | |
| 44 | |
| 45 Use the following functions/macros: | |
| 46 | |
| 47 structype *Blocktype_new(structype) | |
| 48 [MACRO] Create a new block-type object of the specified type. | |
| 49 The argument to this call should be the type of object to be | |
| 50 created, e.g. foobar_blocktype. | |
| 51 type *Blocktype_alloc(b) | |
| 52 [MACRO] Allocate a block of the proper type for the specified | |
| 53 block-type object and return a pointer to it. | |
| 54 Blocktype_free(b, block) | |
| 55 Free a block of the type corresponding to the specified block-type | |
| 56 object. | |
| 57 Blocktype_delete(b) | |
| 58 Destroy a block-type object and the memory allocated to it. | |
| 59 | |
| 60 */ | |
| 61 | |
| 62 /* This file has been Mule-ized. */ | |
| 63 | |
| 64 #include <config.h> | |
| 65 #include "lisp.h" | |
| 66 | |
| 67 #include "blocktype.h" | |
| 68 | |
| 69 typedef struct blocktype | |
| 70 { | |
| 71 Blocktype_declare (void); | |
| 72 } Blocktype; | |
| 73 | |
| 74 struct block_internal | |
| 75 { | |
| 76 void *next; | |
| 77 }; | |
| 78 | |
| 79 void * | |
| 665 | 80 Blocktype_newf (Bytecount elsize) |
| 428 | 81 { |
| 82 Blocktype *b = xnew (Blocktype); | |
| 665 | 83 b->elsize = max (elsize, (Bytecount) sizeof (void *)); |
| 428 | 84 b->free = 0; |
| 85 return (void *) b; | |
| 86 } | |
| 87 | |
| 88 void | |
| 89 Blocktype_allocf (void *bbb) | |
| 90 { | |
| 91 Blocktype *b = (Blocktype *) bbb; | |
| 92 if (b->free) | |
| 93 { | |
| 94 b->tempel = b->free; | |
| 95 b->free = ((struct block_internal *) (b->free))->next; | |
| 96 } | |
| 97 else | |
| 98 b->tempel = (void *) xmalloc (b->elsize); | |
| 99 } | |
| 100 | |
| 101 void | |
| 102 Blocktype_free (void *bbb, void *el) | |
| 103 { | |
| 104 Blocktype *b = (Blocktype *) bbb; | |
| 105 ((struct block_internal *) el)->next = b->free; | |
| 106 b->free = el; | |
| 107 } |