Mercurial > hg > xemacs-beta
annotate src/EmacsShell.c @ 5142:f965e31a35f0
reduce lcrecord headers to 2 words, rename printing_unreadable_object
-------------------- ChangeLog entries follow: --------------------
man/ChangeLog addition:
2010-03-13 Ben Wing <ben@xemacs.org>
* internals/internals.texi (Working with Lisp Objects):
* internals/internals.texi (Writing Macros):
* internals/internals.texi (lrecords):
More rewriting to correspond with changes from
*LRECORD* to *LISP_OBJECT*.
modules/ChangeLog addition:
2010-03-13 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c (print_pgconn):
* postgresql/postgresql.c (print_pgresult):
printing_unreadable_object -> printing_unreadable_object_fmt.
2010-03-13 Ben Wing <ben@xemacs.org>
* ldap/eldap.c (print_ldap):
printing_unreadable_object -> printing_unreadable_object_fmt.
src/ChangeLog addition:
2010-03-13 Ben Wing <ben@xemacs.org>
* alloc.c (alloc_sized_lrecord_1):
* alloc.c (alloc_sized_lrecord_array):
* alloc.c (old_alloc_sized_lcrecord):
* alloc.c (disksave_object_finalization_1):
* alloc.c (mark_lcrecord_list):
* alloc.c (alloc_managed_lcrecord):
* alloc.c (free_managed_lcrecord):
* alloc.c (tick_lcrecord_stats):
* alloc.c (sweep_lcrecords_1):
* buffer.c (print_buffer):
* buffer.c (DEFVAR_BUFFER_LOCAL_1):
* casetab.c:
* casetab.c (print_case_table):
* console.c (print_console):
* console.c (DEFVAR_CONSOLE_LOCAL_1):
* data.c (print_weak_list):
* data.c (print_weak_box):
* data.c (print_ephemeron):
* data.c (ephemeron_equal):
* database.c (print_database):
* database.c (finalize_database):
* device-msw.c (sync_printer_with_devmode):
* device-msw.c (print_devmode):
* device-msw.c (finalize_devmode):
* device.c:
* device.c (print_device):
* elhash.c:
* elhash.c (print_hash_table):
* eval.c (print_subr):
* eval.c (print_multiple_value):
* event-stream.c (event_stream_resignal_wakeup):
* events.c (clear_event_resource):
* events.c (zero_event):
* events.c (print_event):
* extents.c:
* extents.c (print_extent):
* file-coding.c (print_coding_system):
* font-mgr.c:
* font-mgr.c (Ffc_init):
* frame.c:
* frame.c (print_frame):
* gc.c:
* gc.c (GC_CHECK_NOT_FREE):
* glyphs.c:
* glyphs.c (print_image_instance):
* glyphs.c (print_glyph):
* gui.c (print_gui_item):
* gui.c (copy_gui_item):
* keymap.c (print_keymap):
* keymap.c (MARKED_SLOT):
* lisp.h:
* lisp.h (struct Lisp_String):
* lisp.h (DEFUN):
* lisp.h (DEFUN_NORETURN):
* lrecord.h:
* lrecord.h (NORMAL_LISP_OBJECT_UID):
* lrecord.h (struct lrecord_header):
* lrecord.h (set_lheader_implementation):
* lrecord.h (struct old_lcrecord_header):
* lrecord.h (struct free_lcrecord_header):
* marker.c (print_marker):
* mule-charset.c:
* mule-charset.c (print_charset):
* objects.c (print_color_instance):
* objects.c (print_font_instance):
* objects.c (finalize_font_instance):
* print.c (print_cons):
* print.c (printing_unreadable_object_fmt):
* print.c (printing_unreadable_lisp_object):
* print.c (external_object_printer):
* print.c (internal_object_printer):
* print.c (debug_p4):
* print.c (ext_print_begin):
* process.c (print_process):
* rangetab.c (print_range_table):
* rangetab.c (range_table_equal):
* scrollbar.c (free_scrollbar_instance):
* specifier.c (print_specifier):
* specifier.c (finalize_specifier):
* symbols.c (guts_of_unbound_marker):
* symeval.h:
* symeval.h (DEFVAR_SYMVAL_FWD):
* tooltalk.c:
* tooltalk.c (print_tooltalk_message):
* tooltalk.c (print_tooltalk_pattern):
* ui-gtk.c (ffi_object_printer):
* ui-gtk.c (emacs_gtk_object_printer):
* ui-gtk.c (emacs_gtk_boxed_printer):
* window.c (print_window):
* window.c (free_window_mirror):
* window.c (debug_print_window):
* xemacs.def.in.in:
(1) printing_unreadable_object -> printing_unreadable_object_fmt.
(2) printing_unreadable_lcrecord -> printing_unreadable_lisp_object
and fix up so it no longer requires an lcrecord.
These previous changes eliminate most of the remaining places where
the terms `lcrecord' and `lrecord' occurred outside of specialized
code.
(3) Fairly major change: Reduce the number of words in an lcrecord
from 3 to 2. The third word consisted of a uid that duplicated the
lrecord uid, and a single free bit, which was moved into the lrecord
structure. This reduces the size of the `uid' slot from 21 bits to
20 bits. Arguably this isn't enough -- we could easily have more than
1,000,000 or so objects created in a session. The answer is
(a) It doesn't really matter if we overflow the uid field because
it's only used for debugging, to identify an object uniquely
(or pretty much so).
(b) If we cared about it overflowing and wanted to reduce this,
we could make it so that cons, string, float and certain other
frob-block types that never print out the uid simply don't
store a uid in them and don't increment the lrecord_uid_counter.
(4) In conjunction with (3), create new macro NORMAL_LISP_OBJECT_UID()
and use it to abstract out the differences between NEWGC and old-GC
in accessing the `uid' value from a "normal Lisp Object pointer".
(5) In events.c, use zero_nonsized_lisp_object() in place of custom-
written equivalent. In font-mgr.c use external_object_printer()
in place of custom-written equivalents.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Sat, 13 Mar 2010 05:38:08 -0600 |
| parents | 3d8143fc88e1 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 /* Emacs shell widget -- glue. |
| 2 Copyright (C) 1994, 1995 Sun Microsystems, 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 /* Synched up with: Not in FSF. */ | |
| 22 | |
| 23 /* Written by Ben Wing, May, 1994. */ | |
| 24 | |
| 25 #include <config.h> | |
| 26 | |
| 27 #include <stdio.h> | |
| 28 #include <assert.h> | |
| 29 #include <stdlib.h> | |
| 30 #include <X11/StringDefs.h> | |
| 31 #include "xintrinsicp.h" | |
| 32 #include <X11/Shell.h> | |
| 33 #include <X11/ShellP.h> | |
| 34 #include "EmacsShell.h" | |
| 35 #include "ExternalShell.h" | |
| 36 | |
| 2500 | 37 #define ABORT abort |
| 38 | |
| 428 | 39 #if 0 /* Not currently used */ |
| 40 | |
| 41 /* The root_geometry_manager() method in Shell.c is fucked up with regard | |
| 42 to the user-specified-position vs. program-specified-position and | |
| 43 user-specified-size vs. program-specified-size flag. (It always | |
| 44 sets program-specified whenever the program requests a change | |
| 45 in its size or position, even when this came from direct user | |
| 46 request.) So we provide external entry points to fix this after | |
| 47 the program requested a size or position change. If it turns | |
| 48 out that the user-specified-position flag needs to be set at the | |
| 49 *same* time that the geometry change request is made, then we | |
| 50 will have to duplicate the entire root_geometry_manager() method; | |
| 51 but I don't think there are any WM's that require this. */ | |
| 52 | |
| 53 /* junk stolen from IntrinsicI.h */ | |
| 54 | |
| 55 extern void _XtAllocError( String /* alloc_type */); | |
| 56 | |
| 57 /* junk ungraciously copied from Shell.c */ | |
| 58 | |
| 59 static void ComputeWMSizeHints(w, hints) | |
| 60 WMShellWidget w; | |
| 61 XSizeHints *hints; | |
| 62 { | |
| 63 long flags; | |
| 64 hints->flags = flags = w->wm.size_hints.flags; | |
| 65 #define copy(field) hints->field = w->wm.size_hints.field | |
| 66 if (flags & (USPosition | PPosition)) { | |
| 67 copy(x); | |
| 68 copy(y); | |
| 69 } | |
| 70 if (flags & (USSize | PSize)) { | |
| 71 copy(width); | |
| 72 copy(height); | |
| 73 } | |
| 74 if (flags & PMinSize) { | |
| 75 copy(min_width); | |
| 76 copy(min_height); | |
| 77 } | |
| 78 if (flags & PMaxSize) { | |
| 79 copy(max_width); | |
| 80 copy(max_height); | |
| 81 } | |
| 82 if (flags & PResizeInc) { | |
| 83 copy(width_inc); | |
| 84 copy(height_inc); | |
| 85 } | |
| 86 if (flags & PAspect) { | |
| 87 copy(min_aspect.x); | |
| 88 copy(min_aspect.y); | |
| 89 copy(max_aspect.x); | |
| 90 copy(max_aspect.y); | |
| 91 } | |
| 92 #undef copy | |
| 93 #define copy(field) hints->field = w->wm.field | |
| 94 if (flags & PBaseSize) { | |
| 95 copy(base_width); | |
| 96 copy(base_height); | |
| 97 } | |
| 98 if (flags & PWinGravity) | |
| 99 copy(win_gravity); | |
| 100 #undef copy | |
| 101 } | |
| 102 | |
| 103 static void _SetWMSizeHints(w) | |
| 104 WMShellWidget w; | |
| 105 { | |
| 106 XSizeHints *size_hints = XAllocSizeHints(); | |
| 107 | |
| 108 if (size_hints == NULL) _XtAllocError("XAllocSizeHints"); | |
| 109 ComputeWMSizeHints(w, size_hints); | |
| 110 XSetWMNormalHints(XtDisplay((Widget)w), XtWindow((Widget)w), size_hints); | |
| 111 XFree((char*)size_hints); | |
| 112 } | |
| 113 | |
| 114 /* end of junk ungraciously copied from Shell.c */ | |
| 115 | |
| 116 #endif /* 0 */ | |
| 117 #if 0 /* Not currently used */ | |
| 118 | |
| 119 void | |
| 120 EmacsShellSetSizeUserSpecified (Widget gw) | |
| 121 { | |
| 122 WMShellWidget w = (WMShellWidget) gw; | |
| 123 w->wm.size_hints.flags |= USSize; | |
| 124 w->wm.size_hints.flags &= ~PSize; | |
| 125 if (!w->shell.override_redirect && XtIsRealized (gw)) | |
| 126 _SetWMSizeHints (w); | |
| 127 } | |
| 128 | |
| 129 void | |
| 130 EmacsShellSetPositionUserSpecified (Widget gw) | |
| 131 { | |
| 132 WMShellWidget w = (WMShellWidget) gw; | |
| 133 w->wm.size_hints.flags |= USPosition; | |
| 134 w->wm.size_hints.flags &= ~PPosition; | |
| 135 if (!w->shell.override_redirect && XtIsRealized (gw)) | |
| 136 _SetWMSizeHints (w); | |
| 137 } | |
| 138 | |
| 139 #endif /* 0 */ | |
| 140 | |
| 141 void | |
| 142 EmacsShellSmashIconicHint (Widget shell, int iconic_p) | |
| 143 { | |
| 144 /* See comment in frame-x.c about this */ | |
| 145 WMShellWidget wmshell = (WMShellWidget) shell; | |
| 146 assert (XtIsSubclass (shell, wmShellWidgetClass)); | |
| 147 /* old_state = (wmshell->wm.wm_hints.flags & StateHint | |
| 148 ? wmshell->wm.wm_hints.initial_state | |
| 149 : NormalState); */ | |
| 150 wmshell->wm.wm_hints.flags |= StateHint; | |
| 151 wmshell->wm.wm_hints.initial_state = iconic_p ? IconicState : NormalState; | |
| 152 } | |
| 153 | |
| 154 void | |
| 155 EmacsShellUpdateSizeHints (Widget gw) | |
| 156 { | |
| 157 if (XtIsSubclass (gw, topLevelEmacsShellWidgetClass)) | |
| 158 TopLevelEmacsShellUpdateSizeHints (gw); | |
| 159 #ifdef EXTERNAL_WIDGET | |
| 160 else if (XtIsSubclass (gw, externalShellWidgetClass)) | |
| 161 /* do what ??? Don't abort! */; | |
| 162 #endif | |
| 163 else if (XtIsSubclass (gw, transientEmacsShellWidgetClass)) | |
| 164 TransientEmacsShellUpdateSizeHints (gw); | |
| 165 else | |
| 2500 | 166 ABORT (); |
| 428 | 167 } |
