* [Qemu-devel] [PATCH 0/2 RFC] Support for LED state extension to Qemu VNC server
@ 2013-04-15 9:29 Lei Li
2013-04-15 9:29 ` [Qemu-devel] [PATCH 1/2] vnc: Add SCROLL lock key to kbd_leds Lei Li
2013-04-15 9:29 ` [Qemu-devel] [PATCH 2/2] vnc: Support for LED state extension Lei Li
0 siblings, 2 replies; 5+ messages in thread
From: Lei Li @ 2013-04-15 9:29 UTC (permalink / raw)
To: qemu-devel; +Cc: lagarcia, aliguori, Lei Li
Hi guys,
This patch series tries to add support for LED state
extension to Qemu VNC server. The proposal has been sent
few days ago as link below:
http://lists.gnu.org/archive/html/qemu-devel/2013-04/msg01421.html
This is just an initial implementation, and has not been
completely tested. To catch up Qemu 1.5 soft freeze, I'd
like to send it out to have your suggestion. Please let me
know if this seems like the direction we should be headed.
Your suggestions and comments are very appreciated!
Thanks
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Qemu-devel] [PATCH 1/2] vnc: Add SCROLL lock key to kbd_leds
2013-04-15 9:29 [Qemu-devel] [PATCH 0/2 RFC] Support for LED state extension to Qemu VNC server Lei Li
@ 2013-04-15 9:29 ` Lei Li
2013-04-15 9:29 ` [Qemu-devel] [PATCH 2/2] vnc: Support for LED state extension Lei Li
1 sibling, 0 replies; 5+ messages in thread
From: Lei Li @ 2013-04-15 9:29 UTC (permalink / raw)
To: qemu-devel; +Cc: lagarcia, aliguori, Lei Li
Signed-off-by: Lei Li <lilei@linux.vnet.ibm.com>
---
ui/vnc.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ui/vnc.c b/ui/vnc.c
index 5ddb696..fa7ab94 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -1532,10 +1532,11 @@ static void press_key(VncState *vs, int keysym)
static void kbd_leds(void *opaque, int ledstate)
{
VncState *vs = opaque;
- int caps, num;
+ int caps, num, scr;
caps = ledstate & QEMU_CAPS_LOCK_LED ? 1 : 0;
num = ledstate & QEMU_NUM_LOCK_LED ? 1 : 0;
+ scr = ledstate & QEMU_SCROLL_LOCK_LED ? 1 : 0;
if (vs->modifiers_state[0x3a] != caps) {
vs->modifiers_state[0x3a] = caps;
@@ -1543,6 +1544,9 @@ static void kbd_leds(void *opaque, int ledstate)
if (vs->modifiers_state[0x45] != num) {
vs->modifiers_state[0x45] = num;
}
+ if (vs->modifiers_state[0x46] != scr) {
+ vs->modifiers_state[0x46] = scr;
+ }
}
static void do_key_event(VncState *vs, int down, int keycode, int sym)
--
1.7.7.6
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Qemu-devel] [PATCH 2/2] vnc: Support for LED state extension
2013-04-15 9:29 [Qemu-devel] [PATCH 0/2 RFC] Support for LED state extension to Qemu VNC server Lei Li
2013-04-15 9:29 ` [Qemu-devel] [PATCH 1/2] vnc: Add SCROLL lock key to kbd_leds Lei Li
@ 2013-04-15 9:29 ` Lei Li
2013-04-17 13:52 ` Anthony Liguori
1 sibling, 1 reply; 5+ messages in thread
From: Lei Li @ 2013-04-15 9:29 UTC (permalink / raw)
To: qemu-devel; +Cc: lagarcia, aliguori, Lei Li
Signed-off-by: Lei Li <lilei@linux.vnet.ibm.com>
---
ui/vnc.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
ui/vnc.h | 3 ++-
2 files changed, 52 insertions(+), 1 deletions(-)
diff --git a/ui/vnc.c b/ui/vnc.c
index fa7ab94..b9b3766 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -1529,6 +1529,33 @@ static void press_key(VncState *vs, int keysym)
kbd_put_keycode(keycode | SCANCODE_UP);
}
+static int current_led_state(VncState *vs)
+{
+ int ledstate = 0;
+
+ if (vs->modifiers_state[0x46]) {
+ ledstate |= QEMU_SCROLL_LOCK_LED;
+ }
+ if (vs->modifiers_state[0x45]) {
+ ledstate |= QEMU_NUM_LOCK_LED;
+ }
+ if (vs->modifiers_state[0x3a]) {
+ ledstate |= QEMU_CAPS_LOCK_LED;
+ }
+
+ return ledstate;
+}
+
+static void vnc_led_state_change(VncState *vs, int ledstate)
+{
+ vnc_lock_output(vs);
+ vnc_write_u8(vs, VNC_MSG_SERVER_QEMU);
+ vnc_write_u8(vs, VNC_MSG_SERVER_QEMU_LED_STATE);
+ vnc_write_u8(vs, ledstate);
+ vnc_unlock_output(vs);
+ vnc_flush(vs);
+}
+
static void kbd_leds(void *opaque, int ledstate)
{
VncState *vs = opaque;
@@ -1547,6 +1574,11 @@ static void kbd_leds(void *opaque, int ledstate)
if (vs->modifiers_state[0x46] != scr) {
vs->modifiers_state[0x46] = scr;
}
+
+ /* Sending the current led state message to the client */
+ if (ledstate != current_led_state(vs)) {
+ vnc_led_state_change(vs, current_led_state(vs));
+ }
}
static void do_key_event(VncState *vs, int down, int keycode, int sym)
@@ -1831,6 +1863,20 @@ static void send_ext_audio_ack(VncState *vs)
vnc_flush(vs);
}
+static void send_ext_leds_state_ack(VncState *vs)
+{
+ vnc_lock_output(vs);
+ vnc_write_u8(vs, VNC_MSG_SERVER_FRAMEBUFFER_UPDATE);
+ vnc_write_u8(vs, 0);
+ vnc_write_u16(vs, 1);
+ vnc_framebuffer_update(vs, 0, 0,
+ surface_width(vs->vd->ds),
+ surface_height(vs->vd->ds),
+ VNC_ENCODING_LED_STATE);
+ vnc_unlock_output(vs);
+ vnc_flush(vs);
+}
+
static void set_encodings(VncState *vs, int32_t *encodings, size_t n_encodings)
{
int i;
@@ -1897,6 +1943,10 @@ static void set_encodings(VncState *vs, int32_t *encodings, size_t n_encodings)
case VNC_ENCODING_AUDIO:
send_ext_audio_ack(vs);
break;
+ case VNC_ENCODING_LED_STATE:
+ send_ext_leds_state_ack(vs);
+ vnc_led_state_change(vs, current_led_state(vs));
+ break;
case VNC_ENCODING_WMVi:
vs->features |= VNC_FEATURE_WMVI_MASK;
break;
diff --git a/ui/vnc.h b/ui/vnc.h
index 58e002e..709cbab 100644
--- a/ui/vnc.h
+++ b/ui/vnc.h
@@ -386,6 +386,7 @@ enum {
#define VNC_ENCODING_EXT_KEY_EVENT 0XFFFFFEFE /* -258 */
#define VNC_ENCODING_AUDIO 0XFFFFFEFD /* -259 */
#define VNC_ENCODING_TIGHT_PNG 0xFFFFFEFC /* -260 */
+#define VNC_ENCODING_LED_STATE 0XFFFFFEFB /* -261 */
#define VNC_ENCODING_WMVi 0x574D5669
/*****************************************************************************
@@ -475,7 +476,7 @@ enum {
/* QEMU server -> client message IDs */
#define VNC_MSG_SERVER_QEMU_AUDIO 1
-
+#define VNC_MSG_SERVER_QEMU_LED_STATE 2
/* QEMU client -> server audio message IDs */
--
1.7.7.6
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH 2/2] vnc: Support for LED state extension
2013-04-15 9:29 ` [Qemu-devel] [PATCH 2/2] vnc: Support for LED state extension Lei Li
@ 2013-04-17 13:52 ` Anthony Liguori
2013-04-18 8:21 ` Lei Li
0 siblings, 1 reply; 5+ messages in thread
From: Anthony Liguori @ 2013-04-17 13:52 UTC (permalink / raw)
To: Lei Li, qemu-devel; +Cc: lagarcia
Lei Li <lilei@linux.vnet.ibm.com> writes:
> Signed-off-by: Lei Li <lilei@linux.vnet.ibm.com>
> ---
> ui/vnc.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
> ui/vnc.h | 3 ++-
> 2 files changed, 52 insertions(+), 1 deletions(-)
>
> diff --git a/ui/vnc.c b/ui/vnc.c
> index fa7ab94..b9b3766 100644
> --- a/ui/vnc.c
> +++ b/ui/vnc.c
> @@ -1529,6 +1529,33 @@ static void press_key(VncState *vs, int keysym)
> kbd_put_keycode(keycode | SCANCODE_UP);
> }
>
> +static int current_led_state(VncState *vs)
> +{
> + int ledstate = 0;
> +
> + if (vs->modifiers_state[0x46]) {
> + ledstate |= QEMU_SCROLL_LOCK_LED;
> + }
> + if (vs->modifiers_state[0x45]) {
> + ledstate |= QEMU_NUM_LOCK_LED;
> + }
> + if (vs->modifiers_state[0x3a]) {
> + ledstate |= QEMU_CAPS_LOCK_LED;
> + }
> +
> + return ledstate;
> +}
> +
> +static void vnc_led_state_change(VncState *vs, int ledstate)
> +{
> + vnc_lock_output(vs);
> + vnc_write_u8(vs, VNC_MSG_SERVER_QEMU);
> + vnc_write_u8(vs, VNC_MSG_SERVER_QEMU_LED_STATE);
> + vnc_write_u8(vs, ledstate);
> + vnc_unlock_output(vs);
> + vnc_flush(vs);
> +}
Please use a pseudo-encoding and include a document describing the
psuedo-encoding in the docs/ directory.
> +
> static void kbd_leds(void *opaque, int ledstate)
> {
> VncState *vs = opaque;
> @@ -1547,6 +1574,11 @@ static void kbd_leds(void *opaque, int ledstate)
> if (vs->modifiers_state[0x46] != scr) {
> vs->modifiers_state[0x46] = scr;
> }
> +
> + /* Sending the current led state message to the client */
> + if (ledstate != current_led_state(vs)) {
> + vnc_led_state_change(vs, current_led_state(vs));
> + }
> }
>
> static void do_key_event(VncState *vs, int down, int keycode, int sym)
> @@ -1831,6 +1863,20 @@ static void send_ext_audio_ack(VncState *vs)
> vnc_flush(vs);
> }
>
> +static void send_ext_leds_state_ack(VncState *vs)
> +{
> + vnc_lock_output(vs);
> + vnc_write_u8(vs, VNC_MSG_SERVER_FRAMEBUFFER_UPDATE);
> + vnc_write_u8(vs, 0);
> + vnc_write_u16(vs, 1);
> + vnc_framebuffer_update(vs, 0, 0,
> + surface_width(vs->vd->ds),
> + surface_height(vs->vd->ds),
> + VNC_ENCODING_LED_STATE);
> + vnc_unlock_output(vs);
> + vnc_flush(vs);
> +}
I don't think the ack is really necessary. You should encode the
current led state in this pseudo-encoding data and just send the current
led state once after set_encodings and then whenever the state changes
again.
Regards,
Anthony Liguori
> +
> static void set_encodings(VncState *vs, int32_t *encodings, size_t n_encodings)
> {
> int i;
> @@ -1897,6 +1943,10 @@ static void set_encodings(VncState *vs, int32_t *encodings, size_t n_encodings)
> case VNC_ENCODING_AUDIO:
> send_ext_audio_ack(vs);
> break;
> + case VNC_ENCODING_LED_STATE:
> + send_ext_leds_state_ack(vs);
> + vnc_led_state_change(vs, current_led_state(vs));
> + break;
> case VNC_ENCODING_WMVi:
> vs->features |= VNC_FEATURE_WMVI_MASK;
> break;
> diff --git a/ui/vnc.h b/ui/vnc.h
> index 58e002e..709cbab 100644
> --- a/ui/vnc.h
> +++ b/ui/vnc.h
> @@ -386,6 +386,7 @@ enum {
> #define VNC_ENCODING_EXT_KEY_EVENT 0XFFFFFEFE /* -258 */
> #define VNC_ENCODING_AUDIO 0XFFFFFEFD /* -259 */
> #define VNC_ENCODING_TIGHT_PNG 0xFFFFFEFC /* -260 */
> +#define VNC_ENCODING_LED_STATE 0XFFFFFEFB /* -261 */
> #define VNC_ENCODING_WMVi 0x574D5669
>
> /*****************************************************************************
> @@ -475,7 +476,7 @@ enum {
>
> /* QEMU server -> client message IDs */
> #define VNC_MSG_SERVER_QEMU_AUDIO 1
> -
> +#define VNC_MSG_SERVER_QEMU_LED_STATE 2
>
>
> /* QEMU client -> server audio message IDs */
> --
> 1.7.7.6
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH 2/2] vnc: Support for LED state extension
2013-04-17 13:52 ` Anthony Liguori
@ 2013-04-18 8:21 ` Lei Li
0 siblings, 0 replies; 5+ messages in thread
From: Lei Li @ 2013-04-18 8:21 UTC (permalink / raw)
To: Anthony Liguori; +Cc: lagarcia, qemu-devel
On 04/17/2013 09:52 PM, Anthony Liguori wrote:
> Lei Li <lilei@linux.vnet.ibm.com> writes:
>
>> Signed-off-by: Lei Li <lilei@linux.vnet.ibm.com>
>> ---
>> ui/vnc.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
>> ui/vnc.h | 3 ++-
>> 2 files changed, 52 insertions(+), 1 deletions(-)
>>
>> diff --git a/ui/vnc.c b/ui/vnc.c
>> index fa7ab94..b9b3766 100644
>> --- a/ui/vnc.c
>> +++ b/ui/vnc.c
>> @@ -1529,6 +1529,33 @@ static void press_key(VncState *vs, int keysym)
>> kbd_put_keycode(keycode | SCANCODE_UP);
>> }
>>
>> +static int current_led_state(VncState *vs)
>> +{
>> + int ledstate = 0;
>> +
>> + if (vs->modifiers_state[0x46]) {
>> + ledstate |= QEMU_SCROLL_LOCK_LED;
>> + }
>> + if (vs->modifiers_state[0x45]) {
>> + ledstate |= QEMU_NUM_LOCK_LED;
>> + }
>> + if (vs->modifiers_state[0x3a]) {
>> + ledstate |= QEMU_CAPS_LOCK_LED;
>> + }
>> +
>> + return ledstate;
>> +}
>> +
>> +static void vnc_led_state_change(VncState *vs, int ledstate)
>> +{
>> + vnc_lock_output(vs);
>> + vnc_write_u8(vs, VNC_MSG_SERVER_QEMU);
>> + vnc_write_u8(vs, VNC_MSG_SERVER_QEMU_LED_STATE);
>> + vnc_write_u8(vs, ledstate);
>> + vnc_unlock_output(vs);
>> + vnc_flush(vs);
>> +}
> Please use a pseudo-encoding and include a document describing the
> psuedo-encoding in the docs/ directory.
OK.
>> +
>> static void kbd_leds(void *opaque, int ledstate)
>> {
>> VncState *vs = opaque;
>> @@ -1547,6 +1574,11 @@ static void kbd_leds(void *opaque, int ledstate)
>> if (vs->modifiers_state[0x46] != scr) {
>> vs->modifiers_state[0x46] = scr;
>> }
>> +
>> + /* Sending the current led state message to the client */
>> + if (ledstate != current_led_state(vs)) {
>> + vnc_led_state_change(vs, current_led_state(vs));
>> + }
>> }
>>
>> static void do_key_event(VncState *vs, int down, int keycode, int sym)
>> @@ -1831,6 +1863,20 @@ static void send_ext_audio_ack(VncState *vs)
>> vnc_flush(vs);
>> }
>>
>> +static void send_ext_leds_state_ack(VncState *vs)
>> +{
>> + vnc_lock_output(vs);
>> + vnc_write_u8(vs, VNC_MSG_SERVER_FRAMEBUFFER_UPDATE);
>> + vnc_write_u8(vs, 0);
>> + vnc_write_u16(vs, 1);
>> + vnc_framebuffer_update(vs, 0, 0,
>> + surface_width(vs->vd->ds),
>> + surface_height(vs->vd->ds),
>> + VNC_ENCODING_LED_STATE);
>> + vnc_unlock_output(vs);
>> + vnc_flush(vs);
>> +}
> I don't think the ack is really necessary. You should encode the
> current led state in this pseudo-encoding data and just send the current
> led state once after set_encodings and then whenever the state changes
> again.
OK, got it.
Thanks!
>
> Regards,
>
> Anthony Liguori
>
>> +
>> static void set_encodings(VncState *vs, int32_t *encodings, size_t n_encodings)
>> {
>> int i;
>> @@ -1897,6 +1943,10 @@ static void set_encodings(VncState *vs, int32_t *encodings, size_t n_encodings)
>> case VNC_ENCODING_AUDIO:
>> send_ext_audio_ack(vs);
>> break;
>> + case VNC_ENCODING_LED_STATE:
>> + send_ext_leds_state_ack(vs);
>> + vnc_led_state_change(vs, current_led_state(vs));
>> + break;
>> case VNC_ENCODING_WMVi:
>> vs->features |= VNC_FEATURE_WMVI_MASK;
>> break;
>> diff --git a/ui/vnc.h b/ui/vnc.h
>> index 58e002e..709cbab 100644
>> --- a/ui/vnc.h
>> +++ b/ui/vnc.h
>> @@ -386,6 +386,7 @@ enum {
>> #define VNC_ENCODING_EXT_KEY_EVENT 0XFFFFFEFE /* -258 */
>> #define VNC_ENCODING_AUDIO 0XFFFFFEFD /* -259 */
>> #define VNC_ENCODING_TIGHT_PNG 0xFFFFFEFC /* -260 */
>> +#define VNC_ENCODING_LED_STATE 0XFFFFFEFB /* -261 */
>> #define VNC_ENCODING_WMVi 0x574D5669
>>
>> /*****************************************************************************
>> @@ -475,7 +476,7 @@ enum {
>>
>> /* QEMU server -> client message IDs */
>> #define VNC_MSG_SERVER_QEMU_AUDIO 1
>> -
>> +#define VNC_MSG_SERVER_QEMU_LED_STATE 2
>>
>>
>> /* QEMU client -> server audio message IDs */
>> --
>> 1.7.7.6
>
--
Lei
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-04-18 8:21 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-04-15 9:29 [Qemu-devel] [PATCH 0/2 RFC] Support for LED state extension to Qemu VNC server Lei Li
2013-04-15 9:29 ` [Qemu-devel] [PATCH 1/2] vnc: Add SCROLL lock key to kbd_leds Lei Li
2013-04-15 9:29 ` [Qemu-devel] [PATCH 2/2] vnc: Support for LED state extension Lei Li
2013-04-17 13:52 ` Anthony Liguori
2013-04-18 8:21 ` Lei Li
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.