Mercurial > hg > xemacs-beta
annotate src/widget.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 | 80cd90837ac5 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 /* Primitives for work of the "widget" library. |
| 2 Copyright (C) 1997 Free Software Foundation, Inc. | |
| 3 | |
| 4 This file is part of XEmacs. | |
| 5 | |
| 6 XEmacs is free software; you can redistribute it and/or modify it | |
| 7 under the terms of the GNU General Public License as published by the | |
| 8 Free Software Foundation; either version 2, or (at your option) any | |
| 9 later version. | |
| 10 | |
| 11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 14 for more details. | |
| 15 | |
| 16 You should have received a copy of the GNU General Public License | |
| 17 along with XEmacs; see the file COPYING. If not, write to | |
| 18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 19 Boston, MA 02111-1307, USA. */ | |
| 20 | |
| 21 /* Synched up with: Not in FSF. */ | |
| 22 | |
| 23 /* In an ideal world, this file would not have been necessary. | |
| 24 However, elisp function calls being as slow as they are, it turns | |
| 25 out that some functions in the widget library (wid-edit.el) are the | |
| 26 bottleneck of Widget operation. Here is their translation to C, | |
| 27 for the sole reason of efficiency. */ | |
| 28 | |
| 29 #include <config.h> | |
| 30 #include "lisp.h" | |
| 31 #include "buffer.h" | |
| 32 | |
| 33 | |
| 34 Lisp_Object Qwidget_type; | |
| 35 | |
| 36 | |
| 37 DEFUN ("widget-plist-member", Fwidget_plist_member, 2, 2, 0, /* | |
| 38 Like `plist-get', but returns the tail of PLIST whose car is PROP. | |
| 39 */ | |
| 40 (plist, prop)) | |
| 41 { | |
| 42 while (!NILP (plist) && !EQ (Fcar (plist), prop)) | |
| 43 { | |
| 44 /* Check for QUIT, so a circular plist doesn't lock up the | |
| 45 editor. */ | |
| 46 QUIT; | |
| 47 plist = Fcdr (Fcdr (plist)); | |
| 48 } | |
| 49 return plist; | |
| 50 } | |
| 51 | |
| 52 DEFUN ("widget-put", Fwidget_put, 3, 3, 0, /* | |
| 53 In WIDGET set PROPERTY to VALUE. | |
| 54 The value can later be retrieved with `widget-get'. | |
| 55 */ | |
| 56 (widget, property, value)) | |
| 57 { | |
| 58 CHECK_CONS (widget); | |
| 59 XCDR (widget) = Fplist_put (XCDR (widget), property, value); | |
| 60 return widget; | |
| 61 } | |
| 62 | |
| 63 DEFUN ("widget-get", Fwidget_get, 2, 2, 0, /* | |
| 64 In WIDGET, get the value of PROPERTY. | |
| 65 The value could either be specified when the widget was created, or | |
| 66 later with `widget-put'. | |
| 67 */ | |
| 68 (widget, property)) | |
| 69 { | |
| 70 Lisp_Object value = Qnil; | |
| 71 | |
| 72 while (1) | |
| 73 { | |
| 74 Lisp_Object tmp = Fwidget_plist_member (Fcdr (widget), property); | |
| 75 if (!NILP (tmp)) | |
| 76 { | |
| 77 value = Fcar (Fcdr (tmp)); | |
| 78 break; | |
| 79 } | |
| 80 tmp = Fcar (widget); | |
| 81 if (!NILP (tmp)) | |
| 82 { | |
| 83 widget = Fget (tmp, Qwidget_type, Qnil); | |
| 84 continue; | |
| 85 } | |
| 86 break; | |
| 87 } | |
| 88 return value; | |
| 89 } | |
| 90 | |
| 91 DEFUN ("widget-apply", Fwidget_apply, 2, MANY, 0, /* | |
| 92 Apply the value of WIDGET's PROPERTY to the widget itself. | |
| 93 ARGS are passed as extra arguments to the function. | |
|
4693
80cd90837ac5
Add argument information to remaining MANY or UNEVALLED C subrs.
Aidan Kehoe <kehoea@parhasard.net>
parents:
563
diff
changeset
|
94 |
|
80cd90837ac5
Add argument information to remaining MANY or UNEVALLED C subrs.
Aidan Kehoe <kehoea@parhasard.net>
parents:
563
diff
changeset
|
95 arguments: (WIDGET PROPERTY &rest ARGS) |
| 428 | 96 */ |
| 97 (int nargs, Lisp_Object *args)) | |
| 98 { | |
| 99 /* This function can GC */ | |
| 100 Lisp_Object newargs[3]; | |
| 101 struct gcpro gcpro1; | |
| 102 | |
| 103 newargs[0] = Fwidget_get (args[0], args[1]); | |
| 104 newargs[1] = args[0]; | |
| 105 newargs[2] = Flist (nargs - 2, args + 2); | |
| 434 | 106 GCPRO1 (newargs[2]); |
| 428 | 107 RETURN_UNGCPRO (Fapply (3, newargs)); |
| 108 } | |
| 109 | |
| 110 void | |
| 111 syms_of_widget (void) | |
| 112 { | |
| 563 | 113 DEFSYMBOL (Qwidget_type); |
| 428 | 114 |
| 115 DEFSUBR (Fwidget_plist_member); | |
| 116 DEFSUBR (Fwidget_put); | |
| 117 DEFSUBR (Fwidget_get); | |
| 118 DEFSUBR (Fwidget_apply); | |
| 119 } |