Mercurial > hg > xemacs-beta
view lwlib/xlwradio.c @ 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 | c33ae14dd6d0 |
children | c2569faae8ed |
line wrap: on
line source
/* Radio Widget for XEmacs. Copyright (C) 1999 Edward A. Falk 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: Radio.c 1.1 */ /* * Radio.c - Radio button widget * * Author: Edward A. Falk * falk@falconer.vip.best.com * * Date: June 30, 1997 * * * Overview: This widget is identical to the Toggle widget in behavior, * but completely different in appearance. This widget looks like a small * diamond-shaped button with a label to the right. * * To make this work, we subclass the Toggle widget to inherit its behavior * and to inherit the label-drawing function from which Toggle is * subclassed. We then completely replace the Expose, Set, Unset * and Highlight member functions. * * The Set and Unset actions are slightly unorthodox. In Toggle's * ClassInit function, Toggle searches the Command actions list and * "steals" the Set and Unset functions, caching pointers to them in its * class record. It then calls these functions from its own ToggleSet * and Toggle actions. * * We, in turn, override the Set() and Unset() actions in our own ClassRec. */ #include <config.h> #include <stdio.h> #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> #include ATHENA_XawInit_h_ #include "../src/xmu.h" #include "xlwradioP.h" #define BOX_SIZE 13 #define rclass(w) ((RadioWidgetClass)((w)->core.widget_class)) #ifdef _ThreeDP_h #define swid(rw) ((rw)->threeD.shadow_width) #else #define swid(rw) ((rw)->core.border_width) #endif #define bsize(rw) (rclass(rw)->radio_class.dsize) #define bs(rw) (bsize(rw) + 2*swid(rw)) /**************************************************************** * * Full class record constant * ****************************************************************/ /* The translations table from Toggle do not need to be * overridden by Radio */ /* Member functions */ static void RadioInit (Widget, Widget, ArgList, Cardinal *); static void RadioExpose (Widget, XEvent *, Region); static void RadioResize (Widget); static void RadioDestroy (Widget, XtPointer, XtPointer); static void RadioClassInit (void); static void RadioClassPartInit (WidgetClass); static Boolean RadioSetValues (Widget, Widget, Widget, ArgList, Cardinal *); static void DrawDiamond (Widget); static XtGeometryResult RadioQueryGeometry (Widget, XtWidgetGeometry *, XtWidgetGeometry *); /* Action procs */ static void RadioHighlight (Widget, XEvent *, String *, Cardinal *); static void RadioUnhighlight (Widget, XEvent *, String *, Cardinal *); /* internal privates */ static void RadioSize (RadioWidget, Dimension *, Dimension *); /* The actions table from Toggle is almost perfect, but we need * to override Highlight, Set, and Unset. */ static XtActionsRec actionsList[] = { {"highlight", RadioHighlight}, {"unhighlight", RadioUnhighlight}, }; #define SuperClass ((ToggleWidgetClass)&toggleClassRec) RadioClassRec radioClassRec = { { (WidgetClass) SuperClass, /* superclass */ "Radio", /* class_name */ sizeof(RadioRec), /* size */ RadioClassInit, /* class_initialize */ RadioClassPartInit, /* class_part_initialize */ FALSE, /* class_inited */ RadioInit, /* initialize */ NULL, /* initialize_hook */ XtInheritRealize, /* realize */ actionsList, /* actions */ XtNumber(actionsList), /* num_actions */ NULL, /* resources */ 0, /* resource_count */ NULLQUARK, /* xrm_class */ TRUE, /* compress_motion */ TRUE, /* compress_exposure */ TRUE, /* compress_enterleave */ FALSE, /* visible_interest */ NULL, /* destroy */ RadioResize, /* resize */ RadioExpose, /* expose */ RadioSetValues, /* set_values */ NULL, /* set_values_hook */ XtInheritSetValuesAlmost, /* set_values_almost */ NULL, /* get_values_hook */ NULL, /* accept_focus */ XtVersion, /* version */ NULL, /* callback_private */ XtInheritTranslations, /* tm_table */ RadioQueryGeometry, /* query_geometry */ XtInheritDisplayAccelerator, /* display_accelerator */ NULL /* extension */ }, /* CoreClass fields initialization */ { XtInheritChangeSensitive /* change_sensitive */ }, /* SimpleClass fields initialization */ #ifdef _ThreeDP_h { XtInheritXaw3dShadowDraw /* field not used */ }, /* ThreeDClass fields initialization */ #endif { 0 /* field not used */ }, /* LabelClass fields initialization */ { 0 /* field not used */ }, /* CommandClass fields initialization */ { RadioSet, /* Set Procedure. */ RadioUnset, /* Unset Procedure. */ NULL /* extension. */ }, /* ToggleClass fields initialization */ { BOX_SIZE, DrawDiamond, /* draw procedure */ NULL /* extension. */ } /* RadioClass fields initialization */ }; /* for public consumption */ WidgetClass radioWidgetClass = (WidgetClass) &radioClassRec; /**************************************************************** * * Class Methods * ****************************************************************/ static void RadioClassInit (void) { XawInitializeWidgetSet(); } static void RadioClassPartInit (WidgetClass class) { RadioWidgetClass c = (RadioWidgetClass) class ; RadioWidgetClass super = (RadioWidgetClass)c->core_class.superclass ; if( c->radio_class.drawDiamond == NULL || c->radio_class.drawDiamond == XtInheritDrawDiamond ) { c->radio_class.drawDiamond = super->radio_class.drawDiamond ; } } /*ARGSUSED*/ static void RadioInit (Widget request, Widget new, ArgList args, Cardinal *num_args) { RadioWidget rw = (RadioWidget) new; RadioWidget rw_req = (RadioWidget) request; Dimension w,h ; /* Select initial size for the widget */ if( rw_req->core.width == 0 || rw_req->core.height == 0 ) { RadioSize(rw, &w,&h) ; if( rw_req->core.width == 0 ) rw->core.width = w ; if( rw_req->core.height == 0 ) rw->core.height = h ; rw->core.widget_class->core_class.resize(new) ; } } /* Function Name: RadioDestroy * Description: Destroy Callback for radio widget. * Arguments: w - the radio widget that is being destroyed. * junk, garbage - not used. * Returns: none. */ /* ARGSUSED */ static void RadioDestroy (Widget w, XtPointer junk, XtPointer garbage) { /* TODO: get rid of this */ } /* React to size change from manager. Label widget will compute some internal * stuff, but we need to override. This code requires knowledge of the * internals of the Label widget. */ static void RadioResize (Widget w) { RadioWidget rw = (RadioWidget)w ; /* call parent resize proc */ SuperClass->core_class.resize(w) ; /* override label offset */ switch( rw->label.justify ) { case XtJustifyLeft: rw->label.label_x += (bs(rw) + rw->label.internal_width) ; break ; case XtJustifyRight: break ; case XtJustifyCenter: default: rw->label.label_x += (bs(rw) + rw->label.internal_width)/2; break ; } } /* * Repaint the widget window. */ static void RadioExpose (Widget w, XEvent *event, Region region) { RadioWidget rw = (RadioWidget) w ; Display *dpy = XtDisplay(w) ; Window win = XtWindow(w) ; GC gc ; Pixmap left_bitmap ; extern WidgetClass labelWidgetClass ; /* Note: the Label widget examines the region to decide if anything * needs to be drawn. I'm not sure that this is worth the effort, * but it bears thinking on. */ /* Command widget may sometimes override the label GC in order * to draw inverse video. We don't use inverse video, so we need * to restore the label's normal GC. */ rw->label.normal_GC = rw->command.normal_GC ; /* Let label widget draw the label. If there was an lbm_x * field, we could let Label draw the bitmap too. But there * isn't, so we need to temporarily remove the bitmap and * draw it ourself later. */ left_bitmap = rw->label.left_bitmap ; rw->label.left_bitmap = None ; labelWidgetClass->core_class.expose(w,event,region) ; rw->label.left_bitmap = left_bitmap ; /* now manually draw the left bitmap. TODO: 3-d look, xaw-xpm */ gc = XtIsSensitive(w) ? rw->label.normal_GC : rw->label.gray_GC ; if( left_bitmap != None && rw->label.lbm_width > 0 ) { /* TODO: handle pixmaps */ XCopyPlane(dpy, left_bitmap, win, gc, 0,0, rw->label.lbm_width, rw->label.lbm_height, (int) rw->label.internal_width*2 + bs(rw), (int) rw->label.internal_height + rw->label.lbm_y, 1UL) ; } /* Finally, the button itself */ ((RadioWidgetClass)(w->core.widget_class))->radio_class.drawDiamond(w) ; } /************************************************************ * * Set specified arguments into widget * ***********************************************************/ /* ARGSUSED */ static Boolean RadioSetValues (Widget current, Widget request, Widget new, ArgList args, Cardinal *num_args) { RadioWidget oldrw = (RadioWidget) current; RadioWidget newrw = (RadioWidget) new; /* Need to find out if the size of the widget changed. Set new size * if it did and resize is permitted. One way to determine of the * widget changed size would be to scan the args list. Another way * is to compare the old and new widgets and see if any of several * size-related fields have been changed. The Label widget chose the * former method, but I choose the latter. */ if( newrw->label.resize && ( newrw->core.width != oldrw->core.width || newrw->core.height != oldrw->core.height || newrw->core.border_width != oldrw->core.border_width ) ) { RadioSize(newrw, &newrw->core.width, &newrw->core.height) ; } /* The label set values routine can resize the widget. We need to * recalculate if this is true. */ if (newrw->label.label_x != oldrw->label.label_x) { RadioResize (new); } return FALSE ; } static XtGeometryResult RadioQueryGeometry (Widget w, XtWidgetGeometry *intended, XtWidgetGeometry *preferred) { RadioWidget rw = (RadioWidget) w; preferred->request_mode = CWWidth | CWHeight; RadioSize(rw, &preferred->width, &preferred->height) ; if ( ((intended->request_mode & (CWWidth | CWHeight)) == (CWWidth | CWHeight)) && intended->width == preferred->width && intended->height == preferred->height) return XtGeometryYes; else if (preferred->width == w->core.width && preferred->height == w->core.height) return XtGeometryNo; else return XtGeometryAlmost; } /************************************************************ * * Action Procedures * ************************************************************/ /* * Draw the highlight border around the widget. The Command widget * did this by drawing through a mask. We do it by just drawing the * border. */ static void DrawHighlight (Widget w, GC gc) { RadioWidget rw = (RadioWidget)w; XRectangle rects[4] ; Dimension ht = rw->command.highlight_thickness ; if( ht <= 0 || ht > rw->core.width/2 || ht > rw->core.height/2 ) return ; if( ! XtIsRealized(w) ) return ; rects[0].x = 0 ; rects[0].y = 0 ; rects[0].width = rw->core.width ; rects[0].height = ht ; rects[1].x = 0 ; rects[1].y = rw->core.height - ht ; rects[1].width = rw->core.width ; rects[1].height = ht ; rects[2].x = 0 ; rects[2].y = ht ; rects[2].width = ht ; rects[2].height = rw->core.height - ht*2 ; rects[3].x = rw->core.width - ht ; rects[3].y = ht ; rects[3].width = ht ; rects[3].height = rw->core.height - ht*2 ; XFillRectangles( XtDisplay(w), XtWindow(w), gc, rects, 4) ; } static void RadioHighlight (Widget w, XEvent *event, String *params, Cardinal *num_params) { RadioWidget rw = (RadioWidget)w; DrawHighlight(w, rw->command.normal_GC) ; } static void RadioUnhighlight (Widget w, XEvent *event, String *params, Cardinal *num_params) { RadioWidget rw = (RadioWidget)w; DrawHighlight(w, rw->command.inverse_GC) ; } /* ARGSUSED */ void RadioSet (Widget w, XEvent *event, String *params, /* unused */ Cardinal *num_params) /* unused */ { RadioWidget rw = (RadioWidget)w; RadioWidgetClass class = (RadioWidgetClass) w->core.widget_class ; if( rw->command.set ) return ; rw->command.set = TRUE ; if( XtIsRealized(w) ) class->radio_class.drawDiamond(w) ; } /* ARGSUSED */ void RadioUnset (Widget w, XEvent *event, String *params, /* unused */ Cardinal *num_params) /* unused */ { RadioWidget rw = (RadioWidget)w; RadioWidgetClass class = (RadioWidgetClass) w->core.widget_class ; if( ! rw->command.set ) return ; rw->command.set = FALSE ; if( XtIsRealized(w) ) class->radio_class.drawDiamond(w) ; } /************************************************************ * * Internal Procedures * ************************************************************/ /* Size of widget. Width is size of box plus width of border around * box plus width of label plus three margins plus the size of the left * bitmap, if any. Height is max(box,bitmap,label) plus two margins. */ static void RadioSize (RadioWidget rw, Dimension *w, Dimension *h) { *w = rw->label.label_width + bs(rw) + LEFT_OFFSET(rw) + 3 * rw->label.internal_width ; *h = Max( rw->label.label_height, bs(rw) ) + 2 * rw->label.internal_width ; } static void DrawDiamond (Widget w) { RadioWidget rw = (RadioWidget) w ; Display *dpy = XtDisplay(w) ; Window win = XtWindow(w) ; GC gc, gci ; XPoint pts[5] ; Dimension del = bsize(rw)/2 ; Position x,y ; /* diamond center */ #ifdef _ThreeDP_h int i=0; Dimension s = swid(rw) ; GC top, bot, ctr ; #endif gc = XtIsSensitive(w) ? rw->command.normal_GC : rw->label.gray_GC ; gci = rw->command.set ? rw->command.normal_GC : rw->command.inverse_GC ; x = rw->label.internal_width + bs(rw)/2 ; y = rw->core.height/2 ; #ifdef _ThreeDP_h if( ! rw->command.set ) { top = rw->threeD.top_shadow_GC ; bot = rw->threeD.bot_shadow_GC ; ctr = gc ; /* TODO */ } else { top = rw->threeD.bot_shadow_GC ; bot = rw->threeD.top_shadow_GC ; ctr = gc ; /* TODO */ } #endif pts[0].x = x - del ; pts[0].y = y ; pts[1].x = x ; pts[1].y = y - del ; pts[2].x = x + del ; pts[2].y = y ; pts[3].x = x ; pts[3].y = y + del ; pts[4] = pts[0] ; XFillPolygon(dpy,win,gci, pts,4, Convex, CoordModeOrigin) ; #ifdef _ThreeDP_h for(i=0; i<s; ++i) { XDrawLine(dpy,win,bot, x-i-del,y, x,y+del+i) ; XDrawLine(dpy,win,bot, x+del+i,y, x,y+del+i) ; } for(i=0; i<s; ++i) { XDrawLine(dpy,win,top, x-del-i,y, x,y-del-i) ; XDrawLine(dpy,win,top, x+del+i,y, x,y-del-i) ; } #else XDrawLines(dpy,win,gc, pts,5, CoordModeOrigin) ; #endif }