Commit: 7d967b1235dd9de8b4148b624ef0d80510832c0d - trjp_sawfish (git)

Japanese translation of message catalog for Sawfish Window-Manager

Commit MetaInfo

• Revision: 7d967b1235dd9de8b4148b624ef0d80510832c0d (tree)
• Time: 2000-05-18 19:23:25
• Author: john <john>
• Commiter: john

Log Message

merged from HEAD

Change Summary

• modified: Makefile.in
• modified: THANKS
• modified: TODO
• modified: configure.in
• modified: lisp/ChangeLog
• modified: lisp/auto-raise.jl
• modified: lisp/focus.jl
• modified: lisp/gnome-menu.jl
• modified: lisp/sawmill-gaol.jl
• modified: lisp/sawmill.jl
• modified: lisp/transient.jl
• modified: man/faq.texi
• modified: man/news.texi
• modified: sawfish.spec.in
• modified: src/ChangeLog
• modified: src/events.c

Incremental Difference

--- a/Makefile.in
+++ b/Makefile.in
@@ -38,14 +38,16 @@ build.h : build-info config.status
 	  '$(sawfishdir)' '$(lispdir)' '$(sawfishexecdir)'
 
 install : all installdirs
-	-set -e; for dir in $(SUBDIRS); do \
+	set -e; for dir in $(SUBDIRS); do \
 	  ( cd $$dir && $(MAKE) $@ ); \
 	done
 	for f in ./DOC*; do \
 	  $(INSTALL_DATA) $$f $(DESTDIR)$(sawfishdir)/$(version); \
 	done
-	rm -f $(DESTDIR)$(GNOMEDIR)/share/gnome/wm-properties/Sawmill.desktop
-	$(INSTALL_DATA) Sawfish.desktop $(DESTDIR)$(GNOMEDIR)/share/gnome/wm-properties
+	if [ -d $(DESTDIR)$(GNOMEDIR)/share/gnome/wm-properties ]; then \
+	  rm -f $(DESTDIR)$(GNOMEDIR)/share/gnome/wm-properties/Sawmill.desktop; \
+	  $(INSTALL_DATA) Sawfish.desktop $(DESTDIR)$(GNOMEDIR)/share/gnome/wm-properties; \
+	fi
 	-set -e; for f in $(OLD_BINARIES); do \
 	  if [ -x $(DESTDIR)$(bindir)/$$f ]; then \
 	    rm -f $(DESTDIR)$(bindir)/$$f; \
@@ -54,7 +56,7 @@ install : all installdirs
 	done
 
 installdirs : $(top_srcdir)/mkinstalldirs
-	$(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sawfishdir)/$(version) $(DESTDIR)$(bindir) $(DESTDIR)$(GNOMEDIR)/share/gnome/wm-properties
+	$(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sawfishdir)/$(version) $(DESTDIR)$(bindir)
 
 uninstall :
 	set -e; for dir in $(SUBDIRS); do \
@@ -84,8 +86,10 @@ realclean :
 	rm -f config.cache config.h config.log config.status Makedefs Makefile
 	rm -f *~ NEWS DOC* TAGS build.h sawfish.spec
 
+distclean : realclean
+
 TAGS :
 	etags --language=c `find . -name '*.[ch]' -print` \
 	      --language=lisp `find . -name '*.jl' -print`
 
-.PHONY: install uninstall tar nobak clean realclean TAGS
+.PHONY: install uninstall tar nobak clean realclean distclean TAGS

--- a/THANKS
+++ b/THANKS
@@ -34,7 +34,7 @@ Many others have also contributed patches, including:
    Probst, Kirk Saranathan, Ian, Morgan Schweers, Jens Finke, G駻ard
    Milmeister, Andreas Degert, Rob Hodges, Martin Blais, Dan Winship,
    Dave Pearson, Jens-Ulrik Petersen, Alexander Barinov, Richard
-   Kilgore
+   Kilgore, Bruce Miller
 
 
 Thanks also to those who have contributed translations:

--- a/TODO
+++ b/TODO
@@ -11,6 +11,8 @@ and longer-term ideas are marked -
 Outstanding bugs
 ================
 
+  ! raise-groups-on-focus is commented out
+
   ! running multiple instances of the wm loses
 
     (because they share the same ~/.sawmill/custom file)
@@ -102,6 +104,20 @@ Outstanding bugs
 Window manager tasks
 ====================
 
+  + some hci ideas:
+
+    placement mode to favour some/any of:
+
+	- positions near the currently focused window
+	- near the mouse pointer
+
+	  [ the above two are now possible using best-fit cost
+	    components.. not sure if they work 100% correctly.. ]
+
+	- near other windows in the same group
+
+    theme that has visual cues (colours?) for group membership
+
   + look at kde khotkeys for ideas
 
   + support the new GNOME/KDE wm interaction protocols
@@ -132,8 +148,6 @@ Window manager tasks
     make sawmill-ui extract defcustom decls straight from lisp files
     somehow?
 
-  + handle language codes better in gnome-menu
-
   + add a (destroyed . FUN) attribute to display-message
 
     also allow multiple messages to be displayed/managed

--- 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.27.1"
+version="0.27.2"
 
 output_files="src/Makefile lisp/Makefile themes/Makefile\
  sounds/Makefile man/Makefile po/Makefile Makedefs Makefile sawfish.spec"
@@ -220,9 +220,9 @@ AC_ARG_WITH(gnome_prefix,
  [ with_gnome_prefix="" ])
 AC_MSG_CHECKING([for GNOME prefix])
 if test "x$with_gnome_prefix" = "x"; then
-  with_gnome_prefix=`gnome-config --prefix 2>&1`
+  with_gnome_prefix=`gnome-config --prefix 2>/dev/null`
   if test $? -ne 0; then
-    gnome_prefix='${prefix}'
+    with_gnome_prefix='${prefix}'
   fi
 fi
 AC_MSG_RESULT([$with_gnome_prefix])

--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,41 @@
[phone]  John Harper  <[e-mail]>
+
+	* version 0.27.2
+
[phone]  John Harper  <[e-mail]>
+
+	* sawmill-gaol.jl (sawmill-safe-specials): added batch-mode
+
[phone]  John Harper  <[e-mail]>
+
+	* auto-raise.jl (raise-groups-on-focus): commented out this
+	option, it causes window groups to flicker (sometimes
+	repeatedly) in certain cases due to the extra focus events it
+	causes
+
[phone]  John Harper  <[e-mail]>
+
+	* gnome-menu.jl (gnome-menu-lang): now a list of strings, made
+	by destructuring the language code, e.g. if LANG=de_DE, then
+	the list will be ("de" "de_DE")
+
+	(gnome-menu-read-desktop-entry): match encountered languages
+	against all items in gnome-menu-lang
+
+	* gnome-menu.jl, sawmill.jl: search LANGUAGE, LC_ALL,
+	LC_MESSAGES, LANG for the language code to use, in that order
+
[phone]  John Harper  <[e-mail]>
+
+	* focus.jl (focus-enter-fun, focus-enter-fun): generate events
+	when the root window is entered/left, enter-root and leave-root
+	(enter-exit): unfocus the window when the root window is
+	entered, as well as when the window is left
+
+	* transient.jl (transient-unmap-window): fix bug of looking for
+	window under pointer _in_ click to focus mode, it should be
+	only done when _not in_ this mode
+
 2000-05-10  John Harper  <[e-mail]>
 
 	* version 0.27.1

--- a/lisp/auto-raise.jl
+++ b/lisp/auto-raise.jl
@@ -33,10 +33,11 @@
   :type number
   :group focus)
 
-(defcustom raise-groups-on-focus t
-  "Raise entire group after focusing a window (when auto-raise is enabled)."
-  :type boolean
-  :group (focus advanced))
+;XXX this thing is hosed
+;(defcustom raise-groups-on-focus t
+;  "Raise entire group after focusing a window (when auto-raise is enabled)."
+;  :type boolean
+;  :group (focus advanced))
 
 (defvar disable-auto-raise nil)
 
@@ -50,9 +51,12 @@
     (setq rw-timer nil)))
 
 (defun rw-raise-window (w)
-  (if raise-groups-on-focus
-      (raise-group w)
-    (raise-window w)))
+  (raise-window w))
+
+;(defun rw-raise-window (w)
+;  (if raise-groups-on-focus
+;      (raise-group w)
+;    (raise-window w)))
 
 (defun rw-on-focus (w)
   (unless disable-auto-raise

--- a/lisp/focus.jl
+++ b/lisp/focus.jl
@@ -103,7 +103,7 @@ EVENT-NAME)', where EVENT-NAME may be one of the following symbols:
    (cond ((eq action 'pointer-in)
 	  (when (window-really-wants-input-p w)
 	    (set-input-focus w)))
-	 ((eq action 'pointer-out)
+	 ((memq action '(pointer-out enter-root))
 	  (set-input-focus nil)))))
 
 (define-focus-mode 'enter-only
@@ -159,12 +159,16 @@ EVENT-NAME)', where EVENT-NAME may be one of the following symbols:
 ;; hooks
 
 (defun focus-enter-fun (w)
-  (when (windowp w)
-    (focus-invoke-mode w 'pointer-in)))
+  (cond ((windowp w)
+	 (focus-invoke-mode w 'pointer-in))
+	((eq w 'root)
+	 (focus-invoke-mode (input-focus) 'enter-root))))
 
 (defun focus-leave-fun (w)
-  (when (windowp w)
-    (focus-invoke-mode w 'pointer-out)))
+  (cond ((windowp w)
+	 (focus-invoke-mode w 'pointer-out))
+	((eq w 'root)
+	 (focus-invoke-mode (input-focus) 'leave-root))))
 
 (defun focus-in-fun (w)
   (focus-invoke-mode w 'focus-in)

--- a/lisp/gnome-menu.jl
+++ b/lisp/gnome-menu.jl
@@ -42,11 +42,21 @@
     nil))
 
 (defvar gnome-menu-lang (let
-			    ((lang (or (getenv "LC_ALL") (getenv "LANG"))))
-			  (when (string= lang "en")
-			    (setq lang nil))
-			  lang)
-  "Language code used when constructing GNOME menus.")
+			    ((lang (or (getenv "LANGUAGE")
+				       (getenv "LC_ALL")
+				       (getenv "LC_MESSAGES")
+				       (getenv "LANG")))
+			     (all '()))
+			  (when (and lang (not (string= lang "en")))
+			    (setq all (cons lang all))
+			    (when (string-match "[.@]" lang)
+			      (setq lang (substring lang 0 (match-start)))
+			      (setq all (cons lang all)))
+			    (when (string-match "_" lang)
+			      (setq lang (substring lang 0 (match-start)))
+			      (setq all (cons lang all))))
+			  all)
+  "List of language codes used when constructing GNOME menus.")
 
 (defvar gnome-menu-roots (list (expand-file-name
 				"apps" gnome-share-directory)
@@ -104,9 +114,8 @@
 			(string-looking-at "Name=(.*)\n" line 0 t))
 		   (setq name (expand-last-match "\\1")))
 		  ((and (eq section 'desktop-entry) gnome-menu-lang
-			(string-looking-at
-			 "Name\\[([^]]+)\\]=(.*)\n" line 0 t)
-			(string= gnome-menu-lang (expand-last-match "\\1")))
+			(string-looking-at "Name\\[([^]]+)\\]=(.*)\n" line 0 t)
+			(member (expand-last-match "\\1") gnome-menu-lang))
 		   (setq name (expand-last-match "\\2")))
 		  ((and (eq section 'desktop-entry)
 			(string-looking-at "Exec=(.*)\n" line 0 t))

--- a/lisp/sawmill-gaol.jl
+++ b/lisp/sawmill-gaol.jl
@@ -45,7 +45,7 @@
 (defvar sawmill-safe-specials
   '(default-foreground display-name canonical-display-name
     default-font default-frame nil-frame frame-part-classes
-    decorate-transients))
+    decorate-transients batch-mode))
 
 (defvar sawmill-safe-features '(gtkrc gradient make-theme x))
 

--- a/lisp/sawmill.jl
+++ b/lisp/sawmill.jl
@@ -49,7 +49,8 @@
 ;; load i18n support when necessary
 (unless batch-mode
   (let
-      ((lang (or (getenv "LC_ALL") (getenv "LANG") (getenv "LANGUAGE")))
+      ((lang (or (getenv "LANGUAGE") (getenv "LC_ALL")
+		 (getenv "LC_MESSAGES") (getenv "LANG")))
        (disable-nls (get-command-line-option "--disable-nls")))
 
     (when (and lang (not disable-nls) (not (string= lang "C")))

--- a/lisp/transient.jl
+++ b/lisp/transient.jl
@@ -72,8 +72,8 @@
 	;; if no parent, choose the topmost window (if in click-to-focus
 	;; mode) or the window under the pointer otherwise
 	(if (eq focus-mode 'click)
-	    (setq parent (query-pointer-window))
-	  (setq parent nil))
+	    (setq parent nil)
+	  (setq parent (query-pointer-window)))
 	(unless (or parent (eq focus-mode 'enter-exit))
 	  (setq parent (window-order-most-recent))))
       (when (or (null parent) (window-really-wants-input-p parent))

--- a/man/faq.texi
+++ b/man/faq.texi
@@ -56,7 +56,7 @@ try clicking both buttons simultaneously)
 
 If, after reading this, you still think that sawfish isn't working,
 please send mail describing the problem to the sawfish mailing list
-@email{sawfish@@aarg.net}
+@email{sawmill@@aarg.net}
 
 
 @item How do I add customizations?

--- a/man/news.texi
+++ b/man/news.texi
@@ -6,9 +6,33 @@ This lists the user-visible changes made to Sawmill, and which releases
 they occurred between. For more detailed information see the
 @file{ChangeLog} files in the Sawmill source tree.
 
+
+@unnumberedsec 0.27.2
+
+@itemize @bullet
+
+@item Translation updates: da (Kenneth Christiansen), de (Karl

+
+@item Attempt to destructure the language code when parsing GNOME
+desktop items (e.g. if @samp{LANG=de_DE} look for both @samp{de_DE} and
+@samp{de} translations)
+
+@item New focus handler events @code{enter-root} and @code{leave-root}
+
+@item Removed @code{raise-groups-on-focus} option, it caused unstable
+window flickering in certain cases
+
+@item Fixed bug When transferring focus after a window is unmapped
+(inverted choice of when to look under pointer, and when to look in
+focus history)
+
+@end itemize
+
+
 @unnumberedsec 0.27
 
-@itemize
+@itemize @bullet
 
 @item Changed the name from @samp{sawmill} to @samp{sawfish}; all
 user-visible binaries have been renamed appropriately, the old programs

--- a/sawfish.spec.in
+++ b/sawfish.spec.in
@@ -1,19 +1,15 @@
 
-%define nam	sawfish
-%define ver	@version@
-%define rel	1
-
+Name: sawfish
+Version: @version@
+Release: 1
 Summary: a highly configurable and extensible X11 window manager
-Name: %{nam}
-Version: %{ver}
-Release: %{rel}
 Requires: librep >= 0.10, rep-gtk >= 0.8
 Copyright: GPL
 Group: User Interface/Desktops
-Source: ftp://ftp.dcs.warwick.ac.uk/people/John.Harper/sawfish/sawfish-%{ver}.tar.gz
+Source: ftp://ftp.dcs.warwick.ac.uk/people/John.Harper/sawfish/sawfish-%{version}.tar.gz
 URL: http://www.dcs.warwick.ac.uk/~john/sw/sawfish/
 Packager: John Harper <[e-mail]>
-Buildroot: /var/tmp/%{nam}-root
+Buildroot: /var/tmp/%{name}-root
 BuildPrereq: rep-gtk-libglade control-center-devel gmp-devel
 PreReq: /sbin/install-info
 Obsoletes: sawmill
@@ -30,7 +26,7 @@ mostly-GNOME compliant.
 %package gnome
 Summary: GNOME support for sawfish
 Group: User Interface/Desktops
-Requires: %{nam}
+Requires: %{name}
 Obsoletes: sawmill-gnome
 
 %description gnome
@@ -40,7 +36,7 @@ control center applet
 %package themer
 Summary: GUI for creating sawfish themes
 Group: User Interface/Desktops
-Requires: %{nam}, rep-gtk-libglade
+Requires: %{name}, rep-gtk-libglade
 Obsoletes: sawmill-themer
 
 %description themer
@@ -82,8 +78,8 @@ fi
 %{_prefix}/bin/sawmill
 %{_prefix}/bin/sawmill-client
 %{_prefix}/bin/sawmill-ui
-%{_prefix}/share/sawfish/%{ver}
-%{_prefix}/libexec/sawfish/%{ver}/%{_host}
+%{_prefix}/share/sawfish/%{version}
+%{_prefix}/libexec/sawfish/%{version}/%{_host}
 %{_prefix}/info/sawfish*
 
 %files gnome
@@ -99,7 +95,7 @@ fi
 %defattr(-,root,root)
 %{_prefix}/bin/sawfish-themer
 %{_prefix}/bin/sawmill-themer
-%{_prefix}/share/sawfish/%{ver}/themer.glade
+%{_prefix}/share/sawfish/%{version}/themer.glade
 
 %changelog
 * Mon Apr 24 2000 John Harper <[e-mail]>

--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
[phone]  John Harper  <[e-mail]>
+
+	* version 0.27.2
+
[phone]  John Harper  <[e-mail]>
+
+	* events.c (enter_notify): ignore NotifyInferior events
+	(entering from inner window), leave_notify has always done this
+
 2000-05-09  John Harper  <[e-mail]>
 
 	* version 0.27

--- a/src/events.c
+++ b/src/events.c
@@ -710,8 +710,11 @@ enter_notify (XEvent *ev)
     else
     {
 	Lisp_Window *w = find_window_by_id (ev->xcrossing.window);
-	if (w != 0 && w->mapped && w->visible)
+	if (w != 0 && w->mapped && w->visible
+	    && ev->xcrossing.detail != NotifyInferior)
+	{
 	    Fcall_window_hook (Qenter_notify_hook, rep_VAL(w), Qnil, Qnil);
+	}
     }
 }