Skip to content

Commit ce32baf

Browse files
committed
Update for fvwm3 1.1.4 release
1 parent 8a55594 commit ce32baf

File tree

10 files changed

+182
-62
lines changed

10 files changed

+182
-62
lines changed

Man/FvwmEvent.html

Lines changed: 38 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -325,9 +325,44 @@ <h2 id="_configuration_options">CONFIGURATION OPTIONS</h2>
325325
</div>
326326
<div class="paragraph">
327327
<p>The monitor_* events do not operate in a window context (as there isn&#8217;t
328-
one), but react to when a monitor is plugged in (enabled), unplugged
329-
(disabled), focused (focus) or changed (resized/rotated, etc., which
330-
will only be true if the monitor is already active).</p>
328+
one).</p>
329+
</div>
330+
<div class="paragraph">
331+
<p>The given event command is also passed the following values:</p>
332+
</div>
333+
<div class="literalblock highlight">
334+
<div class="content">
335+
<pre>$0: monitor_event_name (for example: monitor_changed)
336+
$1: monitor_name (the RandR name of the monitor)</pre>
337+
</div>
338+
</div>
339+
<div class="paragraph">
340+
<p>For example, consider the following:</p>
341+
</div>
342+
<div class="literalblock highlight">
343+
<div class="content">
344+
<pre> DestroyFunc RandRFunc
345+
AddToFunc RandRFunc
346+
+ I Exec exec xmessage "Monitor $1 had this event: $0"
347+
348+
DestroyModuleConfig FE-Monitor: *
349+
*FE-Monitor: monitor_changed RandRFunc
350+
*FE-Monitor: monitor_enabled RandRFunc
351+
352+
KillModule FvwmEvent FE-Monitor
353+
Module FvwmEvent FE-Monitor</pre>
354+
</div>
355+
</div>
356+
<div class="paragraph">
357+
<p>When, say, the monitor_changed event is triggered, RandRFunc is run, with the
358+
monitor name passed in as the first argument, and the monitor event as the
359+
second argument. In this way it is possible to do further matching if
360+
required.</p>
361+
</div>
362+
<div class="paragraph">
363+
<p><strong>NOTE</strong>: Using <code>PassID</code> with a configuration which includes monitor_ lines
364+
won&#8217;t work since there is no ID to pass back. If <code>PassID</code> is still required,
365+
separate out monitor events into their own FvwmEvent configuration.</p>
331366
</div>
332367
<div class="paragraph">
333368
<p>The echo event is generated whenever Fvwm receives an Echo command.</p>

Man/FvwmIconMan.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -505,8 +505,8 @@ <h2 id="_configuration_options">CONFIGURATION OPTIONS</h2>
505505
<dd>
506506
<p>A printf like format string which describes the string to be printed
507507
in the manager window for each managed window. Possible flags are: %t,
508-
%i, %c, and %r for the window&#8217;s title, icon title, class, or resource
509-
name, respectively. The default is "%c: %i".</p>
508+
%i, %c, %r, and %s for the window&#8217;s title, icon title, class, resource
509+
name, or screen respectively. The default is "%c: %i".</p>
510510
</dd>
511511
<dt class="hdlist1">*FvwmIconMan: [id] IconName iconstring</dt>
512512
<dd>
@@ -692,7 +692,7 @@ <h2 id="_configuration_options">CONFIGURATION OPTIONS</h2>
692692
<dd>
693693
<p>Assigns the specified <em>weight</em> to windows that match <em>pattern-list</em>.
694694
The list is made up of patterns of the form <em>type=pattern</em>, where type
695-
is one of <em>class</em>, <em>resource</em>, <em>title</em>, or <em>icon</em>, and pattern is an
695+
is one of <em>class</em>, <em>resource</em>, <em>title</em>, <em>icon</em>, or, <em>screen</em> and pattern is an
696696
expression of the same format used in the fvwm style command
697697
(minimalistic shell pattern matching). Multiple sort weights can be
698698
given. Each window is matched against the list of sort weights, in

Man/FvwmPager.html

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -412,14 +412,15 @@ <h3 id="_balloon_windows">BALLOON WINDOWS</h3>
412412
</div>
413413
<div class="dlist">
414414
<dl>
415-
<dt class="hdlist1">*FvwmPager: Balloons [type]</dt>
415+
<dt class="hdlist1">*FvwmPager: Balloons type</dt>
416416
<dd>
417417
<p>Show a balloon describing the window when the pointer is moved into a
418418
window in the pager. The default format (the window&#8217;s icon name) can
419419
be changed using <em>BalloonStringFormat</em>. If <em>type</em> is "Pager" balloons
420-
are just shown for an un-iconified pager; if <em>type</em> is "Icon" balloons
421-
are just shown for an iconified pager. If <em>type</em> is anything else (or
422-
null) balloons are always shown.</p>
420+
are just shown for an un-iconified pager. If <em>type</em> is "Icon" balloons
421+
are just shown for an iconified pager. If <em>type</em> is "All" (or any unused
422+
non blank value) balloons are always shown. If <em>type</em> is "None" balloons
423+
are never shown (the default behavior).</p>
423424
</dd>
424425
<dt class="hdlist1">*FvwmPager: BalloonFont font-name</dt>
425426
<dd>

Man/FvwmRearrange.html

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,15 @@ <h3 id="_general_options">GENERAL OPTIONS</h3>
324324
such as <em>EwmhBaseStruts</em>; by default, FvwmRearrange will honour the
325325
working area. This option may place windows outside of the current monitor.</p>
326326
</dd>
327+
<dt class="hdlist1">-win_cmd <em>COMMAND</em></dt>
328+
<dd>
329+
<p>Runs the fvwm <em>COMMAND</em> in the context of every window that is rearranged.
330+
This can be used to set the state of all affected windows with the <em>COMMAND</em>
331+
"State n" so they can be matched using the "State n" conditional. The
332+
<em>COMMAND</em> is sent after the window is moved/resized, so any change in
333+
window&#8217;s size, adding removing title bars, etc, will not be used in
334+
computing the new position/size of the window.</p>
335+
</dd>
327336
</dl>
328337
</div>
329338
</div>
@@ -413,6 +422,12 @@ <h3 id="_filtering_options">FILTERING OPTIONS</h3>
413422
<p>Causes all windows on the desk to be cascaded/tiled instead of only
414423
windows that intersect the bounding box.</p>
415424
</dd>
425+
<dt class="hdlist1">-on_screen</dt>
426+
<dd>
427+
<p>Causes all windows on the monitor to be cascaded/tiled instead of only
428+
windows that intersect the bounding box. Has no effect when used together
429+
with <em>-desk</em>.</p>
430+
</dd>
416431
</dl>
417432
</div>
418433
</div>

Man/fvwm3.html

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -564,17 +564,7 @@ <h2 id="_randr_multi_screen_support">RANDR MULTI-SCREEN SUPPORT</h2>
564564
changes size, or has been added or removed.</p>
565565
</div>
566566
<div class="paragraph">
567-
<p>In addition to specific <strong>FvwmEvent</strong> conditions which can be used to track a
568-
monitor&#8217;s change, there is a function called <em>RandRFunc</em> which the user can
569-
define to be run when a screen event occurs (such as
570-
enabling/disabling/resolution change):</p>
571-
</div>
572-
<div class="literalblock highlight">
573-
<div class="content">
574-
<pre>DestroyFunc RandRFunc
575-
AddToFunc RandRFunc
576-
+ I Exec exec xmessage "A screen changed"</pre>
577-
</div>
567+
<p>These are controlled by <strong>FvwmEvent</strong>.</p>
578568
</div>
579569
</div>
580570
</div>
@@ -2085,12 +2075,13 @@ <h2 id="_command_expansion">COMMAND EXPANSION</h2>
20852075
<p>Please refer to the <strong>Colorsets</strong> section for details about colorsets.</p>
20862076
</div>
20872077
</dd>
2088-
<dt class="hdlist1">$[math.+.&lt;x&gt;,&lt;y&gt;] $[math.-.&lt;x&gt;,&lt;y&gt;] $[math.*.&lt;x&gt;,&lt;y&gt;] $[math./.&lt;x&gt;,&lt;y&gt;] $[math.%.&lt;x&gt;,&lt;y&gt;] $[math.^.&lt;x&gt;,&lt;y&gt;]</dt>
2078+
<dt class="hdlist1">$[math.+.&lt;x&gt;,&lt;y&gt;] $[math.-.&lt;x&gt;,&lt;y&gt;] $[math.*.&lt;x&gt;,&lt;y&gt;] $[math./.&lt;x&gt;,&lt;y&gt;] $[math.%.&lt;x&gt;,&lt;y&gt;] $[math.^.&lt;x&gt;,&lt;y&gt;] $[math.&lt;.&lt;x&gt;,&lt;y&gt;] $[math.&gt;.&lt;x&gt;,&lt;y&gt;]</dt>
20892079
<dd>
20902080
<p>The math expansion variables can be used to do some basic arithmetic
20912081
on the integers &lt;x&gt; and &lt;y&gt;. These expressions can be used to add
20922082
(&#43;), subtract (-), multiply (*), divide (/), modulus
2093-
(%), and exponentiation (^). This can be useful when computing
2083+
(%), and exponentiation (^). Maximum (&gt;) returns the greater of
2084+
two values, and minimum (&lt;) the lesser. This can be useful when computing
20942085
the size of panels or locations of windows relative to a monitor, for
20952086
example $[math.-.$[monitor.$[monitor.primary].height],200] will
20962087
subtract 200 pixels from the height of the primary monitor. These can

Man/fvwm3all.html

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -602,17 +602,7 @@ <h2 id="_randr_multi_screen_support">RANDR MULTI-SCREEN SUPPORT</h2>
602602
changes size, or has been added or removed.</p>
603603
</div>
604604
<div class="paragraph">
605-
<p>In addition to specific <strong>FvwmEvent</strong> conditions which can be used to track a
606-
monitor&#8217;s change, there is a function called <em>RandRFunc</em> which the user can
607-
define to be run when a screen event occurs (such as
608-
enabling/disabling/resolution change):</p>
609-
</div>
610-
<div class="literalblock highlight">
611-
<div class="content">
612-
<pre>DestroyFunc RandRFunc
613-
AddToFunc RandRFunc
614-
+ I Exec exec xmessage "A screen changed"</pre>
615-
</div>
605+
<p>These are controlled by <strong>FvwmEvent</strong>.</p>
616606
</div>
617607
</div>
618608
</div>
@@ -2123,12 +2113,13 @@ <h2 id="_command_expansion">COMMAND EXPANSION</h2>
21232113
<p>Please refer to the <strong>Colorsets</strong> section for details about colorsets.</p>
21242114
</div>
21252115
</dd>
2126-
<dt class="hdlist1">$[math.+.&lt;x&gt;,&lt;y&gt;] $[math.-.&lt;x&gt;,&lt;y&gt;] $[math.*.&lt;x&gt;,&lt;y&gt;] $[math./.&lt;x&gt;,&lt;y&gt;] $[math.%.&lt;x&gt;,&lt;y&gt;] $[math.^.&lt;x&gt;,&lt;y&gt;]</dt>
2116+
<dt class="hdlist1">$[math.+.&lt;x&gt;,&lt;y&gt;] $[math.-.&lt;x&gt;,&lt;y&gt;] $[math.*.&lt;x&gt;,&lt;y&gt;] $[math./.&lt;x&gt;,&lt;y&gt;] $[math.%.&lt;x&gt;,&lt;y&gt;] $[math.^.&lt;x&gt;,&lt;y&gt;] $[math.&lt;.&lt;x&gt;,&lt;y&gt;] $[math.&gt;.&lt;x&gt;,&lt;y&gt;]</dt>
21272117
<dd>
21282118
<p>The math expansion variables can be used to do some basic arithmetic
21292119
on the integers &lt;x&gt; and &lt;y&gt;. These expressions can be used to add
21302120
(&#43;), subtract (-), multiply (*), divide (/), modulus
2131-
(%), and exponentiation (^). This can be useful when computing
2121+
(%), and exponentiation (^). Maximum (&gt;) returns the greater of
2122+
two values, and minimum (&lt;) the lesser. This can be useful when computing
21322123
the size of panels or locations of windows relative to a monitor, for
21332124
example $[math.-.$[monitor.$[monitor.primary].height],200] will
21342125
subtract 200 pixels from the height of the primary monitor. These can

Man/fvwm3commands.html

Lines changed: 36 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -701,9 +701,6 @@ <h3 id="_miscellaneous_commands">Miscellaneous Commands</h3>
701701
<p><em>nls</em> which prints information on the locale catalogs that fvwm used</p>
702702
</div>
703703
<div class="paragraph">
704-
<p><em>style</em> which prints information on fvwm styles. <em>verbose</em> can be 1.</p>
705-
</div>
706-
<div class="paragraph">
707704
<p><em>bindings</em> which prints information on all the bindings fvwm has: key
708705
and mouse bindings. <em>verbose</em> has no effect with this option.</p>
709706
</div>
@@ -1667,40 +1664,56 @@ <h3 id="_focus_mouse_movement">Focus &amp; Mouse Movement</h3>
16671664
<p><em>CursorBarrier</em> only works if fvwm is complied with the XFixes extension.</p>
16681665
</div>
16691666
</dd>
1670-
<dt class="hdlist1"><strong>CursorMove</strong> <em>horizontal</em>[p] <em>vertical</em>[p]</dt>
1667+
<dt class="hdlist1"><strong>CursorMove</strong> [screen <em>RANDRNAME</em>] <em>horizontal</em>[p] <em>vertical</em>[p]</dt>
16711668
<dd>
1672-
<p>Moves the mouse pointer by <em>horizontal</em> pages in the X direction and
1673-
<em>vertical</em> pages in the Y direction. Either or both entries may be
1674-
negative. CursorMove can only move the mouse cursor to a relative
1675-
position. To move the mouse cursor to an absolute position, see
1676-
<strong>WarpToWindow</strong>. Both horizontal and vertical values are expressed in
1677-
percent of pages, so</p>
1669+
<p>Without the <em>screen</em> option, <em>CusorMove</em> moves the mouse cursor a
1670+
<em>horizontal</em> distance and <em>vertical</em> distance from its current position.
1671+
The values are expressed as either a percent of the virtual desktop size,
1672+
or a pixel distance by appending a '<em>p</em>' to the value. Either or both
1673+
entries may be negative. For example,</p>
16781674
<div class="literalblock highlight">
16791675
<div class="content">
1680-
<pre>CursorMove 100 100</pre>
1676+
<pre># Move down and right by one full page.
1677+
CursorMove 100 100
1678+
1679+
# Move down two full pages.
1680+
CursorMove 0 200
1681+
1682+
# Move half page right and quarter page up.
1683+
CursorMove 50 -25
1684+
1685+
# Move left 100 pixels and down 50 pixels.
1686+
CursorMove -100p 50p</pre>
16811687
</div>
16821688
</div>
16831689
<div class="paragraph">
1684-
<p>means to move down and right by one full page.</p>
1690+
<p>If the option <em>screen</em> followed by a valid RandR monitor name is included,
1691+
<em>CursorMove</em> will move the cursor to the absolute position (starting at
1692+
the top left corner) given by the arguments, as either percent values
1693+
of the monitor&#8217;s size, or an absolute location with the '<em>p</em>' suffix.
1694+
For example,</p>
16851695
</div>
16861696
<div class="literalblock highlight">
16871697
<div class="content">
1688-
<pre>CursorMove 50 25</pre>
1698+
<pre># Move cursor to center of monitor DP-1
1699+
CursorMove screen DP-1 50 50
1700+
1701+
# Move cursor to the exact location (400, 200) of monitor DP-2
1702+
CursorMove screen DP-2 400p 200p</pre>
16891703
</div>
16901704
</div>
16911705
<div class="paragraph">
1692-
<p>means to move right half a page and down a quarter of a page.
1693-
Alternatively, the distance can be specified in pixels by appending a
1694-
'<em>p</em>' to the horizontal and/or vertical specification. For example</p>
1695-
</div>
1696-
<div class="literalblock highlight">
1697-
<div class="content">
1698-
<pre>CursorMove -10p -10p</pre>
1699-
</div>
1706+
<p>When moving to a specified <em>screen</em>, the <em>horizontal</em> and <em>vertical</em>
1707+
values are always shifted to be inside the current page of the specified
1708+
monitor. For instance '50', '150', and '-150' will all be the center of the
1709+
monitor, and will not change monitor&#8217;s page. Use <strong>GotoPage</strong> to change the
1710+
page of a specified monitor. Negative values can be used to specify distance
1711+
from the right/bottom corner of the monitor.</p>
17001712
</div>
17011713
<div class="paragraph">
1702-
<p>means move ten pixels up and ten pixels left. The CursorMove function
1703-
should not be called from pop-up menus.</p>
1714+
<p><em>CusorMove</em> can only move the cursor relative to its current position,
1715+
or to an absolute position on a given monitor. To move the cursor relative
1716+
to a window, use <strong>WarpToWindow</strong>.</p>
17041717
</div>
17051718
</dd>
17061719
<dt class="hdlist1"><strong>FlipFocus</strong> [NoWarp]</dt>

Man/fvwm3styles.html

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,81 @@ <h2 id="_controlling_window_styles">Controlling Window Styles</h2>
2626
alphabetically. The description of the <strong>Style</strong> command can be found at
2727
the end of this section.</p>
2828
</div>
29+
<div class="paragraph">
30+
<p>The commands: <strong>FocusStyle</strong>, <strong>Style</strong>, and <strong>WindowStyle</strong> can accept optional
31+
conditional components to match some properties of a window.</p>
32+
</div>
33+
<div class="paragraph">
34+
<p>For example:</p>
35+
</div>
36+
<div class="literalblock highlight">
37+
<div class="content">
38+
<pre>Style (Name mc) Sticky</pre>
39+
</div>
40+
</div>
41+
<div class="paragraph">
42+
<p>Will make a window whose name matched 'mc' <em>Sticky</em>.</p>
43+
</div>
44+
<div class="literalblock highlight">
45+
<div class="content">
46+
<pre>Style (Name mc, Class XTerm) StartIconic</pre>
47+
</div>
48+
</div>
49+
<div class="paragraph">
50+
<p>This example will start an xterm(1) window whose WM_CLASS matches 'XTerm' and
51+
name is 'mc'.</p>
52+
</div>
53+
<div class="paragraph">
54+
<p>A valid list of properties to test against are:</p>
55+
</div>
56+
<div class="ulist">
57+
<ul>
58+
<li>
59+
<p>Resource</p>
60+
</li>
61+
<li>
62+
<p>Class</p>
63+
</li>
64+
<li>
65+
<p>Name</p>
66+
</li>
67+
<li>
68+
<p>Icon</p>
69+
</li>
70+
<li>
71+
<p>WindowID</p>
72+
</li>
73+
</ul>
74+
</div>
75+
<div class="paragraph">
76+
<p>The matching of the properties specified for any <strong>Style</strong> line are ANDed
77+
together, and for styles to be applied, <strong>all</strong> properties must match.</p>
78+
</div>
79+
<div class="paragraph">
80+
<p><strong>NOTE</strong>: To destroy a style line with window properties, <strong>DestroyStyle</strong>
81+
should be used. For example:</p>
82+
</div>
83+
<div class="literalblock highlight">
84+
<div class="content">
85+
<pre>DestroyStyle (Name mc, Class XTerm)</pre>
86+
</div>
87+
</div>
88+
<div class="paragraph">
89+
<p>It is not required to specify the style arguments when destroying a style,
90+
only the property components are required.</p>
91+
</div>
92+
<div class="paragraph">
93+
<p>Existing <strong>Style</strong> lines in the form:</p>
94+
</div>
95+
<div class="literalblock highlight">
96+
<div class="content">
97+
<pre>Style Application* Sticky, StartIconic</pre>
98+
</div>
99+
</div>
100+
<div class="paragraph">
101+
<p>are still supported, and their behaviour remains unchanged.</p>
102+
</div>
103+
<hr>
29104
<div class="dlist">
30105
<dl>
31106
<dt class="hdlist1"><strong>FocusStyle</strong> <em>stylename</em> <em>options</em></dt>

Man/index.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
title: Fvwm3 Manual Pages
33
showtitle: 1
44
---
5-
6-
The following are the manual pages for fvwm3 version <strong>1.1.2</strong>.
5+
The following are the manual pages for fvwm3 version <strong>1.1.4-1-gc7a86a9c</strong>.
76
<div id="markdown-toc">
87
<ul class="sectlevel1">
98
<li><a href="#_fvwm3">Fvwm3</a></li>

_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ url: "https://www.fvwm.org" # the base hostname & protocol for your site
1515

1616
# FVWM release version
1717
fvwm2-version: 2.7.0
18-
fvwm3-version: 1.1.2
18+
fvwm3-version: 1.1.4
1919

2020
# Highlight fvwm2rc code
2121
fvwm2rc: False

0 commit comments

Comments
 (0)