Mercurial > hg > xemacs-beta
annotate src/elhash.h @ 5043:d0c14ea98592
various frame-geometry fixes
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-15 Ben Wing <ben@xemacs.org>
* EmacsFrame.c:
* EmacsFrame.c (EmacsFrameResize):
* console-msw-impl.h:
* console-msw-impl.h (struct mswindows_frame):
* console-msw-impl.h (FRAME_MSWINDOWS_TARGET_RECT):
* device-tty.c:
* device-tty.c (tty_asynch_device_change):
* event-msw.c:
* event-msw.c (mswindows_wnd_proc):
* faces.c (Fface_list):
* faces.h:
* frame-gtk.c:
* frame-gtk.c (gtk_set_initial_frame_size):
* frame-gtk.c (gtk_set_frame_size):
* frame-msw.c:
* frame-msw.c (mswindows_init_frame_1):
* frame-msw.c (mswindows_set_frame_size):
* frame-msw.c (mswindows_size_frame_internal):
* frame-msw.c (msprinter_init_frame_3):
* frame.c:
* frame.c (enum):
* frame.c (Fmake_frame):
* frame.c (adjust_frame_size):
* frame.c (store_minibuf_frame_prop):
* frame.c (Fframe_property):
* frame.c (Fframe_properties):
* frame.c (Fframe_displayable_pixel_height):
* frame.c (Fframe_displayable_pixel_width):
* frame.c (internal_set_frame_size):
* frame.c (Fset_frame_height):
* frame.c (Fset_frame_pixel_height):
* frame.c (Fset_frame_displayable_pixel_height):
* frame.c (Fset_frame_width):
* frame.c (Fset_frame_pixel_width):
* frame.c (Fset_frame_displayable_pixel_width):
* frame.c (Fset_frame_size):
* frame.c (Fset_frame_pixel_size):
* frame.c (Fset_frame_displayable_pixel_size):
* frame.c (frame_conversion_internal_1):
* frame.c (get_frame_displayable_pixel_size):
* frame.c (change_frame_size_1):
* frame.c (change_frame_size):
* frame.c (generate_title_string):
* frame.h:
* gtk-xemacs.c:
* gtk-xemacs.c (gtk_xemacs_size_request):
* gtk-xemacs.c (gtk_xemacs_size_allocate):
* gtk-xemacs.c (gtk_xemacs_paint):
* gutter.c:
* gutter.c (update_gutter_geometry):
* redisplay.c (end_hold_frame_size_changes):
* redisplay.c (redisplay_frame):
* toolbar.c:
* toolbar.c (update_frame_toolbars_geometry):
* window.c:
* window.c (frame_pixsize_valid_p):
* window.c (check_frame_size):
Various fixes to frame geometry to make it a bit easier to understand
and fix some bugs.
1. IMPORTANT: Some renamings. Will need to be applied carefully to
the carbon repository, in the following order:
-- pixel_to_char_size -> pixel_to_frame_unit_size
-- char_to_pixel_size -> frame_unit_to_pixel_size
-- pixel_to_real_char_size -> pixel_to_char_size
-- char_to_real_pixel_size -> char_to_pixel_size
-- Reverse second and third arguments of change_frame_size() and
change_frame_size_1() to try to make functions consistent in
putting width before height.
-- Eliminate old round_size_to_char, because it didn't really
do anything differently from round_size_to_real_char()
-- round_size_to_real_char -> round_size_to_char; any places that
called the old round_size_to_char should just call the new one.
2. IMPORTANT FOR CARBON: The set_frame_size() method is now passed
sizes in "frame units", like all other frame-sizing functions,
rather than some hacked-up combination of char-cell units and
total pixel size. This only affects window systems that use
"pixelated geometry", and I'm not sure if Carbon is one of them.
MS Windows is pixelated, X and GTK are not. For pixelated-geometry
systems, the size in set_frame_size() is in displayable pixels
rather than total pixels and needs to be converted appropriately;
take a look at the changes made to mswindows_set_frame_size()
method if necessary.
3. Add a big long comment in frame.c describing how frame geometry
works.
4. Remove MS Windows-specific character height and width fields,
duplicative and unused.
5. frame-displayable-pixel-* and set-frame-displayable-pixel-*
didn't use to work on MS Windows, but they do now.
6. In general, clean up the handling of "pixelated geometry" so
that fewer functions have to worry about this. This is really
an abomination that should be removed entirely but that will
have to happen later. Fix some buggy code in
frame_conversion_internal() that happened to "work" because it
was countered by oppositely buggy code in change_frame_size().
7. Clean up some frame-size code in toolbar.c and use functions
already provided in frame.c instead of rolling its own.
8. Fix check_frame_size() in window.c, which formerly didn't take
pixelated geometry into account.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Mon, 15 Feb 2010 22:14:11 -0600 |
| parents | aa28d959af41 |
| children | e0db3c197671 |
| rev | line source |
|---|---|
| 428 | 1 /* Lisp interface to hash tables -- include file. |
| 2 Copyright (C) 1995, 1996 Ben Wing. | |
| 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 /* Synched up with: Not in FSF. */ | |
| 22 | |
| 440 | 23 #ifndef INCLUDED_elhash_h_ |
| 24 #define INCLUDED_elhash_h_ | |
| 428 | 25 |
| 440 | 26 typedef struct Lisp_Hash_Table Lisp_Hash_Table; |
| 428 | 27 |
| 440 | 28 DECLARE_LRECORD (hash_table, Lisp_Hash_Table); |
| 29 | |
| 30 #define XHASH_TABLE(x) XRECORD (x, hash_table, Lisp_Hash_Table) | |
| 617 | 31 #define wrap_hash_table(p) wrap_record (p, hash_table) |
| 428 | 32 #define HASH_TABLEP(x) RECORDP (x, hash_table) |
| 33 #define CHECK_HASH_TABLE(x) CHECK_RECORD (x, hash_table) | |
| 34 #define CONCHECK_HASH_TABLE(x) CONCHECK_RECORD (x, hash_table) | |
| 35 | |
| 4072 | 36 typedef struct htentry |
| 37 { | |
| 3092 | 38 #ifdef NEW_GC |
| 4072 | 39 struct lrecord_header lheader; |
| 40 #endif /* NEW_GC */ | |
| 41 Lisp_Object key; | |
| 42 Lisp_Object value; | |
| 43 } htentry; | |
| 44 | |
| 45 #define HTENTRY_CLEAR_P(htentry) ((*(EMACS_UINT*)(&((htentry)->key))) == 0) | |
| 46 | |
| 47 #ifdef NEW_GC | |
| 48 | |
| 3092 | 49 typedef struct htentry Lisp_Hash_Table_Entry; |
| 50 | |
| 51 DECLARE_LRECORD (hash_table_entry, Lisp_Hash_Table_Entry); | |
| 52 | |
| 53 #define XHASH_TABLE_ENTRY(x) \ | |
| 54 XRECORD (x, hash_table_entry, Lisp_Hash_Table_Entry) | |
| 55 #define wrap_hash_table_entry(p) wrap_record (p, hash_table_entry) | |
| 56 #define HASH_TABLE_ENTRYP(x) RECORDP (x, hash_table_entry) | |
| 57 #define CHECK_HASH_TABLE_ENTRY(x) CHECK_RECORD (x, hash_table_entry) | |
| 58 #define CONCHECK_HASH_TABLE_ENTRY(x) CONCHECK_RECORD (x, hash_table_entry) | |
| 59 #endif /* NEW_GC */ | |
| 60 | |
| 428 | 61 enum hash_table_weakness |
| 62 { | |
| 63 HASH_TABLE_NON_WEAK, | |
| 64 HASH_TABLE_KEY_WEAK, | |
| 65 HASH_TABLE_VALUE_WEAK, | |
| 442 | 66 HASH_TABLE_KEY_VALUE_WEAK, |
| 428 | 67 HASH_TABLE_KEY_CAR_WEAK, |
| 68 HASH_TABLE_VALUE_CAR_WEAK, | |
| 450 | 69 HASH_TABLE_KEY_CAR_VALUE_WEAK, |
| 428 | 70 HASH_TABLE_WEAK |
| 71 }; | |
| 72 | |
| 73 enum hash_table_test | |
| 74 { | |
| 75 HASH_TABLE_EQ, | |
| 76 HASH_TABLE_EQL, | |
| 77 HASH_TABLE_EQUAL | |
| 78 }; | |
| 79 | |
| 1204 | 80 extern const struct memory_description hash_table_description[]; |
| 428 | 81 |
| 82 EXFUN (Fcopy_hash_table, 1); | |
| 83 EXFUN (Fhash_table_count, 1); | |
| 84 EXFUN (Fgethash, 3); | |
| 85 EXFUN (Fputhash, 3); | |
| 86 EXFUN (Fremhash, 2); | |
| 87 EXFUN (Fclrhash, 1); | |
| 88 | |
| 89 typedef int (*hash_table_test_function_t) (Lisp_Object obj1, Lisp_Object obj2); | |
| 2515 | 90 typedef Hashcode (*hash_table_hash_function_t) (Lisp_Object obj); |
| 428 | 91 typedef int (*maphash_function_t) (Lisp_Object key, Lisp_Object value, |
| 92 void* extra_arg); | |
| 93 | |
| 450 | 94 Lisp_Object make_standard_lisp_hash_table (enum hash_table_test test, |
| 665 | 95 Elemcount size, |
| 450 | 96 double rehash_size, |
| 97 double rehash_threshold, | |
| 98 enum hash_table_weakness weakness); | |
| 99 | |
| 100 Lisp_Object make_general_lisp_hash_table (hash_table_hash_function_t hash_function, | |
| 101 hash_table_test_function_t test_function, | |
| 665 | 102 Elemcount size, |
| 428 | 103 double rehash_size, |
| 104 double rehash_threshold, | |
| 105 enum hash_table_weakness weakness); | |
| 106 | |
| 665 | 107 Lisp_Object make_lisp_hash_table (Elemcount size, |
| 428 | 108 enum hash_table_weakness weakness, |
| 109 enum hash_table_test test); | |
| 110 | |
| 111 void elisp_maphash (maphash_function_t function, | |
| 112 Lisp_Object hash_table, void *extra_arg); | |
| 113 | |
| 489 | 114 void elisp_maphash_unsafe (maphash_function_t function, |
| 115 Lisp_Object hash_table, void *extra_arg); | |
| 116 | |
| 428 | 117 void elisp_map_remhash (maphash_function_t predicate, |
| 118 Lisp_Object hash_table, void *extra_arg); | |
| 119 | |
| 120 int finish_marking_weak_hash_tables (void); | |
| 121 void prune_weak_hash_tables (void); | |
| 122 | |
| 440 | 123 void pdump_reorganize_hash_table (Lisp_Object); |
| 428 | 124 |
| 2421 | 125 void inchash_eq (Lisp_Object key, Lisp_Object table, EMACS_INT offset); |
| 126 | |
| 4072 | 127 htentry *find_htentry (Lisp_Object key, const Lisp_Hash_Table *ht); |
| 128 | |
| 440 | 129 #endif /* INCLUDED_elhash_h_ */ |