Mercurial > hg > xemacs-beta
diff src/device-impl.h @ 872:79c6ff3eef26
[xemacs-hg @ 2002-06-20 21:18:01 by ben]
font changes etc.; some 21.4 changes
mule/mule-msw-init-late.el: Specify charset->windows-registry conversion.
mule/mule-x-init.el: Delete extra mule font additions here. Put them in faces.c.
cl-macs.el: Document better.
font-lock.el: Move Lisp function regexp to lisp-mode.el.
lisp-mode.el: Various indentation fixes:
Handle flet functions better.
Handle argument lists in defuns and flets.
Handle quoted lists, e.g. property lists -- don't indent like
function calls. Distinguish between lambdas and other lists.
lisp-mode.el: Handle this form.
faces.el, font-menu.el, font.el, gtk-faces.el, msw-faces.el, msw-font-menu.el, x-faces.el, x-init.el: Major overhaul of face-handling code:
-- Fix lots of bogus code in msw-faces.el, msw-font-menu.el,
font-menu.el that was "truenaming" font specs -- i.e. in the
process of frobbing a particular field in a general user-specified
font spec with wildcarded fields, sticking in particular values
for all the remaining wildcarded fields. This bug was rampant
everywhere except in x-faces.el (the oldest and only correctly
written code). This also means that we need to work with font
names at all times and not font instances, because a font instance
is essentially a truenamed font.
-- Total rewrite of extremely junky code in msw-faces.el. Work
with names as well as font instances, and return names; stop
truenaming when canonicalizing and frobbing; fix handling of the
combined style field, i.e. weight/slant (also fixed in font.el).
-- Totally rewrite the frobbing functions in faces.el. This time,
we frob all the instantiators rather than just computing a single
instance value and working backwards. That way, e.g., `bold' will
work for all charsets that have bold available, rather than only
for whatever charset was part of the computed font instance
(another example of the truename virus). Also fix up code to look
at the fallbacks (all of them) when no global value present, so we
don't need to put something in the global value. Intelligently
handle a request to frob a buffer locale, rather than signalling
an error. When frobbing instantiators, try hard to figure out
what device type is associated with them, and frob each according
to its own proper device type. Correctly handle inheritance
vectors given as instantiators. Preserve existing tags when
putting back frobbed instantiators. Extract out general
specifier-frobbing code into specifier.el. Document everything
cleanly. Do lots of other things better, etc.
-- Don't duplicatively set a global specification for the default
font -- it's already in the fallback and we no longer need a
default global specification present. Delete various code in
x-faces.el and msw-faces.el that duplicated the lists of fonts in
faces.c.
-- init-global-faces was not being called at all under MS Windows!
Major bogosity. That caused device-specific values to get stuck
into all the fonts, making it very hard to change them -- setting
global specs caused nothing to happen.
-- Correct weight names in font.el.
-- Lots more font fixups in objects*.c.
Printer.el: Warning fix.
specifier.el: Add more args to map-specifier.
Add various "heuristic" specifier functions to aid in creation of
specifier-munging code such as in faces.el.
subr.el: New functions.
lwlib.c: Fix warning.
config.inc.samp: Clean up, add args to control fastcall (not yet supported! the
changes needed are in another ws of mine), profile support, vc6
support, union-type.
xemacs.dsp, xemacs.mak: Semi-major overhaul.
Fix bug where dump-id was always getting recomputed, forcing a
redump even when nothing changed.
Add support for fastcall. Support edit-and-continue (on by
default) with vc6. Use incremental linking when doing a debug
compilation. Add support for profiling.
Consolidate the various debug flags.
Partial support for "batch-compiling" -- compiling many files on a
single invocation of the compiler. Doesn't seem to help that much
for me, so it's not finished or enabled by default.
Remove HAVE_MSW_C_DIRED, we always do.
Correct some sloppy use of directories.
s/cygwin32.h: Allow pdump to work under Cygwin (mmap is broken, so need to undefine
HAVE_MMAP).
s/win32-common.h, s/windowsnt.h: Support for fastcall. Add WIN32_ANY for identifying all Win32
variants (Cygwin, native, MinGW). Both of these are properly used
in another ws.
alloc.c, balloon-x.c, buffer.c, bytecode.c, callint.c, cm.c, cmdloop.c, cmds.c, console-gtk.c, console-gtk.h, console-msw.c, console-msw.h, console-stream.c, console-stream.h, console-tty.c, console-tty.h, console-x.c, console-x.h, console.c, console.h, device-gtk.c, device-msw.c, device-tty.c, device-x.c, device.c, device.h, devslots.h, dialog-gtk.c, dialog-msw.c, dialog-x.c, dialog.c, dired-msw.c, editfns.c, emacs.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.c, extents.c, extents.h, faces.c, fileio.c, fns.c, frame-gtk.c, frame-msw.c, frame-tty.c, frame-x.c, frame.c, frame.h, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gui-gtk.c, gui-msw.c, gui-x.c, gui.c, gutter.c, input-method-xlib.c, intl-encap-win32.c, intl-win32.c, keymap.c, lisp.h, macros.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, menubar.h, minibuf.c, mule-charset.c, nt.c, objects-gtk.c, objects-gtk.h, objects-msw.c, objects-msw.h, objects-tty.c, objects-tty.h, objects-x.c, objects-x.h, objects.c, objects.h, postgresql.c, print.c, process.h, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, redisplay.h, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, select-gtk.c, select-msw.c, select-x.c, select.c, signal.c, sound.c, specifier.c, symbols.c, syntax.c, sysdep.c, syssignal.h, syswindows.h, toolbar-common.c, toolbar-gtk.c, toolbar-msw.c, toolbar-x.c, toolbar.c, unicode.c, window.c, window.h: The following are the major changes made:
(1) Separation of various header files into an external and an
internal version, similar to the existing separation of process.h
and procimpl.h. Eventually this should be done for all Lisp
objects. The external version has the same name as currently; the
internal adds -impl. The external file has XFOO() macros for
objects, but the structure is opaque and defined only in the
internal file. It's now reasonable to move all prototypes in
lisp.h into the appropriate external file, and this should be
done. Currently, separation has been done on extents.h,
objects*.h, console.h, device.h, frame.h, and window.h.
For c/d/f/w, the most basic properties are available in the
external header file, with the macros resolving to functions. In
the internal header file, the macros are redefined to directly
access the structure. Also, the global MARK_FOO_CHANGED macros
have been made into functions so that they can be accessed without
needing to include lots of -impl headers -- they are used in
almost exclusively in non-time-critical functions, and take up
enough time that the function overhead will be negligible.
Similarly, the function overhead from making the basic properties
mentioned above into functions is negligible, and code that does
heavy accessing of c/d/f/w structures inevitably ends up needing
the internal header files, anyway.
(2) More face changes.
-- Major rewrite of objects-msw.c. Now handles wildcard specs
properly, rather than "truenaming" (or even worse, signalling an
error, which previously happened with some of the fallbacks if you
tried to use them in make-font-instance!).
-- Split charset matching of fonts into two stages -- one to find
a font specifically designed for a particular charset (by
examining its registry), the second to find a Unicode font that
can support the charset. This needs to proceed as two complete,
separate instantiations in order to work properly (otherwise many
of the fonts in the HELLO page look wrong). This should also make
it easy to support iso10646 (Unicode) fonts under X.
-- All default values for fonts are now completely specified in
the fallbacks. Stuff from mule-x-init.el has all been moved here,
merged with the existing specs, and totally rethought so you get
sensible results. (HELLO now looks much better!).
-- Generalize the "default X/GTK device" stuff into a
per-device-type "default device".
-- Add mswindows-{set-}charset-registry. In time,
charset<->code-page conversion functions will be removed.
-- Wrap protective code around calls to compute device specifier tags,
and do this computation before calling the face initialization code
because the latter may need these tags to be correctly updated.
(3) Other changes.
EmacsFrame.c, glyphs-msw.c, eval.c, gui-x.c, intl-encap-win32.c, search.c, signal.c, toolbar-msw.c, unicode.c: Warning fixes.
config.h.in: #undefs meant to be frobbed by configure *MUST* go inside of
#ifndef WIN32_NO_CONFIGURE, and everything else *MUST* go outside!
eval.c: Let detailed backtraces be detailed.
specifier.c: Don't override user's print-string-length/print-length settings.
glyphs.c: New function image-instance-instantiator.
config.h.in, sysdep.c: Changes for fastcall.
sysdep.c, nt.c: Fix up a previous botched patch that tried to add support for both
EEXIST and EACCES. IF THE BOTCHED PATCH WENT INTO 21.4, THIS FIXUP
NEEDS TO GO IN, TOO.
search.c: Fix *evil* crash due to incorrect synching of syntax-cache code
with 21.1. THIS SHOULD GO INTO 21.4.
author | ben |
---|---|
date | Thu, 20 Jun 2002 21:19:10 +0000 |
parents | |
children | c15f25529e61 |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/device-impl.h Thu Jun 20 21:19:10 2002 +0000 @@ -0,0 +1,331 @@ +/* Define device-object for XEmacs. + Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. + Copyright (C) 1995, 2002 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_impl_h_ +#define INCLUDED_device_impl_h_ + +#include "console-impl.h" +#include "device.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; + Charbpos charpos; + Charbpos closest; + Charcount modeline_closest; + Lisp_Object obj1, obj2; + int retval; +}; + +/* Less public: */ +#define DEVICE_TYPE_NAME(d) ((d)->devmeths->name) +#define DEVICE_IMPL_FLAG(d, f) CONMETH_IMPL_FLAG ((d)->devmeths, (f)) +#define DEVICE_SPECIFIC_FRAME_PROPS(d) \ + ((d)->devmeths->device_specific_frame_props) + +/* More public: */ +#define DEVICE_TYPE(d) ((d)->devmeths->symbol) +#define XDEVICE_TYPE(d) DEVICE_TYPE (XDEVICE (d)) + +/******** 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. */ + int old_fcntl_owner; +#endif +}; + +/* Redefine basic properties more efficiently */ + +#undef DEVICE_LIVE_P +#define DEVICE_LIVE_P(d) (!EQ (DEVICE_TYPE (d), Qdead)) +#undef DEVICE_CONSOLE +#define DEVICE_CONSOLE(d) ((d)->console) +#undef DEVICE_FRAME_LIST +#define DEVICE_FRAME_LIST(d) ((d)->frame_list) + +#define DEVICE_TYPE_P(d, type) EQ (DEVICE_TYPE (d), Q##type) + +#ifdef ERROR_CHECK_TYPES +DECLARE_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)) + +#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_CONNECTION(d) ((d)->connection) +#define DEVICE_CANON_CONNECTION(d) ((d)->canon_connection) +#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)) + +#endif /* INCLUDED_device_impl_h_ */