Mercurial > hg > xemacs-beta
view src/device.h @ 617:af57a77cbc92
[xemacs-hg @ 2001-06-18 07:09:50 by ben]
---------------------------------------------------------------
DOCUMENTATION FIXES:
---------------------------------------------------------------
eval.c: Correct documentation.
elhash.c: Doc correction.
---------------------------------------------------------------
LISP OBJECT CLEANUP:
---------------------------------------------------------------
bytecode.h, buffer.h, casetab.h, chartab.h, console-msw.h, console.h, database.c, device.h, eldap.h, elhash.h, events.h, extents.h, faces.h, file-coding.h, frame.h, glyphs.h, gui-x.h, gui.h, keymap.h, lisp-disunion.h, lisp-union.h, lisp.h, lrecord.h, lstream.h, mule-charset.h, objects.h, opaque.h, postgresql.h, process.h, rangetab.h, specifier.h, toolbar.h, tooltalk.h, ui-gtk.h: Add wrap_* to all objects (it was already there for a few of them)
-- an expression to encapsulate a pointer into a Lisp object,
rather than the inconvenient XSET*. "wrap" was chosen because
"make" as in make_int(), make_char() is not appropriate. (It
implies allocation. The issue does not exist for ints and chars
because they are not allocated.)
Full error checking has been added to these expressions. When
used without error checking, non-union build, use of these
expressions will incur no loss of efficiency. (In fact, XSET* is
now defined in terms of wrap_* in a non-union build.) In a union
build, you will also get no loss of efficiency provided that you
have a decent optimizing compiler, and a compiler that either
understands inlines or automatically inlines those particular
functions. (And since people don't normally do their production
builds on union, it doesn't matter.)
Update the sample Lisp object definition in lrecord.h accordingly.
dumper.c: Fix places in dumper that referenced wrap_object to reference
its new name, wrap_pointer_1.
buffer.c, bufslots.h, conslots.h, console.c, console.h, devslots.h, device.c, device.h, frame.c, frame.h, frameslots.h, window.c, window.h, winslots.h: -- Extract out the Lisp objects of `struct device' into devslots.h,
just like for the other structures.
-- Extract out the remaining (not copied into the window config)
Lisp objects in `struct window' into winslots.h; use different
macros (WINDOW_SLOT vs. WINDOW_SAVED_SLOT) to differentiate them.
-- Eliminate the `dead' flag of `struct frame', since it
duplicates information already available in `framemeths', and fix
FRAME_LIVE_P accordingly. (Devices and consoles already work this
way.)
-- In *slots.h, switch to system where MARKED_SLOT is automatically
undef'd at the end of the file. (Follows what winslots.h already
does.)
-- Update the comments at the beginning of *slots.h to be accurate.
-- When making any of the above objects dead, zero it out entirely
and reset all Lisp object slots to Qnil. (We were already doing
this somewhat, but not consistently.) This (1) Eliminates the
possibility of extra objects hanging around that ought to be
GC'd, (2) Causes an immediate crash if anyone tries to access a
structure in one of these objects, (3) Ensures consistent behavior
wrt dead objects.
dialog-msw.c: Use internal_object_printer, since this object should not escape.
---------------------------------------------------------------
FIXING A CRASH THAT I HIT ONCE (AND A RELATED BAD BEHAVIOR):
---------------------------------------------------------------
eval.c: Fix up some comments about the FSF implementation.
Fix two nasty bugs:
(1) condition_case_unwind frees the conses sitting in the
catch->tag slot too quickly, resulting in a crash that I hit.
(2) catches need to be unwound one at a time when calling
unwind-protect code, rather than all at once at the end; otherwise,
incorrect behavior can result. (A comment shows exactly how.)
backtrace.h: Improve comment about FSF differences in the handler stack.
---------------------------------------------------------------
FIXING A CRASH THAT I REPEATEDLY HIT WHEN USING THE MOUSE WHEEL
UNDER MSWINDOWS:
---------------------------------------------------------------
Basic idea: My crash is due either to a dead, non-marked,
GC-collected frame inside of a window mirror, or a prematurely
freed window mirror. We need to mark the Lisp objects inside of
window mirrors. Tracking the lifespan of window mirrors and
scrollbar instances is extremely hard, and there may well be
lurking bugs where such objects are freed too soon. The only safe
way to fix these problems (and it fixes both problems at once) is
to make both of these structures Lisp objects.
lrecord.h, emacs.c, inline.c, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, scrollbar.h, symsinit.h: Make scrollbar instances actual Lisp objects. Mark the window
mirrors in them. inline.c needs to know about scrollbar.h now.
Record the new type in lrecord.h. Fix up scrollbar-*.c
appropriately. Create a hash table in scrollbar-msw.c so that the
scrollbar instances stored in scrollbar HWND's are properly
GC-protected. Create complex_vars_of_scrollbar_mswindows() to
create the hash table at startup, and call it from emacs.c. Don't
store the scrollbar instance as a property of the GTK scrollbar,
as it's not used and if we did this, we'd have to separately
GC-protect it in a hash table, like in MS Windows.
lrecord.h, frame.h, frame.c, frameslots.h, redisplay.c, window.c, window.h: Move mark_window_mirror from redisplay.c to window.c. Make window
mirrors actual Lisp objects. Tell lrecord.h about them. Change
the window mirror member of struct frame from a pointer to a Lisp
object, and add XWINDOW_MIRROR in appropriate places. Mark the
scrollbar instances in the window mirror.
redisplay.c, redisplay.h, alloc.c: Delete mark_redisplay. Don't call mark_redisplay. We now mark
frame-specific structures in mark_frame.
NOTE: I also deleted an extremely questionable call to
update_frame_window_mirrors(). It was extremely questionable
before, and now totally impossible, since it will create
Lisp objects during redisplay.
frame.c: Mark the scrollbar instances, which are now Lisp objects.
Call mark_gutter() here, not in mark_redisplay().
gutter.c: Update comments about correct marking.
---------------------------------------------------------------
ISSUES BROUGHT UP BY MARTIN:
---------------------------------------------------------------
buffer.h: Put back these macros the way Steve T and I think they ought to be.
I already explained in a previous changelog entry why I think these
macros should be the way I'd defined them. Once again:
We fix these macros so they don't care about the type of their
lvalues. The non-C-string equivalents of these already function
in the same way, and it's correct because it should be OK to pass
in a CBufbyte *, a BufByte *, a Char_Binary *, an UChar_Binary *,
etc. The whole reason for these different types is to work around
errors caused by signed-vs-unsigned non-matching types. Any
possible error that might be caught in a DFC macro would also be
caught wherever the argument is used elsewhere. So creating
multiple macro versions would add no useful error-checking and
just further complicate an already complicated area.
As for Martin's "ANSI aliasing" bug, XEmacs is not ANSI-aliasing
clean and probably never will be. Unless the board agrees to
change XEmacs in this way (and we really don't want to go down
that road), this is not a bug.
sound.h: Undo Martin's type change.
signal.c: Fix problem identified by Martin with Linux and g++ due to
non-standard declaration of setitimer().
systime.h: Update the docs for "qxe_" to point out why making the
encapsulation explicit is always the right way to go. (setitimer()
itself serves as an example.)
For 21.4:
update-elc-2.el: Correct misplaced parentheses, making lisp/mule not get
recompiled.
author | ben |
---|---|
date | Mon, 18 Jun 2001 07:10:32 +0000 |
parents | 9a775fb11bb7 |
children | fdefd0186b75 |
line wrap: on
line source
/* Define device-object for XEmacs. Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. Copyright (C) 1995 Ben Wing Copyright (C) 1995 Sun Microsystems This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ /* Written by Chuck Thompson and Ben Wing. */ #ifndef INCLUDED_device_h_ #define INCLUDED_device_h_ #include "console.h" /* This should really be in redisplay.h but by putting it here we won't have to ensure that redisplay.h is always included before this file. */ struct pixel_to_glyph_translation_cache { unsigned int valid :1; struct frame *frame; int low_x_coord, high_x_coord, col, obj_x; int low_y_coord, high_y_coord, row, obj_y; struct window *w; Bufpos bufpos; Bufpos closest; Charcount modeline_closest; Lisp_Object obj1, obj2; int retval; }; #define DEVICE_TYPE_NAME(d) ((d)->devmeths->name) #define DEVICE_TYPE(d) ((d)->devmeths->symbol) #define DEVICE_IMPL_FLAG(d, f) CONMETH_IMPL_FLAG ((d)->devmeths, (f)) #define DEVICE_SPECIFIC_FRAME_PROPS(d) \ ((d)->devmeths->device_specific_frame_props) /******** Accessing / calling a device method *********/ #define HAS_DEVMETH_P(d, m) HAS_CONTYPE_METH_P ((d)->devmeths, m) #define DEVMETH(d, m, args) CONTYPE_METH ((d)->devmeths, m, args) #define MAYBE_DEVMETH(d, m, args) MAYBE_CONTYPE_METH ((d)->devmeths, m, args) #define DEVMETH_OR_GIVEN(d, m, args, given) \ CONTYPE_METH_OR_GIVEN((d)->devmeths, m, args, given) #define MAYBE_INT_DEVMETH(d, m, args) \ MAYBE_INT_CONTYPE_METH ((d)->devmeths, m, args) #define MAYBE_LISP_DEVMETH(d, m, args) \ MAYBE_LISP_CONTYPE_METH ((d)->devmeths, m, args) struct device { struct lcrecord_header header; /* Methods for this device's console. This can also be retrieved through device->console, but it's faster this way. */ struct console_methods *devmeths; /* A structure of auxiliary data specific to the device type. struct x_device is used for X window frames; defined in console-x.h struct tty_device is used to TTY's; defined in console-tty.h */ void *device_data; /* redisplay flags */ unsigned int buffers_changed :1; unsigned int clip_changed :1; unsigned int extents_changed :1; unsigned int faces_changed :1; unsigned int frame_changed :1; unsigned int glyphs_changed :1; unsigned int subwindows_changed :1; unsigned int subwindows_state_changed :1; unsigned int icon_changed :1; unsigned int menubar_changed :1; unsigned int modeline_changed :1; unsigned int point_changed :1; unsigned int size_changed :1; unsigned int gutter_changed :1; unsigned int toolbar_changed :1; unsigned int windows_changed :1; unsigned int windows_structure_changed :1; unsigned int locked :1; /* Cache information about last pixel position translated to a glyph. The law of locality applies very heavily here so caching the value leads to a significant win. At the moment this is really X specific but once we have generic mouse support it won't be. */ struct pixel_to_glyph_translation_cache pixel_to_glyph_cache; /* Output baud rate of device; used for redisplay decisions. */ int baud_rate; /* sound flags */ unsigned int on_console_p :1; unsigned int connected_to_nas_p :1; #define MARKED_SLOT(x) Lisp_Object x #include "devslots.h" /* File descriptors for input and output. Much of the time (but not always) these will be the same. For an X device, these both hold the file descriptor of the socket used to communicate with the X server. For a TTY device, these may or may not be the same and point to the terminal that is used for I/O. */ int infd, outfd; /* infd and outfd are moved outside HAVE_UNIXOID_EVENT_LOOP conditionals, because Win32, presumably the first port which does not use select() polling, DOES have handles for a console device. -- kkm */ #ifdef HAVE_UNIXOID_EVENT_LOOP /* holds some data necessary for SIGIO control. Perhaps this should be inside of device_data; but it is used for both TTY's and X device. Perhaps it should be conditionalized on SIGIO; but this requires including syssignal.h and systty.h. */ int old_fcntl_owner; #endif }; DECLARE_LRECORD (device, struct device); #define XDEVICE(x) XRECORD (x, device, struct device) #define XSETDEVICE(x, p) XSETRECORD (x, p, device) #define wrap_device(p) wrap_record (p, device) #define DEVICEP(x) RECORDP (x, device) #define CHECK_DEVICE(x) CHECK_RECORD (x, device) #define CONCHECK_DEVICE(x) CONCHECK_RECORD (x, device) #define CHECK_LIVE_DEVICE(x) do { \ CHECK_DEVICE (x); \ if (! DEVICE_LIVE_P (XDEVICE (x))) \ dead_wrong_type_argument (Qdevice_live_p, (x)); \ } while (0) #define CONCHECK_LIVE_DEVICE(x) do { \ CONCHECK_DEVICE (x); \ if (! DEVICE_LIVE_P (XDEVICE (x))) \ x = wrong_type_argument (Qdevice_live_p, (x)); \ } while (0) #define DEVICE_TYPE_P(d, type) EQ (DEVICE_TYPE (d), Q##type) #ifdef ERROR_CHECK_TYPECHECK INLINE_HEADER struct device * error_check_device_type (struct device *d, Lisp_Object sym); INLINE_HEADER struct device * error_check_device_type (struct device *d, Lisp_Object sym) { assert (EQ (DEVICE_TYPE (d), sym)); return d; } # define DEVICE_TYPE_DATA(d, type) \ ((struct type##_device *) error_check_device_type (d, Q##type)->device_data) #else # define DEVICE_TYPE_DATA(d, type) \ ((struct type##_device *) (d)->device_data) #endif #define CHECK_DEVICE_TYPE(x, type) \ do { \ CHECK_DEVICE (x); \ if (!(DEVICEP (x) && DEVICE_TYPE_P (XDEVICE (x), \ type))) \ dead_wrong_type_argument \ (type##_console_methods->predicate_symbol, x); \ } while (0) #define CONCHECK_DEVICE_TYPE(x, type) \ do { \ CONCHECK_DEVICE (x); \ if (!(DEVICEP (x) && DEVICE_TYPE_P (XDEVICE (x), \ type))) \ x = wrong_type_argument \ (type##_console_methods->predicate_symbol, x); \ } while (0) #define DEVICE_DISPLAY_P(dev) \ (DEVICE_LIVE_P (dev) && \ !DEVICE_IMPL_FLAG (dev, XDEVIMPF_IS_A_PRINTER)) #define CHECK_DISPLAY_DEVICE(dev) \ do { \ CHECK_DEVICE (dev); \ if (!(DEVICEP (dev) \ && DEVICE_DISPLAY_P (XDEVICE (dev)))) \ dead_wrong_type_argument (Qdisplay, dev); \ } while (0) #define CONCHECK_DISPLAY_DEVICE(dev) \ do { \ CONCHECK_DEVICE (dev); \ if (!(DEVICEP (dev) \ && DEVICE_DISPLAY_P (XDEVICE (dev)))) \ wrong_type_argument (Qdisplay, dev); \ } while (0) #define DEVICE_PRINTER_P(dev) \ (DEVICE_LIVE_P (dev) && !DEVICE_DISPLAY_P (dev)) #define CHECK_PRINTER_DEVICE(dev) \ do { \ CHECK_DEVICE (dev); \ if (!(DEVICEP (dev) \ && DEVICE_PRINTER_P (XDEVICE (dev)))) \ dead_wrong_type_argument (Qprinter, dev); \ } while (0) #define CONCHECK_PRINTER_DEVICE(dev) \ do { \ CONCHECK_DEVICE (dev); \ if (!(DEVICEP (dev) \ && DEVICE_PRINTER_P (XDEVICE (dev)))) \ wrong_type_argument (Qprinter, dev); \ } while (0) /* #### These should be in the device-*.h files but there are too many places where the abstraction is broken. Need to fix. */ #define DEVICE_X_P(dev) CONSOLE_TYPESYM_X_P (DEVICE_TYPE (dev)) #define CHECK_X_DEVICE(z) CHECK_DEVICE_TYPE (z, x) #define CONCHECK_X_DEVICE(z) CONCHECK_DEVICE_TYPE (z, x) #define DEVICE_GTK_P(dev) CONSOLE_TYPESYM_GTK_P (DEVICE_TYPE (dev)) #define CHECK_GTK_DEVICE(z) CHECK_DEVICE_TYPE (z, gtk) #define CONCHECK_GTK_DEVICE(z) CONCHECK_DEVICE_TYPE (z, gtk) #define DEVICE_MSWINDOWS_P(dev) CONSOLE_TYPESYM_MSWINDOWS_P (DEVICE_TYPE (dev)) #define CHECK_MSWINDOWS_DEVICE(z) CHECK_DEVICE_TYPE (z, mswindows) #define CONCHECK_MSWINDOWS_DEVICE(z) CONCHECK_DEVICE_TYPE (z, mswindows) #define DEVICE_TTY_P(dev) CONSOLE_TYPESYM_TTY_P (DEVICE_TYPE (dev)) #define CHECK_TTY_DEVICE(z) CHECK_DEVICE_TYPE (z, tty) #define CONCHECK_TTY_DEVICE(z) CONCHECK_DEVICE_TYPE (z, tty) #define DEVICE_STREAM_P(dev) CONSOLE_TYPESYM_STREAM_P (DEVICE_TYPE (dev)) #define CHECK_STREAM_DEVICE(z) CHECK_DEVICE_TYPE (z, stream) #define CONCHECK_STREAM_DEVICE(z) CONCHECK_DEVICE_TYPE (z, stream) #define DEVICE_WIN_P(dev) CONSOLE_TYPESYM_WIN_P (DEVICE_TYPE (dev)) EXFUN (Fdevice_console, 1); EXFUN (Fdevice_name, 1); EXFUN (Ffind_device, 2); EXFUN (Fmake_device, 3); EXFUN (Fselected_device, 1); extern Lisp_Object Qcreate_device_hook, Qdelete_device_hook, Qgrayscale; extern Lisp_Object Qinit_post_tty_win, Qmono, Vdefault_x_device, Vdefault_gtk_device; extern Lisp_Object Vdevice_class_list; int valid_device_class_p (Lisp_Object class); #define DEVICE_LIVE_P(d) (!EQ (DEVICE_TYPE (d), Qdead)) #define DEVICE_REDISPLAY_INFO(d) ((d)->redisplay_info) #define DEVICE_NAME(d) ((d)->name) #define DEVICE_CLASS(d) ((d)->device_class) /* Catch people attempting to set this. */ #define DEVICE_SELECTED_FRAME(d) NON_LVALUE ((d)->selected_frame) #define DEVICE_FRAME_WITH_FOCUS_REAL(d) ((d)->frame_with_focus_real) #define DEVICE_FRAME_WITH_FOCUS_FOR_HOOKS(d) ((d)->frame_with_focus_for_hooks) #define DEVICE_FRAME_THAT_OUGHT_TO_HAVE_FOCUS(d) \ ((d)->frame_that_ought_to_have_focus) #define DEVICE_USER_DEFINED_TAGS(d) ((d)->user_defined_tags) #define DEVICE_FRAME_LIST(d) ((d)->frame_list) #define DEVICE_CONNECTION(d) ((d)->connection) #define DEVICE_CANON_CONNECTION(d) ((d)->canon_connection) #define DEVICE_CONSOLE(d) ((d)->console) #define DEVICE_BAUD_RATE(d) ((d)->baud_rate) #define DEVICE_INFD(d) ((d)->infd) #define DEVICE_OUTFD(d) ((d)->outfd) #define DEVICE_OLD_FCNTL_OWNER(d) ((d)->old_fcntl_owner) #define DEVICE_ON_CONSOLE_P(d) ((d)->on_console_p) #define DEVICE_CONNECTED_TO_NAS_P(d) ((d)->connected_to_nas_p) #define LOCK_DEVICE(d) ((void) ((d)->locked = 1)) #define UNLOCK_DEVICE(d) ((void) ((d)->locked = 0)) #define INVALIDATE_DEVICE_PIXEL_TO_GLYPH_CACHE(d) \ ((void) ((d)->pixel_to_glyph_cache.valid = 0)) #define INVALIDATE_PIXEL_TO_GLYPH_CACHE do { \ Lisp_Object IPTGC_devcons, IPTGC_concons; \ DEVICE_LOOP_NO_BREAK (IPTGC_devcons, IPTGC_concons) \ INVALIDATE_DEVICE_PIXEL_TO_GLYPH_CACHE (XDEVICE (XCAR (IPTGC_devcons))); \ } while (0) #define MARK_DEVICE_FACES_CHANGED(d) \ ((void) (faces_changed = (d)->faces_changed = 1)) #define MARK_DEVICE_GLYPHS_CHANGED(d) \ ((void) (glyphs_changed = (d)->glyphs_changed = 1)) #define MARK_DEVICE_SUBWINDOWS_CHANGED(d) \ ((void) (subwindows_changed = (d)->subwindows_changed = 1)) #define MARK_DEVICE_SUBWINDOWS_STATE_CHANGED(d) \ ((void) (subwindows_state_changed = (d)->subwindows_state_changed = 1)) #define MARK_DEVICE_TOOLBARS_CHANGED(d) \ ((void) (toolbar_changed = (d)->toolbar_changed = 1)) #define MARK_DEVICE_GUTTERS_CHANGED(d) \ ((void) (gutter_changed = (d)->gutter_changed = 1)) #define MARK_DEVICE_SIZE_CHANGED(d) \ ((void) (size_changed = (d)->size_changed = 1)) #define MARK_DEVICE_FRAMES_FACES_CHANGED(d) do { \ struct device *mdffc_d = (d); \ Lisp_Object frmcons; \ DEVICE_FRAME_LOOP (frmcons, mdffc_d) \ XFRAME (XCAR (frmcons))->faces_changed = 1; \ MARK_DEVICE_FACES_CHANGED (mdffc_d); \ } while (0) #define MARK_DEVICE_FRAMES_GLYPHS_CHANGED(d) do { \ struct device *mdffc_d = (d); \ Lisp_Object frmcons; \ DEVICE_FRAME_LOOP (frmcons, mdffc_d) \ XFRAME (XCAR (frmcons))->glyphs_changed = 1; \ MARK_DEVICE_GLYPHS_CHANGED (mdffc_d); \ } while (0) #define MARK_DEVICE_FRAME_CHANGED(d) \ ((void) (frame_changed = (d)->frame_changed = 1)) #define MARK_DEVICE_WINDOWS_CHANGED(d) \ ((void) (windows_changed = (d)->windows_changed = 1)) #define MARK_DEVICE_WINDOWS_STRUCTURE_CHANGED(d) \ ((void) (windows_structure_changed = (d)->windows_structure_changed = 1)) /* #### unify this with DOMAIN_DEVICE once the latter has image instances expunged from it. */ /* This turns out to be used heavily so we make it a macro to make it inline. Also, the majority of the time the object will turn out to be a window so we move it from being checked last to being checked first. */ #define DFW_DEVICE(obj) \ (WINDOWP (obj) ? WINDOW_DEVICE (XWINDOW (obj)) \ : (FRAMEP (obj) ? FRAME_DEVICE (XFRAME (obj)) \ : (DEVICEP (obj) ? obj \ : Qnil))) /* NO_BREAK means that "break" doesn't do what you think it does! Use goto instead. "continue" is OK, though. */ #define DEVICE_LOOP_NO_BREAK(devcons, concons) \ CONSOLE_LOOP (concons) \ CONSOLE_DEVICE_LOOP (devcons, XCONSOLE (XCAR (concons))) #define DEVICE_FRAME_LOOP(frmcons, d) \ LIST_LOOP (frmcons, DEVICE_FRAME_LIST (d)) #define CONSOLE_FRAME_LOOP_NO_BREAK(frmcons, devcons, con) \ CONSOLE_DEVICE_LOOP (devcons, con) \ DEVICE_FRAME_LOOP (frmcons, XDEVICE (XCAR (devcons))) void select_device_1 (Lisp_Object); struct device *decode_device (Lisp_Object); void handle_asynch_device_change (void); void call_critical_lisp_code (struct device *d, Lisp_Object function, Lisp_Object object); void delete_device_internal (struct device *d, int force, int called_from_delete_console, int from_io_error); void io_error_delete_device (Lisp_Object device); Lisp_Object find_nonminibuffer_frame_not_on_device (Lisp_Object device); void set_device_selected_frame (struct device *d, Lisp_Object frame); Lisp_Object domain_device_type (Lisp_Object domain); int window_system_pixelated_geometry (Lisp_Object domain); #endif /* INCLUDED_device_h_ */