From e294656cb11082a77f2e785fb55ddafa926bbc47 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 9 Oct 2014 18:28:37 +0200 Subject: client API: rename --input-x11-keyboard to --input-vo-keyboard Apparently we need this for Cocoa too. (The option was X11 specific in the hope that only X11 would need this hack.) --- DOCS/client-api-changes.rst | 2 ++ DOCS/client_api_examples/qtexample.cpp | 4 ++-- DOCS/man/options.rst | 7 +++++-- 3 files changed, 9 insertions(+), 4 deletions(-) (limited to 'DOCS') diff --git a/DOCS/client-api-changes.rst b/DOCS/client-api-changes.rst index 8943855f13..c269ea1be0 100644 --- a/DOCS/client-api-changes.rst +++ b/DOCS/client-api-changes.rst @@ -33,6 +33,8 @@ API changes work as expected, and now the behavior can be explicitly controlled with the "input-x11-keyboard" option. This is only a temporary measure until XEmbed is implemented and confirmed working. + Note: in 1.6, "input-x11-keyboard" was renamed to "input-vo-keyboard", + although the old option name still works. 1.4 - subtle change in X11 and "--wid" behavior (this change was added to 0.5.2, and broke some things, see #1090) --- mpv 0.5.0 is released --- diff --git a/DOCS/client_api_examples/qtexample.cpp b/DOCS/client_api_examples/qtexample.cpp index fa657cf7b9..b4b5934b57 100644 --- a/DOCS/client_api_examples/qtexample.cpp +++ b/DOCS/client_api_examples/qtexample.cpp @@ -67,8 +67,8 @@ MainWindow::MainWindow(QWidget *parent) : mpv_set_option_string(mpv, "input-default-bindings", "yes"); // Enable keyboard input on the X11 window. For the messy details, see - // --input-x11-keyboard on the manpage. - mpv_set_option_string(mpv, "input-x11-keyboard", "yes"); + // --input-vo-keyboard on the manpage. + mpv_set_option_string(mpv, "input-vo-keyboard", "yes"); // Let us receive property change events with MPV_EVENT_PROPERTY_CHANGE if // this property changes. diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst index 86632436dd..f0bd8aac66 100644 --- a/DOCS/man/options.rst +++ b/DOCS/man/options.rst @@ -2176,8 +2176,9 @@ Input Use the right Alt key as Alt Gr to produce special characters. If disabled, count the right Alt as an Alt modifier key. Enabled by default. -``--input-x11-keyboard=`` - Disable all keyboard input on the X11 VO window. Generally useful for +``--input-vo-keyboard=`` + Disable all keyboard input on for VOs which can't participate in proper + keyboard input dispatching. This currently affects X11. Generally useful for embedding only. On X11, a sub-window with input enabled grabs all keyboard input as long @@ -2195,6 +2196,8 @@ Input As a workaround, this option is disabled by default in libmpv. (Note that ``input-default-bindings`` is disabled by default in libmpv as well.) + (This option was renamed from ``--input-x11-keyboard``.) + OSD --- -- cgit v1.2.3