X-Git-Url: https://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-button.el;h=a3b915c6d1c087003152747fbdfd671534078a65;hp=b024dd6d64b3f3df32daaaa0bb1ec59b00f381a7;hb=ed67e1d98105fb3abcc81b79e441f97112dfe8c7;hpb=9f0f8e8f7c1fefd0ae6712872f9dcb78ae3ea11c diff --git a/lisp/riece-button.el b/lisp/riece-button.el index b024dd6..a3b915c 100644 --- a/lisp/riece-button.el +++ b/lisp/riece-button.el @@ -36,15 +36,28 @@ (defconst riece-channel-button-popup-menu '("Channel" - ["Switch" riece-channel-button-switch-to-channel] - ["Part" riece-channel-button-part] - ["List" riece-channel-button-list]) - "Menu for channel buttons") + ["Switch To Channel" riece-channel-button-switch-to-channel] + ["Part Channel" riece-channel-button-part] + ["List Channel" riece-channel-button-list]) + "Menu for channel buttons.") + +(defconst riece-user-button-popup-menu + '("User" + ["Finger (WHOIS)" riece-user-button-finger] + ["Start Private Conversation" riece-user-button-join-partner] + ["Give Channel Operator Privileges" riece-user-button-set-operators] + ["Allow To Speak" riece-user-button-set-speakers]) + "Menu for user buttons.") + +(defvar riece-button-enabled nil) + +(defconst riece-button-description + "Display useful buttons in IRC buffers") (defvar help-echo-owns-message) -(define-widget 'riece-channel-button 'push-button +(define-widget 'riece-identity-button 'push-button "A channel button." - :action 'riece-channel-button-action + :action 'riece-button-switch-to-identity :help-echo (lambda (widget/window &optional overlay pos) ;; Needed to properly clear the message due to a bug in @@ -57,22 +70,31 @@ ;; window, overlay, position. (riece-format-identity (if overlay - (with-current-buffer (overlay-buffer overlay) - (widget-value (widget-at (overlay-start overlay)))) + (with-current-buffer (riece-overlay-buffer overlay) + (widget-value (widget-at (riece-overlay-start overlay)))) (widget-value widget/window)))))) -(defun riece-channel-button-action (widget &optional event) - "Callback for channel buttons." +(defun riece-button-switch-to-identity (widget &optional event) + "Switch to identity stored in WIDGET. +This function is used as a callback for a channel button." (let ((channel (widget-value widget))) (if (riece-identity-member channel riece-current-channels) (riece-command-switch-to-channel channel) (message "%s" (substitute-command-keys "Type \\[riece-command-join] to join the channel"))))) -(defun riece-channel-button-popup-menu (event) - "Popup the menu for channel buttons." +(defun riece-identity-button-popup-menu (event) + "Popup the menu for identity buttons." (interactive "@e") - (riece-popup-menu-popup riece-channel-button-popup-menu event)) + (save-excursion + (set-buffer (riece-event-buffer event)) + (goto-char (riece-event-point event)) + (riece-popup-menu-popup + (if (riece-channel-p (riece-identity-prefix + (get-text-property (point) 'riece-identity))) + riece-channel-button-popup-menu + riece-user-button-popup-menu) + event))) (defun riece-channel-button-switch-to-channel () (interactive) @@ -89,57 +111,145 @@ (riece-command-list (riece-identity-prefix (get-text-property (point) 'riece-identity)))) -(defvar riece-channel-button-map +(defun riece-user-button-join-partner () + (interactive) + (riece-command-join-partner + (get-text-property (point) 'riece-identity))) + +(defun riece-user-button-set-operators () + (interactive) + (let (group users) + (if (riece-region-active-p) + (save-excursion + (riece-scan-property-region + 'riece-identity + (region-beginning) (region-end) + (lambda (start end) + (setq group (cons (get-text-property start 'riece-identity) + group))))) + (setq group (list (get-text-property (point) 'riece-identity)))) + (setq users (riece-with-server-buffer + (riece-identity-server riece-current-channel) + (riece-channel-get-users (riece-identity-prefix + riece-current-channel)))) + (if (setq group + (delq nil + (mapcar + (lambda (identity) + (unless (memq ?o (cdr (riece-identity-assoc + (riece-identity-prefix identity) + users + t))) + identity)) + group))) + (riece-command-set-operators (mapcar #'riece-identity-prefix group))))) + +(defun riece-user-button-set-speakers () + (interactive) + (let (group users) + (if (riece-region-active-p) + (save-excursion + (riece-scan-property-region + 'riece-identity + (region-beginning) (region-end) + (lambda (start end) + (setq group (cons (get-text-property start 'riece-identity) + group))))) + (setq group (list (get-text-property (point) 'riece-identity)))) + (setq users (riece-with-server-buffer + (riece-identity-server riece-current-channel) + (riece-channel-get-users (riece-identity-prefix + riece-current-channel)))) + (if (setq group + (delq nil + (mapcar + (lambda (identity) + (unless (memq ?v (cdr (riece-identity-assoc + (riece-identity-prefix identity) + users + t))) + identity)) + group))) + (riece-command-set-speakers (mapcar #'riece-identity-prefix group))))) + +(defun riece-user-button-finger () + (interactive) + (riece-command-finger (get-text-property (point) 'riece-identity))) + +(defun riece-make-identity-button-map () (let ((map (make-sparse-keymap))) - (set-keymap-parent map riece-channel-list-mode-map) - (define-key map [down-mouse-3] 'riece-channel-button-popup-menu) + (set-keymap-parent map (current-local-map)) + (define-key map [down-mouse-3] 'riece-identity-button-popup-menu) map)) -(defun riece-button-add-channel-buttons (start end) - (save-excursion - (catch 'done - (while t - ;; Search for the beginning of the button region. - (unless (get-text-property start 'riece-identity) - (setq start (next-single-property-change start 'riece-identity - nil end))) - ;; Search for the end of the button region. - (let* ((identity (get-text-property start 'riece-identity)) - (button-end (next-single-property-change start 'riece-identity - nil end))) - (if (= button-end end) - (throw 'done nil) - (if (riece-channel-p (riece-identity-prefix identity)) - (progn - (widget-convert-button 'riece-channel-button start - button-end identity) - (add-text-properties - start button-end - (list 'local-map riece-channel-button-map - 'keymap riece-channel-button-map)))) - (setq start button-end))))))) - -(defun riece-button-update-channel-list-buffer () - (if riece-channel-list-buffer-mode - (save-excursion - (set-buffer riece-channel-list-buffer) - (let ((inhibit-read-only t) - buffer-read-only) - (riece-button-add-channel-buttons (point-min) (point-max)))))) - -(defun riece-button-requires () - '(riece-highlight)) +(defvar riece-identity-button-map) +(defun riece-button-add-identity-button (start end) + (if riece-button-enabled + (riece-scan-property-region + 'riece-identity + start end + (lambda (start end) + (let ((inhibit-read-only t) + buffer-read-only) + (widget-convert-button 'riece-identity-button start end + (get-text-property start 'riece-identity)) + (add-text-properties + start end + (list 'local-map riece-identity-button-map + 'keymap riece-identity-button-map))))))) + +(defun riece-button-update-buffer () + (riece-button-add-identity-button (point-min) (point-max))) +(defvar riece-channel-list-mode-map) +(defvar riece-user-list-mode-map) +(defvar riece-dialogue-mode-map) (defun riece-button-insinuate () (add-hook 'riece-channel-list-mode-hook (lambda () (set-keymap-parent riece-channel-list-mode-map widget-keymap) + (set (make-local-variable 'riece-identity-button-map) + (riece-make-identity-button-map)) (add-hook 'riece-update-buffer-functions - 'riece-button-update-channel-list-buffer t))) + 'riece-button-update-buffer t t))) + (add-hook 'riece-user-list-mode-hook + (lambda () + (set-keymap-parent riece-user-list-mode-map widget-keymap) + (set (make-local-variable 'riece-identity-button-map) + (riece-make-identity-button-map)) + (add-hook 'riece-update-buffer-functions + 'riece-button-update-buffer t t))) (add-hook 'riece-dialogue-mode-hook (lambda () - (set-keymap-parent riece-dialogue-mode-map widget-keymap))) - (add-hook 'riece-after-insert-functions 'riece-button-add-channel-buttons)) + (set-keymap-parent riece-dialogue-mode-map widget-keymap) + (set (make-local-variable 'riece-identity-button-map) + (riece-make-identity-button-map)))) + (add-hook 'riece-after-insert-functions 'riece-button-add-identity-button)) + +(defun riece-button-enable () + (setq riece-button-enabled t) + (let ((pointer riece-buffer-list)) + (while pointer + (with-current-buffer (car pointer) + (if (eq (derived-mode-class major-mode) + 'riece-dialogue-mode) + (riece-button-update-buffer))) + (setq pointer (cdr pointer))) + (if riece-current-channel + (riece-emit-signal 'user-list-changed riece-current-channel)) + (riece-emit-signal 'channel-list-changed))) + +(defun riece-button-disable () + (setq riece-button-enabled nil) + (save-excursion + (let ((pointer riece-buffer-list)) + (while pointer + ;; On XEmacs, BUFFER arg of widget-map-buttons is ignored. + (set-buffer (car pointer)) + (widget-map-buttons + (lambda (widget maparg) + (widget-leave-text widget))) + (setq pointer (cdr pointer)))))) (provide 'riece-button)