Merge branch 'main' of tildegit.org:acdw/emacs

3 files changed, 160 insertions, 33 deletions

@@ -78,9 +78,9 @@ If USE-TLS is non-nil, use TLS."
   "Reconnect to all IRC servers."
   (interactive)
   (dolist (buffer (filter-server-buffers))
-    (with-message (format "Reconnecting to server: %s" (buffer-name buffer))
-      (with-current-buffer buffer
-        (erc-server-reconnect)))))
+    (with-current-buffer buffer
+      (ignore-errors
+        (erc-cmd-RECONNECT)))))
 
 (defun erc/disconnect ()
   "Disconnect from all IRC servers."
@@ -183,11 +183,9 @@ erc-modified-channels-alist. Should be executed on window change."
   "Overlay used to set bar")
 
 (setq erc-bar-overlay (make-overlay 0 0))
-
+(overlay-put erc-bar-overlay 'face '(:overline "gray"))
 
 (with-eval-after-load 'erc-track
-  (overlay-put erc-bar-overlay 'face '(:underline "gray"))
-
   ;;put the hook before erc-modified-channels-update
   (defadvice erc-track-mode (after erc-bar-setup-hook
                                    (&rest args) activate)
@@ -197,5 +195,34 @@ erc-modified-channels-alist. Should be executed on window change."
                                        (erc-bar-update-overlay))))
 
 
+;;; ZNC babeee
+;; needed variables are stored in private.el
+(defun znc/connect (znc-server znc-port znc-nick irc-servers)
+  (interactive (let ((zserv (or znc/server
+                                (read-string "ZNC Server: ")))
+                     (zport (or znc/port
+                                (read-number "ZNC Port: ")))
+                     (znick (or znc/nick
+                                (read-string "ZNC Nick: ")))
+                     (servers (or znc/irc-servers
+                                  (list
+                                   (cons
+                                    (read-string "IRC Server to connect to: ")
+                                    (read-passwd "Password: "))))))
+                 (list zserv zport znick servers)))
+  (let ((si 0))
+    (dolist (server irc-servers)
+      (run-at-time si nil
+                   (lambda ()
+                     (erc-tls :server znc-server
+                              :port znc-port
+                              :nick znc-nick
+                              :password (format "%s/%s:%s"
+                                                znc-nick
+                                                (car server)
+                                                (cdr server)))))
+      (setq si (1+ si)))))
+
+
 (provide 'acdw-erc)
 ;;; acdw-erc.el ends here
@@ -0,0 +1,84 @@
+;;; acdw-irc.el -*- lexical-binding: t; coding: utf-8-unix -*-
+
+(require 's nil :noerror)
+
+(defgroup acdw-irc nil
+  "Customizations for IRC."
+  :group 'applications)
+
+(defcustom acdw-irc/left-margin 16
+  "The size of the margin for nicks, etc. on the left."
+  :type 'integer)
+
+(defcustom acdw-irc/pre-nick ""
+  "What to show before a nick."
+  :type 'string)
+
+(defcustom acdw-irc/post-nick " | "
+  "What to show after a nick."
+  :type 'string)
+
+(defcustom acdw-irc/pre-my-nick "-"
+  "What to show before the current user's nick."
+  :type 'string)
+
+(defcustom acdw-irc/post-my-nick "-> "
+  "What to show after the current user's nick."
+  :type 'string)
+
+(defcustom acdw-irc/ellipsis "~"
+  "The ellipsis for when a string is too long."
+  :type 'string)
+
+
+;;; Convenience functions (I don't want to /depend/ on s.el)
+
+(if (fboundp 's-repeat)
+    (defalias 'repeat-string 's-repeat)
+  (defun repeat-string (num s)
+    "Make a string of STR repeated NUM times.
+Stolen from s.el."
+    (declare (pure t) (side-effect-free t))
+    (let (ss)
+      (while (> num 0)
+        (setq ss (cons str ss)
+              num (1- num)))
+      (apply #'concat ss))))
+
+(if (fboundp 's-truncate)
+    (defalias 'truncate-string 's-truncate)
+  (defun truncate-string (len s &optional ellipsis)
+    "If STR is longer than LEN, cut it down and add ELLIPSIS to the end.
+When not specified, ELLIPSIS defaults to '...'."
+    (declare (pure t) (side-effect-free t))
+    (unless ellipsis
+      (setq ellipsis "..."))
+    (if (> (length s) len)
+        (format "%s%s" (substring s 0 (- len (length ellipsis))) ellipsis)
+      s)))
+
+
+;;; IRC stuff
+
+(defun acdw-irc/margin-format (str &optional before after alignment)
+  "Print STR to fit in `acdw-irc/left-margin'.
+Optional arguments BEFORE and AFTER specify strings to go
+... before and after the string.  ALIGNMENT aligns left on nil
+and right on t."
+  (let* ((before (or before ""))
+         (after (or after ""))
+         (str-length (length str))
+         (before-length (length before))
+         (after-length (length after))
+         (max-length (- acdw-irc/left-margin 1 (+ before-length after-length)))
+         (left-over (max 0 (- max-length str-length))))
+    (format "%s%s%s%s%s"
+            before
+            (if alignment (repeat-string left-over " ") "")
+            (truncate-string max-length str acdw-irc/ellipsis)
+            (if alignment "" (repeat-string left-over " "))
+            after)))
+
+
+(provide 'acdw-irc)
+;;; acdw-irc.el ends here
@@ -22,6 +22,15 @@
 (require 'simple-modeline)
 (require 'minions)
 
+(defcustom acdw-modeline/word-count-modes
+  (mapcar (lambda (m) (cons m nil)) simple-modeline-word-count-modes)
+  "Alist of modes to functions that `acdw-modeline/word-count' should dispatch.
+If the cdr of the cons cell is nil, use the default function (`count-words').
+Otherwise, cdr should be a function that takes two points (see `count-words')."
+  :type '(alist :key-type (symbol :tag "Major-Mode")
+                :value-type function)
+  :group 'simple-modeline)
+
 (defun acdw-modeline/buffer-name ()     ; gonsie
   "Display the buffer name in a face reflecting its modified status."
   (propertize " %b "
@@ -40,7 +49,35 @@
 (defun acdw-modeline/god-mode-indicator ()
   "Display an indicator if `god-local-mode' is active."
   (when (bound-and-true-p god-local-mode)
-    " God"))
+    " Ω"))
+
+(defun acdw-modeline/major-mode ()
+  "Displays the current major mode in the mode-line."
+  (propertize
+   (concat " "
+           (or (and (boundp 'delighted-modes)
+                    (cadr (assq major-mode delighted-modes)))
+               (format-mode-line mode-name)))
+   'face 'bold
+   'keymap mode-line-major-mode-keymap
+   'mouse-face 'mode-line-highlight))
+
+(defun acdw-modeline/minions () ; by me
+  "Display a button for `minions-minor-modes-menu'."
+  (concat
+   " "
+   (propertize
+    "&"
+    'help-echo (format
+                "Minor modes menu\nmouse-1: show menu.")
+    'local-map (purecopy (simple-modeline-make-mouse-map
+                          'mouse-1
+                          (lambda (event)
+                            (interactive "e")
+                            (with-selected-window (posn-window
+                                                   (event-start event))
+                              (minions-minor-modes-menu)))))
+    'mouse-face 'mode-line-highlight)))
 
 (defun acdw-modeline/modified ()        ; modified from `simple-modeline'
   "Displays a color-coded buffer modification/read-only
@@ -64,23 +101,6 @@ indicator in the mode-line."
                                    (read-only-mode 'toggle)))))
          'mouse-face 'mode-line-highlight))))
 
-(defun acdw-modeline/minions () ; by me
-  "Display a button for `minions-minor-modes-menu'."
-  (concat
-   " "
-   (propertize
-    "&"
-    'help-echo (format
-                "Minor modes menu\nmouse-1: show menu.")
-    'local-map (purecopy (simple-modeline-make-mouse-map
-                          'mouse-1
-                          (lambda (event)
-                            (interactive "e")
-                            (with-selected-window (posn-window
-                                                   (event-start event))
-                              (minions-minor-modes-menu)))))
-    'mouse-face 'mode-line-highlight)))
-
 (defun acdw-modeline/narrowed ()
   "Display an indication if the buffer is narrowed."
   (when (buffer-narrowed-p)
@@ -135,6 +155,11 @@ is, if point < mark."
        " (%-d)")
      text-scale-mode-amount)))
 
+(defun acdw-modeline/track ()
+  "Display `tracking-mode' information."
+  (when tracking-mode
+    tracking-mode-line-buffers))
+
 (defun acdw-modeline/vc-branch ()
   "Display the version control branch of the current buffer in the modeline."
   ;; from https://www.gonsie.com/blorg/modeline.html, from Doom
@@ -148,15 +173,6 @@ Only shows if there is more than one window."
              (> winum--window-count 1))
     (format winum-format (winum-get-number-string))))
 
-(defcustom acdw-modeline/word-count-modes
-  (mapcar (lambda (m) (cons m nil)) simple-modeline-word-count-modes)
-  "Alist of modes to functions that `acdw-modeline/word-count' should dispatch.
-If the cdr of the cons cell is nil, use the default function (`count-words').
-Otherwise, cdr should be a function that takes two points (see `count-words')."
-  :type '(alist :key-type (symbol :tag "Major-Mode")
-                :value-type function)
-  :group 'simple-modeline)
-
 (defun acdw-modeline/word-count ()
   "Display a buffer word count, depending on the major mode.
 Uses `acdw-modeline/word-count-modes' to determine which function to use."