sawfish r4301 - in trunk: . lisp/sawfish/gtk lisp/sawfish/ui lisp/sawfish/ui/widgets lisp/sawfish/wm lisp/sawfish/wm/commands lisp/sawfish/wm/ext lisp/sawfish/wm/gnome lisp/sawfish/wm/placement lisp/sawfish/wm/state lisp/sawfish/wm/util po scripts src themes/Crux themes/smaker
- From: chrisb svn gnome org
- To: svn-commits-list gnome org
- Subject: sawfish r4301 - in trunk: . lisp/sawfish/gtk lisp/sawfish/ui lisp/sawfish/ui/widgets lisp/sawfish/wm lisp/sawfish/wm/commands lisp/sawfish/wm/ext lisp/sawfish/wm/gnome lisp/sawfish/wm/placement lisp/sawfish/wm/state lisp/sawfish/wm/util po scripts src themes/Crux themes/smaker
- Date: Wed, 19 Nov 2008 20:45:09 +0000 (UTC)
Author: chrisb
Date: Wed Nov 19 20:45:08 2008
New Revision: 4301
URL: http://svn.gnome.org/viewvc/sawfish?rev=4301&view=rev
Log:
Remove ^L [Teika Kazura]
Modified:
trunk/ChangeLog
trunk/OPTIONS
trunk/TODO
trunk/lisp/sawfish/gtk/widget.jl
trunk/lisp/sawfish/ui/slot.jl
trunk/lisp/sawfish/ui/widgets/match-window.jl
trunk/lisp/sawfish/wm/commands/gnome.jl
trunk/lisp/sawfish/wm/commands/move-resize.jl
trunk/lisp/sawfish/wm/commands/slide-window.jl
trunk/lisp/sawfish/wm/commands/x-cycle.jl
trunk/lisp/sawfish/wm/custom.jl
trunk/lisp/sawfish/wm/customize.jl
trunk/lisp/sawfish/wm/ext/match-window.jl
trunk/lisp/sawfish/wm/ext/window-history.jl
trunk/lisp/sawfish/wm/focus.jl
trunk/lisp/sawfish/wm/frames.jl
trunk/lisp/sawfish/wm/gnome/menus.jl
trunk/lisp/sawfish/wm/keymaps.jl
trunk/lisp/sawfish/wm/placement.jl
trunk/lisp/sawfish/wm/placement/smart.jl
trunk/lisp/sawfish/wm/stacking.jl
trunk/lisp/sawfish/wm/state/gnome.jl
trunk/lisp/sawfish/wm/state/iconify.jl
trunk/lisp/sawfish/wm/state/maximize.jl
trunk/lisp/sawfish/wm/state/shading.jl
trunk/lisp/sawfish/wm/state/transient.jl
trunk/lisp/sawfish/wm/state/wm-spec.jl
trunk/lisp/sawfish/wm/util/font.jl
trunk/lisp/sawfish/wm/util/groups.jl
trunk/lisp/sawfish/wm/util/gtkrc.jl
trunk/lisp/sawfish/wm/util/keymap.jl
trunk/lisp/sawfish/wm/util/nokogiri.jl
trunk/lisp/sawfish/wm/util/prompt.jl
trunk/lisp/sawfish/wm/util/rects.jl
trunk/lisp/sawfish/wm/viewport.jl
trunk/lisp/sawfish/wm/windows.jl
trunk/lisp/sawfish/wm/workspace.jl
trunk/po/sawfish-xgettext
trunk/scripts/sawfish-menu.jl
trunk/src/colors.c
trunk/src/cursors.c
trunk/src/display.c
trunk/src/dlmalloc.c
trunk/src/events.c
trunk/src/flippers.c
trunk/src/fonts.c
trunk/src/frames.c
trunk/src/functions.c
trunk/src/gradient.c
trunk/src/images.c
trunk/src/keys.c
trunk/src/keys.h
trunk/src/libclient.c
trunk/src/pixmap-cache.c
trunk/src/play-sample.c
trunk/src/sawmill.h
trunk/src/selection.c
trunk/src/server.c
trunk/src/session.c
trunk/src/stacking-list.c
trunk/src/windows.c
trunk/src/x.c
trunk/themes/Crux/theme.jl
trunk/themes/smaker/theme.jl
Modified: trunk/OPTIONS
==============================================================================
--- trunk/OPTIONS (original)
+++ trunk/OPTIONS Wed Nov 19 20:45:08 2008
@@ -24,7 +24,6 @@
;; $Id: OPTIONS,v 1.5 2004/01/11 17:26:15 jsh Exp $
-
;; window animation options
;; (define-special-variable default-window-animator 'none
@@ -39,7 +38,6 @@
;; (define-special-variable anim-outline-steps 16)
;; (define-special-variable anim-outline-delay 20)
-
;; customization options
;; (define-special-variable customize-program "sawfish-ui"
@@ -55,7 +53,6 @@
;; "Also include commands of these classes the key bindings panel.
;;Add the `viewport' keyboard to make viewport commands show up.")
-
;; focus options
;; (define-special-variable focus-mode 'click
@@ -78,7 +75,6 @@
;; (define-special-variable ignore-window-input-hint nil
;; "Give focus to windows even when they haven't asked for it.")
-
;; window frame (theme) options
;; (define-special-variable default-frame-style nil
@@ -127,7 +123,6 @@
;; (define-special-variable default-bevel-percent nil
;; "Bevel intensity as a percentage.")
-
;; menu options
;; (define-special-variable menus-include-shortcuts nil
@@ -151,7 +146,6 @@
;; (define-special-variable custom-menu-includes-all-settings t
;; "When non-nil, the custom menu includes the `All settings' item.")
-
;; window placement options
;; (define-special-variable place-window-mode 'top-left
@@ -165,7 +159,6 @@
;; (define-special-variable ignore-program-positions t
;; "Ignore program-specified window placements.")
-
;; viewport options
;; (define-special-variable viewport-dimensions '(1 . 1)
@@ -178,7 +171,6 @@
;; "How to act when passing the first or last workspace, one of
;;`stop', `wrap-around' or `keep-going'")
-
;; workspace options
;; (define-special-variable workspace-send-boundary-mode 'stop
@@ -193,7 +185,6 @@
;; (define-special-variable static-workspace-menus)
-
;; grow/pack options
;; (define-special-variable grow-is-maximize t
@@ -223,7 +214,6 @@
;; (define-special-variable grow-pack-menu)
-
;; window cycling options
;; (define-special-variable cycle-show-window-names t
@@ -241,7 +231,6 @@
;; (define-special-variable cycle-raise-windows t
;; "Raise windows while they're temporarily selected during cycling.")
-
;; move/resize options
;; (define-special-variable move-outline-mode 'opaque
@@ -279,7 +268,6 @@
;; (define-special-variable move-cursor-shape (default-cursor))
;; (define-special-variable resize-cursor-shape (default-cursor))
-
;; audio options
;; (define-special-variable audio-events-enabled nil
@@ -303,7 +291,6 @@
;; "The program used to play audio samples. If unset, built-in
;;support for ESD is used.")
-
;; edge flip options
;; (require 'sawfish.wm.ext.edge-flip)
@@ -320,7 +307,6 @@
;; (define-special-variable edge-flip-delay 250
;; "Milliseconds to delay before edge flipping.")
-
;; error handling options
;; (require 'sawfish.wm.ext.error-handler)
@@ -332,7 +318,6 @@
;; "Where to display error messages; one of nowhere, screen, or
;;standard-error")
-
;; tooltips options
;; (require 'sawfish.wm.ext.tooltips)
@@ -358,7 +343,6 @@
;; (define-special-variable tooltips-foreground-color "black"
;; "Color used for the tooltips foreground")
-
;; window history options
;; (require 'sawfish.wm.ext.window-history)
@@ -388,7 +372,6 @@
;; (define-special-variable window-history-ignore-transients t
;; "Don't automatically remember details of transient windows.")
-
;; auto raise optiosn
;; (require 'sawfish.wm.ext.auto-raise)
@@ -399,7 +382,6 @@
;; (define-special-variable raise-window-timeout 500
;; "Delay in milliseconds until focused windows are raised.")
-
;; shade-hover options
;; (require 'sawfish.wm.ext.shade-hover)
@@ -413,7 +395,6 @@
;; (defcustom shade-hover-raise nil
;; "Raise windows when they are unshaded.")
-
;; gnome menus options
;; (require 'sawfish.wm.gnome.menus)
@@ -427,7 +408,6 @@
;; "~/.gnome/apps")
;; "List of directories to read GNOME menu entries from.")
-
;; smart placement modes
;; (define-special-variable sp-avoided-windows-weight 100)
@@ -444,7 +424,6 @@
;; "Only when there's fewer X events than this pending do we try to
;;do smart placement.")
-
;; configure-request handler
;; (define-special-variable configure-auto-gravity t
@@ -453,14 +432,12 @@
;; (define-special-variable configure-ignore-stacking-requests nil
;; "Ignore requests from applications to change window stacking.")
-
;; original (obsolete) gnome hints
;; ;; this is needed since the gnome tasklist applet doesn't honour
;; ;; the _WIN_HIDDEN property (?)
;; (define-special-variable gnome-ignored-windows-in-client-list t)
-
;; iconify options
;; (define-special-variable focus-windows-on-uniconify nil
@@ -489,7 +466,6 @@
;; (defcustom unshade-selected-windows nil
;; "Unshade selected windows.")
-
;; maximize options
;; (define-special-variable maximize-always-expands nil
@@ -508,7 +484,6 @@
;; (define-special-variable move-lock-when-maximized t
;; "Lock position and size while windows are maximized.")
-
;; Miscellaneous options
;; (define-special-variable transients-above 'parents
@@ -571,7 +546,6 @@
;; "Shell command used to direct a web browser to load a url. Any
;;`%s' substrings will be replaced by the name of the url.")
-
;; prompt options
;; (define-special-variable prompt-max-display 20
Modified: trunk/TODO
==============================================================================
--- trunk/TODO (original)
+++ trunk/TODO Wed Nov 19 20:45:08 2008
@@ -15,12 +15,10 @@
Bugs are marked !, things that should be done soon are marked +,
and longer-term ideas are marked -
-
Before next release
===================
-
Outstanding bugs
================
@@ -103,7 +101,6 @@
(use this when switching workspaces, but focus must be preserved)
-
Window manager tasks
====================
@@ -242,11 +239,9 @@
(didn't NeWS allow this kind of thing, must do research..)
-
ui tasks
========
see lisp/sawfish/ui/WISHLIST
-
Modified: trunk/lisp/sawfish/gtk/widget.jl
==============================================================================
--- trunk/lisp/sawfish/gtk/widget.jl (original)
+++ trunk/lisp/sawfish/gtk/widget.jl Wed Nov 19 20:45:08 2008
@@ -109,7 +109,6 @@
(define callback-enabled (make-fluid t))
-
;;; High level widget management
;; each widget is a function taking a single argument, the operation to
@@ -167,7 +166,6 @@
(define (make-signal-callback fun) (lambda () (call-callback fun)))
-
;;; tooltip support
(define tooltips)
@@ -184,7 +182,6 @@
(setq tooltips (gtk-tooltips-new)))
(gtk-tooltips-set-tip tooltips widget tip-string key))
-
;;; Predefined widget constructors
(define (make-choice-item changed-callback . options)
@@ -317,7 +314,6 @@
(define-widget-type 'boolean make-boolean-item)
(widget-accepts-doc-string 'boolean)
-
;;; ``Meta'' widgets
(define (make-or-item changed-callback #!rest items)
@@ -498,7 +494,6 @@
(define-widget-type 'quoted make-quoted-item)
-
;;; widget used for unknown widget types
(define (make-unknown-item changed-callback)
@@ -516,7 +511,6 @@
(define-widget-type 'unknown make-unknown-item)
-
;;; utility functions
(define string->symbol intern)
Modified: trunk/lisp/sawfish/ui/slot.jl
==============================================================================
--- trunk/lisp/sawfish/ui/slot.jl (original)
+++ trunk/lisp/sawfish/ui/slot.jl Wed Nov 19 20:45:08 2008
@@ -65,7 +65,6 @@
(defvar *nokogiri-slot-changed-hook* '())
-
;;; slot creation, data structure mgmt
(define (slot-dependences slot)
@@ -149,7 +148,6 @@
(cdr slots-rest)
to-fetch))))))
-
;;; misc
(define (custom-symbol-value symbol)
Modified: trunk/lisp/sawfish/ui/widgets/match-window.jl
==============================================================================
--- trunk/lisp/sawfish/ui/widgets/match-window.jl (original)
+++ trunk/lisp/sawfish/ui/widgets/match-window.jl Wed Nov 19 20:45:08 2008
@@ -32,7 +32,6 @@
(defconst matcher-count 3)
-
;;; the widget representing the `matchers' frame
;; (match-window:matchers x-properties)
@@ -112,7 +111,6 @@
(define-widget-type 'match-window:matchers make-match-window:matchers)
-
;;; the widget representing the `Actions' frame
(define (make-match-window:actions changed-callback properties)
@@ -193,7 +191,6 @@
(aset name 0 (char-upcase (aref name 0)))
(_ name)))))
-
;;; the main widget
;; (match-window ...)
Modified: trunk/lisp/sawfish/wm/commands/gnome.jl
==============================================================================
--- trunk/lisp/sawfish/wm/commands/gnome.jl (original)
+++ trunk/lisp/sawfish/wm/commands/gnome.jl Wed Nov 19 20:45:08 2008
@@ -41,7 +41,6 @@
(define-structure-alias gnome-commands sawfish.wm.commands.gnome)
-
;;; commands
(define (gnome-toggle-skip-winlist w)
@@ -86,7 +85,6 @@
(define-command 'gnome-clear-skip-tasklist gnome-clear-skip-tasklist
#:spec "%W")
-
;; extras
(define (gnome-logout)
Modified: trunk/lisp/sawfish/wm/commands/move-resize.jl
==============================================================================
--- trunk/lisp/sawfish/wm/commands/move-resize.jl (original)
+++ trunk/lisp/sawfish/wm/commands/move-resize.jl Wed Nov 19 20:45:08 2008
@@ -504,7 +504,6 @@
(copy-sequence move-resize-moving-edges)
(list 'top 'bottom 'left 'right)))))))
-
;;; hook functions
(define (lost-window w)
@@ -514,7 +513,6 @@
(add-hook 'unmap-notify-hook lost-window t)
(add-hook 'destroy-notify-hook lost-window t)
-
;;; Entry points
(define (move-window-interactively w)
Modified: trunk/lisp/sawfish/wm/commands/slide-window.jl
==============================================================================
--- trunk/lisp/sawfish/wm/commands/slide-window.jl (original)
+++ trunk/lisp/sawfish/wm/commands/slide-window.jl Wed Nov 19 20:45:08 2008
@@ -69,7 +69,6 @@
(define-command 'slide-window-up slide-window-up #:spec "%W")
(define-command 'slide-window-down slide-window-down #:spec "%W")
-
;; group commands
(define (slide-group-left w)
Modified: trunk/lisp/sawfish/wm/commands/x-cycle.jl
==============================================================================
--- trunk/lisp/sawfish/wm/commands/x-cycle.jl (original)
+++ trunk/lisp/sawfish/wm/commands/x-cycle.jl Wed Nov 19 20:45:08 2008
@@ -130,7 +130,6 @@
(defvar after-cycle-step-hook '()
"Window hook called after each step of window cycling.")
-
;; variables
;; the current window
@@ -148,7 +147,6 @@
;; list of all cycle command names
(define cycle-commands '())
-
;;; code
(define (forwards lst elt count)
@@ -334,7 +332,6 @@
(when reverse-name
(apply define-cycle-command reverse-name (command-body -1) rest)))
-
;;; commands
(define-cycle-command-pair
@@ -382,7 +379,6 @@
(delete-if-not (lambda (x) (window-in-cycle-p x #:ignore-cycle-skip t))
(filter-windows dock-window-p)))))
-
#| autoload cookies:
###autoload (autoload-command 'cycle-windows 'sawfish.wm.commands.x-cycle)
Modified: trunk/lisp/sawfish/wm/custom.jl
==============================================================================
--- trunk/lisp/sawfish/wm/custom.jl (original)
+++ trunk/lisp/sawfish/wm/custom.jl Wed Nov 19 20:45:08 2008
@@ -102,7 +102,6 @@
;; hash group names (lists of symbols) to alist of options
(define custom-group-table (make-table equal-hash equal))
-
;;; defining custom variables and groups
(defmacro defcustom (symbol value doc #!rest keys)
@@ -222,7 +221,6 @@
(setq keys (nthcdr 2 keys)))
(cons 'list (nreverse out))))
-
;;; general management
(define custom-setter-table (make-table symbol-hash eq))
@@ -312,7 +310,6 @@
(string-lessp (cadr x) (cadr y))))
(filter atom (cddr custom-groups))))))))
-
;;; setting values
(define (custom-set setter symbol)
@@ -392,7 +389,6 @@
;; XXX alternatives to user-eval
(user-eval x))) (cdr form))))
-
;;; serializing unreadable types
;; property name (symbol) to find type converters on during custom-convert
@@ -455,7 +451,6 @@
(define (define-custom-deserializer type fun)
(put type 'custom-deserializer fun))
-
;;; support for font and color primitive types
(define-custom-serializer 'font (lambda (value)
@@ -482,7 +477,6 @@
(get-color value)
value)))
-
;;; default groups
(defgroup focus "Focus")
@@ -494,7 +488,6 @@
(defgroup min-max "Minimizing and Maximizing")
(defgroup misc "Miscellaneous")
-
;;; loading user's customisations
(define (custom-load filename)
@@ -515,7 +508,6 @@
(custom-default-file
(custom-load custom-default-file))))
-
;;; init
(let ((tem (get-command-line-option "--custom-file" t)))
Modified: trunk/lisp/sawfish/wm/customize.jl
==============================================================================
--- trunk/lisp/sawfish/wm/customize.jl (original)
+++ trunk/lisp/sawfish/wm/customize.jl Wed Nov 19 20:45:08 2008
@@ -44,7 +44,6 @@
(define customize-user-file-read nil)
(define customize-user-file-dirty nil)
-
;;; ui
(define (customize #!optional group)
@@ -57,7 +56,6 @@
;;###autoload
(define-command 'customize customize)
-
;;; setting variables
(define (customize-read-user-file)
Modified: trunk/lisp/sawfish/wm/ext/match-window.jl
==============================================================================
--- trunk/lisp/sawfish/wm/ext/match-window.jl (original)
+++ trunk/lisp/sawfish/wm/ext/match-window.jl Wed Nov 19 20:45:08 2008
@@ -55,7 +55,6 @@
(define-structure-alias match-window sawfish.wm.ext.match-window)
-
;;; configuration and customize stuff
(i18n-defvar match-window-x-properties
@@ -187,7 +186,6 @@
(define (define-match-window-formatter name formatter)
(put name 'match-window-formatter formatter))
-
;;; main entry point
(define (add-window-matcher prop value #!rest actions)
@@ -232,7 +230,6 @@
(delete-if (lambda (cell)
(null (cdr cell))) match-window-profile))))
-
;;; matcher code
(define (safe-string-match re . args)
@@ -311,7 +308,6 @@
(add-hook 'before-add-window-hook match-window t)
-
;;; custom property formatters and setters
(define-match-window-formatter 'WM_CLASS
Modified: trunk/lisp/sawfish/wm/ext/window-history.jl
==============================================================================
--- trunk/lisp/sawfish/wm/ext/window-history.jl (original)
+++ trunk/lisp/sawfish/wm/ext/window-history.jl Wed Nov 19 20:45:08 2008
@@ -85,7 +85,6 @@
()
(,(_ "_Forget saved state") window-history-forget)))
-
;;; customizations
(defgroup window-history "History" :group misc)
@@ -113,7 +112,6 @@
:group (misc window-history)
:type boolean)
-
;;; matching windows
(define (window-history-key w)
@@ -164,7 +162,6 @@
(when alist
(window-history-apply w alist))))
-
;;; recording attributes
(define (window-history-snapshotter w state)
@@ -222,7 +219,6 @@
(window-history-snapshotter w (car states)))
(window-history-state-snapshotter w (cdr states))))
-
;;; manual state recording
(defun window-history-save-position (w)
@@ -252,7 +248,6 @@
(define-command 'window-history-forget
window-history-forget #:spec "%W")
-
;;; restoring attributes
(define (window-history-apply w alist)
@@ -309,7 +304,6 @@
(when (memq value '(t both workspace))
(window-put w 'sticky t))))
-
;;; saving and loading state
(define (window-history-load)
@@ -365,7 +359,6 @@
alist)
(write stream "\)\n\n"))))
-
;;; init
(let ((tem (get-command-line-option "--window-history-file" t)))
Modified: trunk/lisp/sawfish/wm/focus.jl
==============================================================================
--- trunk/lisp/sawfish/wm/focus.jl (original)
+++ trunk/lisp/sawfish/wm/focus.jl Wed Nov 19 20:45:08 2008
@@ -67,7 +67,6 @@
"When true, the current command is being called from within a
click-to-focus button press event.")
-
;;; general utilities
(define (define-focus-mode name fun)
@@ -130,7 +129,6 @@
(define (warp-pointer-if-necessary #!optional (w (input-focus)))
(focus-invoke-mode w 'warp-if-necessary))
-
;;; modes
(define-focus-mode 'enter-exit
@@ -221,7 +219,6 @@
((focus-in focus-out add-window before-mode-change after-mode-change)
(apply (focus-mode-ref 'click) w action args)))))
-
;;; hooks
(define (focus-enter-fun w mode)
@@ -264,7 +261,6 @@
(sm-add-saved-properties 'never-focus 'focus-mode)
-
;; bug prevention
;; XXX Pavel reported this bug (windows becoming unfocusable in
Modified: trunk/lisp/sawfish/wm/frames.jl
==============================================================================
--- trunk/lisp/sawfish/wm/frames.jl (original)
+++ trunk/lisp/sawfish/wm/frames.jl Wed Nov 19 20:45:08 2008
@@ -112,7 +112,6 @@
;; non-maximized. (In fact the frame-type != window-type scheme is
;; largely just for compatibility)
-
;;; custom support
(define (custom-make-frame-style-widget)
@@ -120,7 +119,6 @@
(put 'frame-style 'custom-widget custom-make-frame-style-widget)
-
;;; variables etc
(defvar frame-part-classes nil
@@ -207,7 +205,6 @@
(defvar sawfish-themer-program "sawfish-themer")
-
;;; defcustom's for some built-in variables
(defcustom default-font nil
@@ -220,7 +217,6 @@
(defvar default-bevel-percent nil
"Bevel intensity as a percentage.")
-
;;; managing frame types
(define (define-frame-type-mapper fun)
@@ -247,7 +243,6 @@
;; else, apply this transformation and keep looping
(loop-1 (cdr rest) ((car rest) w type)))))
-
;;; managing frame styles
(define (add-frame-style name function)
@@ -292,7 +287,6 @@
(reload-frame-style style))))
frame-style-files)))
-
;;; applying frame styles to windows
(define (reframe-window w)
@@ -354,7 +348,6 @@
(when (apply-frame-style style)
(save-current-frame-style)))
-
;;; editable frame styles
(define (mark-frame-style-editable style)
@@ -372,7 +365,6 @@
(system (format nil "%s %s &" sawfish-themer-program dir))))))
#:spec (lambda () (list default-frame-style)))
-
;;; kludge different window decors by modifying the assumed window type
(define (window-type w)
@@ -444,7 +436,6 @@
(lambda (w) (set-window-type w type)) #:spec "%W"))
'(default transient shaped shaped-transient unframed))
-
;;; loading ``themes'' (currently just frame styles)
(define (frame-style-directory dir #!optional get-name)
@@ -541,7 +532,6 @@
(check . ,(eq (window-type w) 'unframed))
(group . menu-type))))
-
;;; removing frame parts
(define (remove-frame-class w class)
@@ -559,7 +549,6 @@
(define (frame-class-removed-p w class)
(memq class (window-get w 'removed-classes)))
-
;;; manipulating the frame part classes variables
(define (set-frame-part-value class key value #!optional override)
@@ -625,7 +614,6 @@
((bottom-right-corner) 'bottom_right_corner))
nil))
-
;;; initialisation
(define-frame-class 'menu-button '((keymap . menu-button-keymap)))
Modified: trunk/lisp/sawfish/wm/gnome/menus.jl
==============================================================================
--- trunk/lisp/sawfish/wm/gnome/menus.jl (original)
+++ trunk/lisp/sawfish/wm/gnome/menus.jl Wed Nov 19 20:45:08 2008
@@ -34,7 +34,6 @@
(eval-when-compile (require 'sawfish.wm.menus))
-
;;; variables
(defvar gnome-share-directory
@@ -82,7 +81,6 @@
;; split $PATH
(define cached-path)
-
;;; code
;; search $PATH for an executable file..
@@ -244,7 +242,6 @@
(gnome-menus-update))
gnome-cached-menus)
-
;;; init
;; take over the applications submenu of the root window menu
Modified: trunk/lisp/sawfish/wm/keymaps.jl
==============================================================================
--- trunk/lisp/sawfish/wm/keymaps.jl (original)
+++ trunk/lisp/sawfish/wm/keymaps.jl Wed Nov 19 20:45:08 2008
@@ -32,7 +32,6 @@
(defgroup bindings "Bindings"
:layout keymaps)
-
;;; Customize support
(define (customizable-command-p x)
@@ -83,7 +82,6 @@
(put 'keymap 'custom-set 'custom-set-keymap)
(put 'keymap 'custom-get custom-get-keymap)
-
;;; Options
(defcustom global-keymap (bind-keys (make-keymap)
@@ -190,7 +188,6 @@
(grab-keymap window-keymap)
(grab-keymap global-keymap)))
-
;;; Arrange for window-keymap to be set in each window
(define (keymap-add-window w)
@@ -199,7 +196,6 @@
(add-hook 'add-window-hook keymap-add-window)
-
;; custom support for modifiers
(define-custom-serializer 'modifier-list
Modified: trunk/lisp/sawfish/wm/placement.jl
==============================================================================
--- trunk/lisp/sawfish/wm/placement.jl (original)
+++ trunk/lisp/sawfish/wm/placement.jl Wed Nov 19 20:45:08 2008
@@ -53,7 +53,6 @@
(defvar placement-modes '()
"List of names of all placement modes.")
-
;;; utility functions
;; autoload handling
@@ -128,7 +127,6 @@
(add-hook 'place-window-hook place-window t)
(add-hook 'remove-window-hook unplace-window)
-
;;; standard placement modes
(define (place-window-randomly w)
Modified: trunk/lisp/sawfish/wm/placement/smart.jl
==============================================================================
--- trunk/lisp/sawfish/wm/placement/smart.jl (original)
+++ trunk/lisp/sawfish/wm/placement/smart.jl Wed Nov 19 20:45:08 2008
@@ -60,7 +60,6 @@
sawfish.wm.custom
sawfish.wm.workspace)
-
;;; options/variables
(defvar sp-avoided-windows-weight 100)
@@ -76,7 +75,6 @@
;; to do smart placement
(defvar sp-max-queued-events 256)
-
;;; utility functions
;; RECTS is a list of (LEFT TOP RIGHT BOTTOM); returns sorted, uniquified
@@ -132,7 +130,6 @@
(window-get x 'iconified)
(not (windows-share-workspace-p x w)))))))
-
;;; calculating overlaps
;; returns (POINT . OVERLAP), find the alignment of the rectangle
@@ -160,7 +157,6 @@
'((0 . 0) (0 . -1) (-1 . 0) (-1 . -1)))
(and min-point (cons min-point min-overlap))))
-
;;; first-fit search
(define (sp-first-fit dims grid rects)
@@ -199,7 +195,6 @@
(cdr grid))
nil)))
-
;;; best-fit search
(defmacro sp-edges-adjacent (align-1 start-1 end-1 align-2 start-2 end-2)
@@ -358,7 +353,6 @@
points)
max-point)))))
-
;;; entry-points
(define (sp-do-placement w fit-fun #!optional fall-back-fun #!key window-filter)
@@ -418,7 +412,6 @@
(sp-do-placement w sp-fit-or-nil (placement-mode 'interactively)))
-
;;; init
;;###autoload
Modified: trunk/lisp/sawfish/wm/stacking.jl
==============================================================================
--- trunk/lisp/sawfish/wm/stacking.jl (original)
+++ trunk/lisp/sawfish/wm/stacking.jl Wed Nov 19 20:45:08 2008
@@ -73,7 +73,6 @@
;; this will always return an integer
(define (window-depth w) (window-get w 'depth))
-
;;; constraint mechanics (predicates actually..)
(define (stacking-constraint:layer w)
@@ -161,7 +160,6 @@
basic-stacking-constraints))
(t basic-stacking-constraints)))))
-
;;; utilities
;; returns (BEFORE . AFTER), modifies LST
@@ -412,7 +410,6 @@
(define-command 'raise-window-depth raise-window-depth #:spec "%W")
(define-command 'lower-window-depth lower-window-depth #:spec "%W")
-
;;; stacking groups of windows
;; Helper function for raise-windows and lower-windows. Calls (FIRST
@@ -485,7 +482,6 @@
(lower-windows w order)
(raise-windows w order)))
-
;;; hooks
;; Called from the add-window-hook
Modified: trunk/lisp/sawfish/wm/state/gnome.jl
==============================================================================
--- trunk/lisp/sawfish/wm/state/gnome.jl (original)
+++ trunk/lisp/sawfish/wm/state/gnome.jl Wed Nov 19 20:45:08 2008
@@ -382,7 +382,6 @@
(proxy-current-event gnome-window-id (lsh 1 19))
t)))))
-
;;; initialisation
(define (gnome-init)
Modified: trunk/lisp/sawfish/wm/state/iconify.jl
==============================================================================
--- trunk/lisp/sawfish/wm/state/iconify.jl (original)
+++ trunk/lisp/sawfish/wm/state/iconify.jl Wed Nov 19 20:45:08 2008
@@ -156,7 +156,6 @@
(define-command 'iconify-workspace-windows iconify-workspace-windows)
-
;;; sticky-ness, could be in a separate file..
;; workspace sticky code
@@ -226,7 +225,6 @@
(define-command 'make-window-unsticky make-window-unsticky #:spec "%W")
(define-command 'toggle-window-sticky toggle-window-sticky #:spec "%W")
-
;;; hooks
(define (ws-client-msg-handler w prop data)
Modified: trunk/lisp/sawfish/wm/state/maximize.jl
==============================================================================
--- trunk/lisp/sawfish/wm/state/maximize.jl (original)
+++ trunk/lisp/sawfish/wm/state/maximize.jl Wed Nov 19 20:45:08 2008
@@ -95,7 +95,6 @@
;; called when a window is un-maximized, args (W #!optional DIRECTION)
(defvar window-unmaximized-hook nil)
-
;;; handling maximized state
(define (window-maximized-p w)
@@ -171,7 +170,6 @@
(maximize-discard w (or (memq 'left edges) (memq 'right edges))
(or (memq 'top edges) (memq 'bottom edges)))))
-
;;; 1D packing
(defmacro edges-touching (start end edge)
@@ -248,7 +246,6 @@
(- (cdr fdims) (cdr dims))))
w)))
-
;;; 2D packing
(define (do-both window avoided edges coords dims fdims)
@@ -263,7 +260,6 @@
(- (cdr fdims) (cdr dims))))
window)))
-
;;; size hints stuff
(define (window-maximizable-p w #!optional direction hints)
@@ -306,7 +302,6 @@
(rplacd dims (trunc (cdr dims) y-inc y-base y-max)))
dims))
-
;;; misc functions
(define (maximize-find-workarea #!optional w #!key head head-fallback)
@@ -334,7 +329,6 @@
bottom-left-corner bottom-right-corner title)
(not (and h-maximized v-maximized)))))))
-
;;; commands
(define (maximize-window w #!optional direction only-1d)
@@ -446,7 +440,6 @@
(define-command 'maximize-window-horizontally-toggle maximize-window-horizontally-toggle #:spec "%W")
(define-command 'maximize-window-vertically-toggle maximize-window-vertically-toggle #:spec "%W")
-
;;; fill commands
(define (maximize-fill-window w #!optional direction)
@@ -492,7 +485,6 @@
(define-command 'maximize-fill-window-horizontally-toggle maximize-fill-window-horizontally-toggle #:spec "%W")
(define-command 'maximize-fill-window-vertically-toggle maximize-fill-window-vertically-toggle #:spec "%W")
-
;; fullscreen commands
(define (maximize-window-fullscreen w state)
@@ -556,7 +548,6 @@
(define-command 'maximize-window-fullxinerama-toggle
maximize-window-fullxinerama-toggle #:spec "%W")
-
;;; initialisation
(define (after-add-window w)
Modified: trunk/lisp/sawfish/wm/state/shading.jl
==============================================================================
--- trunk/lisp/sawfish/wm/state/shading.jl (original)
+++ trunk/lisp/sawfish/wm/state/shading.jl Wed Nov 19 20:45:08 2008
@@ -75,7 +75,6 @@
(define-command 'unshade-window unshade-window #:spec "%W")
(define-command 'toggle-window-shaded toggle-window-shaded #:spec "%W")
-
;;; displaying
(define (shaded-frame-type-mapper w type)
@@ -91,7 +90,6 @@
(define-frame-type-mapper shaded-frame-type-mapper)
-
;;; hooks
(define (shading-add-window w)
Modified: trunk/lisp/sawfish/wm/state/transient.jl
==============================================================================
--- trunk/lisp/sawfish/wm/state/transient.jl (original)
+++ trunk/lisp/sawfish/wm/state/transient.jl Wed Nov 19 20:45:08 2008
@@ -52,7 +52,6 @@
(defvar decorate-transients nil
"Decorate dialog windows similarly to application windows.")
-
;;; functions
(define (transient-of-p x y #!key allow-root)
@@ -116,7 +115,6 @@
transient group as window W."
(mapc fun (transient-group w)))
-
;;; commands for raising windows with their transients
(define (raise-window-and-transients w)
@@ -142,7 +140,6 @@
(define-command 'raise-lower-window-and-transients
raise-lower-window-and-transients #:spec "%W" #:class 'advanced)
-
;;; displaying
(define (transient-frame-type w type)
@@ -155,7 +152,6 @@
(define-frame-type-mapper transient-frame-type)
-
;;; hooks
(define (transient-map-window w)
Modified: trunk/lisp/sawfish/wm/state/wm-spec.jl
==============================================================================
--- trunk/lisp/sawfish/wm/state/wm-spec.jl (original)
+++ trunk/lisp/sawfish/wm/state/wm-spec.jl Wed Nov 19 20:45:08 2008
@@ -50,7 +50,6 @@
;; cover but existed in the old GNOME spec; e.g. _GNOME_WM_STATE_FOO
;; for FOO being DO_NOT_COVER, SKIP_FOCUS, ..?
-
;;; constants
(defconst _NET_WM_MOVERESIZE_SIZE_TOPLEFT 0)
@@ -130,7 +129,6 @@
(define supported-states '())
-
;;; setting the client list hints
(define (update-client-list-hints #!key only-stacking-list)
@@ -148,7 +146,6 @@
(set-prop (managed-windows) '_NET_CLIENT_LIST))
(set-prop (nreverse (stacking-order)) '_NET_CLIENT_LIST_STACKING))
-
;; setting the desktop / viewport hints
(define last-workspace nil)
@@ -253,7 +250,6 @@
(when (>= last-workspace-count total-workspaces)
(set-ws-hints))))
-
;;; setting the focus hints
(define last-focus nil)
@@ -265,7 +261,6 @@
(set-x-property 'root '_NET_ACTIVE_WINDOW
(vector (if focus (window-id focus) 0)) 'WINDOW 32))))
-
;;; setting the window state hints
(define (update-client-state w)
@@ -277,7 +272,6 @@
supported-states)
(set-x-property w '_NET_WM_STATE (apply vector state) 'ATOM 32)))
-
;;; honouring the initially set window state hints
(define (update-icon-geometry w geom)
@@ -324,7 +318,6 @@
(when geom
(update-icon-geometry w (nth 2 geom)))))
-
;;; helper functions
(define (define-wm-spec-window-type x fun)
@@ -474,7 +467,6 @@
(lambda (w mode)
(above-below-handler wm-spec-above-depth w mode)))
-
;;; client messages
(define (client-message-handler w type data)
@@ -572,7 +564,6 @@
(t (setq handled nil)))
handled))
-
;;; property changes
(define (property-change-handler w prop kind)
@@ -585,7 +576,6 @@
((_NET_WM_STRUT)
(update-strut w))))
-
;;; utilities
(define (vector->list vec)
@@ -597,7 +587,6 @@
(when (eq w 'root)
(update-workspace-hints)))
-
;;; initialisation
(define (init)
Modified: trunk/lisp/sawfish/wm/util/font.jl
==============================================================================
--- trunk/lisp/sawfish/wm/util/font.jl (original)
+++ trunk/lisp/sawfish/wm/util/font.jl Wed Nov 19 20:45:08 2008
@@ -73,7 +73,6 @@
(define (face-style face style)
(cdr (assoc-case style (face-styles face))))
-
;; Xft naming scheme
(define xft-abbrev-map
@@ -140,7 +139,6 @@
(format nil "%s=%s" (car x) (cdr x)))
(t (car x)))) styles)) #\:)))
-
;; Pango naming scheme
(define pango-style-map
@@ -224,7 +222,6 @@
(loop (cdr rest) (cons (car tem) out))
(loop (cdr rest) out))))))
-
;; XLFD naming scheme
(define xlfd-style-names
Modified: trunk/lisp/sawfish/wm/util/groups.jl
==============================================================================
--- trunk/lisp/sawfish/wm/util/groups.jl (original)
+++ trunk/lisp/sawfish/wm/util/groups.jl Wed Nov 19 20:45:08 2008
@@ -125,7 +125,6 @@
(setq i (1- i)))
(add-window-to-group w i)))
-
;;; menu constructor
(define (window-group-menu #!optional w)
@@ -155,7 +154,6 @@
(lambda ()
(add-window-to-new-group w)))))))
-
;;; session management -- only save group-ids that are _symbols_
(define (group-saved-state w)
Modified: trunk/lisp/sawfish/wm/util/gtkrc.jl
==============================================================================
--- trunk/lisp/sawfish/wm/util/gtkrc.jl (original)
+++ trunk/lisp/sawfish/wm/util/gtkrc.jl Wed Nov 19 20:45:08 2008
@@ -185,7 +185,6 @@
(menu-stop-process t)
t))
-
;;; for restricted themes
(define gtkrc-funs '())
@@ -205,7 +204,6 @@
(gaol-define 'gtkrc-foreground gtkrc-foreground)
(gaol-define 'gtkrc-font gtkrc-font))
-
;;; init
(define (gtkrc-quit)
Modified: trunk/lisp/sawfish/wm/util/keymap.jl
==============================================================================
--- trunk/lisp/sawfish/wm/util/keymap.jl (original)
+++ trunk/lisp/sawfish/wm/util/keymap.jl Wed Nov 19 20:45:08 2008
@@ -41,7 +41,6 @@
(define-structure-alias keymap sawfish.wm.util.keymap)
-
;;; Map a function over all key bindings in a keymap
(defvar map-keymap-recursively t
@@ -70,7 +69,6 @@
(mapc (lambda (k)
(funcall function k)) (cdr keymap))))))))
-
;;; Substitute one command for another in a keymap
(define (substitute-keymap-command olddef newdef #!optional keymap)
@@ -92,7 +90,6 @@
(rplacd k new-ev))) keymap))
-
;;; Adding bindings to a feature that may not yet be loaded
(defmacro lazy-bind-keys (feature keymap #!rest bindings)
@@ -104,7 +101,6 @@
(eval-after-load ,(symbol-name feature)
'(bind-keys ,keymap ,@bindings))))
-
;;; Search for a named command in the current keymap configuration
(define (where-is command #!optional keymap)
@@ -164,7 +160,6 @@
(define-command 'describe-key describe-key)
(define-command-to-screen 'describe-key-to-screen describe-key)
-
;;; grab the next key event
(define (read-event #!optional prompt)
Modified: trunk/lisp/sawfish/wm/util/nokogiri.jl
==============================================================================
--- trunk/lisp/sawfish/wm/util/nokogiri.jl (original)
+++ trunk/lisp/sawfish/wm/util/nokogiri.jl Wed Nov 19 20:45:08 2008
@@ -45,7 +45,6 @@
(defvar customize-command-classes '(default)
"Also include commands of these classes the key bindings panel.")
-
;;; interfaces
(define (nokogiri-report-slot symbol)
@@ -123,7 +122,6 @@
(define (nokogiri-grab-match-window-property name)
(match-window-grab-x-property name))
-
;;; ignore these commands in customizer
(mapc (lambda (x) (put x 'deprecated-command t))
Modified: trunk/lisp/sawfish/wm/util/prompt.jl
==============================================================================
--- trunk/lisp/sawfish/wm/util/prompt.jl (original)
+++ trunk/lisp/sawfish/wm/util/prompt.jl Wed Nov 19 20:45:08 2008
@@ -340,7 +340,6 @@
(defun prompt-for-command (#!optional title)
(prompt-for-symbol title commandp commandp))
-
;;; autoloads
(autoload 'prompt-for-file "sawfish/wm/util/prompt-extras")
@@ -353,7 +352,6 @@
(autoload 'prompt-for-window "sawfish/wm/util/prompt-wm")
(autoload 'prompt-for-workspace "sawfish/wm/util/prompt-wm")
-
;;; init keymap
(bind-keys prompt-keymap
Modified: trunk/lisp/sawfish/wm/util/rects.jl
==============================================================================
--- trunk/lisp/sawfish/wm/util/rects.jl (original)
+++ trunk/lisp/sawfish/wm/util/rects.jl Wed Nov 19 20:45:08 2008
@@ -236,7 +236,6 @@
nil
rect)))
-
;;; overlap
(define (rect-1d-overlap a-1 a-2 b-1 b-2)
Modified: trunk/lisp/sawfish/wm/viewport.jl
==============================================================================
--- trunk/lisp/sawfish/wm/viewport.jl (original)
+++ trunk/lisp/sawfish/wm/viewport.jl Wed Nov 19 20:45:08 2008
@@ -62,7 +62,6 @@
:type number
:range (1 . 50))
-
;;; raw viewport handling
(defvar viewport-x-offset 0)
@@ -115,7 +114,6 @@
(add-hook 'before-exit-hook viewport-before-exiting t)
-
;; screen sized viewport handling
(define (screen-viewport)
@@ -220,7 +218,6 @@
(setq viewport-dimensions (cons width height))
(viewport-size-changed))
-
;; commands
(define (activate-viewport x y)
@@ -314,7 +311,6 @@
(define-command 'move-window-up move-window-up #:spec "%W" #:class 'viewport)
(define-command 'move-window-down move-window-down #:spec "%W" #:class 'viewport)
-
;;; session management, config
(define (viewport-saved-state w)
Modified: trunk/lisp/sawfish/wm/windows.jl
==============================================================================
--- trunk/lisp/sawfish/wm/windows.jl (original)
+++ trunk/lisp/sawfish/wm/windows.jl Wed Nov 19 20:45:08 2008
@@ -103,7 +103,6 @@
(defvar dock-window-depth 0
"The stacking depth of dock windows.")
-
;;; finding windows, reading properties
(define (get-window-by-name name)
@@ -211,7 +210,6 @@
((eq (aref data i) atom) t)
(t (loop (1+ i))))))))
-
;;; warping
(define (warp-cursor-to-window w #!optional x y)
@@ -248,7 +246,6 @@
(window-order-push w)
(call-window-hook 'activate-window-hook w))
-
;;; resizing windows in accordance with their size hints
(define (constrain-dimension-to-hints x dimension hints)
@@ -354,7 +351,6 @@
(adjust-position-for-gravity/y
w grav (cdr coords) #:inverse unadjust)))
-
;;; deleting windows
(define (delete-window w #!optional safely)
@@ -374,7 +370,6 @@
(define-command 'delete-window-safely delete-window-safely #:spec "%W")
-
;;; making window names unique
(define (uniquify-name in existing)
@@ -398,7 +393,6 @@
(define-command 'uniquify-window-name uniquify-window-name #:spec "%W")
-
;; selecting a single window
(define select-window-map
@@ -417,7 +411,6 @@
(recursive-edit)))
(ungrab-pointer))))
-
;;; avoided (i.e. non-overlapped) windows
(define (window-avoided-p w)
@@ -437,7 +430,6 @@
(and (not (eq w window))
(window-avoided-p w)))))
-
;;; property and window-state changed interface
(define prop-changes '())
@@ -492,7 +484,6 @@
((cdr cell) w relevant))))
state-changes)))
-
;; gaollable functions
(gaol-add window-really-wants-input-p window-class window-avoided-p
Modified: trunk/lisp/sawfish/wm/workspace.jl
==============================================================================
--- trunk/lisp/sawfish/wm/workspace.jl (original)
+++ trunk/lisp/sawfish/wm/workspace.jl Wed Nov 19 20:45:08 2008
@@ -116,7 +116,6 @@
sawfish.wm.custom
sawfish.wm.session.init)
-
;;; Options and variables
(defvar workspace-boundary-mode 'stop
@@ -171,7 +170,6 @@
;; true when in "show desktop" mode
(define showing-desktop nil)
-
;;; Workspace ``swapping''
;; Property swapping is done on demand, and for each window
@@ -209,7 +207,6 @@
(window-put w 'swapped (delq alist (window-get w 'swapped))))
(window-put w 'swapped-in space)))))
-
;;; Low level functions
;; return list of all workspaces containing window W
@@ -622,7 +619,6 @@
(not (or (desktop-window-p w) (dock-window-p w))))
(hide-desktop)))
-
;;; Menu constructors
(define (workspace-menu)
@@ -654,7 +650,6 @@
(define-command 'popup-workspace-list popup-workspace-list)
(define-command 'popup-window-list popup-window-list)
-
;;; Commands
(define (ws-call-with-workspace fun count mode)
@@ -878,7 +873,6 @@
(define-command 'show-desktop show-desktop)
(define-command 'hide-desktop hide-desktop)
-
;; some commands for moving directly to a workspace
(define (activate-workspace n)
@@ -915,7 +909,6 @@
(define-command 'select-workspace-interactively
select-workspace-interactively)
-
;;; session management
(define (ws-saved-state w)
@@ -943,7 +936,6 @@
(cons p workspace-local-properties))))
props))
-
;;; configuration
(define (workspace-names-changed)
@@ -954,7 +946,6 @@
(setq last-interesting-workspace nil)
(call-hook 'workspace-state-change-hook))
-
;;; Initialisation
(sm-add-saved-properties 'sticky 'iconified 'fixed-position)
Modified: trunk/po/sawfish-xgettext
==============================================================================
--- trunk/po/sawfish-xgettext (original)
+++ trunk/po/sawfish-xgettext Wed Nov 19 20:45:08 2008
@@ -28,7 +28,6 @@
(define (exit n) (throw 'quit n))
-
;; random hackery
;; from sawfish.ui.widgets.match-window
@@ -57,7 +56,6 @@
(aset name 0 (char-upcase (aref name 0)))
name))))
-
;; helper function that groks sawfish specific forms
(define (get-key key args) (and (listp args) (memq key args)))
@@ -143,7 +141,6 @@
(t (scan-list form))))
-
;; entry point
(when (get-command-line-option "--help")
Modified: trunk/scripts/sawfish-menu.jl
==============================================================================
--- trunk/scripts/sawfish-menu.jl (original)
+++ trunk/scripts/sawfish-menu.jl Wed Nov 19 20:45:08 2008
@@ -26,7 +26,6 @@
(require 'gui.gtk-2.gtk)
(require 'rep.data.tables)
-
;; menus
(define menu-selected nil)
@@ -110,7 +109,6 @@
(gtk-main))
menu-selected))
-
;; entry point, loop reading command forms, sending back results
(condition-case nil
Modified: trunk/src/colors.c
==============================================================================
--- trunk/src/colors.c (original)
+++ trunk/src/colors.c Wed Nov 19 20:45:08 2008
@@ -161,7 +161,6 @@
return COLORP(win) ? Qt : Qnil;
}
-
/* type hooks */
static int
@@ -199,7 +198,6 @@
}
}
-
/* initialisation */
void
Modified: trunk/src/cursors.c
==============================================================================
--- trunk/src/cursors.c (original)
+++ trunk/src/cursors.c Wed Nov 19 20:45:08 2008
@@ -28,7 +28,6 @@
repv default_cursor;
DEFSYM(cursor_shape, "cursor-shape");
-
/* Cursors from bitmaps */
static Cursor
@@ -81,7 +80,6 @@
return cursor;
}
-
DEFUN("get-cursor", Fget_cursor, Sget_cursor, (repv data), rep_Subr1) /*
::doc:sawfish.wm.cursors#get-cursor::
@@ -191,7 +189,6 @@
return CURSORP(arg) ? Qt : Qnil;
}
-
/* type hooks */
static int
@@ -237,7 +234,6 @@
}
}
-
/* initialisation */
void
Modified: trunk/src/display.c
==============================================================================
--- trunk/src/display.c (original)
+++ trunk/src/display.c Wed Nov 19 20:45:08 2008
@@ -61,7 +61,6 @@
DEFSYM(display_name, "display-name");
DEFSYM(canonical_display_name, "canonical-display-name");
-
/* X error handlers */
/* General error handler. Probably due to lag between windows being
@@ -103,7 +102,6 @@
exit (1);
}
-
static char *
canonical_host (char *host)
@@ -177,7 +175,6 @@
return buf;
}
-
static void
redisplay (void)
@@ -399,7 +396,6 @@
}
}
-
/* utilities */
repv
Modified: trunk/src/dlmalloc.c
==============================================================================
--- trunk/src/dlmalloc.c (original)
+++ trunk/src/dlmalloc.c Wed Nov 19 20:45:08 2008
@@ -216,7 +216,6 @@
*/
-
/* Preliminaries */
@@ -1064,7 +1063,6 @@
#endif
-
/*
Type declarations
@@ -1207,7 +1205,6 @@
-
/* sizes, alignments */
@@ -1234,7 +1231,6 @@
#define aligned_OK(m) (((unsigned long)((m)) & (MALLOC_ALIGN_MASK)) == 0)
-
/*
Physical chunk operations
@@ -1269,7 +1265,6 @@
#define chunk_at_offset(p, s) ((mchunkptr)(((char*)(p)) + (s)))
-
/*
Dealing with use bits
@@ -1308,7 +1303,6 @@
(((mchunkptr)(((char*)(p)) + (s)))->size &= ~(PREV_INUSE))
-
/*
Dealing with size fields
@@ -1331,7 +1325,6 @@
#define set_foot(p, s) (((mchunkptr)((char*)(p) + (s)))->prev_size = (s))
-
/*
@@ -1421,7 +1414,6 @@
IAV(120), IAV(121), IAV(122), IAV(123), IAV(124), IAV(125), IAV(126), IAV(127)
};
-
/* field-extraction macros */
@@ -1457,7 +1449,6 @@
#define is_small_request(nb) (nb < MAX_SMALLBIN_SIZE - SMALLBIN_WIDTH)
-
/*
To help compensate for the large number of bins, a one-level index
@@ -1480,7 +1471,6 @@
#define clear_binblock(ii) (binblocks &= ~(idx2binblock(ii)))
-
/* Other static bookkeeping data */
@@ -1514,7 +1504,6 @@
static unsigned long mmapped_mem = 0;
static unsigned long max_mmapped_mem = 0;
-
/*
Debugging support
@@ -1655,7 +1644,6 @@
#define check_malloced_chunk(P,N)
#endif
-
/*
Macro-based internal utilities
@@ -1728,7 +1716,6 @@
-
/* Routines dealing with mmap(). */
@@ -1859,7 +1846,6 @@
#endif /* HAVE_MMAP */
-
/*
Extend the top-most chunk by obtaining memory from system.
@@ -1974,7 +1960,6 @@
}
-
/* Main public routines */
@@ -2271,7 +2256,6 @@
}
-
/*
@@ -2388,7 +2372,6 @@
}
-
/*
@@ -2624,7 +2607,6 @@
}
-
/*
@@ -2740,7 +2722,6 @@
}
-
/*
@@ -2844,7 +2825,6 @@
}
#endif
-
/*
@@ -2925,7 +2905,6 @@
}
}
-
/*
malloc_usable_size:
@@ -2961,7 +2940,6 @@
}
-
/* Utility to update current_mallinfo for malloc_stats and mallinfo() */
@@ -3003,7 +2981,6 @@
}
-
/*
@@ -3046,7 +3023,6 @@
}
-
/*
mallopt:
Modified: trunk/src/events.c
==============================================================================
--- trunk/src/events.c (original)
+++ trunk/src/events.c Wed Nov 19 20:45:08 2008
@@ -269,7 +269,6 @@
}
}
-
/* Individual event handlers */
static void
@@ -1274,7 +1273,6 @@
}
}
-
static int synthetic_configure_mutex;
@@ -1371,7 +1369,6 @@
XUngrabPointer (dpy, last_event_time);
}
-
/* Window-local event handlers */
/* Register that FUN should be called for any events received from
@@ -1401,7 +1398,6 @@
&fun.p) ? 0 : fun.v;
}
-
/* Event loop */
static repv
@@ -1498,7 +1494,6 @@
handle_input_mask (0);
}
-
/* Lisp functions */
DEFUN("query-pointer", Fquery_pointer, Squery_pointer, (repv get), rep_Subr1) /*
@@ -1676,7 +1671,6 @@
return (clicked_frame_part != 0) ? rep_VAL (clicked_frame_part) : Qnil;
}
-
/* initialisation */
void
Modified: trunk/src/flippers.c
==============================================================================
--- trunk/src/flippers.c (original)
+++ trunk/src/flippers.c Wed Nov 19 20:45:08 2008
@@ -107,7 +107,6 @@
return Qt;
}
-
/* DL hooks / initialisation */
static Window
Modified: trunk/src/fonts.c
==============================================================================
--- trunk/src/fonts.c (original)
+++ trunk/src/fonts.c Wed Nov 19 20:45:08 2008
@@ -77,7 +77,6 @@
Window id, GC gc, Lisp_Color *fg, int x, int y);
};
-
/* Xlib font structs */
static bool
@@ -131,7 +130,6 @@
fontstruct_measure, fontstruct_draw,
};
-
/* Xlib font sets */
static char *
@@ -339,7 +337,6 @@
fontset_measure, fontset_draw,
};
-
/* Xft fonts */
#ifdef HAVE_X11_XFT_XFT_H
@@ -408,7 +405,6 @@
#endif /* HAVE_X11_XFT_XFT_H */
-
/* Pango fonts */
#ifdef HAVE_PANGO
@@ -572,7 +568,6 @@
#endif /* HAVE_PANGO */
-
/* All classes */
static const Lisp_Font_Class *classes[] = {
@@ -587,7 +582,6 @@
0,
};
-
/* Entry points */
DEFUN ("font-type-exists-p", Ffont_type_exists_p,
@@ -863,7 +857,6 @@
return rep_MAKE_INT(VFONT(font)->descent);
}
-
/* type hooks */
static int
@@ -921,7 +914,6 @@
return val == NULL || strcmp (val, "0") != 0;
}
-
/* initialisation */
void
Modified: trunk/src/frames.c
==============================================================================
--- trunk/src/frames.c (original)
+++ trunk/src/frames.c Wed Nov 19 20:45:08 2008
@@ -92,7 +92,6 @@
static bool frame_draw_mutex;
bool frame_state_mutex;
-
/* type hooks */
static struct frame_part *
@@ -183,7 +182,6 @@
}
}
-
/* building frames from component lists
build the frame from the list of components. Each element
@@ -1692,7 +1690,6 @@
}
}
-
/* creating window frames */
/* Create a frame for window W. Called with the server grabbed. If
@@ -1734,7 +1731,6 @@
}
}
-
/* Lisp functions */
DEFUN("frame-draw-mutex", Fframe_draw_mutex,
@@ -1906,7 +1902,6 @@
return Qt;
}
-
/* initialisation */
void
Modified: trunk/src/functions.c
==============================================================================
--- trunk/src/functions.c (original)
+++ trunk/src/functions.c Wed Nov 19 20:45:08 2008
@@ -936,7 +936,6 @@
return rep_MAKE_INT (root_window);
}
-
/* xinerama support */
void
@@ -1044,7 +1043,6 @@
}
}
-
/* Displaying a `message' window */
static Window message_win;
@@ -1340,7 +1338,6 @@
}
}
-
/* initialisation */
void
Modified: trunk/src/gradient.c
==============================================================================
--- trunk/src/gradient.c (original)
+++ trunk/src/gradient.c Wed Nov 19 20:45:08 2008
@@ -156,7 +156,6 @@
return img;
}
-
/* DL hooks */
repv
Modified: trunk/src/images.c
==============================================================================
--- trunk/src/images.c (original)
+++ trunk/src/images.c Wed Nov 19 20:45:08 2008
@@ -1188,7 +1188,6 @@
return rep_mem_error ();
}
-
/* image structure accessors */
int
@@ -1252,7 +1251,6 @@
#endif
}
-
/* render functions */
#if defined HAVE_GDK_PIXBUF
@@ -1482,7 +1480,6 @@
#endif
}
-
/* lisp functions for accessing image contents */
static repv
@@ -1690,7 +1687,6 @@
return Qnil;
}
-
/* type hooks */
static int
@@ -1744,7 +1740,6 @@
}
}
-
/* initialisation */
void
Modified: trunk/src/keys.c
==============================================================================
--- trunk/src/keys.c (original)
+++ trunk/src/keys.c Wed Nov 19 20:45:08 2008
@@ -103,7 +103,6 @@
static int total_lock_combs, all_lock_mask;
static int all_lock_combs[2*2*2];
-
/* Translate from X events to Lisp events */
static unsigned long
@@ -383,7 +382,6 @@
return 0;
}
-
/* Keymap searching */
static inline bool
@@ -642,7 +640,6 @@
return result;
}
-
/* Translate text->event and vice versa */
struct key_def {
@@ -913,7 +910,6 @@
return TRUE;
}
-
/* Lisp functions */
DEFUN("make-keymap", Fmake_keymap, Smake_keymap, (void), rep_Subr0) /*
@@ -1457,7 +1453,6 @@
return Qt;
}
-
/* Find the lisp modifier mask used by the meta and alt keys. This code
shamelessly stolen from Emacs 19. :-) */
@@ -1657,7 +1652,6 @@
return rep_MAKE_INT (wm_mod);
}
-
/* Key and button grabbing */
static void
@@ -1856,7 +1850,6 @@
}
}
-
/* initialisation */
void
Modified: trunk/src/keys.h
==============================================================================
--- trunk/src/keys.h (original)
+++ trunk/src/keys.h Wed Nov 19 20:45:08 2008
@@ -22,7 +22,6 @@
#ifndef SAWMILL_KEYS_H
#define SAWMILL_KEYS_H
-
/* An event object is (CODE . MODS) */
#define EVENTP(v) (rep_CONSP(v) && rep_INTP(rep_CAR(v)) && rep_INTP(rep_CDR(v)))
@@ -72,7 +71,6 @@
EV_VIRT_MOD_MASK = 0x0ff00000
};
-
/* Support for buttons 6, 7, 8 and 9.
<X11/X.h> doesn't define these, even though XFree supports them.. */
@@ -125,7 +123,6 @@
| Button7Mask | Button8Mask | Button9Mask)
#endif
-
/* In key maps, a `key' is (COMMAND . EVENT) */
#define KEYP(v) (rep_CONSP(v) && rep_CONSP(rep_CDR(v)))
Modified: trunk/src/libclient.c
==============================================================================
--- trunk/src/libclient.c (original)
+++ trunk/src/libclient.c Wed Nov 19 20:45:08 2008
@@ -61,7 +61,6 @@
#define PROTOCOL_X11_VERSION 1
-
/* copied from src/unix_main.c */
static char *
@@ -189,7 +188,6 @@
return tmp;
}
-
/* using the X based server io */
Atom xa_sawfish_request, xa_sawfish_request_win;
@@ -300,7 +298,6 @@
return 0;
}
-
/* unix domain socket server */
#ifdef HAVE_UNIX
@@ -412,7 +409,6 @@
#endif /* HAVE_UNIX */
-
/* entry points */
int
Modified: trunk/src/pixmap-cache.c
==============================================================================
--- trunk/src/pixmap-cache.c (original)
+++ trunk/src/pixmap-cache.c Wed Nov 19 20:45:08 2008
@@ -55,7 +55,6 @@
static pixmap_cache_node *oldest, *newest;
-
/* list manipulators */
static void
@@ -129,7 +128,6 @@
free_node (n, dealloc);
}
-
/* public interface */
bool
Modified: trunk/src/play-sample.c
==============================================================================
--- trunk/src/play-sample.c (original)
+++ trunk/src/play-sample.c Wed Nov 19 20:45:08 2008
@@ -21,7 +21,6 @@
void gnome_sound_init(const char *hostname);
void gnome_sound_shutdown(void);
-
/* from gnome-libs/libgnome/gnome-sound.c HEAD as of March 12, 2000 */
/*
@@ -522,7 +521,6 @@
#endif
}
-
/* sawmill code */
DEFUN("primitive-play-sample", Fprimitive_play_sample,
Modified: trunk/src/sawmill.h
==============================================================================
--- trunk/src/sawmill.h (original)
+++ trunk/src/sawmill.h Wed Nov 19 20:45:08 2008
@@ -62,7 +62,6 @@
/* #define DEBUG 1 */
-
/* Event masks */
/* Events selected on client windows */
@@ -91,7 +90,6 @@
#define POINTER_GRAB_EVENTS (ButtonPressMask | ButtonReleaseMask \
| PointerMotionMask | PointerMotionHintMask)
-
/* Type defs */
/* A managed window */
@@ -297,7 +295,6 @@
ec_session_died
};
-
/* bring in prototypes */
#ifndef XlibSpecificationRelease
@@ -311,7 +308,6 @@
#include "sawmill_subrs.h"
-
/* Miscellaneous macro defs */
/* Maximum/minimum macros. Don't use when X or Y have side-effects! */
Modified: trunk/src/selection.c
==============================================================================
--- trunk/src/selection.c (original)
+++ trunk/src/selection.c Wed Nov 19 20:45:08 2008
@@ -25,7 +25,6 @@
#include <string.h>
#include <X11/Xatom.h>
-
/* selection functions */
static Atom sawmill_selection;
@@ -123,7 +122,6 @@
return res;
}
-
/* dl hooks */
repv
Modified: trunk/src/server.c
==============================================================================
--- trunk/src/server.c (original)
+++ trunk/src/server.c Wed Nov 19 20:45:08 2008
@@ -162,7 +162,6 @@
}
}
-
/* initialisation */
void
Modified: trunk/src/session.c
==============================================================================
--- trunk/src/session.c (original)
+++ trunk/src/session.c Wed Nov 19 20:45:08 2008
@@ -50,7 +50,6 @@
static SmcConn sm_conn;
#endif
-
/* Lisp functions */
DEFUN("sm-set-property", Fsm_set_property, Ssm_set_property,
@@ -135,7 +134,6 @@
return Qt;
}
-
/* SM callbacks */
#ifdef HAVE_X11_SM_SMLIB_H
@@ -193,7 +191,6 @@
#endif /* HAVE_X11_SM_SMLIB_H */
-
/* ICE hooks */
#ifdef HAVE_X11_SM_SMLIB_H
@@ -220,7 +217,6 @@
#endif /* HAVE_X11_SM_SMLIB_H */
-
/* initialisation */
DEFUN("sm-connect", Fsm_connect, Ssm_connect, (repv id), rep_Subr1)
Modified: trunk/src/stacking-list.c
==============================================================================
--- trunk/src/stacking-list.c (original)
+++ trunk/src/stacking-list.c Wed Nov 19 20:45:08 2008
@@ -27,7 +27,6 @@
static Lisp_Window *lowest_window, *highest_window;
-
/* Assertions and consistency checking */
#if !defined (NDEBUG)
@@ -43,7 +42,6 @@
# define assert_constraints(w) do { ; } while (0)
#endif
-
/* Stacking list manipulation */
/* Return true if window W is currently in the stacking list. */
@@ -163,7 +161,6 @@
assert_constraints (w);
}
-
/* Making the X stacking order reflect the stacking list */
static inline Window
@@ -203,7 +200,6 @@
}
}
-
/* Miscellaneous public functions */
/* Return a list of windows in top->bottom order */
Modified: trunk/src/windows.c
==============================================================================
--- trunk/src/windows.c (original)
+++ trunk/src/windows.c Wed Nov 19 20:45:08 2008
@@ -90,7 +90,6 @@
void (*callback) (Lisp_Window *w, repv prop, repv old, repv new);
};
-
/* utilities */
/* Returns true if we should manage window ID */
@@ -272,7 +271,6 @@
Fungrab_server ();
}
-
/* manipulating the Lisp window structures */
/* Return the window object containing ID, or a null pointer */
@@ -636,7 +634,6 @@
pending_destroys = 0;
}
-
/* Lisp functions */
DEFUN("window-get", Fwindow_get, Swindow_get,
@@ -1498,7 +1495,6 @@
return output;
}
-
/* type hooks */
static int
@@ -1570,7 +1566,6 @@
}
}
-
/* initialisation */
void
Modified: trunk/src/x.c
==============================================================================
--- trunk/src/x.c (original)
+++ trunk/src/x.c Wed Nov 19 20:45:08 2008
@@ -222,7 +222,6 @@
return GXcopy;
}
-
/* GC Functions */
static long
@@ -515,7 +514,6 @@
return X_GCP (gc) ? Qt : Qnil;
}
-
/* Window functions */
static long
@@ -993,7 +991,6 @@
return Qt;
}
-
/* Drawing functions */
DEFUN ("x-clear-window", Fx_clear_window,
@@ -1340,7 +1337,6 @@
m == 0 ? Qnil : rep_MAKE_INT (m));
}
-
/* Utility functions */
DEFUN ("x-gc-set-dashes", Fx_gc_set_dashes, Sx_gc_set_dashes,
@@ -1394,7 +1390,6 @@
return Qt;
}
-
/* gc type hooks */
static int
@@ -1440,7 +1435,6 @@
}
}
-
/* window type hooks */
static int
@@ -1487,7 +1481,6 @@
}
}
-
/* initialisation */
repv
Modified: trunk/themes/Crux/theme.jl
==============================================================================
--- trunk/themes/Crux/theme.jl (original)
+++ trunk/themes/Crux/theme.jl Wed Nov 19 20:45:08 2008
@@ -71,7 +71,6 @@
;; maps WINDOW -> BUTTON-LIST
(define button-table (make-weak-table eq-hash eq))
-
;; images
;; 16x3
@@ -195,7 +194,6 @@
(make-button-fg (make-image "inactive:shade-button.png")
(make-image "active:shade-button.png"))))
-
;; geometry computations
(define (title-left-width w)
@@ -222,7 +220,6 @@
(define (horizontal-justification w)
(+ (* (length (car (table-ref button-table w))) 18) 2))
-
;; recolouring images
(define (foreground-color)
@@ -257,7 +254,6 @@
(mapc (lambda (x)
(recolorer (cdr x))) menu-button)))
-
;; window icons
(define icon-table (make-weak-table eq-hash eq))
@@ -271,7 +267,6 @@
(table-set icon-table w scaled)
scaled))))))
-
;; frames
(define common-frame-parts
@@ -372,7 +367,6 @@
(top-edge . -19)
(class . top-right-corner))))
-
;; packing buttons
(define button-map
@@ -408,7 +402,6 @@
point) out)))
((null rest) out)))
-
;; misc stuff
(define (rebuild-all)
@@ -442,7 +435,6 @@
((shaped-transient)
(make-frame w shaped-frame (button-theme 'transient)))))
-
;; initialization
(define initialize-gtkrc
Modified: trunk/themes/smaker/theme.jl
==============================================================================
--- trunk/themes/smaker/theme.jl (original)
+++ trunk/themes/smaker/theme.jl Wed Nov 19 20:45:08 2008
@@ -71,7 +71,6 @@
:group (appearance smaker)
:type number)
-
;; image loading
(let*
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
