Commit: 67aa191261146204f24e20452ee0f458d3862582 - trjp_sawfish (git)

Japanese translation of message catalog for Sawfish Window-Manager

Commit MetaInfo

• Revisão: 67aa191261146204f24e20452ee0f458d3862582 (tree)
• Hora: 1999-12-06 03:26:41
• Autor: john <john>
• Commiter: john

Mensagem de Log

*** empty log message ***

Mudança Sumário

• modified: TODO
• modified: configure.in
• modified: lisp/ChangeLog
• modified: lisp/sawfish/wm/commands/x-cycle.jl
• modified: lisp/x-cycle.jl
• modified: man/faq.texi
• modified: man/news.texi
• modified: man/sawmill.texi
• modified: sawmill.spec.in
• modified: src/ChangeLog
• modified: themes/mono/theme.jl
• modified: themes/simple/theme.jl
• modified: themes/smaker/theme.jl

Diff

--- a/TODO
+++ b/TODO
@@ -13,13 +13,6 @@ Outstanding bugs
   ! multiple viewports, gnome tasklist thinks that all windows are in
     the top-left viewport
 
-  ! OK button in bindings capplet loses bindings until a different
-    window is focused
-
-    [ 12/10: what's actually happening is that the cc is becoming
-    unfocused, but without any other window (or our no_focus_window)
-    being focused afterwards.. ]
-
   ! ICCCM says we should not passive grab on the client windows, but on
     our frames instead
 
@@ -31,8 +24,6 @@ Outstanding bugs
 
   ! Num_Lock is filtered, but not Scroll_Lock
 
-  ! shouldn't be able to maximize non-resizable windows
-
   ! turn off mouse warping options, put cursor in window in center of
     screen (under message window), M-TAB, and the pointer leaving the
     message window will refocus the original window
@@ -47,20 +38,12 @@ Outstanding bugs
   ! when snapping edges while moving, position displayed may not be
     correct
 
-  ! After starting licq, the first time I set my auto-response (either
-    directly with the "set auto response" menu item, or by changing my
-    status) it works fine, but then the auto response window will not
-    appear again until I restart licq
-
   ! when you switch viewports, sawmill will sometimes get confused as
     to which windows were where, and leave windows on seemingly random
     viewports [I'm not convinced, could this be the desk-guide thing?]
 
-  ! while interactively placing a window, edge flip ...
-
-  ! automatic workspace merging doesn't seem to work. when i remove the
-    last window in a workspace, i am taken to another with windows in
-    it, but the empty workspace is not removed
+  ! edge-flipping while interactively placing a window can leave
+    rubber-band traces [this is hard to fix..]
 
   ! if i press M-button1 (move-window-interactively) but not move the
     window and _hold_ button1, it gets raised, but the window
@@ -92,8 +75,6 @@ General tasks
 
   + add option send-window-to-workspace won't select workspace
 
-  + follow size hints (increments) when maximizing (?)
-
   + support for synthesizing events
 
   + add focus-order to smart placement weights?

--- a/configure.in
+++ b/configure.in
@@ -25,7 +25,7 @@ AC_CONFIG_HEADER(config.h)
 AC_CONFIG_AUX_DIR(etc)
 
 dnl Release versioning info
-version="0.17"
+version="0.18"
 
 output_files="src/Makefile lisp/Makefile capplet/Makefile\
  themes/Makefile man/Makefile po/Makefile Makedefs Makefile sawmill.spec"

--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,33 @@
[phone]  John Harper  <[e-mail]>
+
+	* version 0.18
+
+	* x-cycle.jl, move-resize.jl, keymap.jl: replaced show-message
+	by display-message
+
+	* menus.jl (window-ops-menu, root-menu): just use function
+	names of dynamic sub-menus, don't create closures
+
[phone]  John Harper  <[e-mail]>
+
+	* frames.jl (rebuild-frames-with-style,
+	reframe-windows-with-style): new functions
+
+	* maximize.jl (maximize-window): respect the window's size
+	hints, both to see if the window is maximizable, and to
+	truncate the maximized dimensions to an integral size
+
 1999-12-03  John Harper  <[e-mail]>
 
+	* workspace.jl (select-workspace): only hide/show windows whose
+	`placed' property is set
+
+	* x-cycle.jl (x-cycle-modifier-alist): support the Hyper
+	modifier
+
+	* workspace.jl (ws-after-removing-window): fix the logic
+	deciding when it's necessary to switch workspaces after merging
+
 	* x-cycle.jl (cycle-windows): grab the keyboard to the
 	currently focused window, prevents the ``lose focus with a
 	single bug''

--- a/lisp/sawfish/wm/commands/x-cycle.jl
+++ b/lisp/sawfish/wm/commands/x-cycle.jl
@@ -68,7 +68,7 @@
 
 ;; customization options
 
-(defgroup cycle "Window cycling")
+(defgroup cycle "Window Cycling")
 
 (defcustom cycle-show-window-names t
   "Display window names while cycling through windows."

--- a/lisp/x-cycle.jl
+++ b/lisp/x-cycle.jl
@@ -68,7 +68,7 @@
 
 ;; customization options
 
-(defgroup cycle "Window cycling")
+(defgroup cycle "Window Cycling")
 
 (defcustom cycle-show-window-names t
   "Display window names while cycling through windows."

--- a/man/faq.texi
+++ b/man/faq.texi
@@ -107,8 +107,8 @@ Info manual for the documentation
 
 @item Are there any other themes available?
 
-There's a list including those I'm aware of on the sawmill home-page
-(@url{http://www.dcs.warwick.ac.uk/~john/sw/sawmill/}).
+Thanks to those nice people at themes.org, there's now
+@url{http://sawmill.themes.org/} for your theming pleasure
 
 
 @item Why don't GTK themes work with sawmill?

--- a/man/news.texi
+++ b/man/news.texi
@@ -7,6 +7,75 @@ they occurred between. For more detailed information see the
 @file{ChangeLog} files in the Sawmill source tree.
 
 
+@unnumberedsec 0.18
+
+@itemize @bullet
+
+@item General subsystem for matching windows to properties as they're
+created. Allows matching on one or more of the window's X properties
+(e.g. name, class, etc@dots{}), and then setting any number of window
+manager properties as a result. See the @samp{Matched Windows}
+customize group
+
+@item Removed all @code{auto-@var{foo}-alist} and
+@code{@var{bar}-windows-re} variables, they're obsoleted by the general
+match-windows mechanism
+
+@item Respect window's size hints when maximizing (both to see if the
+window is maximizable, and to truncate the maximized dimensions to an
+integral number of rows and columns)
+
+@item Show actual colors in the configurator, not just their names
+
+@item Added a new directory to the theme search path:
+@file{@var{prefix}/share/sawmill/themes}. Use this for system-wide
+themes (don't use the version specific directory)
+
+@item Included a new theme @code{mono}
+
+@item Deprecated the @code{show-message} function, replaced by
+@code{display-message} with a better calling interface; also displays
+multi-line strings
+
+@item Deprecated the menu ``expand variables when first in list''
+behaviour. Instead expand variables when the list is dotted to them, as
+is done for functions
+
+@item Support the @code{Hyper} modifier, prefix is @kbd{H-}
+
+@item In the configurator, look for i18n'd theme README files (Yukihiro
+Nakai)
+
+@item Added option to disable the ability to grab a second edge while
+resizing (@code{resize-add-edges})
+
+@item Included Danish message catalogue (Kenneth Christiansen)
+
+@item Renamed @code{fixed-position} property as @code{sticky-viewport},
+and @code{focus-proxy-click} as @code{focus-click-through}
+
+@item When evaluating mouse events, look in the window that the pointer
+was in when the button was pressed, not where the pointer currently is
+
+@item Fixed bug where focus gets totally lost after closing a Motif
+application that has grabbed the keyboard
+
+@item Fixed (again) the problems when handling remapped windows; also
+should be more ICCCM-compliant
+
+@item Fixed typos in one-dimensional maximisation (G駻ard Milmeister)
+
+@item Fixed the logic deciding when it's necessary to switch workspaces
+after merging an empty one
+
+@item Fixed interactive placement showing the window when edge-flipping
+(but it still doesn't work properly, rubber band traces are left)
+
+@item Removed flicker when focusing already-focused windows
+
+@end itemize
+
+
 @unnumberedsec 0.17
 
 @itemize @bullet

--- a/man/sawmill.texi
+++ b/man/sawmill.texi
@@ -4,9 +4,9 @@
 @footnotestyle end
 
 @set EDITION 0.5
-@set VERSION 0.17
-@set UPDATED 21 November 1999
-@set UPDATE-MONTH November 1999
+@set VERSION 0.18
+@set UPDATED 5 December 1999
+@set UPDATE-MONTH December 1999
 
 @ifinfo
 @direntry
@@ -658,7 +658,7 @@ When in click-to-focus mode, the focus-assigning click is only passed
 through to the client window if this variable is non-@code{nil}.
 
 This option may be set on a per-window basis by setting the
-@code{focus-proxy-click} property of the window (using the
+@code{focus-click-through} property of the window (using the
 @code{window-put} function).
 @end defvar
 
@@ -833,15 +833,6 @@ original window stacking order, returning the value of the
 @code{progn}.
 @end defmac
 
-As windows are created their stacking depth may be automatically set
-through the contents of the @code{auto-depth-alist} variable.
-
-@defvar auto-depth-alist
-An alist associating regular expressions with integer depths. If the
-name of a newly created window matches one of the regular expressions
-it is given the associated depth.
-@end defvar
-
 For the following functions, when called interactively they all operate
 on the window that received the current event, or alternatively the
 currently focused window.
@@ -1657,11 +1648,6 @@ Returns a symbol naming the frame type currently associated with
 @var{window}.
 @end defun
 
-@defvar auto-window-type-alist
-A list of @code{(@var{regexp} . @var{type})} entries, associating
-window names with frame types.
-@end defvar
-
 
 @node Frame Styles, Themes, Frame Types, Window Frames
 @section Frame Styles
@@ -1706,9 +1692,7 @@ window).
 
 @defun set-frame-for-window window &optional force type
 If @var{window} has no frame style associated with it, then chooses the
-default value for this window, either a value from
-@code{auto-frame-style-alist} or the value of
-@code{default-frame-style}.
+default value for this window, the value of @code{default-frame-style}.
 
 If @var{force} is non-nil then the style is always re-chosen, even if
 the window already has a chosen default style.
@@ -1717,17 +1701,21 @@ If @var{type} is non-nil it defines the frame type to give the window,
 otherwise the current default for the window is used.
 @end defun
 
-@defvar auto-frame-style-alist
-Alist associating regular expressions with frame style names. If the
-name of a new window matches one of the regular expressions, it's given
-the associated frame style.
-@end defvar
-
 @defun reframe-all-windows
 Forcibly reselect all window frame styles. Only windows with a user
 specified style are not changed to the current defaults.
 @end defun
 
+@defun rebuild-frames-with-style style
+Call @code{rebuild-frame} on all windows that currently have a frame
+defined by frame style @var{style} (a symbol)
+@end defun
+
+@defun reframe-windows-with-style style
+Completely recreate all window frames that are defined by the style
+@var{style}.
+@end defun
+
 Several window properties are used while choosing frame styles:
 
 @defvr {Window Property} frame-style
@@ -1867,17 +1855,16 @@ for example, a single-level menu could be defined by:
 @noindent
 The null item will create a separator line in the displayed menu.
 
-If the first element of any item is a symbol, then the whole item is
-replaced by the contents of the named variable. If the cdr of the first
-element is a symbol, then the rest of the item is defined by the result
-of calling the named function.
+If the cdr of first element of any item is a symbol, then the rest of
+the item is defined by the value of the named variable. If this value
+is functional then the definition is found by calling the function.
 
 Consider the following definition:
 
 @lisp
 (("Workspaces" . workspace-menu)
  ("Windows" . window-menu)
- (apps-menu)
+ ("Programs" . apps-menu)
  ("Customize" . custom-menu)
  ("About..." (customize 'about))
  ()
@@ -1886,17 +1873,16 @@ Consider the following definition:
 @end lisp
 
 @noindent
-This is the definition of Sawmill's root menu. We can see that three
-submenus are created dynamically by calling functions
-(@code{workspace-menu}, @code{window-menu} and @code{custom-menu}),
-while one submenu is stored in a separate variable (@code{apps-menu}).
+This is the definition of Sawmill's root menu. We can see that four
+submenus are created dynamically by dereferencing variables (in fact,
+three of this variables contain functions) (@code{workspace-menu},
+@code{window-menu}, @code{apps-menu} and @code{custom-menu}).
 
 The @code{apps-menu} variable can thus be used to redefine the
 applications menu. The default definition is as follows:
 
 @lisp
-("Applications"
- ("xterm" (system "xterm &"))
+(("xterm" (system "xterm &"))
  ("Emacs" (system "emacs &"))
  ("Netscape" (system "netscape &"))
  ("The GIMP" (system "gimp &"))
@@ -1966,9 +1952,9 @@ This function returns @code{t} if its argument is an input event.
 
 Each event has a name, a string. This string contains zero or more
 modifier descriptions separated by hyphens, and then the name of the
-key itself. The standard X modifier names are provided, as well as two
-special modifiers @key{Meta} and @key{Alt} that are mapped to the
-keysyms of the same name.
+key itself. The standard X modifier names are provided, as well as
+three special modifiers @key{Meta}, @key{Alt} and @key{Hyper} that are
+mapped to the keysyms of the same name.
 
 The following table lists the possible modifier prefixes:
 
@@ -1985,6 +1971,9 @@ The alt modifier
 @item S
 The shift modifier
 
+@item H
+The hyper modifier
+
 @item Mod@var{k}
 The standard X modifiers, for @var{k} between 1 and 5
 
@@ -2059,6 +2048,11 @@ A list defining the names of the X keysyms generating the virtual
 @samp{A} modifier.
 @end defvar
 
+@defvar hyper-keysyms
+A list defining the names of the X keysyms generating the virtual
+@samp{H} modifier.
+@end defvar
+
 
 @node Commands, Keymaps, Events, Top
 @chapter Commands
@@ -2492,23 +2486,39 @@ the root window.
 may only be @code{box} for a 3x3 grid.
 @end defun
 
-@defun show-message &optional text font fg bg position
-Display the string @var{text} in the center of the screen. If
-@var{text} is @code{nil} then any string previously displayed is
-removed. Returns the numeric id of the window displaying the message,
-or @code{nil} if no message is displayed.
+@defun display-message &optional text attributes
+Display the string @var{text} in a window on the screen. If @var{text}
+is @code{nil} then any string previously displayed is removed. Returns
+the numeric id of the window displaying the message, or @code{nil} if
+no message is displayed.
+
+@var{attributes} is an alist specifying how the string should be
+displayed; each element of the list is a cons cell @code{(@var{attr} .
+@var{value})} associating an attribute @var{attr} (a symbol) with it's
+value.
 
-@var{font} defines the font to use, if undefined the
-@code{default-font} variable provides this value. @var{fg} and @var{bg}
-define the color of the text and its background respectively. If
-undefined they are black and white.
+Possible attributes currently include:
 
-@var{position} is a cons cell @code{(@var{x} . @var{y})}. @var{x} and
-@var{y} are integers or @code{nil} (for centered display). If negative
-they count in from the left and bottom edges respectively.
+@table @code
+@item font
+The font to use
+
+@item foreground
+The color to draw the text with
+
+@item background
+The color to draw the background with
 
-Note that newlines in @var{text} are ignored. This may change in the
-future.
+@item x-justify
+The justification method for multi-line strings. One of the symbols
+@code{left}, @code{right}, or @code{center}
+
+@item position
+A cons cell defining the coordinates at which to display the message
+window. The cell is @code{(@var{x} . @var{y})}. @var{x} and @var{y} are
+integers or @code{nil} (for centered display). If negative they count
+in from the left and bottom edges respectively.
+@end table
 @end defun
 
 

--- a/sawmill.spec.in
+++ b/sawmill.spec.in
@@ -61,11 +61,6 @@ gzip -9nf $RPM_BUILD_ROOT%{_prefix}/info/sawmill*
 %{_prefix}/share/control-center/Sawmill
 %{_prefix}/share/gnome/wm-properties/Sawmill.desktop
 
-%post
-if [ ! -d ${_prefix}/share/sawmill/themes ]; then
-  mkdir ${_prefix}/share/sawmill/themes
-fi
-
 %changelog
 * Fri Sep 17 1999 John Harper <[e-mail]>
 - don't patch the Makefile

--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,17 @@
[phone]  John Harper  <[e-mail]>
+
+	* version 0.18
+
+	* sawmill-ui.jl (build-color): create buttons containing a
+	preview of the color, not just its name
+
 1999-12-03  John Harper  <[e-mail]>
 
+	* windows.c (add_window): always set the `placed' property
+	before exiting
+
+	* keys.h, keys.c: support Hyper modifier, prefix `H-'
+
 	* frames.c (set_frame_part_bg): fixed a bug when tiling shaped
 	frame parts, removed the spurious clipping code
 	(refresh_frame_part): handle the dimensions checking here

--- a/themes/mono/theme.jl
+++ b/themes/mono/theme.jl
@@ -1,5 +1,5 @@
 ;; mono/theme.jl
-;; $Id$
+;; $Id: theme.jl,v 1.1 1999/12/05 11:34:19 john Exp $
 
 ;; Copyright (C) 1999 John Harper <[e-mail]>
 
@@ -19,14 +19,14 @@
 ;; along with sawmill; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
-(defgroup mono-frame "Mono frame")
+(defgroup mono-frame "Mono Frame")
 
-(defcustom mono:gtk-background-color nil
+(defcustom mono:gtk-background-color t
   "Use the GTK+ background color for inactive frames."
   :type boolean
   :group mono-frame)
 
-(defcustom mono:normal-color "#8d7ee1"
+(defcustom mono:normal-color "slateblue1"
   "Color of inactive frames. (When the above option is unset.)"
   :type color
   :group mono-frame

--- a/themes/simple/theme.jl
+++ b/themes/simple/theme.jl
@@ -19,7 +19,7 @@
 ;; along with sawmill; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
-(defgroup simple-frame "Simple frame")
+(defgroup simple-frame "Simple Frame")
 
 (defcustom simple:normal-color "lightsteelblue4"
   "Color of inactive frames in `simple' frame style."

--- a/themes/smaker/theme.jl
+++ b/themes/smaker/theme.jl
@@ -1,5 +1,5 @@
 ;; smaker/theme.jl -- somewhat windowmaker like theme, heavily customizable
-;; $Id: theme.jl,v 1.6 1999/11/25 23:38:41 john Exp $
+;; $Id: theme.jl,v 1.7 1999/12/05 11:31:06 john Exp $
 
 ;; Copyright (C) 1999 John Harper <[e-mail]>
 
@@ -19,7 +19,7 @@
 ;; along with sawmill; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
-(defgroup smaker-frame "SMaker frame")
+(defgroup smaker-frame "SMaker Frame")
 
 (defcustom smaker:inverted-buttons nil
   "Use black-on-white button images."