RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-14 02:45:43 +00:00
Code Issues Releases Wiki Activity

Add <keycombo> markup for key combinations

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21736 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
torinthiel 2006-12-23 10:55:55 +00:00
parent 07e24dd787
commit 81a70c0387
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DOCS/xml/en/codecs.xml
View File

@ -669,7 +669,7 @@ Take a deep breath and start searching the registry...
Start <command>regedit</command>. Start <command>regedit</command>.
</para></step> </para></step>
<step><para> <step><para>
Press <keycap>Ctrl</keycap>+<keycap>F</keycap>, disable the first two Press <keycombo><keycap>Ctrl</keycap><keycap>F</keycap></keycombo>, disable the first two
checkboxes, and enable the third. Type in the fourcc of the codec (e.g. checkboxes, and enable the third. Type in the fourcc of the codec (e.g.
<userinput>TM20</userinput>). <userinput>TM20</userinput>).
</para></step> </para></step>

22
DOCS/xml/en/video.xml
View File

@ -581,8 +581,9 @@ with every chipset driver for XFree out there.
</simpara></listitem> </simpara></listitem>
<listitem><simpara> <listitem><simpara>
Some drivers simply fail to switch back to normal resolution (use Some drivers simply fail to switch back to normal resolution (use
<keycap>Ctrl</keycap>+<keycap>Alt</keycap>+<keycap>Keypad +</keycap> and <keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Keypad +</keycap></keycombo>
<keycap>Ctrl</keycap>+<keycap>Alt</keycap>+<keycap>Keypad -</keycap> and
<keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Keypad -</keycap></keycombo>
to switch back manually). to switch back manually).
</simpara></listitem> </simpara></listitem>
<listitem><simpara> <listitem><simpara>
@ -1288,8 +1289,8 @@ It won't work!
<listitem><simpara> <listitem><simpara>
Often after terminating VESA driver you get Often after terminating VESA driver you get
<emphasis role="bold">black</emphasis> screen. To return your screen to <emphasis role="bold">black</emphasis> screen. To return your screen to
original state - simply switch to other console original state - simply switch to other console (by pressing
(by pressing <keycap>Alt</keycap>+<keycap>F&lt;x&gt;</keycap>) <keycombo><keycap>Alt</keycap><keycap>F&lt;x&gt;</keycap></keycombo>)
then switch to your previous console by the same way. then switch to your previous console by the same way.
</simpara></listitem> </simpara></listitem>
<listitem><simpara> <listitem><simpara>
@ -1334,9 +1335,9 @@ modelines</link>, and insert them into your <filename>XF86Config</filename>.
<listitem><simpara> <listitem><simpara>
With XFree86 3.x.x: you have to cycle through available resolutions With XFree86 3.x.x: you have to cycle through available resolutions
with the with the
<keycap>Ctrl</keycap>+<keycap>Alt</keycap>+<keycap>Keypad +</keycap> <keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Keypad +</keycap></keycombo>
and and
<keycap>Ctrl</keycap>+<keycap>Alt</keycap>+<keycap>Keypad -</keycap> <keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Keypad -</keycap></keycombo>
keys. keys.
</simpara></listitem> </simpara></listitem>
</itemizedlist> </itemizedlist>
@ -2315,7 +2316,7 @@ mplayer -vo mga -fs -screenw 640 -screenh 512 <replaceable>filename</replaceable
--></screen> --></screen>
(If you use X, now change to matroxfb with for example (If you use X, now change to matroxfb with for example
<keycap>Ctrl</keycap>+<keycap>Alt</keycap>+<keycap>F1</keycap>.) <keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>F1</keycap></keycombo>.)
Change <literal>640</literal> and <literal>512</literal> if you set Change <literal>640</literal> and <literal>512</literal> if you set
the resolution to other... the resolution to other...
</para></step> </para></step>
@ -2488,7 +2489,8 @@ with a simple analog TV encoder, some have a more advanced one.
the following parameters on the kernel command line: the following parameters on the kernel command line:
<option>append="video=vesafb:ywrap,mtrr" vga=791</option>. <option>append="video=vesafb:ywrap,mtrr" vga=791</option>.
You should start <application>X</application>, then switch to console mode You should start <application>X</application>, then switch to console mode
with e.g. <keycap>CTRL</keycap>+<keycap>ALT</keycap>+<keycap>F1</keycap>. with e.g.
<keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>F1</keycap></keycombo>.
If you fail to start <application>X</application> before running If you fail to start <application>X</application> before running
<application>MPlayer</application> from the console, the video <application>MPlayer</application> from the console, the video
becomes slow and choppy (explanations are welcome). becomes slow and choppy (explanations are welcome).
@ -2497,8 +2499,8 @@ with a simple analog TV encoder, some have a more advanced one.
<screen>clear; mplayer -vo fbdev -zoom -cache 8192 dvd://</screen> <screen>clear; mplayer -vo fbdev -zoom -cache 8192 dvd://</screen>
Now you should see the movie running in console mode filling up about Now you should see the movie running in console mode filling up about
half your laptop's LCD screen. half your laptop's LCD screen. To switch to TV hit
To switch to TV hit <keycap>Fn</keycap>+<keycap>F5</keycap> three times. <keycombo><keycap>Fn</keycap><keycap>F5</keycap></keycombo> three times.
Tested on a Tecra 8000, 2.6.15 kernel with vesafb, ALSA v1.0.10. Tested on a Tecra 8000, 2.6.15 kernel with vesafb, ALSA v1.0.10.
</para></listitem> </para></listitem>
<listitem> <listitem>