From 009a1300609e629ef9dbf4e03c098f96f51ceb6d Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Mon, 11 Aug 2014 21:15:24 +0200 Subject: [PATCH] Consistency fixes Some typos fixed (mostly trailing white space symbols), a few more outdated comments removed. Also a little bit more consistent comment style. Thanks to consus@gmx.com --- etc/cfg_dock.lua | 33 ++++++++++-------- etc/cfg_kludges.lua | 53 ++++++++++++++--------------- etc/cfg_layouts.lua | 28 +++++++-------- etc/cfg_menu.lua | 14 +++----- etc/cfg_notion.lua | 43 +++++++++++------------ etc/cfg_notioncore.lua | 92 +++++++++++++++++++++++++------------------------- etc/cfg_query.lua | 57 ++++++++++++++----------------- etc/cfg_statusbar.lua | 31 ++++++++--------- etc/cfg_tiling.lua | 11 ++---- 9 files changed, 169 insertions(+), 193 deletions(-) diff --git a/etc/cfg_dock.lua b/etc/cfg_dock.lua index 582c0b59..47541d0d 100644 --- a/etc/cfg_dock.lua +++ b/etc/cfg_dock.lua @@ -2,35 +2,39 @@ -- Notion dock module configuration -- --- Create a dock +-- Create a dock. mod_dock.create{ - -- Dock mode: embedded|floating + -- Dock mode: embedded|floating. mode="floating", - -- The screen to create the dock on + + -- The screen to create the dock on. screen=0, + -- Corner or side of the screen to place the dock on. - -- For embedded dock the valid values are: tl|tr|bl|br - -- For floating dock the following are also valid: tc|bc|ml|mc|mr + -- For embedded dock the valid values are: tl|tr|bl|br. + -- For floating dock the following are also valid: tc|bc|ml|mc|mr. pos="bl", - -- Growth direction: left|right|up|down + + -- Growth direction: left|right|up|down. grow="right", - -- Whether new dockapps should be added automatically to this dock - is_auto=true, + + -- Whether new dockapps should be added automatically to this dock. + is_auto=true, + -- Show floating dock initially? floating_hidden=false, - -- Name of the dock + + -- Name of the dock. name="*dock*", } - -- For floating docks, you may want the following toggle binding. defbindings("WScreen", { bdoc("Toggle floating dock."), - kpress(META.."D", "mod_dock.set_floating_shown_on(_, 'toggle')") + kpress(META.."D", "mod_dock.set_floating_shown_on(_, 'toggle')"), }) - --- Dock settings menu. For this to work, mod_menu must have been loaded +-- Dock settings menu. For this to work, mod_menu must have been loaded -- previously. if mod_menu then defmenu("dock-settings", { @@ -43,9 +47,8 @@ if mod_menu then menuentry("Grow-U", "_:set{grow='up'}"), menuentry("Grow-D", "_:set{grow='down'}"), }) - + defbindings("WDock", { mpress("Button3", "mod_menu.pmenu(_, _sub, 'dock-settings')"), }) end - diff --git a/etc/cfg_kludges.lua b/etc/cfg_kludges.lua index f7c9be09..3b79edb6 100644 --- a/etc/cfg_kludges.lua +++ b/etc/cfg_kludges.lua @@ -2,33 +2,30 @@ -- Options to get some programs work more nicely (or at all) -- - -defwinprop{ +defwinprop { class = "AcroRead", instance = "documentShell", - acrobatic = true + acrobatic = true, } - -defwinprop{ +defwinprop { class = "Xpdf", instance = "openDialog_popup", ignore_cfgrq = true, } -- Better would be to apply these settings automatically whenever a window --- has type _NET_WM_WINDOW_TYPE_NOTIFICATION -defwinprop{ - class = "Xfce4-notifyd", - - float = true, - userpos = true, - switchto = false, +-- has type _NET_WM_WINDOW_TYPE_NOTIFICATION. +defwinprop { + class = "Xfce4-notifyd", + float = true, + userpos = true, + switchto = false, } --- Put all dockapps in the statusbar's systray, also adding the missing --- size hints necessary for this to work. -defwinprop{ +-- Put all dockapps in the statusbar's systray, also adding the missing size +-- hints necessary for this to work. +defwinprop { is_dockapp = true, statusbar = "systray", max_size = { w = 64, h = 64}, @@ -36,34 +33,35 @@ defwinprop{ } -- Make an exception for Docker, which sets correct size hints. -defwinprop{ +defwinprop { is_dockapp = true, class = "Docker", statusbar = "systray", } -- https://sourceforge.net/tracker/?func=detail&aid=3471910&group_id=314802&atid=1324528 -defwinprop{ - class = "Gimp", +defwinprop { + class = "Gimp", acrobatic = true, } --- You might want to enable these if you really must use XMMS. +-- You might want to enable these if you really must use XMMS. --[[ -defwinprop{ +defwinprop { class = "xmms", instance = "XMMS_Playlist", - transient_mode = "off" + transient_mode = "off", } -defwinprop{ +defwinprop { class = "xmms", instance = "XMMS_Player", - transient_mode = "off" + transient_mode = "off", } --]] --- InteiilJ IDEA - I wonder whether we should do this for *all* sun-awt-X11-XWindowPeer windows +-- InteiilJ IDEA - I wonder whether we should do this for *all* +-- sun-awt-X11-XWindowPeer windows. defwinprop { class = "jetbrains-idea-ce", instance = "sun-awt-X11-XWindowPeer", @@ -85,10 +83,9 @@ defwinprop { transient_mode = "current", } - --- Define some additional title shortening rules to use when the full --- title doesn't fit in the available space. The first-defined matching --- rule that succeeds in making the title short enough is used. +-- Define some additional title shortening rules to use when the full title +-- doesn't fit in the available space. The first-defined matching rule that +-- succeeds in making the title short enough is used. ioncore.defshortening("(.*) - Mozilla(<[0-9]+>)", "$1$2$|$1$<...$2") ioncore.defshortening("(.*) - Mozilla", "$1$|$1$<...") ioncore.defshortening("XMMS - (.*)", "$1$|...$>$1") diff --git a/etc/cfg_layouts.lua b/etc/cfg_layouts.lua index 246d1ae8..946dbfe4 100644 --- a/etc/cfg_layouts.lua +++ b/etc/cfg_layouts.lua @@ -6,16 +6,16 @@ -- Helper routines and structures -- --- Tiled frame template for the layouts below +-- Tiled frame template for the layouts below. local a_frame = { type="WSplitRegion", regparams = { - type = "WFrame", + type = "WFrame", frame_style = "frame-tiled" } } --- Helper function for generating splits for layouts +-- Helper function for generating splits for layouts. local function mksplit(dir, tl, br, float) return { type = (float and "WSplitFloat" or "WSplitSplit"), @@ -32,7 +32,7 @@ local function mktiling(split_tree) managed = { { type = "WTiling", - bottom = true, -- Make it the bottom of the group + bottom = true, -- Make it the bottom of the group. split_tree = split_tree, } } @@ -40,36 +40,36 @@ local function mktiling(split_tree) end -- --- The layouts +-- Layouts -- --- Tiling with single 1:1 horizontal split +-- Tiling with single 1:1 horizontal split. local tmp=mktiling(mksplit("horizontal", a_frame, a_frame)) ioncore.deflayout("hsplit", tmp) ioncore.deflayout("default", tmp) --- Tiling with single 1:1 vertical split +-- Tiling with single 1:1 vertical split. ioncore.deflayout("vsplit", mktiling(mksplit("vertical", a_frame, a_frame)) ) --- Tiling with single 1:1 floating horizontal split -ioncore.deflayout("hfloat", +-- Tiling with single 1:1 floating horizontal split. +ioncore.deflayout("hfloat", mktiling(mksplit("horizontal", a_frame, a_frame, true)) ) --- Tiling with single 1:1 floating vertical split -ioncore.deflayout("vfloat", +-- Tiling with single 1:1 floating vertical split. +ioncore.deflayout("vfloat", mktiling(mksplit("vertical", a_frame, a_frame, true)) ) --- Tiling with horizontal and then vertical splits +-- Tiling with horizontal and then vertical splits. ioncore.deflayout("2x2", - mktiling(mksplit("horizontal", + mktiling(mksplit("horizontal", mksplit("vertical", a_frame, a_frame), mksplit("vertical", a_frame, a_frame)) ) ) --- Tiling with single full screen frame +-- Tiling with single full screen frame. ioncore.deflayout("full", mktiling(a_frame)) diff --git a/etc/cfg_menu.lua b/etc/cfg_menu.lua index fff79579..12acc8d6 100644 --- a/etc/cfg_menu.lua +++ b/etc/cfg_menu.lua @@ -1,32 +1,26 @@ -- --- Menu module configuration. --- --- Only bindings that are effect in menus are configured here. --- See ion-menus.lua for menu definitions and ion-bindings.lua --- for bindings to display menus. +-- Menu module configuration -- - defbindings("WMenu", { bdoc("Close the menu."), kpress("Escape", "WMenu.cancel(_)"), kpress("Control+G", "WMenu.cancel(_)"), kpress("Control+C", "WMenu.cancel(_)"), kpress("Left", "WMenu.cancel(_)"), - + bdoc("Activate current menu entry."), kpress("Return", "WMenu.finish(_)"), kpress("KP_Enter", "WMenu.finish(_)"), kpress("Control+M", "WMenu.finish(_)"), kpress("Right", "WMenu.finish(_)"), - + bdoc("Select next/previous menu entry."), kpress("Control+N", "WMenu.select_next(_)"), kpress("Control+P", "WMenu.select_prev(_)"), kpress("Up", "WMenu.select_prev(_)"), kpress("Down", "WMenu.select_next(_)"), - + bdoc("Clear the menu's typeahead find buffer."), kpress("BackSpace", "WMenu.typeahead_clear(_)"), }) - diff --git a/etc/cfg_notion.lua b/etc/cfg_notion.lua index 1b48d4a6..22d931af 100644 --- a/etc/cfg_notion.lua +++ b/etc/cfg_notion.lua @@ -3,13 +3,13 @@ -- -- This file only includes some settings that are rather frequently altered. -- The rest of the settings are in cfg_notioncore.lua and individual modules' --- configuration files (cfg_modulename.lua). +-- configuration files (cfg_modulename.lua). -- --- When any binding and other customisations that you want are minor, it is +-- When any binding and other customisations that you want are minor, it is -- recommended that you include them in a copy of this file in ~/.notion/. -- Simply create or copy the relevant settings at the end of this file (from --- the other files), recalling that a key can be unbound by passing 'nil' --- (without the quotes) as the callback. For more information, please see +-- the other files), recalling that a key can be unbound by passing 'nil' +-- (without the quotes) as the callback. For more information, please see -- the Notion configuration manual available from the Notion Web page. -- @@ -21,10 +21,10 @@ --META="Mod4+" --ALTMETA="" --- Terminal emulator +-- Terminal emulator. --XTERM="xterm" --- Some basic settings +-- Some basic settings. ioncore.set{ -- Maximum delay between clicks in milliseconds to be considered a -- double click. @@ -41,25 +41,25 @@ ioncore.set{ -- Movement commands warp the pointer to frames instead of just -- changing focus. Enabled by default. --warp=true, - - -- Switch frames to display newly mapped windows + + -- Switch frames to display newly mapped windows. --switchto=true, - + -- Default index for windows in frames: one of 'last', 'next' (for -- after current), or 'next-act' (for after current and anything with -- activity right after it). --frame_default_index='next', - + -- Auto-unsqueeze transients/menus/queries. --unsqueeze=true, - + -- Display notification tooltips for activity on hidden workspace. --screen_notify=true, - + -- Automatically save layout on restart and exit. --autosave_layout=true, - - -- Mouse focus mode; set to "sloppy" if you want the focus to follow the + + -- Mouse focus mode; set to "sloppy" if you want the focus to follow the -- mouse, and to "disabled" otherwise. --mousefocus="sloppy", @@ -70,27 +70,26 @@ ioncore.set{ -- Time (in ms) that a window has to be focussed in order to be added to the -- focus list. Set this to <=0 (or comment it out) to disable the logic, and - -- update the focus list immediately + -- update the focus list immediately. --focuslist_insert_delay=1000, -- If enabled, activity notifiers are displayed on ALL the screens, not just -- the screen that contains the window producing the notification. This is - -- only relevant on multi-head setups. By default this is disabled + -- only relevant on multi-head setups. By default this is disabled. --activity_notification_on_all_screens=false, -- If enabled, a workspace indicator comes up at the bottom-left of the -- screen when a new workspace is selected. This indicator stays active for -- only as long as indicated by this variable (in ms). Timeout values <=0 - -- disable the indicator altogether. This is disabled by default + -- disable the indicator altogether. This is disabled by default. --workspace_indicator_timeout=0, } - -- Load default settings. The file cfg_defaults loads all the files -- commented out below, except mod_dock. If you do not want to load -- something, comment out this line, and uncomment the lines corresponding --- the the modules or configuration files that you want, below. --- The modules' configuration files correspond to the names of the +-- the modules or configuration files that you want, below. +-- The modules' configuration files correspond to the names of the -- modules with 'mod' replaced by 'cfg'. dopath("cfg_defaults") @@ -100,7 +99,7 @@ dopath("cfg_defaults") -- Load some kludges to make apps behave better. --dopath("cfg_kludges") --- Define some layouts. +-- Define some layouts. --dopath("cfg_layouts") -- Load some modules. Bindings and other configuration specific to modules @@ -114,7 +113,6 @@ dopath("cfg_defaults") --dopath("mod_notionflux") --dopath("mod_xrandr") - -- -- Common customisations -- @@ -129,4 +127,3 @@ dopath("cfg_defaults") --defbindings("WMPlex.toplevel", { -- kpress(META.."M", "mod_menu.menu(_, _sub, 'ctxmenu')"), --}) - diff --git a/etc/cfg_notioncore.lua b/etc/cfg_notioncore.lua index 9fbeade1..f3752cdf 100644 --- a/etc/cfg_notioncore.lua +++ b/etc/cfg_notioncore.lua @@ -3,9 +3,9 @@ -- --- +-- -- Bindings. This includes global bindings and bindings common to --- screens and all types of frames only. See modules' configuration +-- screens and all types of frames only. See modules' configuration -- files for other bindings. -- @@ -16,7 +16,7 @@ -- -- The variable META should contain a string of the form 'Mod4+' -- where Mod4 maybe replaced with the modifier you want to use for most --- of the bindings. Similarly ALTMETA may be redefined to add a +-- of the bindings. Similarly ALTMETA may be redefined to add a -- modifier to some of the F-key bindings. defbindings("WScreen", { @@ -32,7 +32,7 @@ defbindings("WScreen", { kpress(META.."8", "WScreen.switch_nth(_, 7)"), kpress(META.."9", "WScreen.switch_nth(_, 8)"), kpress(META.."0", "WScreen.switch_nth(_, 9)"), - + bdoc("Switch to next/previous object within current screen."), kpress(META.."comma", "WScreen.switch_prev(_)"), kpress(META.."period", "WScreen.switch_next(_)"), @@ -45,10 +45,10 @@ defbindings("WScreen", { --bdoc("Go to previous active object."), --kpress("K", "ioncore.goto_previous()"), - + --bdoc("Go to first object on activity/urgency list."), --kpress("I", "ioncore.goto_activity()"), - + bdoc("Clear all tags."), kpress("T", "ioncore.tagged_clear()"), }), @@ -60,21 +60,21 @@ defbindings("WScreen", { kpress(META.."W", "ioncore.goto_nth_screen(1)"), kpress(META.."Shift+3", "ioncore.goto_nth_screen(2)"), kpress(META.."E", "ioncore.goto_nth_screen(2)"), - + bdoc("Go to next/previous screen on multihead setup."), kpress(META.."Shift+comma", "ioncore.goto_prev_screen()"), kpress(META.."I", "ioncore.goto_prev_screen()"), kpress(META.."O", "ioncore.goto_next_screen()"), kpress(META.."grave", "ioncore.goto_next_screen()"), - + bdoc("Create a new workspace of chosen default type."), kpress(META.."F9", "ioncore.create_ws(_)"), - + bdoc("Display the main menu."), kpress(ALTMETA.."F12", "mod_query.query_menu(_, _sub, 'mainmenu', 'Main menu:')"), --kpress(ALTMETA.."F12", "mod_menu.menu(_, _sub, 'mainmenu', {big=true})"), mpress("Button3", "mod_menu.pmenu(_, _sub, 'mainmenu')"), - + bdoc("Display the window list menu."), mpress("Button2", "mod_menu.pmenu(_, _sub, 'windowlist')"), @@ -84,13 +84,13 @@ defbindings("WScreen", { -- the managing group of that window. The right/left directions are -- used instead of next/prev, because they work better in conjunction -- with tilings. - kpress(META.."Tab", "ioncore.goto_next(_chld, 'right')", + kpress(META.."Tab", "ioncore.goto_next(_chld, 'right')", "_chld:non-nil"), - submap(META.."K", { + submap(META.."K", { bdoc("Backward-circulate focus."), - kpress("AnyModifier+Tab", "ioncore.goto_next(_chld, 'left')", + kpress("AnyModifier+Tab", "ioncore.goto_next(_chld, 'left')", "_chld:non-nil"), - + bdoc("Raise focused object, if possible."), kpress("AnyModifier+R", "WRegion.rqorder(_chld, 'front')", "_chld:non-nil"), @@ -111,7 +111,7 @@ defbindings("WClientWin", { bdoc("Kill client owning the client window."), kpress("C", "WClientWin.kill(_)"), - + bdoc("Send next key press to the client window. ".. "Some programs may not allow this by default."), kpress("Q", "WClientWin.quote_next(_)"), @@ -130,7 +130,7 @@ defbindings("WGroupCW", { -- WMPlex context bindings -- -- These bindings work in frames and on screens. The innermost of such --- contexts/objects always gets to handle the key press. +-- contexts/objects always gets to handle the key press. defbindings("WMPlex", { bdoc("Close current object."), @@ -144,7 +144,7 @@ defbindings("WMPlex.toplevel", { bdoc("Lock screen"), kpress(META.."L", "notioncore.exec_on(_, notioncore.lookup_script('notion-lock'))"), - + bdoc("Query for manual page to be displayed."), kpress(ALTMETA.."F1", "mod_query.query_man(_, ':man')"), @@ -153,7 +153,7 @@ defbindings("WMPlex.toplevel", { bdoc("Run a terminal emulator."), kpress(ALTMETA.."F2", "mod_query.exec_on_merr(_, XTERM or 'xterm')"), - + bdoc("Query for command line to execute."), kpress(ALTMETA.."F3", "mod_query.query_exec(_)"), @@ -164,27 +164,27 @@ defbindings("WMPlex.toplevel", { kpress(ALTMETA.."F4", "mod_query.query_ssh(_, ':ssh')"), bdoc("Query for file to edit."), - kpress(ALTMETA.."F5", + kpress(ALTMETA.."F5", "mod_query.query_editfile(_, 'run-mailcap --action=edit')"), bdoc("Query for file to view."), - kpress(ALTMETA.."F6", + kpress(ALTMETA.."F6", "mod_query.query_runfile(_, 'run-mailcap --action=view')"), bdoc("Query for workspace to go to or create a new one."), kpress(ALTMETA.."F9", "mod_query.query_workspace(_)"), - + bdoc("Query for a client window to go to."), kpress(META.."G", "mod_query.query_gotoclient(_)"), - + bdoc("Display context menu."), --kpress(META.."M", "mod_menu.menu(_, _sub, 'ctxmenu')"), kpress(META.."M", "mod_query.query_menu(_, _sub, 'ctxmenu', 'Context menu:')"), - + submap(META.."K", { bdoc("Detach (float) or reattach an object to its previous location."), -- By using _chld instead of _sub, we can detach/reattach queries - -- attached to a group. The detach code checks if the parameter + -- attached to a group. The detach code checks if the parameter -- (_chld) is a group 'bottom' and detaches the whole group in that -- case. kpress("D", "ioncore.detach(_chld, 'toggle')", "_chld:non-nil"), @@ -203,30 +203,30 @@ defbindings("WFrame", { kpress("H", "WFrame.maximize_horiz(_)"), kpress("V", "WFrame.maximize_vert(_)"), }), - + bdoc("Display context menu."), mpress("Button3", "mod_menu.pmenu(_, _sub, 'ctxmenu')"), - + bdoc("Begin move/resize mode."), kpress(META.."R", "WFrame.begin_kbresize(_)"), - + bdoc("Switch the frame to display the object indicated by the tab."), mclick("Button1@tab", "WFrame.p_switch_tab(_)"), mclick("Button2@tab", "WFrame.p_switch_tab(_)"), - + bdoc("Resize the frame."), mdrag("Button1@border", "WFrame.p_resize(_)"), mdrag(META.."Button3", "WFrame.p_resize(_)"), - + bdoc("Move the frame."), mdrag(META.."Button1", "WFrame.p_move(_)"), - + bdoc("Move objects between frames by dragging and dropping the tab."), mdrag("Button1@tab", "WFrame.p_tabdrag(_)"), mdrag("Button2@tab", "WFrame.p_tabdrag(_)"), - + bdoc("Switch to next/previous object within the frame."), - mclick(META.."Button4", "WFrame.switch_next(_)"), + mclick(META.."Button4", "WFrame.switch_next(_)"), mclick(META.."Button5", "WFrame.switch_prev(_)"), }) @@ -235,11 +235,11 @@ defbindings("WFrame", { defbindings("WFrame.toplevel", { bdoc("Query for a client window to attach."), kpress(META.."A", "mod_query.query_attachclient(_)"), - + submap(META.."K", { -- Display tab numbers when modifiers are released submap_wait("ioncore.tabnum.show(_)"), - + bdoc("Switch to n:th object within the frame."), kpress("1", "WFrame.switch_nth(_, 0)"), kpress("2", "WFrame.switch_nth(_, 1)"), @@ -251,15 +251,15 @@ defbindings("WFrame.toplevel", { kpress("8", "WFrame.switch_nth(_, 7)"), kpress("9", "WFrame.switch_nth(_, 8)"), kpress("0", "WFrame.switch_nth(_, 9)"), - + bdoc("Switch to next/previous object within the frame."), kpress("N", "WFrame.switch_next(_)"), kpress("P", "WFrame.switch_prev(_)"), - + bdoc("Move current object within the frame left/right."), kpress("comma", "WFrame.dec_index(_, _sub)", "_sub:non-nil"), kpress("period", "WFrame.inc_index(_, _sub)", "_sub:non-nil"), - + bdoc("Maximize the frame horizontally/vertically."), kpress("H", "WFrame.maximize_horiz(_)"), kpress("V", "WFrame.maximize_vert(_)"), @@ -269,27 +269,27 @@ defbindings("WFrame.toplevel", { }), }) --- Bindings for floating frames. +-- Bindings for floating frames defbindings("WFrame.floating", { bdoc("Toggle shade mode"), mdblclick("Button1@tab", "WFrame.set_shaded(_, 'toggle')"), - + bdoc("Raise the frame."), mpress("Button1@tab", "WRegion.rqorder(_, 'front')"), mpress("Button1@border", "WRegion.rqorder(_, 'front')"), mclick(META.."Button1", "WRegion.rqorder(_, 'front')"), - + bdoc("Lower the frame."), mclick(META.."Button3", "WRegion.rqorder(_, 'back')"), - + bdoc("Move the frame."), mdrag("Button1@tab", "WFrame.p_move(_)"), }) -- WMoveresMode context bindings --- +-- -- These bindings are available keyboard move/resize mode. The mode -- is activated on frames with the command begin_kbresize (bound to -- META.."R" above by default). @@ -310,7 +310,7 @@ defbindings("WMoveresMode", { kpress("B", "WMoveresMode.resize(_, 0, 1, 0, 0)"), kpress("P", "WMoveresMode.resize(_, 0, 0, 1, 0)"), kpress("N", "WMoveresMode.resize(_, 0, 0, 0, 1)"), - + bdoc("Shrink in specified direction."), kpress("Shift+Left", "WMoveresMode.resize(_,-1, 0, 0, 0)"), kpress("Shift+Right", "WMoveresMode.resize(_, 0,-1, 0, 0)"), @@ -320,7 +320,7 @@ defbindings("WMoveresMode", { kpress("Shift+B", "WMoveresMode.resize(_, 0,-1, 0, 0)"), kpress("Shift+P", "WMoveresMode.resize(_, 0, 0,-1, 0)"), kpress("Shift+N", "WMoveresMode.resize(_, 0, 0, 0,-1)"), - + bdoc("Move in specified direction."), kpress(META.."Left", "WMoveresMode.move(_,-1, 0)"), kpress(META.."Right", "WMoveresMode.move(_, 1, 0)"), @@ -342,7 +342,7 @@ defbindings("WMoveresMode", { defmenu("mainmenu", { menuentry("Run...", "mod_query.query_exec(_)"), menuentry("Terminal", "mod_query.exec_on_merr(_, XTERM or 'xterm')"), - menuentry("Lock screen", + menuentry("Lock screen", "notioncore.exec_on(_, notioncore.lookup_script('notion-lock'))"), menuentry("Help", "mod_query.query_man(_)"), menuentry("About Notion", "mod_query.show_about_ion(_)"), @@ -376,7 +376,7 @@ defctxmenu("WFrame", "Frame", { -- Context menu for groups (workspaces, client windows) defctxmenu("WGroup", "Group", { menuentry("Toggle tag", "WRegion.set_tagged(_, 'toggle')"), - menuentry("De/reattach", "ioncore.detach(_, 'toggle')"), + menuentry("De/reattach", "ioncore.detach(_, 'toggle')"), }) diff --git a/etc/cfg_query.lua b/etc/cfg_query.lua index 123de770..1ecabaa9 100644 --- a/etc/cfg_query.lua +++ b/etc/cfg_query.lua @@ -1,11 +1,6 @@ -- --- Query module configuration. +-- Query module configuration -- --- Only bindings that are in effect in queries and message displays are --- configured here. Actions to display queries are configured in --- ion-bindings.lua --- - defbindings("WEdln", { bdoc("Move one character forward/backward."), @@ -13,13 +8,13 @@ defbindings("WEdln", { kpress("Control+B", "WEdln.back(_)"), kpress("Right", "WEdln.forward(_)"), kpress("Left", "WEdln.back(_)"), - + bdoc("Go to end/beginning."), kpress("Control+E", "WEdln.eol(_)"), kpress("Control+A", "WEdln.bol(_)"), kpress("End", "WEdln.eol(_)"), kpress("Home", "WEdln.bol(_)"), - + bdoc("Skip one word forward/backward."), kpress("Control+X", "WEdln.skip_word(_)"), kpress("Control+Z", "WEdln.bskip_word(_)"), @@ -27,21 +22,21 @@ defbindings("WEdln", { bdoc("Delete next character."), kpress("Control+D", "WEdln.delete(_)"), kpress("Delete", "WEdln.delete(_)"), - + bdoc("Delete previous character."), kpress("BackSpace", "WEdln.backspace(_)"), kpress("Control+H", "WEdln.backspace(_)"), - + bdoc("Delete one word forward/backward."), kpress("Control+W", "WEdln.kill_word(_)"), kpress("Control+O", "WEdln.bkill_word(_)"), bdoc("Delete to end of line."), kpress("Control+J", "WEdln.kill_to_eol(_)"), - + bdoc("Delete the whole line."), kpress("Control+Y", "WEdln.kill_line(_)"), - + bdoc("Transpose characters."), kpress("Control+T", "WEdln.transpose_chars(_)"), @@ -57,16 +52,16 @@ defbindings("WEdln", { mclick("Button2", "WEdln.paste(_)"), submap("Control+K", { kpress("C", "WEdln.paste(_)"), - + bdoc("Set mark/begin selection."), kpress("B", "WEdln.set_mark(_)"), - + bdoc("Cut selection."), kpress("Y", "WEdln.cut(_)"), - + bdoc("Copy selection."), kpress("K", "WEdln.copy(_)"), - + bdoc("Clear mark/cancel selection."), kpress("G", "WEdln.clear_mark(_)"), @@ -75,28 +70,27 @@ defbindings("WEdln", { }), bdoc("Try to complete the entered text or cycle through completions."), - kpress("Tab", "WEdln.complete(_, 'next', 'normal')"), + kpress("Tab", "WEdln.complete(_, 'next', 'normal')"), kpress("Shift+Tab", "WEdln.complete(_, 'prev', 'normal')"), - -- Do not cycle; only force evaluation of new completions + -- Do not cycle; only force evaluation of new completions. kpress("Control+Tab", "WEdln.complete(_, nil, 'normal')"), - + bdoc("Complete from history"), kpress("Control+R", "WEdln.complete(_, 'next', 'history')"), kpress("Control+S", "WEdln.complete(_, 'prev', 'history')"), - + bdoc("Close the query and execute bound action."), kpress("Control+M", "WEdln.finish(_)"), kpress("Return", "WEdln.finish(_)"), kpress("KP_Enter", "WEdln.finish(_)"), }) - defbindings("WInput", { bdoc("Close the query/message box, not executing bound actions."), kpress("Escape", "WInput.cancel(_)"), kpress("Control+G", "WInput.cancel(_)"), kpress("Control+C", "WInput.cancel(_)"), - + bdoc("Scroll the message or completions up/down."), kpress("Control+U", "WInput.scrollup(_)"), kpress("Control+V", "WInput.scrolldown(_)"), @@ -104,21 +98,20 @@ defbindings("WInput", { kpress("Page_Down", "WInput.scrolldown(_)"), }) - --- Some settings +-- Settings --[[ mod_query.set{ - -- Auto-show completions? + -- Auto-show completions? autoshowcompl=true, - - -- Delay for completion after latest keypress/modification in - -- milliseconds + + -- Delay for completion after latest keypress/modification in + -- milliseconds. autoshowcompl_delay=250, - - -- Case-insensitive completion? (Some queries only.) + + -- Case-insensitive completion (some queries only)? caseicompl=true, - - -- Sub-string completion? (Some queries only.) + + -- Sub-string completion (some queries only)? substrcompl=true, } --]] diff --git a/etc/cfg_statusbar.lua b/etc/cfg_statusbar.lua index e4495e0d..01c2dc47 100644 --- a/etc/cfg_statusbar.lua +++ b/etc/cfg_statusbar.lua @@ -1,19 +1,20 @@ -- -- Notion statusbar module configuration file --- - +-- --- Create a statusbar +-- Create a statusbar. mod_statusbar.create{ - -- First screen, bottom left corner + -- First screen, bottom left corner. screen=0, pos='bl', - -- Set this to true if you want a full-width statusbar + + -- Set this to true if you want a full-width statusbar. fullsize=false, - -- Swallow systray windows + + -- Swallow systray windows. systray=true, - -- Template. Tokens %string are replaced with the value of the + -- Template. Tokens %string are replaced with the value of the -- corresponding meter. Currently supported meters are: -- date date -- load load average (1min, 5min, 15min) @@ -26,7 +27,7 @@ mod_statusbar.create{ -- mail_*_total mail count -- -- Space preceded by % adds stretchable space for alignment of variable - -- meter value widths. > before meter name aligns right using this + -- meter value widths. > before meter name aligns right using this -- stretchable space , < left, and | centers. -- Meter values may be zero-padded to a width preceding the meter name. -- These alignment and padding specifiers and the meter name may be @@ -41,27 +42,26 @@ mod_statusbar.create{ --template="[ %date || load: %05load_1min || mail: %02mail_new/%02mail_total ] %filler%systray", } - -- Launch ion-statusd. This must be done after creating any statusbars -- for necessary statusd modules to be parsed from the templates. mod_statusbar.launch_statusd{ -- Date meter date={ - -- ISO-8601 date format with additional abbreviated day name + -- ISO-8601 date format with additional abbreviated day name. date_format='%a %Y-%m-%d %H:%M', -- Finnish etc. date format --date_format='%a %d.%m.%Y %H:%M', -- Locale date format (usually shows seconds, which would require -- updating rather often and can be distracting) --date_format='%c', - - -- Additional date formats. - --[[ - formats={ + + -- Additional date formats. + --[[ + formats={ time = '%H:%M', -- %date_time } --]] - }, + }, -- Load meter load={ @@ -85,4 +85,3 @@ mod_statusbar.launch_statusd{ --files={}, }, } - diff --git a/etc/cfg_tiling.lua b/etc/cfg_tiling.lua index 4c222f9b..afed4850 100644 --- a/etc/cfg_tiling.lua +++ b/etc/cfg_tiling.lua @@ -3,7 +3,6 @@ -- -- Bindings for the tilings. - defbindings("WTiling", { bdoc("Split current frame vertically."), kpress(META.."S", "WTiling.split_at(_, _sub, 'bottom', true)"), @@ -13,6 +12,7 @@ defbindings("WTiling", { kpress(META.."N", "ioncore.goto_next(_sub, 'down', {no_ascend=_})"), mclick(META.."Shift+Button4", "ioncore.goto_next(_sub, 'up', {no_ascend=_})"), mclick(META.."Shift+Button5", "ioncore.goto_next(_sub, 'down', {no_ascend=_})"), + bdoc("Go to frame right/left of current frame."), kpress(META.."Tab", "ioncore.goto_next(_sub, 'right')"), submap(META.."K", { @@ -26,9 +26,7 @@ defbindings("WTiling", { }), }) - --- Frame bindings - +-- Frame bindings. defbindings("WFrame.floating", { submap(META.."K", { bdoc("Tile frame, if no tiling exists on the workspace"), @@ -36,9 +34,7 @@ defbindings("WFrame.floating", { }), }) - -- Context menu for tiled workspaces. - defctxmenu("WTiling", "Tiling", { menuentry("Destroy frame", "WTiling.unsplit_at(_, _sub)"), @@ -74,11 +70,8 @@ defctxmenu("WTiling", "Tiling", { }), }) - -- Extra context menu extra entries for floatframes. - defctxmenu("WFrame.floating", "Floating frame", { append=true, menuentry("New tiling", "mod_tiling.mkbottom(_)"), }) - -- 2.11.4.GIT