GNOME.org
 

[sawfish: 1/2] Doc. ChangeLog. * Polished news. * Corrected edge-flip docs. * Supplemented lacking description of s

commit 040e988c0d690c515b7f30a634cb735c8ec86a41
Author: Teika kazura <teika lavabit com>
Date:   Sat Jul 31 08:53:25 2010 +0900

    Doc. ChangeLog.
    * Polished news.
    * Corrected edge-flip docs.
    * Supplemented lacking description of subrs: (un)grab-keymap,
      x-raise-window, x-lower-window, and frame-state-mutex.
    * In sawfish.texi, all "#!optional" are put into @t{..}.
    * comments.

 ChangeLog                           |   20 +++++
 KEYBINDINGS                         |    3 +
 lisp/sawfish/wm.jl                  |    2 +
 lisp/sawfish/wm/ext/edge-flip.jl    |    7 +-
 lisp/sawfish/wm/ext/match-window.jl |    3 +
 man/faq.texi                        |   11 ++-
 man/news.texi                       |   25 ++++--
 man/sawfish.texi                    |  153 +++++++++++++++++++++++------------
 man/user-doc.texi                   |    3 +
 src/frames.c                        |    8 +-
 src/keys.c                          |    8 +-
 src/sawfish.h                       |    4 +-
 src/sawfish_subrs.h                 |    2 +-
 13 files changed, 172 insertions(+), 77 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 7e8d8aa..5550056 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2010-07-31  Teika kazura <teika lavabit com>
+	* KEYBINDINGS
+	* lisp/sawfish/wm.jl
+	* lisp/sawfish/wm/ext/edge-flip.jl
+	* lisp/sawfish/wm/ext/match-window.jl
+	* man/faq.texi
+	* man/news.texi
+	* man/sawfish.texi
+	* man/user-doc.texi
+	* src/frames.c
+	* src/keys.c
+	* src/sawfish.h
+	* src/sawfish_subrs.h: Doc
+	Polished news.
+	Corrected edge-flip docs.
+	Supplemented lacking description of subrs: (un)grab-keymap,
+	x-raise-window, x-lower-window, and frame-state-mutex.
+	In sawfish.texi, all "#!optional" are put into @t{..}.
+	Comments.
+
 2010-07-30  Christopher Bratusek <zanghar freenet de>
 	* src/main.c: add --5-buttons to sawfish --help
 
diff --git a/KEYBINDINGS b/KEYBINDINGS
index 3637188..3af3bb1 100644
--- a/KEYBINDINGS
+++ b/KEYBINDINGS
@@ -151,6 +151,9 @@ It's possible to have a keymap for a specific application only.  For
 example, you can use `nautilus-keymap' which is active when Nautilus
 is focused. All other key events are ignored, that is, events not in
 `nautilus-keymap' are not captured by Sawfish, but sent to Nautilus.
+That means that `window-keymap' gets ignored in nautilus. (Internally,
+`window-keymap' is set to all windows when they appear, but a window
+specific keymap simply replaces the default.)
 
 ( define nautilus-keymap ( make-keymap ) )
 ( bind-keys nautilus-keymap
diff --git a/lisp/sawfish/wm.jl b/lisp/sawfish/wm.jl
index 15ccb8c..8c383eb 100644
--- a/lisp/sawfish/wm.jl
+++ b/lisp/sawfish/wm.jl
@@ -113,6 +113,8 @@
 		   sawfish.wm.state.transient
 		   sawfish.wm.state.ignored))
 
+;; Bindings in these modules are exported by sawfish.wm on behalf of
+;; them.
 (export-bindings (parse-interface
 		  '(compound-interface
 		    (structure-interface sawfish.wm.colors)
diff --git a/lisp/sawfish/wm/ext/edge-flip.jl b/lisp/sawfish/wm/ext/edge-flip.jl
index 1017eaf..e4a66e5 100644
--- a/lisp/sawfish/wm/ext/edge-flip.jl
+++ b/lisp/sawfish/wm/ext/edge-flip.jl
@@ -20,10 +20,11 @@
 
 (define-structure sawfish.wm.ext.edge-flip
 
-    (export edge-flip-for-edge
+    (export edge-flip-enable
+	    ;; These three functions are not for API, but let's keep 'em.
+	    edge-flip-for-edge
 	    edge-flip-synthesize
-	    edge-flip-while-moving
-	    edge-flip-enable)
+	    edge-flip-while-moving)
 
     (open rep
 	  rep.system
diff --git a/lisp/sawfish/wm/ext/match-window.jl b/lisp/sawfish/wm/ext/match-window.jl
index f75bf2e..5238265 100644
--- a/lisp/sawfish/wm/ext/match-window.jl
+++ b/lisp/sawfish/wm/ext/match-window.jl
@@ -54,6 +54,9 @@
                  (WM_COMMAND . "Command")
                  (WM_LOCALE_NAME . "Locale")))
 
+  ;; Actions (for example, `ignore-program-position') are,
+  ;; if declared by `define-match-window-setter' in this file,
+  ;; handled by it. Otherwise registered with `window-put'.
   (i18n-defvar
    match-window-properties
    `((placement ,(_ "Placement")
diff --git a/man/faq.texi b/man/faq.texi
index 4c15b20..8d4a74b 100644
--- a/man/faq.texi
+++ b/man/faq.texi
@@ -4,6 +4,8 @@
 
 @chapter Frequently Asked Questions
 
+See also @url{http:://sawfish.wikia.com/wiki/Tips}.
+
 @enumerate
 
 @item How can I get information on Sawfish?
@@ -224,7 +226,13 @@ mechanism on top of workspace.
 
 Install ``unclutter''.
 
- item Why don't you use GUILE?
+ item Why don't you use GUILE or other languages?
+
+(Current Sawfish community's attitude.)
+
+We can't afford it. We're understaffed.
+
+(Written by John Harper.)
 
 Mainly because I'm lazy; I had already written rep, and therefore
 understood it completely, whereas I have never used GUILE. Also, rep
@@ -234,7 +242,6 @@ autoloading, built-in event-loop, @dots{})
 But before you flame me: yes I do think scheme is a more elegant
 language.
 
-
 @item Will you add feature @var{x}?
 
 Possibly. But only if it can be written in Lisp, or doesn't conflict
diff --git a/man/news.texi b/man/news.texi
index 8532d88..3c2258a 100644
--- a/man/news.texi
+++ b/man/news.texi
@@ -16,7 +16,7 @@ they occurred between. For more detailed information see the
 @item Update requirements
 @itemize @minus
 
- item librep 0.90.5 >> 0.90.7
+ item librep 0.90.5 -> 0.90.7
 @end itemize
 @item Notices
 @itemize @minus
@@ -52,7 +52,8 @@ the keyboard ``group'', which is mainly for multilinguals, keyboard
 and mouse bindings get messed.
 
 Now, this can be prevented by passing a new commandline option
- code{--5-buttons} at Sawfish invocation.
+ code{--5-buttons} at Sawfish invocation. It is assumed that modifiers
+are common among keyboard groups.
 
 By doing so, you won't be able to bind Sawfish commands to mouse
 buttons 6 - 8. This may be fixed in future, but not now because
@@ -83,15 +84,15 @@ parts. (@pxref{Frame Part Definition})
 @itemize @minus
 @item More error and backtrace printing [Teika Kazura]
 
-If you're using librep >= 0.90.7, then the backtrace is printed for
-sawfish-client, too. But it is printed to Sawfish's standard error,
-not to sawfish-client's, sorry.
+Due to librep >= 0.90.7, the backtrace is printed by default on error.
+It is printed for sawfish-client, too, but it's sent to Sawfish's
+standard error, not to sawfish-client's, sorry.
 
 Previously when you connect to Sawfish as a server asynchronously,
 then the error is not printed. Now it is printed to Sawfish's 
-output. (A client which connects synchronously receives the error
-message.) Practically, this means sawfish-pager's errors are printed
-to Sawfish's output. 
+output. (In contrast, a client which connects synchronously receives
+the error message.) Practically, this means sawfish-pager's errors are
+printed to Sawfish's output.
 
 Phrase ``Sawfish error:'' is prepended to error messages which are
 printed to standard error.
@@ -102,10 +103,16 @@ prevents it from (accidently) immediately disappearing.
 
 @item Module @code{3d-hack} is not autoloaded any more.
 
- item Doc improvements *
+ item Doc improvements
+
 Faq items, on how to hide the mouse pointer, and on application execution  *
 Manuals (1) describe all options.
 
+Described functions @code{grab-keymap} and @code{ungrab-keymap}
+(@pxref{Keymaps}), @code{x-raise-window} and @code{x-lower-window}
+(@pxref{Raising and Lowering Windows}), @code{frame-state-mutex}
+(@pxref{Frame Functions}).
+
 @item @code{sawfish-config} is now minimal, moving most of the contents to @code{sawfish.cfg.shell} [Teika Kazura]
 
 @end itemize
diff --git a/man/sawfish.texi b/man/sawfish.texi
index f37c565..fdb4dd1 100644
--- a/man/sawfish.texi
+++ b/man/sawfish.texi
@@ -748,7 +748,7 @@ Change the window's name to @var{name}. This works in practice, but
 technically ICCCM doesn't suppose window name changes.
 @end defun
 
- defun window-class window #!optional spec
+ defun window-class window @t{#!optional} spec
 If the optional argument @var{spec} is @code{nil}, returns the class
 that @var{window} belongs to as a string, or nil if @var{window} has
 no associated class.
@@ -779,7 +779,7 @@ Returns a cons-cell @code{(@var{x} . @var{y})} defining the position
 relative to the root window of @var{window}.
 @end defun
 
- defun display-window-position #!optional window
+ defun display-window-position @t{#!optional} window
 Display @var{window}'s position and size in a popup. If the argument
 is @code{nil} or called as a command, user chooses the window by cursor
 and click.
@@ -1690,18 +1690,22 @@ Sets the stacking depth of @var{window} to @var{depth}, then restacks
 the windows to reflect this change.
 @end defun
 
+Functions to change stacking order.
+
 @defun window-on-top-p window
 Returns @code{t} if @var{window} is at the top of its stacking depth.
 @end defun
 
 @defun stack-window-below below above
 Change stacking order of window @var{below} so that it is immediately
-below window @var{above}.
+below window @var{above}. This function alone does not raise / lower
+windows.
 @end defun
 
 @defun stack-window-above above below
 Change stacking order of window @var{above} so that it is immediately
-above window @var{below}.
+above window @var{below}. This function alone does not raise / lower
+windows.
 @end defun
 
 @defmac save-stacking-order &rest forms
@@ -1762,7 +1766,8 @@ the Composite extention, as every window is reported unobscured.  Use
 
 Over time, Sawfish has accumulated several subtle variations of
 functions for raising and lowering windows.  One set of functions
-operates on single windows.
+operates on single windows. Notice how the function name and command
+name for each pair differs slightly.
 
 @deffn Function lower-window window
 @deffnx Command lower-single-window window
@@ -1780,10 +1785,17 @@ If @var{window} is the highest in its stacking level, lower it to the
 bottom of this level, otherwise raise it to the top of its level.
 @end deffn
 
-Notice how the function name and command name for each pair differs
-slightly.  Another set of functions supports operating on multiple windows
-simultaneously.  Again, the function name and command name for each
-pair is different.
+ defun x-raise-window win ref
+ defunx x-lower-window win ref
+Raise / lower window @var{win} so that it is above / below window
+ var{ref}  If @var{ref} is undefined, @var{win} is put at the top
+/ bottom of the stacking order.
+ end defun
+
+Another set of functions supports operating on multiple windows
+simultaneously. You have to import @code{sawfish.wm.util.stacking} to
+use them.  Again, the function name and command name for each pair is
+different.
 
 @deffn Function lower-window* window
 @deffnx Command lower-window window
@@ -1986,10 +1998,10 @@ other window. More precisely, the grow can be done repeatedly, each
 time until the edge meets another edge, and shrink is done so that
 it overlaps with one less window.
 
- deffn Command grow-window-up window #!optional arg
- deffnx Command grow-window-down window #!optional arg
- deffnx Command grow-window-left window #!optional arg
- deffnx Command grow-window-right window #!optional arg
+ deffn Command grow-window-up window @t{#!optional} arg
+ deffnx Command grow-window-down window @t{#!optional} arg
+ deffnx Command grow-window-left window @t{#!optional} arg
+ deffnx Command grow-window-right window @t{#!optional} arg
 Grows @var{window} upwards / downwards / left / right until it touches
 another window.  If that edge is beyond the screen edge, it is
 brought back in. With a universal prefix @var{arg}, maximize in that
@@ -2015,9 +2027,9 @@ are ``pack'' and ``yank''. So, ``pack'' moves until the window touches
 another, and ``yank'' moves until the overlap reduces.
 
 @deffn Command pack-window-up window #! optional arg
- deffnx Command pack-window-down #!optional arg
- deffnx Command pack-window-left window #!optional arg
- deffnx Command pack-window-right window #!optional arg
+ deffnx Command pack-window-down @t{#!optional} arg
+ deffnx Command pack-window-left window @t{#!optional} arg
+ deffnx Command pack-window-right window @t{#!optional} arg
 Moves @var{window} upwards / downwards / left /right until it touches
 another window.  If that edge is beyond the screen edge, it is moved
 back in.  With a universal prefix @var{arg}, move in that direction
@@ -3796,6 +3808,11 @@ position of frame part @var{part} against its window's frame
 origin.
 @end defun
 
+ defun window-frame-id win
+Returns the numeric id of the framing window associated with object
+ var{window}  Returns nil if the client window has no frame.
+ end defun
+
 @defun frame-part-window part
 Return the window object associated with this frame part.
 @end defun
@@ -3805,9 +3822,18 @@ Return the X11 window ID associated with this frame part.
 @end defun
 
 @defun frame-draw-mutex lock
-Called with @var{lock} equal to @code{t}, frame part redraws will be
-delayed.  The redraws will take place once the function is called with
- var{lock} set to @code{nil}.
+If @var{lock} equals to @code{t}, frame part redraws
+will be delayed.  The redraws will take place once the function is
+called with @var{lock} set to @code{nil}.
+
+Returns the previous value.
+ end defun
+
+ defun frame-state-mutex lock
+If @var{lock} is non-nil, the state of frame parts will not be altered
+at pointer enter and leave events.
+
+Returns the previous value.
 @end defun
 
 @defun map-frame-parts function window
@@ -4350,8 +4376,8 @@ The word ``virtual desktop'' is sometimes used instead of
 @menu
 * Workspace Intervals::			``Interesting'' workspaces
 * Workspace Manipulation::		Creating, rearranging, deleting
-* Workspaces and Windows::		Adding, removing
-* Edge Flipping::			Moving workspaces using the mouse
+* Workspaces and Windows::
+* Edge Flipping::			Switching workspaces with mouse
 @end menu
 
 @node Workspace Intervals, Workspace Manipulation, Workspaces, Workspaces
@@ -4705,13 +4731,9 @@ otherwise.
 @node Edge Flipping,  , Workspaces and Windows, Workspaces
 @section Edge Flipping
 
-Sawfish provides a way to flip between workspaces (or viewports)
-automatically by moving the mouse to the edge of the screen.  The
-technique is called ``edge flipping''.
-
-These definitions are stored in the @code{sawfish.wm.ext.edge-flip}
-structure.  They can only be enabled through the customization
-interface.
+Sawfish provides an intuitive way, like flipping pages, to switch the
+workspace (or the viewport) by moving the mouse to the edge of the
+screen. This is called ``edge flipping''.
 
 @defvr Customizable edge-flip-enabled nil
 When true, select the next desktop when the pointer hits screen edge.
@@ -4734,25 +4756,38 @@ This variable is not customizable, but it can be edited.
 Milliseconds to delay before edge flipping.  Defaults to 250.
 @end defvar
 
-Flippers are implemented as invisible windows on the edges of the
-display (the windows overlap at the corners).  When the pointer moves
-over any of these windows, Sawfish generates @code{enter-flipper-hook}
-and @code{leave-flipper-hook} events.
+ defvr {Hook} before-edge-flip-hook
+ defvrx {Hook} after-edge-flip-hook
+These hooks are called immediately before / after edge-flipping.
+ end defvr
+
+Edge-flipping is implemented by invisible, pixel-wide windows on the
+edges of the display footnote{Detecter narrow windows overlap at the
+screen corners.}. When the pointer moves over any of these windows,
+Sawfish calls @code{enter-flipper-hook} and @code{leave-flipper-hook}
+hooks.
 
 Programmers can add their own callbacks to perform other actions with
-the flippers.  This depends on manually enabling the flippers, using
-the following functions in the @code{sawfish.wm.util.flippers}
-structure.  Note that you may have to manually remove the
+the flippers. Note that you may have to manually remove the
 @code{edge-flip-enter} and @code{edge-flip-leave} callbacks from the
 hooks before adding your own callbacks.
 
+These low level functions are stored in the
+ code{sawfish wm util flippers} structure.
+
 @defun enable-flippers
-Add edge windows used to implement flipping.
+ defunx disable-flippers
+Add / remove edge windows used by edge-flip. At sawfish startup,
+`enable-flippers' is called.
 @end defun
 
- defun disable-flippers
-Remove the edge windows used to implement flipping.
- end defun
+ defvr {Hook} enter-flipper-hook
+ defvrx {Hook} leave-flipper-hook
+These hooks are called as the pointer enters and leaves the detecter
+windows on the edge of the screen. They're called with a single
+argument, one of the symbols @code{left}, @code{right}, @code{top},
+ code{bottom} indicating the edge in question.
+ end defvr
 
 @node RandR and Xinerama, Window Placement, Workspaces, Top
 @chapter RandR and Xinerama
@@ -5780,6 +5815,23 @@ of the events or the event objects themselves) from the keymap
 @var{keymap}.
 @end defun
 
+Functions @code{bind-keys} and @code{unbind-keys} do not affect the
+bindings of existing windows, because keymaps are set on a window when
+the window is created and begins to be managed by Sawfish. Update
+can be done by following functions.
+
+ defun grab-keymap keymap
+ defunx ungrab-keymap keymap
+All bindings stored in @var{keymap} get into / out of effect of all
+windows, including root, but not of frame parts.
+
+Notice that @code{ungrab-keymap} has to be called BEFORE you change
+the keymap.
+
+If the window foo has its own keymap rather than @code{window-keymap},
+then it is not affected by @code{(grab-keymap window-keymap)}.
+ end defun
+
 @defun search-keymap event keymap
 Search for a binding of the event @var{event} in @var{keymap}. If a
 binding is found a cons cell @code{(@var{command} . @var{event})} is
@@ -6436,7 +6488,8 @@ head on some viewport.
 @cindex Functions, gradients
 
 The @code{gradient} feature allows color gradients to be drawn in
-images. (Evaluate @code{(require 'gradient)} to load this feature.)
+images. Import @code{gradient} or @code{sawfish.wm.util.gradient}
+to use this feature.
 
 @defun draw-vertical-gradient image from to
 Draw a vertical color gradient in @var{image}. The color at the top of
@@ -6669,7 +6722,7 @@ module.
 The program launched by the @code{xterm} function. Interpreted by shell.
 @end defvr
 
- deffn Function xterm #!optional command
+ deffn Function xterm @t{#!optional} command
 @deffnx Command xterm
 Start a new terminal. Optional argument @var{COMMAND} is passed to the
 terminal with @code{-e} option, so for most, including xterm, it can contain
@@ -6680,7 +6733,7 @@ arguments to be passed.
 The program launched by the @code{browser} function. Interpreted by shell.
 @end defvr
 
- deffn Function browser #!optional url
+ deffn Function browser @t{#!optional} url
 @deffnx Command browser
 Start a new browser instance. Visit @var{URL} if supplied.
 @end deffn
@@ -7051,14 +7104,9 @@ moved.
 
 @defvr {Hook} enter-flipper-hook
 @defvrx {Hook} leave-flipper-hook
-When viewport edge-flipping is enabled, these hooks are called as the
-pointer enters and leaves the pixel-wide border on the edge of the
-screen. They're called with a single argument, one of the symbols
- code{left}, @code{right}, @code{top}, @code{bottom} indicating the
-edge in question.
+See @xref{Edge Flipping}.
 @end defvr
 
-
 @node Startup and Shutdown Hooks, Other Hooks, Workspace and Viewport Hooks, Standard Hooks
 @section Startup and Shutdown Hooks
 @cindex Startup and Shutdown Hooks
@@ -7351,6 +7399,8 @@ Allowed attribute names are @code{background} and @code{border-color}.
 @node X Selections, X Keysyms, X Windows, Low-level X Interface
 @section X Selections
 
+These functions are defined in @code{sawfish.wm.util.selection}.
+
 @defun x-get-selection sel
 Return the string corresponding to the current value of the X11
 selection defined by @var{sel}, or @code{nil} if the selection
@@ -7399,7 +7449,8 @@ Destroy the X drawable @var{drawable}.
 @end defun
 
 @defun x-drawable-height drawable
-Return the height in pixels of @var{drawable}.
+ defunx x-drawable-width drawable
+Return the height / width in pixels of @var{drawable}.
 @end defun
 
 @defun x-drawable-id drawable
@@ -7411,10 +7462,6 @@ Return the X11 drawable-ID (an integer) associated with
 Return @code{t} if @var{obj} is an X drawable object.
 @end defun
 
- defun x-drawable-width drawable
-Return the width in pixels of @var{drawable}.
- end defun
-
 @defun x-grab-image-from-drawable drawable mask
 Return a new image object copied from @var{drawable}.  @var{Mask} is a
 stencil mask for the image; black pixels in @var{mask} become
diff --git a/man/user-doc.texi b/man/user-doc.texi
index de59810..5c68198 100644
--- a/man/user-doc.texi
+++ b/man/user-doc.texi
@@ -4,6 +4,9 @@
 
 Sorry, this document still needs much expansion.
 
+Todo: describe gtk-style, which is installed, for example, at
+ file{/usr/lib/sawfish/1.6.4/x86_64-pc-linux-gnu/gtk-style}
+
 @enumerate
 
 @item Introduction
diff --git a/src/frames.c b/src/frames.c
index e359a18..b5c72dd 100644
--- a/src/frames.c
+++ b/src/frames.c
@@ -1767,8 +1767,9 @@ destroy_window_frame (Lisp_Window *w, bool leave_frame_win)
 DEFUN("frame-draw-mutex", Fframe_draw_mutex,
       Sframe_draw_mutex, (repv arg), rep_Subr1) /*
 ::doc:sawfish.wm.frames.subrs#frame-draw-mutex::
-While this variable is non-nil no frame parts will be redrawn. When it is
-set to nil any pending redraws will take place.
+When called with non-nil, no frame parts will be redrawn. When it is
+set to nil any pending redraws will take place. Returns the previous
+value.
 ::end:: */
 {
     repv ret = frame_draw_mutex ? Qt : Qnil;
@@ -1792,8 +1793,9 @@ set to nil any pending redraws will take place.
 DEFUN("frame-state-mutex", Fframe_state_mutex,
       Sframe_state_mutex, (repv arg), rep_Subr1) /*
 ::doc:sawfish.wm.frames.subrs#frame-state-mutex::
-While this variable is non-nil the state of frame parts will not be
+When called with non-nil, the state of frame parts will not be
 altered when the pointer enters or leaves its window.
+Returns the previous value.
 ::end:: */
 {
     repv ret = frame_state_mutex ? Qt : Qnil;
diff --git a/src/keys.c b/src/keys.c
index cb4ebf8..faef1db 100644
--- a/src/keys.c
+++ b/src/keys.c
@@ -1054,8 +1054,8 @@ DEFUN("grab-keymap", Fgrab_keymap, Sgrab_keymap, (repv map), rep_Subr1) /*
 ::doc:sawfish.wm.events#grab-keymap::
 grab-keymap KEYMAP
 
-Grab any events in KEYMAP that need to be grabbed so that bindings in
-KEYMAP may be serviced.
+Grab any events in KEYMAP on windows, including root, but not
+frame parts. This function is useful after keymap changes.
 ::end:: */
 {
     rep_DECLARE1(map, rep_CONSP);
@@ -1067,8 +1067,8 @@ DEFUN("ungrab-keymap", Fungrab_keymap, Sungrab_keymap, (repv map), rep_Subr1)/*
 ::doc:sawfish.wm.events#ungrab-keymap::
 ungrab-keymap KEYMAP
 
-Ungrab any events in KEYMAP that would have been grabbed so that bindings in
-KEYMAP may be serviced.
+Ungrab any events in KEYMAP on windows, including root, but not
+frame parts. This function is useful before keymap changes.
 ::end:: */
 {
     rep_DECLARE1(map, rep_CONSP);
diff --git a/src/sawfish.h b/src/sawfish.h
index 69162b8..6ce231e 100644
--- a/src/sawfish.h
+++ b/src/sawfish.h
@@ -81,7 +81,7 @@ typedef int bool;
 		   | PointerMotionHintMask | EnterWindowMask \
 		   | LeaveWindowMask | KeyPressMask | ExposureMask)
 
-/* Events selected on the frame window */
+/* Events selected on the window including frame */
 #define FRAME_EVENTS (ButtonPressMask | ButtonReleaseMask | KeyPressMask \
 		      | ButtonMotionMask | PointerMotionHintMask \
 		      | EnterWindowMask | LeaveWindowMask | ExposureMask \
@@ -155,7 +155,7 @@ typedef struct lisp_window {
     repv icon_image;
 
     /* Frame data */
-    Window frame;
+    Window frame; /* Reparenter window */
     struct frame_part *frame_parts;
     int frame_x, frame_y;		/* relative to client-window */
     unsigned int frame_width, frame_height;
diff --git a/src/sawfish_subrs.h b/src/sawfish_subrs.h
index 2616759..33c5c32 100644
--- a/src/sawfish_subrs.h
+++ b/src/sawfish_subrs.h
@@ -357,7 +357,7 @@ extern void manage_windows (void);
 extern void windows_init (void);
 extern void windows_kill (void);
 
-/* from window-list.c */
+/* from stacking-list.c */
 extern bool window_in_stacking_list_p (Lisp_Window *w);
 extern void remove_from_stacking_list (Lisp_Window *w);
 extern void insert_in_stacking_list_above_all (Lisp_Window *w);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]