OSDN > Developer > hmatrjp > Chamber > trjp_sawfish > 提交

hmatrjp

trjp_sawfish
Fork

Fork origin:

SawfishWM/sawfish

R/O
HTTP
SSH
HTTPS

提交

Commit MetaInfo

修订版	7d967b1235dd9de8b4148b624ef0d80510832c0d (tree)
时间	2000-05-18 19:23:25
作者	john <john>
Commiter	john

Log Message

merged from HEAD

更改概述

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

差异

--- a/Makefile.in

+++ b/Makefile.in

		@@ -38,14 +38,16 @@ build.h : build-info config.status
38	38	'$(sawfishdir)' '$(lispdir)' '$(sawfishexecdir)'
39	39
40	40	install : all installdirs
41		- -set -e; for dir in $(SUBDIRS); do \
	41	+ set -e; for dir in $(SUBDIRS); do \
42	42	( cd $$dir && $(MAKE) $@ ); \
43	43	done
44	44	for f in ./DOC*; do \
45	45	$(INSTALL_DATA) $$f $(DESTDIR)$(sawfishdir)/$(version); \
46	46	done
47		- rm -f $(DESTDIR)$(GNOMEDIR)/share/gnome/wm-properties/Sawmill.desktop
48		- $(INSTALL_DATA) Sawfish.desktop $(DESTDIR)$(GNOMEDIR)/share/gnome/wm-properties
	47	+ if [ -d $(DESTDIR)$(GNOMEDIR)/share/gnome/wm-properties ]; then \
	48	+ rm -f $(DESTDIR)$(GNOMEDIR)/share/gnome/wm-properties/Sawmill.desktop; \
	49	+ $(INSTALL_DATA) Sawfish.desktop $(DESTDIR)$(GNOMEDIR)/share/gnome/wm-properties; \
	50	+ fi
49	51	-set -e; for f in $(OLD_BINARIES); do \
50	52	if [ -x $(DESTDIR)$(bindir)/$$f ]; then \
51	53	rm -f $(DESTDIR)$(bindir)/$$f; \

		@@ -54,7 +56,7 @@ install : all installdirs
54	56	done
55	57
56	58	installdirs : $(top_srcdir)/mkinstalldirs
57		- $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sawfishdir)/$(version) $(DESTDIR)$(bindir) $(DESTDIR)$(GNOMEDIR)/share/gnome/wm-properties
	59	+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sawfishdir)/$(version) $(DESTDIR)$(bindir)
58	60
59	61	uninstall :
60	62	set -e; for dir in $(SUBDIRS); do \

		@@ -84,8 +86,10 @@ realclean :
84	86	rm -f config.cache config.h config.log config.status Makedefs Makefile
85	87	rm -f ~ NEWS DOC TAGS build.h sawfish.spec
86	88
	89	+distclean : realclean
	90	+
87	91	TAGS :
88	92	etags --language=c `find . -name '*.[ch]' -print` \
89	93	--language=lisp `find . -name '*.jl' -print`
90	94
91		-.PHONY: install uninstall tar nobak clean realclean TAGS
	95	+.PHONY: install uninstall tar nobak clean realclean distclean TAGS

--- a/THANKS

+++ b/THANKS

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

--- a/TODO

+++ b/TODO

		@@ -11,6 +11,8 @@ and longer-term ideas are marked -
11	11	Outstanding bugs
12	12	================
13	13
	14	+ ! raise-groups-on-focus is commented out
	15	+
14	16	! running multiple instances of the wm loses
15	17
16	18	(because they share the same ~/.sawmill/custom file)

		@@ -102,6 +104,20 @@ Outstanding bugs
102	104	Window manager tasks
103	105	====================
104	106
	107	+ + some hci ideas:
	108	+
	109	+ placement mode to favour some/any of:
	110	+
	111	+ - positions near the currently focused window
	112	+ - near the mouse pointer
	113	+
	114	+ [ the above two are now possible using best-fit cost
	115	+ components.. not sure if they work 100% correctly.. ]
	116	+
	117	+ - near other windows in the same group
	118	+
	119	+ theme that has visual cues (colours?) for group membership
	120	+
105	121	+ look at kde khotkeys for ideas
106	122
107	123	+ support the new GNOME/KDE wm interaction protocols

		@@ -132,8 +148,6 @@ Window manager tasks
132	148	make sawmill-ui extract defcustom decls straight from lisp files
133	149	somehow?
134	150
135		- + handle language codes better in gnome-menu
136		-
137	151	+ add a (destroyed . FUN) attribute to display-message
138	152
139	153	also allow multiple messages to be displayed/managed

--- a/configure.in

+++ b/configure.in

		@@ -25,7 +25,7 @@ AC_CONFIG_HEADER(config.h)
25	25	AC_CONFIG_AUX_DIR(etc)
26	26
27	27	dnl Release versioning info
28		-version="0.27.1"
	28	+version="0.27.2"
29	29
30	30	output_files="src/Makefile lisp/Makefile themes/Makefile\
31	31	sounds/Makefile man/Makefile po/Makefile Makedefs Makefile sawfish.spec"

		@@ -220,9 +220,9 @@ AC_ARG_WITH(gnome_prefix,
220	220	[ with_gnome_prefix="" ])
221	221	AC_MSG_CHECKING([for GNOME prefix])
222	222	if test "x$with_gnome_prefix" = "x"; then
223		- with_gnome_prefix=`gnome-config --prefix 2>&1`
	223	+ with_gnome_prefix=`gnome-config --prefix 2>/dev/null`
224	224	if test $? -ne 0; then
225		- gnome_prefix='${prefix}'
	225	+ with_gnome_prefix='${prefix}'
226	226	fi
227	227	fi
228	228	AC_MSG_RESULT([$with_gnome_prefix])

--- a/lisp/ChangeLog

+++ b/lisp/ChangeLog

		@@ -1,3 +1,41 @@
	1	+2000-05-18 John Harper <john@dcs.warwick.ac.uk>
	2	+
	3	+ * version 0.27.2
	4	+
	5	+2000-05-15 John Harper <john@dcs.warwick.ac.uk>
	6	+
	7	+ * sawmill-gaol.jl (sawmill-safe-specials): added batch-mode
	8	+
	9	+2000-05-14 John Harper <john@dcs.warwick.ac.uk>
	10	+
	11	+ * auto-raise.jl (raise-groups-on-focus): commented out this
	12	+ option, it causes window groups to flicker (sometimes
	13	+ repeatedly) in certain cases due to the extra focus events it
	14	+ causes
	15	+
	16	+2000-05-12 John Harper <john@dcs.warwick.ac.uk>
	17	+
	18	+ * gnome-menu.jl (gnome-menu-lang): now a list of strings, made
	19	+ by destructuring the language code, e.g. if LANG=de_DE, then
	20	+ the list will be ("de" "de_DE")
	21	+
	22	+ (gnome-menu-read-desktop-entry): match encountered languages
	23	+ against all items in gnome-menu-lang
	24	+
	25	+ * gnome-menu.jl, sawmill.jl: search LANGUAGE, LC_ALL,
	26	+ LC_MESSAGES, LANG for the language code to use, in that order
	27	+
	28	+2000-05-11 John Harper <john@dcs.warwick.ac.uk>
	29	+
	30	+ * focus.jl (focus-enter-fun, focus-enter-fun): generate events
	31	+ when the root window is entered/left, enter-root and leave-root
	32	+ (enter-exit): unfocus the window when the root window is
	33	+ entered, as well as when the window is left
	34	+
	35	+ * transient.jl (transient-unmap-window): fix bug of looking for
	36	+ window under pointer _in_ click to focus mode, it should be
	37	+ only done when _not in_ this mode
	38	+
1	39	2000-05-10 John Harper <john@dcs.warwick.ac.uk>
2	40
3	41	* version 0.27.1

--- a/lisp/auto-raise.jl

+++ b/lisp/auto-raise.jl

		@@ -33,10 +33,11 @@
33	33	:type number
34	34	:group focus)
35	35
36		-(defcustom raise-groups-on-focus t
37		- "Raise entire group after focusing a window (when auto-raise is enabled)."
38		- :type boolean
39		- :group (focus advanced))
	36	+;XXX this thing is hosed
	37	+;(defcustom raise-groups-on-focus t
	38	+; "Raise entire group after focusing a window (when auto-raise is enabled)."
	39	+; :type boolean
	40	+; :group (focus advanced))
40	41
41	42	(defvar disable-auto-raise nil)
42	43

		@@ -50,9 +51,12 @@
50	51	(setq rw-timer nil)))
51	52
52	53	(defun rw-raise-window (w)
53		- (if raise-groups-on-focus
54		- (raise-group w)
55		- (raise-window w)))
	54	+ (raise-window w))
	55	+
	56	+;(defun rw-raise-window (w)
	57	+; (if raise-groups-on-focus
	58	+; (raise-group w)
	59	+; (raise-window w)))
56	60
57	61	(defun rw-on-focus (w)
58	62	(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:
103	103	(cond ((eq action 'pointer-in)
104	104	(when (window-really-wants-input-p w)
105	105	(set-input-focus w)))
106		- ((eq action 'pointer-out)
	106	+ ((memq action '(pointer-out enter-root))
107	107	(set-input-focus nil)))))
108	108
109	109	(define-focus-mode 'enter-only

		@@ -159,12 +159,16 @@ EVENT-NAME)', where EVENT-NAME may be one of the following symbols:
159	159	;; hooks
160	160
161	161	(defun focus-enter-fun (w)
162		- (when (windowp w)
163		- (focus-invoke-mode w 'pointer-in)))
	162	+ (cond ((windowp w)
	163	+ (focus-invoke-mode w 'pointer-in))
	164	+ ((eq w 'root)
	165	+ (focus-invoke-mode (input-focus) 'enter-root))))
164	166
165	167	(defun focus-leave-fun (w)
166		- (when (windowp w)
167		- (focus-invoke-mode w 'pointer-out)))
	168	+ (cond ((windowp w)
	169	+ (focus-invoke-mode w 'pointer-out))
	170	+ ((eq w 'root)
	171	+ (focus-invoke-mode (input-focus) 'leave-root))))
168	172
169	173	(defun focus-in-fun (w)
170	174	(focus-invoke-mode w 'focus-in)

--- a/lisp/gnome-menu.jl

+++ b/lisp/gnome-menu.jl

		@@ -42,11 +42,21 @@
42	42	nil))
43	43
44	44	(defvar gnome-menu-lang (let
45		- ((lang (or (getenv "LC_ALL") (getenv "LANG"))))
46		- (when (string= lang "en")
47		- (setq lang nil))
48		- lang)
49		- "Language code used when constructing GNOME menus.")
	45	+ ((lang (or (getenv "LANGUAGE")
	46	+ (getenv "LC_ALL")
	47	+ (getenv "LC_MESSAGES")
	48	+ (getenv "LANG")))
	49	+ (all '()))
	50	+ (when (and lang (not (string= lang "en")))
	51	+ (setq all (cons lang all))
	52	+ (when (string-match "[.@]" lang)
	53	+ (setq lang (substring lang 0 (match-start)))
	54	+ (setq all (cons lang all)))
	55	+ (when (string-match "_" lang)
	56	+ (setq lang (substring lang 0 (match-start)))
	57	+ (setq all (cons lang all))))
	58	+ all)
	59	+ "List of language codes used when constructing GNOME menus.")
50	60
51	61	(defvar gnome-menu-roots (list (expand-file-name
52	62	"apps" gnome-share-directory)

		@@ -104,9 +114,8 @@
104	114	(string-looking-at "Name=(.*)\n" line 0 t))
105	115	(setq name (expand-last-match "\\1")))
106	116	((and (eq section 'desktop-entry) gnome-menu-lang
107		- (string-looking-at
108		- "Name\\[([^]]+)\\]=(.*)\n" line 0 t)
109		- (string= gnome-menu-lang (expand-last-match "\\1")))
	117	+ (string-looking-at "Name\\[([^]]+)\\]=(.*)\n" line 0 t)
	118	+ (member (expand-last-match "\\1") gnome-menu-lang))
110	119	(setq name (expand-last-match "\\2")))
111	120	((and (eq section 'desktop-entry)
112	121	(string-looking-at "Exec=(.*)\n" line 0 t))

--- a/lisp/sawmill-gaol.jl

+++ b/lisp/sawmill-gaol.jl

		@@ -45,7 +45,7 @@
45	45	(defvar sawmill-safe-specials
46	46	'(default-foreground display-name canonical-display-name
47	47	default-font default-frame nil-frame frame-part-classes
48		- decorate-transients))
	48	+ decorate-transients batch-mode))
49	49
50	50	(defvar sawmill-safe-features '(gtkrc gradient make-theme x))
51	51

--- a/lisp/sawmill.jl

+++ b/lisp/sawmill.jl

		@@ -49,7 +49,8 @@
49	49	;; load i18n support when necessary
50	50	(unless batch-mode
51	51	(let
52		- ((lang (or (getenv "LC_ALL") (getenv "LANG") (getenv "LANGUAGE")))
	52	+ ((lang (or (getenv "LANGUAGE") (getenv "LC_ALL")
	53	+ (getenv "LC_MESSAGES") (getenv "LANG")))
53	54	(disable-nls (get-command-line-option "--disable-nls")))
54	55
55	56	(when (and lang (not disable-nls) (not (string= lang "C")))

--- a/lisp/transient.jl

+++ b/lisp/transient.jl

		@@ -72,8 +72,8 @@
72	72	;; if no parent, choose the topmost window (if in click-to-focus
73	73	;; mode) or the window under the pointer otherwise
74	74	(if (eq focus-mode 'click)
75		- (setq parent (query-pointer-window))
76		- (setq parent nil))
	75	+ (setq parent nil)
	76	+ (setq parent (query-pointer-window)))
77	77	(unless (or parent (eq focus-mode 'enter-exit))
78	78	(setq parent (window-order-most-recent))))
79	79	(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)
56	56
57	57	If, after reading this, you still think that sawfish isn't working,
58	58	please send mail describing the problem to the sawfish mailing list
59		-@email{sawfish@@aarg.net}
	59	+@email{sawmill@@aarg.net}
60	60
61	61
62	62	@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
6	6	they occurred between. For more detailed information see the
7	7	@file{ChangeLog} files in the Sawmill source tree.
8	8
	9	+
	10	+@unnumberedsec 0.27.2
	11	+
	12	+@itemize @bullet
	13	+
	14	+@item Translation updates: da (Kenneth Christiansen), de (Karl
	15
	16	+
	17	+@item Attempt to destructure the language code when parsing GNOME
	18	+desktop items (e.g. if @samp{LANG=de_DE} look for both @samp{de_DE} and
	19	+@samp{de} translations)
	20	+
	21	+@item New focus handler events @code{enter-root} and @code{leave-root}
	22	+
	23	+@item Removed @code{raise-groups-on-focus} option, it caused unstable
	24	+window flickering in certain cases
	25	+
	26	+@item Fixed bug When transferring focus after a window is unmapped
	27	+(inverted choice of when to look under pointer, and when to look in
	28	+focus history)
	29	+
	30	+@end itemize
	31	+
	32	+
9	33	@unnumberedsec 0.27
10	34
11		-@itemize
	35	+@itemize @bullet
12	36
13	37	@item Changed the name from @samp{sawmill} to @samp{sawfish}; all
14	38	user-visible binaries have been renamed appropriately, the old programs

--- a/sawfish.spec.in

+++ b/sawfish.spec.in

		@@ -1,19 +1,15 @@
1	1
2		-%define nam sawfish
3		-%define ver @version@
4		-%define rel 1
5		-
	2	+Name: sawfish
	3	+Version: @version@
	4	+Release: 1
6	5	Summary: a highly configurable and extensible X11 window manager
7		-Name: %{nam}
8		-Version: %{ver}
9		-Release: %{rel}
10	6	Requires: librep >= 0.10, rep-gtk >= 0.8
11	7	Copyright: GPL
12	8	Group: User Interface/Desktops
13		-Source: ftp://ftp.dcs.warwick.ac.uk/people/John.Harper/sawfish/sawfish-%{ver}.tar.gz
	9	+Source: ftp://ftp.dcs.warwick.ac.uk/people/John.Harper/sawfish/sawfish-%{version}.tar.gz
14	10	URL: http://www.dcs.warwick.ac.uk/~john/sw/sawfish/
15	11	Packager: John Harper <john@dcs.warwick.ac.uk>
16		-Buildroot: /var/tmp/%{nam}-root
	12	+Buildroot: /var/tmp/%{name}-root
17	13	BuildPrereq: rep-gtk-libglade control-center-devel gmp-devel
18	14	PreReq: /sbin/install-info
19	15	Obsoletes: sawmill

		@@ -30,7 +26,7 @@ mostly-GNOME compliant.
30	26	%package gnome
31	27	Summary: GNOME support for sawfish
32	28	Group: User Interface/Desktops
33		-Requires: %{nam}
	29	+Requires: %{name}
34	30	Obsoletes: sawmill-gnome
35	31
36	32	%description gnome

		@@ -40,7 +36,7 @@ control center applet
40	36	%package themer
41	37	Summary: GUI for creating sawfish themes
42	38	Group: User Interface/Desktops
43		-Requires: %{nam}, rep-gtk-libglade
	39	+Requires: %{name}, rep-gtk-libglade
44	40	Obsoletes: sawmill-themer
45	41
46	42	%description themer

		@@ -82,8 +78,8 @@ fi
82	78	%{_prefix}/bin/sawmill
83	79	%{_prefix}/bin/sawmill-client
84	80	%{_prefix}/bin/sawmill-ui
85		-%{_prefix}/share/sawfish/%{ver}
86		-%{_prefix}/libexec/sawfish/%{ver}/%{_host}
	81	+%{_prefix}/share/sawfish/%{version}
	82	+%{_prefix}/libexec/sawfish/%{version}/%{_host}
87	83	%{_prefix}/info/sawfish*
88	84
89	85	%files gnome

		@@ -99,7 +95,7 @@ fi
99	95	%defattr(-,root,root)
100	96	%{_prefix}/bin/sawfish-themer
101	97	%{_prefix}/bin/sawmill-themer
102		-%{_prefix}/share/sawfish/%{ver}/themer.glade
	98	+%{_prefix}/share/sawfish/%{version}/themer.glade
103	99
104	100	%changelog
105	101	* Mon Apr 24 2000 John Harper <john@dcs.warwick.ac.uk>

--- a/src/ChangeLog

+++ b/src/ChangeLog

		@@ -1,3 +1,12 @@
	1	+2000-05-18 John Harper <john@dcs.warwick.ac.uk>
	2	+
	3	+ * version 0.27.2
	4	+
	5	+2000-05-12 John Harper <john@dcs.warwick.ac.uk>
	6	+
	7	+ * events.c (enter_notify): ignore NotifyInferior events
	8	+ (entering from inner window), leave_notify has always done this
	9	+
1	10	2000-05-09 John Harper <john@dcs.warwick.ac.uk>
2	11
3	12	* version 0.27

--- a/src/events.c

+++ b/src/events.c

		@@ -710,8 +710,11 @@ enter_notify (XEvent *ev)
710	710	else
711	711	{
712	712	Lisp_Window *w = find_window_by_id (ev->xcrossing.window);
713		- if (w != 0 && w->mapped && w->visible)
	713	+ if (w != 0 && w->mapped && w->visible
	714	+ && ev->xcrossing.detail != NotifyInferior)
	715	+ {
714	716	Fcall_window_hook (Qenter_notify_hook, rep_VAL(w), Qnil, Qnil);
	717	+ }
715	718	}
716	719	}
717	720

trjp_sawfish Fork

提交

标签

Frequently used words (click to add to your profile)

Commit MetaInfo

Log Message

更改概述

差异

trjp_sawfish
Fork