Mercurial > hg > xemacs-beta
annotate src/blocktype.c @ 4908:b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* compiler.h:
Create a USED() macro to force unused-var warnings to go away,
in certain cases where it's inconvenient to do otherwise (e.g.
when THIS_IS_GTK in redisplay-xlike-inc.c).
* console-x.h:
Remove unneeded decls, make some static.
* redisplay-xlike-inc.c:
* console-xlike-inc.h: New file. Include defns from
redisplay-xlike-inc.c that may be useful in other XLIKE files.
Correct the handling of colors and font-style setting functions
in the xlike defns. Lots of fixes in the GTK-specific defns.
* depend: Regenerate.
* event-xlike-inc.c:
* event-xlike-inc.c (USE_UNICODE_MAP):
* event-xlike-inc.c (endif):
* gccache-gtk.c:
* gtk-glue.c (xemacs_list_to_gtklist):
* gtk-glue.c (xemacs_gtklist_to_list):
* gtk-glue.c (FROB):
* gtk-glue.c (face_to_gc):
* gtk-glue.c (face_to_style):
* gtk-glue.c (gdk_event_to_emacs_event):
* gtk-xemacs.h (struct _GtkXEmacs):
* gtk-xemacs.h (struct _GtkXEmacsClass):
* objects-xlike-inc.c:
Cosmetic, comment fixes.
* glyphs.c (pixmap_to_lisp_data):
Unused var fixes.
* gtk-glue.c:
* gccache-gtk.c:
* gtk-xemacs.c:
* gtk-xemacs.h:
* objects-xlike-inc.c:
* ui-gtk.c:
* ui-gtk.h:
* xgccache.c:
* xgccache.c (GC_CACHE_SIZE):
* xgccache.h:
Misc include-file fixes.
* objects-xlike-inc.c (XFUN):
* objects-xlike-inc.c (xlistfonts_checking_charset):
Combine some ifdeffed stuff using defs in console-xlike-inc.h.
* redisplay-gtk.c:
* redisplay-gtk.c (THIS_IS_GTK):
* redisplay-gtk.c (XLIKE_bevel_area):
* redisplay-gtk.c (XLIKE_ring_bell):
* redisplay-gtk.c (gdk_draw_text_image):
Fix numerous compile problems. Delete gtk_output_shadows(),
which mostly duplicates generic bevel_modeline(). Fix up
gtk_bevel_modeline() into XLIKE_bevel_area() and make use of
the style var properly to set the appropriate GTK constant.
* redisplay-x.c:
* redisplay-x.c (XLIKE_window_output_begin):
* redisplay-x.c (XLIKE_window_output_end):
* redisplay-x.c (XLIKE_bevel_area):
* redisplay-x.c (x_output_shadows):
* redisplay-x.c (XLIKE_ring_bell):
Make x_output_shadows be static. Change the defn of various
functions to look like XLIKE_foo() so it matches the calling
convention elsewhere.
* redisplay-xlike-inc.c:
* redisplay-xlike-inc.c (NEED_GCCACHE_H):
* redisplay-xlike-inc.c (XLIKE_text_width):
* redisplay-xlike-inc.c (XLIKE_get_gc):
* redisplay-xlike-inc.c (XLIKE_text_width_single_run):
* redisplay-xlike-inc.c (XFT_FROB_LISP_COLOR):
* redisplay-xlike-inc.c (XLIKE_output_xlike_pixmap):
* redisplay-xlike-inc.c (XLIKE_output_pixmap):
* redisplay-xlike-inc.c (XLIKE_output_vertical_divider):
* redisplay-xlike-inc.c (XLIKE_flash):
Lots of header fixes. Lots of stuff moved to console-xlike-inc.h.
Use XFUN() to generate function names instead of directly
calling XLIKE_PASTE(). Remove unnecessary prototypes.
Unify calls to text_width funs. Make XLIKE_get_gc non-static
since it's called from gtk. Change the color-function calls
and fill-style-setting calls to match the changes in
console-xlike-inc.h. Use USED() to avoid some warnings.
* symsinit.h:
Sort the prototypes, and add a fun `sort-symsinit' in a comment
that does the sorting (using sort-regexp-fields).
* symsinit.h (init_number):
* sysgtk.h: New file, wraps the various GTK headers.
* sysgdkx.h: New file, wraps <gtk/gdkx.h>. Keep this separate to
* event-gtk.h: Delete. Combine stuff into console-gtk.h.
help isolate X-specific code from GTK.
* device-gtk.c:
* event-gtk.c:
* console-gtk.h:
* frame-gtk.c:
* gccache-gtk.c:
* gccache-gtk.h:
* glyphs-gtk.c (gtk_colorize_image_instance):
* glyphs-gtk.h:
* gtk-xemacs.h:
* objects-gtk.c:
* objects-gtk.c (MAX_FONT_COUNT):
* ui-gtk.h:
Use sysgtk.h or sysgdkx.h instead of directly including GTK
headers. Don't include event-gtk.h.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Mon, 01 Feb 2010 02:15:28 -0600 |
| 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 } |