Mercurial > hg > xemacs-beta
view lisp/widgets-gtk.el @ 5090:0ca81354c4c7
Further frame-geometry cleanups
-------------------- ChangeLog entries follow: --------------------
man/ChangeLog addition:
2010-03-03 Ben Wing <ben@xemacs.org>
* internals/internals.texi (Intro to Window and Frame Geometry):
* internals/internals.texi (The Paned Area):
* internals/internals.texi (The Displayable Area):
Update to make note of e.g. the fact that the bottom gutter is
actually above the minibuffer.
src/ChangeLog addition:
2010-03-03 Ben Wing <ben@xemacs.org>
* emacs.c:
* emacs.c (assert_equal_failed):
* lisp.h:
* lisp.h (assert_equal):
New fun assert_equal, asserting that two values == each other, and
printing out both values upon failure.
* frame-gtk.c (gtk_initialize_frame_size):
* frame-impl.h:
* frame-impl.h (FRAME_TOP_INTERNAL_BORDER_START):
* frame-impl.h (FRAME_BOTTOM_INTERNAL_BORDER_START):
* frame-impl.h (FRAME_LEFT_INTERNAL_BORDER_START):
* frame-impl.h (FRAME_PANED_TOP_EDGE):
* frame-impl.h (FRAME_NONPANED_SIZE):
* frame-x.c (x_initialize_frame_size):
* frame.c:
* gutter.c (get_gutter_coords):
* gutter.c (calculate_gutter_size):
* gutter.h:
* gutter.h (WINDOW_REAL_TOP_GUTTER_BOUNDS):
* gutter.h (FRAME_TOP_GUTTER_BOUNDS):
* input-method-xlib.c:
* input-method-xlib.c (XIM_SetGeometry):
* redisplay-output.c (clear_left_border):
* redisplay-output.c (clear_right_border):
* redisplay-output.c (redisplay_output_pixmap):
* redisplay-output.c (redisplay_clear_region):
* redisplay-output.c (redisplay_clear_top_of_window):
* redisplay-output.c (redisplay_clear_to_window_end):
* redisplay-xlike-inc.c (XLIKE_clear_frame):
* redisplay.c:
* redisplay.c (UPDATE_CACHE_RETURN):
* redisplay.c (pixel_to_glyph_translation):
* toolbar.c (update_frame_toolbars_geometry):
* window.c (Fwindow_pixel_edges):
Get rid of some redundant macros. Consistently use the
FRAME_TOP_*_START, FRAME_RIGHT_*_END, etc. format. Rename
FRAME_*_BORDER_* to FRAME_*_INTERNAL_BORDER_*. Comment out
FRAME_BOTTOM_* for gutters and the paned area due to the
uncertainty over where the paned area actually begins. (Eventually
we should probably move the gutters outside the minibuffer so that
the paned area is contiguous.) Use FRAME_PANED_* more often in the
code to make things clearer.
Update the diagram to show that the bottom gutter is inside the
minibuffer (!) and that there are "junk boxes" when you have left
and/or right gutters (dead boxes that are mistakenly left uncleared,
unlike the corresponding scrollbar dead boxes). Update the text
appropriately to cover the bottom gutter position, etc.
Rewrite gutter-geometry code to use the FRAME_*_GUTTER_* in place of
equivalent expressions referencing other frame elements, to make the
code more portable in case we move around the gutter location.
Cleanup FRAME_*_GUTTER_BOUNDS() in gutter.h.
Add some #### GEOM! comments where I think code is incorrect --
typically, it wasn't fixed up properly when the gutter was added.
Some cosmetic changes.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Wed, 03 Mar 2010 05:07:47 -0600 |
parents | ecf1ebac70d8 |
children | 308d34e9f07d |
line wrap: on
line source
;;; widgets-gtk.el --- Embedded widget support for XEmacs w/GTK primitives ;; Copyright (C) 2001 Free Software Foundation, Inc. ;; Maintainer: William M. Perry <wmperry@gnu.org> ;; Keywords: extensions, internal, dumped ;; 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, 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Synched up with: Not in FSF. ;;; Commentary: ;; This file is dumped with XEmacs (when embedded widgets are compiled in). (globally-declare-fboundp '(gtk-button-new-with-label gtk-signal-connect gtk-radio-button-new-with-label gtk-radio-button-group gtk-toggle-button-set-active gtk-check-button-new-with-label gtk-widget-show-all gtk-notebook-new gtk-notebook-append-page gtk-vbox-new gtk-label-new gtk-adjustment-new gtk-progress-bar-new-with-adjustment gtk-adjustment-set-value gtk-entry-new gtk-entry-set-text gtk-widget-set-style gtk-widget-get-style)) (defun gtk-widget-get-callback (widget plist instance) (let ((cb (plist-get plist :callback)) (ex (plist-get plist :callback-ex)) (real-cb nil)) (cond (ex (gtk-signal-connect widget 'button-release-event (lambda (widget event data) (put widget 'last-event event))) `(lambda (widget &rest ignored) (funcall ,ex ,instance (get widget 'last-event)))) (cb `(lambda (widget &rest ignored) (if (functionp ,real-cb) (funcall ,real-cb) (eval ,real-cb)))) (t nil)))) (defun gtk-widget-instantiate-button-internal (plist instance) (let* ((type (or (plist-get plist :style) 'button)) (label (or (plist-get plist :descriptor) (symbol-name type))) (widget nil)) (case type (button (setq widget (gtk-button-new-with-label label)) (gtk-signal-connect widget 'clicked (gtk-widget-get-callback widget plist instance))) (radio (let ((aux nil) (selected-p (plist-get plist :selected))) (setq widget (gtk-radio-button-new-with-label nil label) aux (gtk-radio-button-new-with-label (gtk-radio-button-group widget) "bogus sibling")) (gtk-toggle-button-set-active widget (eval selected-p)) (gtk-signal-connect widget 'toggled (gtk-widget-get-callback widget plist instance) aux))) (otherwise ;; Check boxes (setq widget (gtk-check-button-new-with-label label)) (gtk-toggle-button-set-active widget (eval (plist-get plist :selected))) (gtk-signal-connect widget 'toggled (gtk-widget-get-callback widget plist instance)))) (gtk-widget-show-all widget) widget)) (defun gtk-widget-instantiate-notebook-internal (plist instance) (let ((widget (gtk-notebook-new)) ;(items (plist-get plist :items)) ) ; (while items ; (gtk-notebook-append-page widget ; (gtk-vbox-new nil 3) ; (gtk-label-new (aref (car items) 0))) ; (setq items (cdr items))) widget)) (defun gtk-widget-instantiate-progress-internal (plist instance) (let* ((adj (gtk-adjustment-new 0.0 0.0 100.0 1.0 5.0 5.0)) (widget (gtk-progress-bar-new-with-adjustment adj))) (gtk-adjustment-set-value adj (or (plist-get plist :value) 0.0)) widget)) (defun gtk-widget-instantiate-entry-internal (plist instance) (let* ((widget (gtk-entry-new)) (default (plist-get plist :descriptor))) (cond ((stringp default) nil) ((sequencep default) (setq default (mapconcat 'identity default ""))) (t (error "Invalid default value: %S" default))) (gtk-entry-set-text widget default) widget)) (put 'button 'instantiator 'gtk-widget-instantiate-button-internal) (put 'tab-control 'instantiator 'gtk-widget-instantiate-notebook-internal) (put 'progress-gauge 'instantiator 'gtk-widget-instantiate-progress-internal) (put 'tree-view 'instantiator 'ignore) (put 'edit-field 'instantiator 'gtk-widget-instantiate-entry-internal) (put 'combo-box 'instantiator 'ignore) (put 'label 'instantiator 'ignore) (put 'layout 'instantiator 'ignore) (defun gtk-widget-instantiate-internal (instance instantiator pointer-fg pointer-bg domain) "The lisp side of widget/glyph instantiation code." (let* ((type (aref instantiator 0)) (plist (cdr (map 'list 'identity instantiator))) (widget (funcall (or (get type 'instantiator) 'ignore) plist instance))) ; (add-timeout 0.1 (lambda (obj) ; (gtk-widget-set-style obj ; (gtk-widget-get-style ; (frame-property nil 'text-widget)))) ; widget) widget)) (defun gtk-widget-property-internal () nil) (defun gtk-widget-redisplay-internal () nil) (provide 'widgets-gtk)