APPROVE COMMIT An all-singing, all-dancing bug-reporter for an all-singing, all-dancing Window Manager. And if you call now, right now, we'll include a free set of steak knives. NOTE: This patch has been committed. xwem patch: ChangeLog files diff command: cvs -q diff -U 0 Files affected: ChangeLog Source files diff command: cvs -q diff -uN Files affected: utils/xwem-worklog.el utils/xwem-osd.el utils/xwem-holer.el lisp/xwem-win.el lisp/xwem-tray.el lisp/xwem-transient.el lisp/xwem-theme.el lisp/xwem-tabbing.el lisp/xwem-strokes.el lisp/xwem-special.el lisp/xwem-sound.el lisp/xwem-selections.el lisp/xwem-rooticon.el lisp/xwem-rooter.el lisp/xwem-root.el lisp/xwem-report.el lisp/xwem-register.el lisp/xwem-netwm.el lisp/xwem-mouse.el lisp/xwem-misc.el lisp/xwem-minibuffer.el lisp/xwem-manage.el lisp/xwem-main.el lisp/xwem-launcher.el lisp/xwem-keymacro.el lisp/xwem-keyboard.el lisp/xwem-interactive.el lisp/xwem-icons.el lisp/xwem-frame.el lisp/xwem-focus.el lisp/xwem-faces.el lisp/xwem-edmacro.el lisp/xwem-desktop.el lisp/xwem-clswi.el lisp/xwem-clients.el lisp/xwem-clgen.el extra/xwem-smartmods.el extra/xwem-recover.el extra/ixwem.el dockapp/xwem-weather.el dockapp/xwem-time.el dockapp/xwem-framei.el dockapp/xwem-battery.el Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/ChangeLog,v retrieving revision 1.63 diff -u -U0 -r1.63 ChangeLog --- ChangeLog 4 Dec 2004 20:24:23 -0000 1.63 +++ ChangeLog 5 Dec 2004 05:51:00 -0000 ＠＠ -0,0 +1,51 ＠＠ +2004-12-05 Steve Youngs <steve(a)youngs.au.com&gt; + + * utils/xwem-holer.el: + * utils/xwem-osd.el: + * utils/xwem-worklog.el: + * lisp/xwem-clgen.el: + * lisp/xwem-clients.el: + * lisp/xwem-clswi.el: + * lisp/xwem-desktop.el: + * lisp/xwem-edmacro.el: + * lisp/xwem-faces.el: + * lisp/xwem-focus.el: + * lisp/xwem-frame.el: + * lisp/xwem-icons.el: + * lisp/xwem-interactive.el: + * lisp/xwem-keyboard.el: + * lisp/xwem-keymacro.el: + * lisp/xwem-launcher.el: + * lisp/xwem-main.el: + * lisp/xwem-manage.el: + * lisp/xwem-minibuffer.el: + * lisp/xwem-misc.el: + * lisp/xwem-mouse.el: + * lisp/xwem-netwm.el: + * lisp/xwem-register.el: + * lisp/xwem-report.el: New file. + * lisp/xwem-root.el: + * lisp/xwem-rooter.el: + * lisp/xwem-rooticon.el: + * lisp/xwem-selections.el: + * lisp/xwem-sound.el: + * lisp/xwem-special.el: + * lisp/xwem-strokes.el: + * lisp/xwem-tabbing.el: + * lisp/xwem-theme.el: + * lisp/xwem-transient.el: + * lisp/xwem-tray.el: + * lisp/xwem-win.el: + * extra/ixwem.el: + * extra/xwem-recover.el: + * extra/xwem-smartmods.el: + * dockapp/xwem-battery.el: + * dockapp/xwem-framei.el: + * dockapp/xwem-time.el: + * dockapp/xwem-weather.el: + + Add a bug-reporting module. All files that have user configurable + variables have been touched to accomodate the bug-reporter. + Basically all the defcustoms were grouped together and a magic + cookie `;;; Internal variables' was added to each of these files. + Index: dockapp/xwem-battery.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/dockapp/xwem-battery.el,v retrieving revision 1.1 diff -u -u -r1.1 xwem-battery.el --- dockapp/xwem-battery.el 29 Nov 2004 20:41:20 -0000 1.1 +++ dockapp/xwem-battery.el 5 Dec 2004 05:50:38 -0000 ＠＠ -107,6 +107,8 ＠＠ :type 'color :group 'xwem-batt) +;;; Internal variables +  (defun xwem-batt-init (xdpy) "On display XDPY create and return APM battery monitor window." Index: dockapp/xwem-framei.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/dockapp/xwem-framei.el,v retrieving revision 1.2 diff -u -u -r1.2 xwem-framei.el --- dockapp/xwem-framei.el 30 Nov 2004 22:02:41 -0000 1.2 +++ dockapp/xwem-framei.el 5 Dec 2004 05:50:38 -0000 ＠＠ -96,6 +96,21 ＠＠ :type 'funtion :group 'xwem-framei) +(define-xwem-face xwem-framei-dockapp-face + `(((desktop) (:foreground "magenta4" :bold t)) + ((embedded-desktop) (:foreground "magenta4")) + ((dedicated) (:foreground "yellowgreen")) + (t (:foreground "magenta4" :bold t))) + "Face used to draw in framei dockapp." +:group 'xwem-faces) + +(defcustom xwem-framei-dockapp-format-function 'xwem-framei-dockapp-default-format + "Function passed with one arg - frame, should return string to display." +:type 'funtion +:group 'xwem-framei) + +;;; Internal variables + (defun xwem-framei-default-format (frame) "Default function used in `xwem-framei-format-function'. Return string in form \"NUM: NAME\"" ＠＠ -202,19 +217,6 ＠＠ (define-key map [button3] 'xwem-framei-dockapp-popup-menu) map) "Keymap used for framei osd.") - -(define-xwem-face xwem-framei-dockapp-face - `(((desktop) (:foreground "magenta4" :bold t)) - ((embedded-desktop) (:foreground "magenta4")) - ((dedicated) (:foreground "yellowgreen")) - (t (:foreground "magenta4" :bold t))) - "Face used to draw in framei dockapp." -:group 'xwem-faces) - -(defcustom xwem-framei-dockapp-format-function 'xwem-framei-dockapp-default-format - "Function passed with one arg - frame, should return string to display." -:type 'funtion -:group 'xwem-framei) (defun xwem-framei-dockapp-default-format (frame) "Default function used in `xwem-framei-dockapp-format-function'. Index: dockapp/xwem-time.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/dockapp/xwem-time.el,v retrieving revision 1.1 diff -u -u -r1.1 xwem-time.el --- dockapp/xwem-time.el 29 Nov 2004 20:41:21 -0000 1.1 +++ dockapp/xwem-time.el 5 Dec 2004 05:50:39 -0000 ＠＠ -106,6 +106,8 ＠＠ :type 'integer :group 'xwem-time) +;;; Internal variables + (defvar xwem-time-last-time nil "Last saved time value.") (defvar xwem-time-last-load nil Index: dockapp/xwem-weather.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/dockapp/xwem-weather.el,v retrieving revision 1.1 diff -u -u -r1.1 xwem-weather.el --- dockapp/xwem-weather.el 29 Nov 2004 20:41:21 -0000 1.1 +++ dockapp/xwem-weather.el 5 Dec 2004 05:50:39 -0000 ＠＠ -64,6 +64,34 ＠＠ :link '(url-link "http://weather.noaa.gov/") :group 'xwem-weather) +(defcustom xwem-weather-data-directory xwem-dir + "*The directory to story weather data files." +:type '(directory :must-match t) +:group 'xwem-weather) + +(defcustom xwem-weather-data-file + (expand-file-name xwem-weather-station-id xwem-weather-data-directory) + "*File to hold the weather data." +:type 'file +:group 'xwem-weather) + +(defcustom xwem-weather-temperature-format 'celsius + "*Display temperature in Celsius or Fahrenheit." +:type '(choice + (const :tag "Celsius" celsius) + (const :tag "Fahrenheit" fahrenheit)) +:group 'xwem-weather) + +(defface xwem-weather-osd-face + '((((class color)) + (:foreground "cyan" :family "fixed" :size "12pt")) + (t + (:family "fixed" :size "12pt"))) + "*Face for the weather OSD." +:group 'xwem-weather) + +;;; Internal variables + (defvar xwem-weather-osd nil) (defvar xwem-weather-frequency 0) ＠＠ -100,6 +128,9 ＠＠ (setq xwem-weather-frequency value) (xwem-message 'info "Weather update frequency set to: %d seconds" value))) +;; This is below the internal variable marker so bug reports aren't +;; gigabytes long. I think we can live without this var being in bug +;; reports. --SY. (defcustom xwem-weather-update-frequency 0 "*The number of seconds between updates of the weather info. ＠＠ -124,32 +155,6 ＠＠ :set '(lambda (sym value) (xwem-weather-alter-update-frequency value)) :initialize 'custom-initialize-default -:group 'xwem-weather) - -(defcustom xwem-weather-data-directory xwem-dir - "*The directory to story weather data files." -:type '(directory :must-match t) -:group 'xwem-weather) - -(defcustom xwem-weather-data-file - (expand-file-name xwem-weather-station-id xwem-weather-data-directory) - "*File to hold the weather data." -:type 'file -:group 'xwem-weather) - -(defcustom xwem-weather-temperature-format 'celsius - "*Display temperature in Celsius or Fahrenheit." -:type '(choice - (const :tag "Celsius" celsius) - (const :tag "Fahrenheit" fahrenheit)) -:group 'xwem-weather) - -(defface xwem-weather-osd-face - '((((class color)) - (:foreground "cyan" :family "fixed" :size "12pt")) - (t - (:family "fixed" :size "12pt"))) - "*Face for the weather OSD." :group 'xwem-weather) (defconst xwem-weather-url-fqdn "weather.noaa.gov" Index: extra/ixwem.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/extra/ixwem.el,v retrieving revision 1.1 diff -u -u -r1.1 ixwem.el --- extra/ixwem.el 29 Nov 2004 20:41:29 -0000 1.1 +++ extra/ixwem.el 5 Dec 2004 05:50:39 -0000 ＠＠ -49,6 +49,8 ＠＠ :type 'number :group 'ixwem) +;;; Internal variables + (defvar ixwem-header-line (concat " IMD Manda Client Size Frame Uptime\n" " --- ----- ------ ---- ----- ------\n")) Index: extra/xwem-recover.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/extra/xwem-recover.el,v retrieving revision 1.2 diff -u -u -r1.2 xwem-recover.el --- extra/xwem-recover.el 2 Dec 2004 23:36:27 -0000 1.2 +++ extra/xwem-recover.el 5 Dec 2004 05:50:39 -0000 ＠＠ -54,6 +54,8 ＠＠ :type '(cons number number) :group 'xwem-recover) +;;; Internal variables + (defvar xwem-recover-mode nil "Non-nil mean we are in recovering mode. Use `xwem-recover-turn-on', `xwem-recover-turn-off' and Index: extra/xwem-smartmods.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/extra/xwem-smartmods.el,v retrieving revision 1.1 diff -u -u -r1.1 xwem-smartmods.el --- extra/xwem-smartmods.el 29 Nov 2004 20:41:30 -0000 1.1 +++ extra/xwem-smartmods.el 5 Dec 2004 05:50:39 -0000 ＠＠ -48,15 +48,16 ＠＠ :type '(repeat (cons number number)) :group 'xwem-keyboard) -;; Variables -(defvar xwem-smart-modifiers nil - "List of smart mods generated from `xwem-smart-mods-alist'. -Internal variable, do not modify.") - (defcustom xwem-sm-mode-line "SmartMods" "*String to show when smart modifiers mode is on." :type 'string :group 'xwem-modes) + +;;; Internal variables + +(defvar xwem-smart-modifiers nil + "List of smart mods generated from `xwem-smart-mods-alist'. +Internal variable, do not modify.") (defvar xwem-sm-global-mode nil "Non-nil mean smart modifiers mode enabled globally. Index: lisp/xwem-clgen.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/lisp/xwem-clgen.el,v retrieving revision 1.1 diff -u -u -r1.1 xwem-clgen.el --- lisp/xwem-clgen.el 29 Nov 2004 20:41:46 -0000 1.1 +++ lisp/xwem-clgen.el 5 Dec 2004 05:50:39 -0000 ＠＠ -91,6 +91,8 ＠＠ :type 'boolean :group 'xwem-clgen) +;;; Internal variables + ;;;###autoload (defvar xwem-clgen-map (let ((map (make-sparse-keymap))) Index: lisp/xwem-clients.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/lisp/xwem-clients.el,v retrieving revision 1.10 diff -u -u -r1.10 xwem-clients.el --- lisp/xwem-clients.el 3 Dec 2004 20:25:30 -0000 1.10 +++ lisp/xwem-clients.el 5 Dec 2004 05:50:40 -0000 ＠＠ -264,6 +264,8 ＠＠ :type 'hook :group 'xwem-hooks) +;;; Internal variables +  (defconst xwem-client-ev-mask (Xmask-or XM-ColormapChange XM-PropertyChange Index: lisp/xwem-clswi.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/lisp/xwem-clswi.el,v retrieving revision 1.3 diff -u -u -r1.3 xwem-clswi.el --- lisp/xwem-clswi.el 29 Nov 2004 20:41:47 -0000 1.3 +++ lisp/xwem-clswi.el 5 Dec 2004 05:50:40 -0000 ＠＠ -55,6 +55,8 ＠＠ :type '(restricted-sexp :match-alternatives (functionp boolean-p)) :group 'xwem-clswi) +;;; Internal variables + (defun xwem-clswi-windowing (window arg) "Switch to ARG's next client in window. Return client that was activated." Index: lisp/xwem-desktop.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/lisp/xwem-desktop.el,v retrieving revision 1.2 diff -u -u -r1.2 xwem-desktop.el --- lisp/xwem-desktop.el 3 Dec 2004 23:03:14 -0000 1.2 +++ lisp/xwem-desktop.el 5 Dec 2004 05:50:40 -0000 ＠＠ -69,6 +69,8 ＠＠ (number :tag "Max Size")))) :group 'xwem-desktop) +;;; Internal variables + (defun xwem-desktop-save-element (el &optional buffer) "Save element EL. EL is one of that occurs in `xwem-desktop-goals'." Index: lisp/xwem-edmacro.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/lisp/xwem-edmacro.el,v retrieving revision 1.4 diff -u -u -r1.4 xwem-edmacro.el --- lisp/xwem-edmacro.el 29 Nov 2004 20:41:48 -0000 1.4 +++ lisp/xwem-edmacro.el 5 Dec 2004 05:50:40 -0000 ＠＠ -60,6 +60,8 ＠＠ :type 'boolean :group 'xwem-edmacro) +;;; Internal variables + ;; Variables (defvar xwem-edmacro-prefix-arg nil "Value of prefix argument. Index: lisp/xwem-faces.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/lisp/xwem-faces.el,v retrieving revision 1.7 diff -u -u -r1.7 xwem-faces.el --- lisp/xwem-faces.el 30 Nov 2004 22:02:48 -0000 1.7 +++ lisp/xwem-faces.el 5 Dec 2004 05:50:40 -0000 ＠＠ -54,6 +54,8 ＠＠ (const :tag "High" 94000)) :group 'xwem-faces) +;;; Internal variables + ;;;###xwem-autoload (defun xwem-get-background-mode (color) "Return `dark' or `light' according to COLOR. Index: lisp/xwem-focus.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/lisp/xwem-focus.el,v retrieving revision 1.5 diff -u -u -r1.5 xwem-focus.el --- lisp/xwem-focus.el 29 Nov 2004 20:41:48 -0000 1.5 +++ lisp/xwem-focus.el 5 Dec 2004 05:50:40 -0000 ＠＠ -34,6 +34,16 ＠＠  (require 'xwem-load) +;;;###autoload +(defcustom xwem-default-focus-mode 'generic + "*Default CL's focus mode." +:type '(choice (const :tag "Generic mode" generic) + (const :tag "Click to focus" click-focus) + (const :tag "Follow mouse" follow-mouse)) +:group 'xwem) + +;;; Internal variables + (defvar xwem-focus-stack nil "Last thing that has focus. Internal variable, do not modify.") ＠＠ -140,14 +150,6 ＠＠ (xwem-focus-mode-invoke cl 'before-mode-change) (xwem-cl-put-prop cl prop (or mode xwem-default-focus-mode)) (xwem-focus-mode-invoke cl 'after-mode-change)) - -;;;###autoload -(defcustom xwem-default-focus-mode 'generic - "*Default CL's focus mode." -:type '(choice (const :tag "Generic mode" generic) - (const :tag "Click to focus" click-focus) - (const :tag "Follow mouse" follow-mouse)) -:group 'xwem) (defmacro define-xwem-focus-mode (name args &optional docstring &rest body) "Define new focus mode named by NAME. Index: lisp/xwem-frame.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/lisp/xwem-frame.el,v retrieving revision 1.10 diff -u -u -r1.10 xwem-frame.el --- lisp/xwem-frame.el 3 Dec 2004 20:25:31 -0000 1.10 +++ lisp/xwem-frame.el 5 Dec 2004 05:50:41 -0000 ＠＠ -219,7 +219,8 ＠＠ :type 'hook :group 'xwem-hooks) -;; Variables +;;; Internal variables + (defconst xwem-frame-ev-mask (Xmask-or XM-Exposure XM-StructureNotify Index: lisp/xwem-icons.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/lisp/xwem-icons.el,v retrieving revision 1.5 diff -u -u -r1.5 xwem-icons.el --- lisp/xwem-icons.el 29 Nov 2004 20:41:51 -0000 1.5 +++ lisp/xwem-icons.el 5 Dec 2004 05:50:41 -0000 ＠＠ -47,12 +47,6 ＠＠ :type 'directory :group 'xwem) -(defvar xwem-icons-specifiers nil - "List of icons specifiers.") - -(defvar xwem-icons-loaded-list nil - "List of already loaded icons.") - ;;;###autoload (defcustom xwem-icons-list '(("mini-display.xpm" (class-inst "^Terminal$") (class-name "^Terminal$")) ＠＠ -155,6 +149,14 ＠＠ (const :tag "And operation" and)) (repeat sexp))))) :group 'xwem) + +;;; Internal variables + +(defvar xwem-icons-specifiers nil + "List of icons specifiers.") + +(defvar xwem-icons-loaded-list nil + "List of already loaded icons.")  ;;; Faces Index: lisp/xwem-interactive.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/lisp/xwem-interactive.el,v retrieving revision 1.8 diff -u -u -r1.8 xwem-interactive.el --- lisp/xwem-interactive.el 29 Nov 2004 20:41:51 -0000 1.8 +++ lisp/xwem-interactive.el 5 Dec 2004 05:50:41 -0000 ＠＠ -52,6 +52,8 ＠＠ (const :tag "Standard" complete)) :group 'xwem-misc) +;;; Internal variables + (defvar xwem-interactively nil "Non-nil when xwem in interactive mode. Internal variabel, do not modify.") Index: lisp/xwem-keyboard.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/lisp/xwem-keyboard.el,v retrieving revision 1.9 diff -u -u -r1.9 xwem-keyboard.el --- lisp/xwem-keyboard.el 29 Nov 2004 20:41:51 -0000 1.9 +++ lisp/xwem-keyboard.el 5 Dec 2004 05:50:42 -0000 ＠＠ -155,9 +155,7 ＠＠ :group 'xwem-keyboard :group 'xwem-hooks) -;;}}} - -;;{{{ [-] Internal variables +;;; Internal variables ;;;###autoload (defvar xwem-override-map nil Index: lisp/xwem-keymacro.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/lisp/xwem-keymacro.el,v retrieving revision 1.6 diff -u -u -r1.6 xwem-keymacro.el --- lisp/xwem-keymacro.el 29 Nov 2004 20:41:51 -0000 1.6 +++ lisp/xwem-keymacro.el 5 Dec 2004 05:50:42 -0000 ＠＠ -98,6 +98,8 ＠＠ :type 'file :group 'xwem-keyboard) +;;; Internal variables +  ;;; Macros recording/playing internal variables ;;;###xwem-autoload Index: lisp/xwem-launcher.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/lisp/xwem-launcher.el,v retrieving revision 1.7 diff -u -u -r1.7 xwem-launcher.el --- lisp/xwem-launcher.el 29 Nov 2004 20:41:52 -0000 1.7 +++ lisp/xwem-launcher.el 5 Dec 2004 05:50:42 -0000 ＠＠ -136,6 +136,24 ＠＠ :type 'string :group 'xwem-launcher) +;;; Launcher dockapp button +(defcustom xwem-launch-dock-width 24 + "*Launcher dockapp width." +:type 'number +:group 'xwem-launch) + +(defcustom xwem-launch-dock-height 24 + "*Launcher dockapp height." +:type 'number +:group 'xwem-launch) + +(defcustom xwem-launch-dock-thick 2 + "*Launcher dockapp border thickness." +:type 'number +:group 'xwem-launch) + +;;; Internal variables + (defvar xwem-launcher-shell-completion-table nil "*Completion table in used by `xwem-completer'.") ＠＠ -577,23 +595,6 ＠＠ (xwem-interactive) (xwem-launch-generic-program xwem-xlock-program xwem-xlock-arguments)) - - -;;; Launcher dockapp button -(defcustom xwem-launch-dock-width 24 - "*Launcher dockapp width." -:type 'number -:group 'xwem-launch) - -(defcustom xwem-launch-dock-height 24 - "*Launcher dockapp height." -:type 'number -:group 'xwem-launch) - -(defcustom xwem-launch-dock-thick 2 - "*Launcher dockapp border thickness." -:type 'number -:group 'xwem-launch) (define-xwem-face xwem-launch-dock-face `(((background-light) (:foreground "gray70")) Index: lisp/xwem-main.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/lisp/xwem-main.el,v retrieving revision 1.13 diff -u -u -r1.13 xwem-main.el --- lisp/xwem-main.el 4 Dec 2004 01:39:58 -0000 1.13 +++ lisp/xwem-main.el 5 Dec 2004 05:50:42 -0000 ＠＠ -243,6 +243,8 ＠＠ :type 'boolean :group 'xwem) +;;; Internal variables + ;;;###autoload (defun xwem-init () "Initialization of xwem subsystems." Index: lisp/xwem-manage.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/lisp/xwem-manage.el,v retrieving revision 1.5 diff -u -u -r1.5 xwem-manage.el --- lisp/xwem-manage.el 29 Nov 2004 20:41:53 -0000 1.5 +++ lisp/xwem-manage.el 5 Dec 2004 05:50:43 -0000 ＠＠ -63,16 +63,6 ＠＠ :type 'number :group 'xwem) -(defvar xwem-manage-internal-list nil - "Internal manage list in `xwem-manage-list' format.") - -;;;###autoload -(defvar xwem-manage-expectances nil - "List of expectances in `xwem-manage-list' format. -The difference from `xwem-manage-list' is that, when matching occurs -in `xwem-manage-expectances', matched entry removed from -`xwem-manage-expectances' list.") - ;;;###autoload (defcustom xwem-manage-default-properties '(reguard-x-border-width t) ＠＠ -181,6 +171,18 ＠＠ Use `xwem-appcollect' to create `xwem-applications-alist'." :type '(cons string sexp) :group 'xwem) + +(defvar xwem-manage-internal-list nil + "Internal manage list in `xwem-manage-list' format.") + +;;;###autoload +(defvar xwem-manage-expectances nil + "List of expectances in `xwem-manage-list' format. +The difference from `xwem-manage-list' is that, when matching occurs +in `xwem-manage-expectances', matched entry removed from +`xwem-manage-expectances' list.") + +;;; Internal variables  ;;; Matching Index: lisp/xwem-minibuffer.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/lisp/xwem-minibuffer.el,v retrieving revision 1.7 diff -u -u -r1.7 xwem-minibuffer.el --- lisp/xwem-minibuffer.el 4 Dec 2004 20:07:22 -0000 1.7 +++ lisp/xwem-minibuffer.el 5 Dec 2004 05:50:43 -0000 ＠＠ -196,6 +196,15 ＠＠ :group 'xwem-minibuffer :group 'xwem-hooks) +(defcustom xwem-minib-resize-exact t + "*If non-`nil', make minibuffer frame exactly the size needed to display all its contents. +Otherwise, the minibuffer frame can temporarily increase in size but +never get smaller while it is active." +:type 'boolean +:group 'xwem-minibuffer) + +;;; Internal variables + ;; Variables ;;;###xwem-autoload (defvar xwem-minibuffer nil ＠＠ -517,13 +526,6 ＠＠ ;;; Resize-minibuffer mode (defvar xwem-minib-rsz-saved-height nil) - -(defcustom xwem-minib-resize-exact t - "*If non-`nil', make minibuffer frame exactly the size needed to display all its contents. -Otherwise, the minibuffer frame can temporarily increase in size but -never get smaller while it is active." -:type 'boolean -:group 'xwem-minibuffer) (defun xwem-minib-rsz-count-window-lines (&optional start end) "Return number of window lines occupied by text in region. Index: lisp/xwem-misc.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/lisp/xwem-misc.el,v retrieving revision 1.9 diff -u -u -r1.9 xwem-misc.el --- lisp/xwem-misc.el 4 Dec 2004 20:24:26 -0000 1.9 +++ lisp/xwem-misc.el 5 Dec 2004 05:50:43 -0000 ＠＠ -378,6 +378,8 ＠＠ :initialize 'custom-initialize-default :group 'xwem-cursor) +;;; Internal variables + ;; cursor storages (defvar xwem-cursor-fnt nil "Font for \"cursor\" series.") Index: lisp/xwem-mouse.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/lisp/xwem-mouse.el,v retrieving revision 1.6 diff -u -u -r1.6 xwem-mouse.el --- lisp/xwem-mouse.el 4 Dec 2004 20:07:22 -0000 1.6 +++ lisp/xwem-mouse.el 5 Dec 2004 05:50:43 -0000 ＠＠ -43,6 +43,8 ＠＠ :type 'function :group 'xwem) +;;; Internal variables +  (defun xwem-mouse-change-cursor (cursor) "XXX. Index: lisp/xwem-netwm.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/lisp/xwem-netwm.el,v retrieving revision 1.1 diff -u -u -r1.1 xwem-netwm.el --- lisp/xwem-netwm.el 29 Nov 2004 20:41:54 -0000 1.1 +++ lisp/xwem-netwm.el 5 Dec 2004 05:50:44 -0000 ＠＠ -39,6 +39,18 ＠＠ (require 'xwem-load) (require 'xwem-manage) +(defgroup xwem-fullscreen nil + "Group to customize fullscreen managing model." +:prefix "xwem-fullscreen-" +:group 'xwem-modes) + +(defcustom xwem-fullscreen-switch-any-other nil + "*Non-nil mean switch to any other client, if no other fullscreen client available." +:type 'boolean +:group 'xwem-fullscreen) + +;;; Internal variables + ;;; Constants (defconst _NET_WM_NAME "_NET_WM_NAME") (defconst _NET_WM_VISIBLE_NAME "_NET_WM_VISIBLE_NAME") ＠＠ -352,16 +364,6 ＠＠ ;; ;;; Fullscreen major mode - -(defgroup xwem-fullscreen nil - "Group to customize fullscreen managing model." -:prefix "xwem-fullscreen-" -:group 'xwem-modes) - -(defcustom xwem-fullscreen-switch-any-other nil - "*Non-nil mean switch to any other client, if no other fullscreen client available." -:type 'boolean -:group 'xwem-fullscreen) ;; Supported CL properties: Index: lisp/xwem-register.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/lisp/xwem-register.el,v retrieving revision 1.4 diff -u -u -r1.4 xwem-register.el --- lisp/xwem-register.el 29 Nov 2004 20:41:55 -0000 1.4 +++ lisp/xwem-register.el 5 Dec 2004 05:50:44 -0000 ＠＠ -88,6 +88,8 ＠＠ :type 'boolean :group 'xwem-registers) +;;; Internal variables + (defvar xwem-registers nil "XWEM registers alist. Each element in form (NAME . VALUE), one for each register. Index: lisp/xwem-report.el =================================================================== RCS file: lisp/xwem-report.el diff -N lisp/xwem-report.el --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lisp/xwem-report.el 5 Dec 2004 05:50:44 -0000 ＠＠ -0,0 +1,302 ＠＠ +;;; xwem-report.el --- Generate a bug report -*-Emacs-Lisp-*- + +;; Copyright (C) 2004 by Free Software Foundation, Inc. + +;; Author: Steve Youngs <steve(a)xwem.org&gt; +;; Created: 2004-12-05 +;; Keywords: xwem +;; X-CVS: $Id: $ + +;; This file is part of XWEM. + +;; XWEM is free software; you can redistribute it and/or modify it +;; under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. + +;; XWEM is distributed in the hope that it will be useful, but WITHOUT +;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +;; or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public +;; License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with XEmacs; see the file COPYING. If not, write to the Free +;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +;; 02111-1307, USA. + +;;; Synched up with: Not in FSF + +;;; Commentary: +;; +;; Bug reporter. + +;;; Code: + +(require 'sendmail) +(require 'shadow) + +;; To keep the byte-compiler from spewing out warnings. +(eval-when-compile + (defvar after-sep-pos) + (defvar final-resting-place) + (defvar xwem-version) + (require 'font-lock) + (require 'pp)) + + +;;; Variables + +(defcustom xwem-report-bug-send-init nil + "*If non-nil, include the user's init.el file in the bug report." +:group 'xwem-misc +:type 'boolean) + +;;; Internal variables + +(defconst xwem-report-salutations + ["Dear bug team:" + "Ciao bug team:" + "Salut bug team:" + "Guten Tag bug team:" + "To whom it may concern:" + "Fellow XWEM'ers:" + "Yo bug team:" + "G'day bug team:" + "Greetings Earthlings:"] + "A list of salutations used for `xwem-report-bug'.") + +(defvar xwem-bug-address + "XWEM Devel <xwem-devel(a)xwem.org&gt;&quot; + "The address used for submitting bug reports.") + +;;; Functions + +(defun xwem-report-pre-hook () + "Pre hook run by report-submit-bug-report." + (mail-subject) + (insert "[XWEM Bug] ") + (mail-text)) + +(defun xwem-report-post-hook () + "Post hook run by report-submit-bug-report." + (save-excursion + (mail-subject) + (font-lock-fontify-buffer) + (let ((subj (read-string "Subject header: "))) + (insert subj)))) + +;; Stolen from Gnus. +(defun xwem-report-debug () + "Go through the Xwem source files and report what variables have been changed. +The source file has to be in the load path." + (let ((files '("xwem-smartmods.el" "xwem-recover.el" "ixwem.el" + "xwem-battery.el" "xwem-time.el" "xwem-weather.el" + "xwem-framei.el" "xwem-worklog.el" "xwem-holer.el" + "xwem-osd.el" "xwem-tabbing.el" "xwem-selections.el" + "xwem-root.el" "xwem-report.el" "xwem-desktop.el" + "xwem-faces.el" "xwem-tray.el" "xwem-main.el" "xwem-sound.el" + "xwem-loaddefs.el" "xwem-strokes.el" "xwem-edmacro.el" + "xwem-clgen.el" "xwem-launcher.el" "xwem-frame.el" + "xwem-special.el" "xwem-interactive.el" "xwem-transient.el" + "xwem-keyboard.el" "xwem-mouse.el" "xwem-misc.el" + "xwem-focus.el" "xwem-keymacro.el" "xwem-rooter.el" + "xwem-rooticon.el" "xwem-clients.el" "xwem-minibuffer.el" + "xwem-register.el" "xwem-clswi.el" "xwem-icons.el" + "xwem-manage.el" "xwem-netwm.el" "xwem-win.el" + "xwem-theme.el")) + (print-level 5) + (point (point)) + file expr olist sym) + (message "Please wait while we snoop your variables...") + (sit-for 0) + ;; Go through all the files looking for non-default values for variables. + (save-excursion + (set-buffer (get-buffer-create " *xwem bug info*")) + (while files + (erase-buffer) + (when (and (setq file (locate-library (pop files))) + (file-exists-p file)) + (insert-file-contents file) + (goto-char (point-min)) + (if (not (re-search-forward "^;;* *Internal variables" nil t)) + (message "Malformed sources in file %s" file) + (narrow-to-region (point-min) (point)) + (goto-char (point-min)) + (while (setq expr (ignore-errors (read (current-buffer)))) + (ignore-errors + (and (or (eq (car expr) 'defvar) + (eq (car expr) 'defcustom)) + (stringp (nth 3 expr)) + (or (not (boundp (nth 1 expr))) + (not (equal (eval (nth 2 expr)) + (symbol-value (nth 1 expr))))) + (push (nth 1 expr) olist))))))) + (kill-buffer (current-buffer))) + (when (setq olist (nreverse olist)) + (insert "\n")) + (while olist + (when (boundp (car olist)) + (condition-case () + (pp `(setq ,(car olist) + ,(if (or (consp (setq sym (symbol-value (car olist)))) + (and (symbolp sym) + (not (or (eq sym nil) + (eq sym t))))) + (list 'quote (symbol-value (car olist))) + (symbol-value (car olist)))) + (current-buffer)) + (error + (format "(setq %s 'whatever)\n" (car olist))))) + ;(insert ";; (makeunbound '" (symbol-name (car olist)) ")\n")) + (setq olist (cdr olist))) + ;; Remove any control chars - they seem to cause trouble for some + ;; mailers. (Byte-compiled output from the stuff above.) + (goto-char point) + (while (re-search-forward "[\000-\010\013-\037\200-\237]" nil t) + (replace-match (format "\\%03o" (string-to-char (match-string 0))) + t t)))) + +(defun xwem-bug-packages-list () + "Insert into the current buffer a list of installed packages." + (let ((pkgs packages-package-list)) + (while pkgs + (insert + (format "(%s ver: %s upstream: %s)\n" + (nth 0 (car pkgs)) + (nth 2 (car pkgs)) + (nth 4 (car pkgs)))) + (setq pkgs (cdr pkgs))))) + +(defun xwem-prepare-report () + "Grabs the variables, features to include in bug report. +Then put it all into a mail buffer, nicely formatted." + (mail-to) + (insert xwem-bug-address) + (mail-text) + (forward-line 1) + (setq after-sep-pos (point)) + (setq final-resting-place (point-marker)) + (insert + "\n\n" + "===============================================================\n" + "System info to help the XWEM boys and girls try to fix your bug:\n" + "===============================================================" + "\n\n") + ;; Insert a version string here + ;; xdpyinfo + (insert "Output from xdpyinfo:\n--------------------\n\n" + (shell-command-to-string (concat "xdpyinfo -display " + (X-Dpy-name (xwem-dpy)))) + "\n") + ;; backtrace & messages buffers + (let ((lisptrace (get-buffer "*Backtrace*")) + (ctrace (get-buffer "*gdb-xemacs*")) + (debug (get-buffer "*xwem-debug*")) + (msgs (get-buffer " *xwem-messages*"))) + (when lisptrace + (insert "Lisp Backtrace:\n--------------\n\n") + (insert-buffer-substring lisptrace) + (insert "\n\n")) + (when ctrace + (insert "C Backtrace:\n-----------\n\n") + (insert-buffer-substring ctrace) + (insert "\n\n")) + (when debug + (insert "xwem-debug buffer:\n-----------------\n\n") + (insert-buffer-substring debug) + (insert "\n\n")) + (when msgs + (insert "xwem-messages buffer:\n--------------------\n\n") + (insert-buffer-substring msgs) + (insert "\n\n"))) + ;; Insert all the XWEM vars that have been changed from default. + ;; The actual work for this is done in `xwem-bug-debug', but it + ;; needs to be called toward the end of this function. + (insert "\n\nXWEM variables of note:\n----------------------\n") + (when window-setup-hook + (insert "\n\nwindow-setup-hook:") + (cl-prettyprint (symbol-value 'window-setup-hook))) + (when kill-emacs-hook + (insert "\n\nkill-emacs-hook:") + (cl-prettyprint (symbol-value 'kill-emacs-hook))) + ;; Insert the output of 'describe-installation'. + (insert "\n\n" + (symbol-value 'Installation-string)) + ;; Load-path shadows can cause some grief. + (flet ((append-message + (&rest args) ()) + (clear-message + (&optional label frame stdout-p no-restore) + ())) + (insert "\n\nLoad-Path Lisp Shadows:\n" + "----------------------\n") + (let ((before-shadows (point))) + (insert + (format "%s" + (find-emacs-lisp-shadows load-path))) + (save-restriction + (narrow-to-region before-shadows (point)) + (fill-paragraph t) + (insert "\n")))) + ;; Insert a list of installed packages. + (insert "\n\nInstalled XEmacs Packages:\n" + "-------------------------\n") + (xwem-bug-packages-list) + (insert "\n") + ;; Insert a list of installed modules. + (if (fboundp 'list-modules) + (progn + (insert "\n\nInstalled Modules:\n" + "-----------------\n") + (let* ((mods (list-modules))) + (while mods + (cl-prettyprint (cdr (car mods))) + (setq mods (cdr mods)))))) + ;; Insert a list of loaded features + (let ((before-features (point))) + (insert + (format "\n\nFeatures:\n--------\n\n%s" (symbol-value 'features))) + (save-restriction + (narrow-to-region before-features (point)) + (fill-paragraph t) + (insert "\n\n"))) + ;; Insert the contents of the user's init file if it exists + ;; and the user wants it sent. + (if xwem-report-bug-send-init + (if (file-readable-p user-init-file) + (save-excursion + (message-goto-signature) + (forward-line -3) + (beginning-of-line) + (insert "\n\nUser Init File:\n--------------\n\n") + (insert-file-contents user-init-file)))) + (xwem-report-pre-hook) + (xwem-report-post-hook) + (mail-text) + (insert + (aref xwem-report-salutations + (% (+ (% (random) 1000) 1000) + (length xwem-report-salutations))) "\n") + (re-search-forward "XWEM variables of note:" nil t) + (forward-line 2) + (xwem-report-debug) + (goto-char final-resting-place) + (forward-line 2) + (set-marker final-resting-place nil) + (message "Please enter your report. Type C-c C-c to send, C-x k to abort.")) + +;;;###autoload +(defun xwem-report-bug (&optional no-confirm) + "Submit a bug report for XWEM. +Optional argument BLURB is a string that adds a preamble to the bug report. +Optional argument NO-CONFIRM if 't' will not ask for confirmation." + (interactive) + (if (or no-confirm + (y-or-n-p "Do you want to submit a bug report on XWEM? ")) + (progn + (mail) + (xwem-prepare-report)))) + +(provide 'xwem-report) + +;;; xwem-report.el ends here Index: lisp/xwem-root.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/lisp/xwem-root.el,v retrieving revision 1.5 diff -u -u -r1.5 xwem-root.el --- lisp/xwem-root.el 29 Nov 2004 20:41:56 -0000 1.5 +++ lisp/xwem-root.el 5 Dec 2004 05:50:44 -0000 ＠＠ -78,6 +78,8 ＠＠ :type 'boolean :group 'xwem-root) +;;; Internal variables + (defvar xwem-root-cursor nil "Internal variable, stores root cursor.") Index: lisp/xwem-rooter.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/lisp/xwem-rooter.el,v retrieving revision 1.4 diff -u -u -r1.4 xwem-rooter.el --- lisp/xwem-rooter.el 29 Nov 2004 20:41:56 -0000 1.4 +++ lisp/xwem-rooter.el 5 Dec 2004 05:50:44 -0000 ＠＠ -47,6 +47,8 ＠＠ :type 'string :group 'xwem-rooter) +;;; Internal variables + (defvar xwem-rooter-mode-map (let ((map (make-sparse-keymap))) (define-key map (xwem-kbd "C-<button1>") 'xwem-client-imove) Index: lisp/xwem-rooticon.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/lisp/xwem-rooticon.el,v retrieving revision 1.4 diff -u -u -r1.4 xwem-rooticon.el --- lisp/xwem-rooticon.el 3 Dec 2004 23:38:06 -0000 1.4 +++ lisp/xwem-rooticon.el 5 Dec 2004 05:50:44 -0000 ＠＠ -65,6 +65,8 ＠＠ :type 'boolean :group 'xwem-rooticon) +;;; Internal variables + (defstruct xwem-rooticon cl xgeom Index: lisp/xwem-selections.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/lisp/xwem-selections.el,v retrieving revision 1.1 diff -u -u -r1.1 xwem-selections.el --- lisp/xwem-selections.el 29 Nov 2004 20:41:56 -0000 1.1 +++ lisp/xwem-selections.el 5 Dec 2004 05:50:44 -0000 ＠＠ -45,6 +45,8 ＠＠ :type 'number :group 'xwem-selections) +;;; Internal variables +  (defvar xwem-selections nil "Ring of saved selections. Index: lisp/xwem-sound.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/lisp/xwem-sound.el,v retrieving revision 1.4 diff -u -u -r1.4 xwem-sound.el --- lisp/xwem-sound.el 29 Nov 2004 20:41:57 -0000 1.4 +++ lisp/xwem-sound.el 5 Dec 2004 05:50:44 -0000 ＠＠ -143,6 +143,8 ＠＠ :type 'boolean :group 'xwem-sound) +;;; Internal variables + ;;;###autoload (defvar xwem-sound-alist nil "Sound alist for use by XWEM. Index: lisp/xwem-special.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/lisp/xwem-special.el,v retrieving revision 1.6 diff -u -u -r1.6 xwem-special.el --- lisp/xwem-special.el 4 Dec 2004 20:07:23 -0000 1.6 +++ lisp/xwem-special.el 5 Dec 2004 05:50:44 -0000 ＠＠ -135,7 +135,8 ＠＠ :type 'number :group 'xwem-special) -;; Internal variables +;;; Internal variables + (defvar xwem-special-frames-list nil "List of special frames.")  Index: lisp/xwem-strokes.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/lisp/xwem-strokes.el,v retrieving revision 1.5 diff -u -u -r1.5 xwem-strokes.el --- lisp/xwem-strokes.el 29 Nov 2004 20:41:57 -0000 1.5 +++ lisp/xwem-strokes.el 5 Dec 2004 05:50:45 -0000 ＠＠ -108,6 +108,8 ＠＠ :group 'xwem-strokes :group 'xwem-faces) +;;; Internal variables + ;; Stroke variables (defvar xwem-strokes-keymap (let ((map (make-sparse-keymap))) Index: lisp/xwem-tabbing.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/lisp/xwem-tabbing.el,v retrieving revision 1.4 diff -u -u -r1.4 xwem-tabbing.el --- lisp/xwem-tabbing.el 29 Nov 2004 20:41:58 -0000 1.4 +++ lisp/xwem-tabbing.el 5 Dec 2004 05:50:45 -0000 ＠＠ -133,6 +133,8 ＠＠ :group 'xwem-tab :group 'xwem-faces) +;;; Internal variables + (defvar xwem-tabber-map (let ((map (make-sparse-keymap))) (define-key map [button1] 'xwem-tabber-smart-drag-frame) Index: lisp/xwem-theme.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/lisp/xwem-theme.el,v retrieving revision 1.1 diff -u -u -r1.1 xwem-theme.el --- lisp/xwem-theme.el 29 Nov 2004 20:41:58 -0000 1.1 +++ lisp/xwem-theme.el 5 Dec 2004 05:50:45 -0000 ＠＠ -310,6 +310,8 ＠＠ :type 'xwem-theme :group 'xwem-theme) +;;; Internal variables + (defvar xwem-theme-themes '(xwem-theme-default xwem-theme-extrim) "List of themes.") Index: lisp/xwem-transient.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/lisp/xwem-transient.el,v retrieving revision 1.1 diff -u -u -r1.1 xwem-transient.el --- lisp/xwem-transient.el 29 Nov 2004 20:41:59 -0000 1.1 +++ lisp/xwem-transient.el 5 Dec 2004 05:50:45 -0000 ＠＠ -53,6 +53,8 ＠＠ :type 'boolean :group 'xwem-transient) +;;; Internal variables + (defvar xwem-transient-keymap (let ((map (make-sparse-keymap))) (define-key map (xwem-kbd "C-<button1>") 'xwem-client-imove) Index: lisp/xwem-tray.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/lisp/xwem-tray.el,v retrieving revision 1.5 diff -u -u -r1.5 xwem-tray.el --- lisp/xwem-tray.el 29 Nov 2004 20:41:59 -0000 1.5 +++ lisp/xwem-tray.el 5 Dec 2004 05:50:46 -0000 ＠＠ -142,6 +142,33 ＠＠ :group 'xwem-tray :group 'xwem-faces) +;;; Delimiter stuff +(defcustom xwem-tray-delimiter-width 4 + "*Delimiter width." +:type 'number +:group 'xwem-tray) + +(defcustom xwem-tray-delimiter-height-reminder 2 + "*How many pixels on top/bottom from xwem minibuffer.." +:type 'number +:group 'xwem-tray) + +(define-xwem-face xwem-tray-delimiter-face + `(((background light) + (:foreground "gray40")) + ((background light shadow) + (:foreground "gray30")) + ((background dark) + (:foreground "gray70")) + ((background dark shadow) + (:foreground "gray80")) + (t (:foreground "gray55"))) + "Face to draw systray delimiter." +:group 'xwem-tray +:group 'xwem-faces) + +;;; Internal variables + (defvar xwem-tray-groups '("desktop" "launch" "misc" "default") "List of valid dockapp groups.") ＠＠ -686,31 +713,6 ＠＠ (setq xwem-tray-dapp-list nil) (setq xwem-tray-cursor nil) ) - -;;; Delimiter stuff -(defcustom xwem-tray-delimiter-width 4 - "*Delimiter width." -:type 'number -:group 'xwem-tray) - -(defcustom xwem-tray-delimiter-height-reminder 2 - "*How many pixels on top/bottom from xwem minibuffer.." -:type 'number -:group 'xwem-tray) - -(define-xwem-face xwem-tray-delimiter-face - `(((background light) - (:foreground "gray40")) - ((background light shadow) - (:foreground "gray30")) - ((background dark) - (:foreground "gray70")) - ((background dark shadow) - (:foreground "gray80")) - (t (:foreground "gray55"))) - "Face to draw systray delimiter." -:group 'xwem-tray -:group 'xwem-faces) ;;;###autoload (defun xwem-tray-delimeter (&optional w h bgcol) Index: lisp/xwem-win.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/lisp/xwem-win.el,v retrieving revision 1.5 diff -u -u -r1.5 xwem-win.el --- lisp/xwem-win.el 29 Nov 2004 20:41:59 -0000 1.5 +++ lisp/xwem-win.el 5 Dec 2004 05:50:46 -0000 ＠＠ -166,6 +166,8 ＠＠ :group 'xwem-win :group 'xwem-faces) +;;; Internal variables +  ;;;; Win macros (defmacro xwem-win-child (window) Index: utils/xwem-holer.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/utils/xwem-holer.el,v retrieving revision 1.1 diff -u -u -r1.1 xwem-holer.el --- utils/xwem-holer.el 29 Nov 2004 20:42:26 -0000 1.1 +++ utils/xwem-holer.el 5 Dec 2004 05:50:46 -0000 ＠＠ -95,6 +95,8 ＠＠ :type 'number :group 'xwem-holer) +;;; Internal variables +  ;;; Define holer prefix map ;;;###autoload(autoload 'xwem-holer-prefix "xwem-holer" nil nil 'keymap) Index: utils/xwem-osd.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/utils/xwem-osd.el,v retrieving revision 1.2 diff -u -u -r1.2 xwem-osd.el --- utils/xwem-osd.el 3 Dec 2004 05:33:01 -0000 1.2 +++ utils/xwem-osd.el 5 Dec 2004 05:50:46 -0000 ＠＠ -87,6 +87,17 ＠＠ (require 'xwem-diagram) +(defcustom xwem-osd-default-font "fixed" + "Default font for text drawed in osd.") + +(defcustom xwem-osd-default-color "black" + "Default color used to draw.") + +(defcustom xwem-osd-always-ontop t + "*Non-nil mean that OSD's winow will be always on top.") + +;;; Internal variables + (defconst xwem-osd-instance-types '(text line dots arc rect icon) "List of valid types of osd instance.") ＠＠ -150,15 +161,6 ＠＠ "Remove OSD's property PROP." (setf (xwem-osd-plist osd) (plist-remprop (xwem-osd-plist osd) prop))) - -(defcustom xwem-osd-default-font "fixed" - "Default font for text drawed in osd.") - -(defcustom xwem-osd-default-color "black" - "Default color used to draw.") - -(defcustom xwem-osd-always-ontop t - "*Non-nil mean that OSD's winow will be always on top.")  ;;; Functions Index: utils/xwem-worklog.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/utils/xwem-worklog.el,v retrieving revision 1.5 diff -u -u -r1.5 xwem-worklog.el --- utils/xwem-worklog.el 3 Dec 2004 23:13:59 -0000 1.5 +++ utils/xwem-worklog.el 5 Dec 2004 05:50:47 -0000 ＠＠ -348,6 +348,24 ＠＠ :type '(repeat sexp) :group 'xwem-worklog) +;;; Worklog dockapp +(defcustom xwem-worklog-dockapp-width 24 + "*Width in pixels for worklog dockapp." +:type 'number +:group 'xwem-worklog) + +(defcustom xwem-worklog-dockapp-height 24 + "*Height in pixels for worklog dockapp." +:type 'number +:group 'xwem-worklog) + +(defcustom xwem-worklog-dockapp-sector-width 0 + "*Sector width for worklog dockapps." +:type 'number +:group 'xwem-worklog) + +;;; Internal variables + ;; Worklog keymap ;;;###autoload(autoload 'xwem-worklog-prefix "xwem-worklog" nil nil 'keymap) (xwem-define-prefix-command 'xwem-worklog-prefix t) ＠＠ -1287,22 +1305,6 ＠＠ xwem-worklog-diagram-type spec (xwem-worklog-pause-pwin xwem-worklog-pause-p) (xwem-face-get-gc 'default) x-off y-off wwid whei sec-hei)) ))) - -;;; Worklog dockapp -(defcustom xwem-worklog-dockapp-width 24 - "*Width in pixels for worklog dockapp." -:type 'number -:group 'xwem-worklog) - -(defcustom xwem-worklog-dockapp-height 24 - "*Height in pixels for worklog dockapp." -:type 'number -:group 'xwem-worklog) - -(defcustom xwem-worklog-dockapp-sector-width 0 - "*Sector width for worklog dockapps." -:type 'number -:group 'xwem-worklog) (defvar xwem-worklog-dockapp-map (let ((map (make-sparse-keymap))) -- |---<Steve Youngs>---------------<GnuPG KeyID: A94B3003>---| | In space, | | No one can hear you rip a stinky | |---------------------------------------&lt;steve(a)xwem.org&gt;---|