Mercurial > hg > xemacs-beta
annotate src/ExternalClient-Xlib.c @ 5146:88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-03-15 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (c_readonly):
* alloc.c (deadbeef_memory):
* alloc.c (make_compiled_function):
* alloc.c (make_button_data):
* alloc.c (make_motion_data):
* alloc.c (make_process_data):
* alloc.c (make_timeout_data):
* alloc.c (make_magic_data):
* alloc.c (make_magic_eval_data):
* alloc.c (make_eval_data):
* alloc.c (make_misc_user_data):
* alloc.c (noseeum_make_marker):
* alloc.c (ADDITIONAL_FREE_string):
* alloc.c (common_init_alloc_early):
* alloc.c (init_alloc_once_early):
* bytecode.c (print_compiled_function):
* bytecode.c (mark_compiled_function):
* casetab.c:
* casetab.c (print_case_table):
* console.c:
* console.c (print_console):
* 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_multiple_value):
* eval.c (mark_multiple_value):
* events.c (deinitialize_event):
* events.c (print_event):
* events.c (event_equal):
* extents.c:
* extents.c (soe_dump):
* extents.c (soe_insert):
* extents.c (soe_delete):
* extents.c (soe_move):
* extents.c (extent_fragment_update):
* extents.c (print_extent_1):
* extents.c (print_extent):
* extents.c (vars_of_extents):
* frame.c:
* frame.c (print_frame):
* free-hook.c:
* free-hook.c (check_free):
* glyphs.c:
* glyphs.c (print_image_instance):
* glyphs.c (print_glyph):
* gui.c:
* gui.c (copy_gui_item):
* hash.c:
* hash.c (NULL_ENTRY):
* hash.c (KEYS_DIFFER_P):
* keymap.c (print_keymap):
* keymap.c (MARKED_SLOT):
* lisp.h:
* lrecord.h:
* lrecord.h (LISP_OBJECT_UID):
* lrecord.h (set_lheader_implementation):
* lrecord.h (struct old_lcrecord_header):
* lstream.c (print_lstream):
* lstream.c (finalize_lstream):
* marker.c (print_marker):
* marker.c (marker_equal):
* mc-alloc.c (visit_all_used_page_headers):
* mule-charset.c:
* mule-charset.c (print_charset):
* objects.c (print_color_instance):
* objects.c (print_font_instance):
* objects.c (finalize_font_instance):
* opaque.c (print_opaque):
* opaque.c (print_opaque_ptr):
* opaque.c (equal_opaque_ptr):
* print.c (internal_object_printer):
* print.c (enum printing_badness):
* rangetab.c (print_range_table):
* rangetab.c (range_table_equal):
* specifier.c (print_specifier):
* specifier.c (finalize_specifier):
* symbols.c:
* symbols.c (print_symbol_value_magic):
* tooltalk.c:
* tooltalk.c (print_tooltalk_message):
* tooltalk.c (print_tooltalk_pattern):
* window.c (print_window):
* window.c (debug_print_window):
(1) Make lrecord UID's have a separate UID space for each object.
Otherwise, with 20-bit UID's, we rapidly wrap around, especially
when common objects like conses and strings increment the UID value
for every object created. (Originally I tried making two UID spaces,
one for objects that always print readably and hence don't display
the UID, and one for other objects. But certain objects like markers
for which a UID is displayed are still generated rapidly enough that
UID overflow is a serious issue.) This also has the advantage of
making UID values smaller, hence easier to remember -- their main
purpose is to make it easier to keep track of different objects of
the same type when debugging code. Make sure we dump lrecord UID's
so that we don't have problems with pdumped and non-dumped objects
having the same UID.
(2) Display UID's consistently whenever an object (a) doesn't
consistently print readably (objects like cons and string, which
always print readably, can't display a UID), and (b) doesn't
otherwise have a unique property that makes objects of a
particular type distinguishable. (E.g. buffers didn't and still
don't print an ID, but the buffer name uniquely identifies the
buffer.) Some types, such as event, extent, compiled-function,
didn't always (or didn't ever) display an ID; others (such as
marker, extent, lstream, opaque, opaque-ptr, any object using
internal_object_printer()) used to display the actual machine
pointer instead.
(3) Rename NORMAL_LISP_OBJECT_UID to LISP_OBJECT_UID; make it work
over all Lisp objects and take a Lisp object, not a struct pointer.
(4) Some misc cleanups in alloc.c, elhash.c.
(5) Change code in events.c that "deinitializes" an event so that
it doesn't increment the event UID counter in the process. Also
use deadbeef_memory() to overwrite memory instead of doing the same
with custom code. In the process, make deadbeef_memory() in
alloc.c always available, and delete extraneous copy in mc-alloc.c.
Also capitalize all uses of 0xDEADBEEF. Similarly in elhash.c
call deadbeef_memory().
(6) Resurrect "debug SOE" code in extents.c. Make it conditional
on DEBUG_XEMACS and on a `debug-soe' variable, rather than on
SOE_DEBUG. Make it output to stderr, not stdout.
(7) Delete some custom print methods that were identical to
external_object_printer().
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Mon, 15 Mar 2010 16:35:38 -0500 |
parents | 8de911beca70 |
children | 2aa9cd456ae7 |
rev | line source |
---|---|
0 | 1 /* External client, raw Xlib version. |
2 Copyright (C) 1993, 1994 Sun Microsystems, Inc. | |
3 | |
4 This library is free software; you can redistribute it and/or | |
5 modify it under the terms of the GNU Library General Public | |
6 License as published by the Free Software Foundation; either | |
7 version 2 of the License, or (at your option) any later version. | |
8 | |
9 This library is distributed in the hope that it will be useful, | |
10 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
12 Library General Public License for more details. | |
13 | |
14 You should have received a copy of the GNU Library General Public | |
15 License along with this library; if not, write to | |
16 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
17 Boston, MA 02111-1307, USA. */ | |
18 | |
19 /* Synched up with: Not in FSF. */ | |
20 | |
21 /* Written by Ben Wing, February 1994. */ | |
22 | |
23 #include <X11/Xlib.h> | |
24 #include <X11/Xresource.h> | |
25 #include <X11/Xutil.h> | |
26 #include "extw-Xlib.h" | |
27 | |
28 /* this is not a perfect solution, but otherwise we have to include all | |
29 of the Xt junk */ | |
30 | |
31 #define XtGeometryNo 1 | |
32 | |
33 #if (XlibSpecificationRelease < 5) | |
34 # define XPointer char * | |
35 #endif | |
36 | |
37 static int context_inited; | |
38 static XContext focus_context; | |
39 | |
40 /* does the specified window have the focus, given that the pointer just | |
41 entered (or left) the window (according to enter_p)? This question | |
42 does not have an obvious answer in X. (Basically, X sucks.) */ | |
43 | |
44 static int | |
45 window_has_focus_p (Display *display, Window win, int enter_p) | |
46 { | |
47 Window focuswin; | |
48 int dummy; | |
49 | |
50 XGetInputFocus(display, &focuswin, &dummy); | |
51 if (focuswin == PointerRoot) | |
52 return enter_p; | |
53 if (focuswin == win) | |
54 return True; | |
55 if (!enter_p) | |
56 return False; | |
57 do | |
58 { | |
59 Status st; | |
60 Window root_win, parent_win; | |
61 Window *child_win; | |
2108 | 62 unsigned int nchild; |
0 | 63 |
2108 | 64 st = XQueryTree (display, win, &root_win, &parent_win, &child_win, |
65 &nchild); | |
0 | 66 if (!st) |
67 return False; | |
68 XFree((XPointer)child_win); | |
69 if (parent_win == focuswin) | |
70 return True; | |
71 if (parent_win == root_win) | |
72 return False; | |
73 win = parent_win; | |
74 } | |
75 while (1); | |
76 } | |
77 | |
2108 | 78 |
0 | 79 /* External entry points when using XLib directly */ |
80 | |
81 void ExternalClientInitialize (Display *display, Window win); | |
82 void | |
83 ExternalClientInitialize (Display *display, Window win) | |
84 { | |
85 extw_initialize_atoms(display); | |
86 extw_which_side = extw_client_send; | |
87 if (!context_inited) | |
88 { | |
89 focus_context = XUniqueContext(); | |
90 context_inited = 1; | |
91 } | |
92 XSaveContext(display, win, focus_context, 0); | |
93 XSelectInput(display, win, EnterWindowMask | LeaveWindowMask | | |
94 FocusChangeMask); | |
95 } | |
96 | |
97 void ExternalClientEventHandler (Display *display, Window win, XEvent *event); | |
98 void | |
99 ExternalClientEventHandler (Display *display, Window win, XEvent *event) | |
100 { | |
101 if (win != event->xany.window) | |
102 return; | |
2108 | 103 |
0 | 104 if (event->type == ClientMessage && |
105 event->xclient.message_type == a_EXTW_NOTIFY && | |
106 event->xclient.data.l[0] == extw_shell_send) | |
107 switch (event->xclient.data.l[1]) { | |
108 case extw_notify_gm: | |
109 /* for the moment, just refuse geometry requests. */ | |
110 extw_send_notify_3(display, win, extw_notify_gm, XtGeometryNo, 0, 0); | |
111 break; | |
2108 | 112 |
0 | 113 case extw_notify_init: |
114 extw_send_notify_3(display, win, extw_notify_init, EXTW_TYPE_XLIB, 0, 0); | |
115 break; | |
2108 | 116 |
0 | 117 case extw_notify_end: |
118 XClearArea(display, win, 0, 0, 0, 0, True); | |
119 break; | |
120 } | |
121 else | |
122 { | |
123 int focus_status; | |
124 XPointer current_focus; | |
125 | |
126 if (event->type == FocusIn) | |
127 focus_status = 1; | |
128 else if (event->type == FocusOut) | |
129 focus_status = 0; | |
130 else if (event->type == EnterNotify && | |
131 event->xcrossing.detail != NotifyInferior) | |
132 focus_status = window_has_focus_p(display, win, 1); | |
133 else if (event->type == LeaveNotify && | |
134 event->xcrossing.detail != NotifyInferior) | |
135 focus_status = window_has_focus_p(display, win, 0); | |
136 else | |
137 return; | |
138 XFindContext(display, win, focus_context, ¤t_focus); | |
139 if (focus_status != (int) current_focus) | |
140 { | |
141 XSaveContext(display, win, focus_context, (XPointer) focus_status); | |
142 extw_send_notify_3(display, win, focus_status ? | |
143 extw_notify_focus_in : extw_notify_focus_out, | |
144 0, 0, 0); | |
145 } | |
146 } | |
147 } |