Mercurial > hg > xemacs-beta
view lwlib/xlwradio.c @ 5043:d0c14ea98592
various frame-geometry fixes
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-15 Ben Wing <ben@xemacs.org>
* EmacsFrame.c:
* EmacsFrame.c (EmacsFrameResize):
* console-msw-impl.h:
* console-msw-impl.h (struct mswindows_frame):
* console-msw-impl.h (FRAME_MSWINDOWS_TARGET_RECT):
* device-tty.c:
* device-tty.c (tty_asynch_device_change):
* event-msw.c:
* event-msw.c (mswindows_wnd_proc):
* faces.c (Fface_list):
* faces.h:
* frame-gtk.c:
* frame-gtk.c (gtk_set_initial_frame_size):
* frame-gtk.c (gtk_set_frame_size):
* frame-msw.c:
* frame-msw.c (mswindows_init_frame_1):
* frame-msw.c (mswindows_set_frame_size):
* frame-msw.c (mswindows_size_frame_internal):
* frame-msw.c (msprinter_init_frame_3):
* frame.c:
* frame.c (enum):
* frame.c (Fmake_frame):
* frame.c (adjust_frame_size):
* frame.c (store_minibuf_frame_prop):
* frame.c (Fframe_property):
* frame.c (Fframe_properties):
* frame.c (Fframe_displayable_pixel_height):
* frame.c (Fframe_displayable_pixel_width):
* frame.c (internal_set_frame_size):
* frame.c (Fset_frame_height):
* frame.c (Fset_frame_pixel_height):
* frame.c (Fset_frame_displayable_pixel_height):
* frame.c (Fset_frame_width):
* frame.c (Fset_frame_pixel_width):
* frame.c (Fset_frame_displayable_pixel_width):
* frame.c (Fset_frame_size):
* frame.c (Fset_frame_pixel_size):
* frame.c (Fset_frame_displayable_pixel_size):
* frame.c (frame_conversion_internal_1):
* frame.c (get_frame_displayable_pixel_size):
* frame.c (change_frame_size_1):
* frame.c (change_frame_size):
* frame.c (generate_title_string):
* frame.h:
* gtk-xemacs.c:
* gtk-xemacs.c (gtk_xemacs_size_request):
* gtk-xemacs.c (gtk_xemacs_size_allocate):
* gtk-xemacs.c (gtk_xemacs_paint):
* gutter.c:
* gutter.c (update_gutter_geometry):
* redisplay.c (end_hold_frame_size_changes):
* redisplay.c (redisplay_frame):
* toolbar.c:
* toolbar.c (update_frame_toolbars_geometry):
* window.c:
* window.c (frame_pixsize_valid_p):
* window.c (check_frame_size):
Various fixes to frame geometry to make it a bit easier to understand
and fix some bugs.
1. IMPORTANT: Some renamings. Will need to be applied carefully to
the carbon repository, in the following order:
-- pixel_to_char_size -> pixel_to_frame_unit_size
-- char_to_pixel_size -> frame_unit_to_pixel_size
-- pixel_to_real_char_size -> pixel_to_char_size
-- char_to_real_pixel_size -> char_to_pixel_size
-- Reverse second and third arguments of change_frame_size() and
change_frame_size_1() to try to make functions consistent in
putting width before height.
-- Eliminate old round_size_to_char, because it didn't really
do anything differently from round_size_to_real_char()
-- round_size_to_real_char -> round_size_to_char; any places that
called the old round_size_to_char should just call the new one.
2. IMPORTANT FOR CARBON: The set_frame_size() method is now passed
sizes in "frame units", like all other frame-sizing functions,
rather than some hacked-up combination of char-cell units and
total pixel size. This only affects window systems that use
"pixelated geometry", and I'm not sure if Carbon is one of them.
MS Windows is pixelated, X and GTK are not. For pixelated-geometry
systems, the size in set_frame_size() is in displayable pixels
rather than total pixels and needs to be converted appropriately;
take a look at the changes made to mswindows_set_frame_size()
method if necessary.
3. Add a big long comment in frame.c describing how frame geometry
works.
4. Remove MS Windows-specific character height and width fields,
duplicative and unused.
5. frame-displayable-pixel-* and set-frame-displayable-pixel-*
didn't use to work on MS Windows, but they do now.
6. In general, clean up the handling of "pixelated geometry" so
that fewer functions have to worry about this. This is really
an abomination that should be removed entirely but that will
have to happen later. Fix some buggy code in
frame_conversion_internal() that happened to "work" because it
was countered by oppositely buggy code in change_frame_size().
7. Clean up some frame-size code in toolbar.c and use functions
already provided in frame.c instead of rolling its own.
8. Fix check_frame_size() in window.c, which formerly didn't take
pixelated geometry into account.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Mon, 15 Feb 2010 22:14:11 -0600 |
parents | 5460287a3327 |
children | 308d34e9f07d |
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 <X11/Xmu/Misc.h> #include ATHENA_XawInit_h_ #include "xt-wrappers.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 RadioClassInit (void); static void RadioClassPartInit (WidgetClass); static Boolean RadioSetValues (Widget, Widget, Widget, ArgList, Cardinal *); static void DrawDiamond (Widget); static XtGeometryResult RadioQueryGeometry (Widget, XtWidgetGeometry *, XtWidgetGeometry *); #if 0 /* #### This function isn't used and is slated for destruction. Can we just nuke it? */ static void RadioDestroy (Widget, XtPointer, XtPointer); #endif /* 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[] = { { (String) "highlight", RadioHighlight }, { (String) "unhighlight", RadioUnhighlight }, }; #define SuperClass ((ToggleWidgetClass)&toggleClassRec) RadioClassRec radioClassRec = { { (WidgetClass) SuperClass, /* superclass */ (String) "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 UNUSED (args), Cardinal *UNUSED (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. */ #if 0 /* #### This function isn't used and is slated for destruction. Can we just nuke it? */ /* ARGSUSED */ static void RadioDestroy (Widget UNUSED (w), XtPointer UNUSED (junk), XtPointer UNUSED (garbage)) { /* TODO: get rid of this */ } #endif /* 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. */ /* 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 UNUSED (request), Widget new_, ArgList UNUSED (args), Cardinal *UNUSED (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 *UNUSED (event), String *UNUSED (params), Cardinal *UNUSED (num_params)) { RadioWidget rw = (RadioWidget)w; DrawHighlight(w, rw->command.normal_GC) ; } static void RadioUnhighlight (Widget w, XEvent *UNUSED (event), String *UNUSED (params), Cardinal *UNUSED (num_params)) { RadioWidget rw = (RadioWidget)w; DrawHighlight(w, rw->command.inverse_GC) ; } /* ARGSUSED */ void RadioSet (Widget w, XEvent *UNUSED (event), String *UNUSED (params), Cardinal *UNUSED (num_params)) { 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 *UNUSED (event), String *UNUSED (params), Cardinal *UNUSED (num_params)) { 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 }