projects
/
riece
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* riece-epg.el
[riece]
/
lisp
/
riece-layout.el
diff --git
a/lisp/riece-layout.el
b/lisp/riece-layout.el
index
5970983
..
54c80b6
100644
(file)
--- a/
lisp/riece-layout.el
+++ b/
lisp/riece-layout.el
@@
-19,8
+19,8
@@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 5
9 Temple Place - Suite 330
,
-;; Boston, MA 0211
1-1307
, USA.
+;; Free Software Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+;; Boston, MA 0211
0-1301
, USA.
;;; Code:
;;; Code:
@@
-28,7
+28,7
@@
(require 'riece-misc)
(defgroup riece-layout nil
(require 'riece-misc)
(defgroup riece-layout nil
- "
Manage window layouts
"
+ "
Window layouts.
"
:prefix "riece-"
:group 'riece)
:prefix "riece-"
:group 'riece)
@@
-49,8
+49,8
@@
"An alist mapping the names to layout functions.
An element of this alist is either in the following forms:
"An alist mapping the names to layout functions.
An element of this alist is either in the following forms:
-
(NAME CONFIGURE-FUNCTION [PARAMETERS]
)
-
(NAME1 . NAME2
)
+
\(NAME CONFIGURE-FUNCTION [PARAMETERS]\
)
+
\(NAME1 . NAME2\
)
In the first form, NAME is a string which specifies the layout
setting, and CONFIGURE-FUNCTION is a function which does window
In the first form, NAME is a string which specifies the layout
setting, and CONFIGURE-FUNCTION is a function which does window
@@
-91,15
+91,18
@@
happen unconditionally."
(if riece-channel-buffer-window-point
(set-window-point (get-buffer-window riece-channel-buffer)
riece-channel-buffer-window-point))
(if riece-channel-buffer-window-point
(set-window-point (get-buffer-window riece-channel-buffer)
riece-channel-buffer-window-point))
- (recenter -1 (get-buffer-window riece-channel-buffer)))))
+ (set-window-point (get-buffer-window riece-channel-buffer)
+ (point-max)))))
(if (get-buffer-window riece-others-buffer)
(with-current-buffer riece-others-buffer
(unless (riece-frozen riece-others-buffer)
(if (get-buffer-window riece-others-buffer)
(with-current-buffer riece-others-buffer
(unless (riece-frozen riece-others-buffer)
- (recenter -1 (get-buffer-window riece-others-buffer)))))
+ (set-window-point (get-buffer-window riece-others-buffer)
+ (point-max)))))
(if (get-buffer-window riece-dialogue-buffer)
(with-current-buffer riece-dialogue-buffer
(unless (riece-frozen riece-dialogue-buffer)
(if (get-buffer-window riece-dialogue-buffer)
(with-current-buffer riece-dialogue-buffer
(unless (riece-frozen riece-dialogue-buffer)
- (recenter -1 (get-buffer-window riece-dialogue-buffer))))))
+ (set-window-point (get-buffer-window riece-dialogue-buffer)
+ (point-max))))))
(defun riece-reconfigure-windows-predicate ()
"Return t, if window reconfiguration is needed.
(defun riece-reconfigure-windows-predicate ()
"Return t, if window reconfiguration is needed.
@@
-151,11
+154,13
@@
This function is used by \"default\" layout."
(set-window-buffer (selected-window)
riece-command-buffer)
(select-window rest-window)
(set-window-buffer (selected-window)
riece-command-buffer)
(select-window rest-window)
- (set-window-buffer (split-window rest-window)
- riece-others-buffer)
+ (if riece-others-buffer-mode
+ (set-window-buffer (split-window rest-window)
+ riece-others-buffer))
(set-window-buffer (selected-window)
riece-channel-buffer))
(set-window-buffer (selected-window)
riece-channel-buffer))
- (if (eq vpos 'middle)
+ (if (and (eq vpos 'middle)
+ riece-others-buffer-mode)
(let ((rest-window (split-window)))
(set-window-buffer (selected-window)
riece-channel-buffer)
(let ((rest-window (split-window)))
(set-window-buffer (selected-window)
riece-channel-buffer)
@@
-164,16
+169,16
@@
This function is used by \"default\" layout."
(set-window-buffer rest-window
riece-command-buffer))
(let ((rest-window (split-window nil (- (window-height) 4))))
(set-window-buffer rest-window
riece-command-buffer))
(let ((rest-window (split-window nil (- (window-height) 4))))
- (set-window-buffer (selected-window)
- riece-others-buffer)
- (set-window-buffer (split-window)
- riece-channel-buffer)
+ (if riece-others-buffer-mode
+ (progn
+ (set-window-buffer (selected-window)
+ riece-others-buffer)
+ (set-window-buffer (split-window)
+ riece-channel-buffer))
+ (set-window-buffer (selected-window)
+ riece-channel-buffer))
(set-window-buffer rest-window
(set-window-buffer rest-window
- riece-command-buffer))))
- (with-current-buffer riece-channel-buffer
- (setq truncate-partial-width-windows nil))
- (with-current-buffer riece-others-buffer
- (setq truncate-partial-width-windows nil)))
+ riece-command-buffer)))))
(if (eq vpos 'bottom)
(progn
(set-window-buffer (selected-window)
(if (eq vpos 'bottom)
(progn
(set-window-buffer (selected-window)
@@
-224,8
+229,7
@@
PLIST accept :command-height, :user-list-width, and :channel-list-width."
(set-window-buffer (selected-window) riece-channel-buffer)
(set-window-buffer user-list-window riece-user-list-buffer)
(select-window user-list-window)
(set-window-buffer (selected-window) riece-channel-buffer)
(set-window-buffer user-list-window riece-user-list-buffer)
(select-window user-list-window)
- (shrink-window-horizontally (- (window-width) user-list-width))
- (setq truncate-partial-width-windows nil)))
+ (shrink-window-horizontally (- (window-width) user-list-width))))
;; only user-list
(show-user-list
(set-window-buffer (selected-window) riece-user-list-buffer))
;; only user-list
(show-user-list
(set-window-buffer (selected-window) riece-user-list-buffer))
@@
-240,8
+244,7
@@
PLIST accept :command-height, :user-list-width, and :channel-list-width."
(set-window-buffer (selected-window) riece-others-buffer)
(set-window-buffer channel-list-window riece-channel-list-buffer)
(select-window channel-list-window)
(set-window-buffer (selected-window) riece-others-buffer)
(set-window-buffer channel-list-window riece-channel-list-buffer)
(select-window channel-list-window)
- (shrink-window-horizontally (- (window-width) channel-list-width))
- (setq truncate-partial-width-windows nil))
+ (shrink-window-horizontally (- (window-width) channel-list-width)))
(set-window-buffer (selected-window) riece-dialogue-buffer))
(riece-set-window-points)
(select-window (or (get-buffer-window buffer)
(set-window-buffer (selected-window) riece-dialogue-buffer))
(riece-set-window-points)
(select-window (or (get-buffer-window buffer)