view lisp/gdk.el @ 5170:5ddbab03b0e6

various fixes to memory-usage stats -------------------- ChangeLog entries follow: -------------------- lisp/ChangeLog addition: 2010-03-25 Ben Wing <ben@xemacs.org> * diagnose.el (show-memory-usage): * diagnose.el (show-object-memory-usage-stats): Further changes to correspond with changes in the C code; add an additional column in show-object-memory-usage-stats showing the ancillary Lisp overhead used with each type; shrink columns for windows in show-memory-usage to get it to fit in 79 chars. src/ChangeLog addition: 2010-03-25 Ben Wing <ben@xemacs.org> * alloc.c: * alloc.c (struct): * alloc.c (finish_object_memory_usage_stats): * alloc.c (object_memory_usage_stats): * alloc.c (Fobject_memory_usage): * alloc.c (lisp_object_memory_usage_full): * alloc.c (compute_memusage_stats_length): * lrecord.h: * lrecord.h (struct lrecord_implementation): Add fields to the `lrecord_implementation' structure to list an offset into the array of extra statistics in a `struct generic_usage_stats' and a length, listing the first slice of ancillary Lisp-object memory. Compute automatically in compute_memusage_stats_length(). Use to add an entry `FOO-lisp-ancillary-storage' for object type FOO. Don't crash when an int or char is given to object-memory-usage, signal an error instead. Add functions lisp_object_memory_usage_full() and lisp_object_memory_usage() to compute the total memory usage of an object (sum of object, non-Lisp attached, and Lisp ancillary memory). * array.c: * array.c (gap_array_memory_usage): * array.h: Add function to return memory usage of a gap array. * buffer.c (struct buffer_stats): * buffer.c (compute_buffer_usage): * buffer.c (vars_of_buffer): * extents.c (compute_buffer_extent_usage): * marker.c: * marker.c (compute_buffer_marker_usage): * extents.h: * lisp.h: Remove `struct usage_stats' arg from compute_buffer_marker_usage() and compute_buffer_extent_usage() -- these are ancillary Lisp objects and don't get accumulated into `struct usage_stats'; change the value of `memusage_stats_list' so that `markers' and `extents' memory is in Lisp-ancillary, where it belongs. In compute_buffer_marker_usage(), use lisp_object_memory_usage() rather than lisp_object_storage_size(). * casetab.c: * casetab.c (case_table_memory_usage): * casetab.c (vars_of_casetab): * emacs.c (main_1): Add memory usage stats for case tables. * lisp.h: Add comment explaining the `struct generic_usage_stats' more, as well as the new fields in lrecord_implementation. * console-impl.h: * console-impl.h (struct console_methods): * scrollbar-gtk.c: * scrollbar-gtk.c (gtk_compute_scrollbar_instance_usage): * scrollbar-msw.c: * scrollbar-msw.c (mswindows_compute_scrollbar_instance_usage): * scrollbar-x.c: * scrollbar-x.c (x_compute_scrollbar_instance_usage): * scrollbar.c: * scrollbar.c (struct scrollbar_instance_stats): * scrollbar.c (compute_all_scrollbar_instance_usage): * scrollbar.c (scrollbar_instance_memory_usage): * scrollbar.c (scrollbar_objects_create): * scrollbar.c (vars_of_scrollbar): * scrollbar.h: * symsinit.h: * window.c: * window.c (find_window_mirror_maybe): * window.c (struct window_mirror_stats): * window.c (compute_window_mirror_usage): * window.c (window_mirror_memory_usage): * window.c (compute_window_usage): * window.c (window_objects_create): * window.c (syms_of_window): * window.c (vars_of_window): Redo memory-usage associated with windows, window mirrors, and scrollbar instances. Should fix crash in find_window_mirror, among other things. Properly assign memo ry to object memory, non-Lisp extra memory, and Lisp ancillary memory. For example, redisplay structures are non-Lisp memory hanging off a window mirror, not a window; make it an ancillary Lisp-object field. Window mirrors and scrollbar instances have their own statistics, among other things.
author Ben Wing <ben@xemacs.org>
date Thu, 25 Mar 2010 06:07:25 -0500
parents 7039e6323819
children 308d34e9f07d
line wrap: on
line source

;;; gdk.el --- Import GDK functions into XEmacs

;; Copyright (C) 2000 Free Software Foundation

;; Maintainer: William Perry <wmperry@gnu.org>
;; Keywords: extensions, 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, Inc., 59 Temple Place - Suite 330, Boston, MA
;; 02111-1307, USA.

;;; Synched up with: Not in FSF

;;; Commentary:

;; This file is dumped with XEmacs.

(eval-and-compile
  (require 'gtk-ffi))

(globally-declare-fboundp
 '(gtk-import-function-internal gtk-call-function))

(gtk-import-function nil gdk_set_show_events (gboolean . show_events))
(gtk-import-function nil gdk_set_use_xshm (gboolean . use_xshm))
(gtk-import-function GtkString gdk_get_display)
(gtk-import-function nil gdk_flush)
(gtk-import-function nil gdk_beep)

(gtk-import-function nil gdk_key_repeat_disable)
(gtk-import-function nil gdk_key_repeat_restore)

(gtk-import-function gint gdk_visual_get_best_depth)
(gtk-import-function GdkVisualType gdk_visual_get_best_type)
(gtk-import-function GdkVisual gdk_visual_get_system)
(gtk-import-function GdkVisual gdk_visual_get_best)
(gtk-import-function GdkVisual gdk_visual_get_best_with_depth (gint . depth))
(gtk-import-function GdkVisual gdk_visual_get_best_with_type (GdkVisualType . visual_type))
(gtk-import-function GdkVisual gdk_visual_get_best_with_both
		     (gint . depth)
		     (GdkVisualType . visual_type))

(gtk-import-function gboolean gdk_window_is_visible (GdkWindow . window))
(gtk-import-function gboolean gdk_window_is_viewable (GdkWindow . window))

(gtk-import-function gboolean gdk_window_set_static_gravities
		     (GdkWindow . window)
		     (gboolean  . use_static))

(gtk-import-function nil gdk_window_set_cursor
		     (GdkWindow	. window)
		     (GdkCursor . cursor))

(gtk-import-function GdkVisual gdk_window_get_visual (GdkWindow . window))
(gtk-import-function GdkWindowType gdk_window_get_type (GdkWindow . window))
(gtk-import-function GdkWindow gdk_window_get_parent (GdkWindow . window))
(gtk-import-function GdkWindow gdk_window_get_toplevel (GdkWindow . window))
(gtk-import-function GdkEventMask gdk_window_get_events (GdkWindow . window))
(gtk-import-function none gdk_window_set_events (GdkWindow . window) (GdkEventMask . events))
(gtk-import-function none gdk_window_set_icon
		     (GdkWindow . window)
		     (GdkWindow . icon_window)
		     (GdkPixmap . pixmap)
		     (GdkBitmap . mask))
(gtk-import-function none gdk_window_set_icon_name (GdkWindow . window) (GtkString . name))
(gtk-import-function none gdk_window_set_group (GdkWindow . window) (GdkWindow . leader))
(gtk-import-function none gdk_window_set_decorations
		     (GdkWindow . window)
		     (GdkWMDecoration . decorations))
(gtk-import-function none gdk_window_set_functions
		     (GdkWindow . window)
		     (GdkWMFunction . functions))

;; Cursors are handled by glyphs in XEmacs
;; GCs are handled by faces in XEmacs
;; Pixmaps are handled by glyphs in XEmacs
;; Images are handled by glyphs in XEmacs
;; Colors are handled natively by XEmacs
;; Fonts are handled natively by XEmacs

(gtk-import-function none gdk_draw_point
		     (GdkDrawable . drawable)
		     (GdkGC . gc)
		     (gint . x)
		     (gint . y))
(gtk-import-function none gdk_draw_line
		     (GdkDrawable . drawable)
		     (GdkGC . gc)
		     (gint . x1)
		     (gint . y1)
		     (gint . x2)
		     (gint . y2))
(gtk-import-function none gdk_draw_rectangle
		     (GdkDrawable . drawable)
		     (GdkGC . gc)
		     (gboolean . filled)
		     (gint . x)
		     (gint . y)
		     (gint . width)
		     (gint . height))
(gtk-import-function none gdk_draw_arc
		     (GdkDrawable . drawable)
		     (GdkGC . gc)
		     (gboolean . filled)
		     (gint . x)
		     (gint . y)
		     (gint . width)
		     (gint . height)
		     (gint . angle1)
		     (gint . angle2))
(gtk-import-function none gdk_draw_string
		     (GdkDrawable . drawable)
		     (GdkFont     . font)
		     (GdkGC       . gc)
		     (gint        . x)
		     (gint        . y)
		     (GtkString   . string))
(gtk-import-function none gdk_draw_text
		     (GdkDrawable . drawable)
		     (GdkFont     . font)
		     (GdkGC       . gc)
		     (gint        . x)
		     (gint        . y)
		     (GtkString   . string)
		     (gint        . text_length))
(gtk-import-function none gdk_draw_pixmap
		     (GdkDrawable . drawable)
		     (GdkGC       . gc)
		     (GdkImage    . image)
		     (gint        . xsrc)
		     (gint        . ysrc)
		     (gint        . xdest)
		     (gint        . ydest)
		     (gint        . width)
		     (gint        . height))

;; Selections are handled natively by XEmacs

(provide 'gdk)