Skip to content

Commit

Permalink
Merge pull request novnc#280 from samhed/documenttitle
Browse files Browse the repository at this point in the history
Display the desktop name in the document title
  • Loading branch information
kanaka committed Jul 18, 2013
2 parents 8f12ca7 + 406a8b4 commit df9d3d9
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
4 changes: 4 additions & 0 deletions include/rfb.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
* noVNC: HTML5 VNC client
* Copyright (C) 2012 Joel Martin
* Copyright (C) 2013 Samuel Mannehed for Cendio AB
* Licensed under MPL 2.0 (see LICENSE.txt)
*
* See README.md for usage and integration instructions.
Expand Down Expand Up @@ -165,6 +166,8 @@ Util.conf_defaults(conf, that, defaults, [
'onFBUComplete(rfb, fbu): RFB FBU received and processed '],
['onFBResize', 'rw', 'func', function() { },
'onFBResize(rfb, width, height): frame buffer resized'],
['onDesktopName', 'rw', 'func', function() { },
'onDesktopName(rfb, name): desktop name received'],

// These callback names are deprecated
['updateState', 'rw', 'func', function() { },
Expand Down Expand Up @@ -873,6 +876,7 @@ init_msg = function() {
/* Connection name/title */
name_length = ws.rQshift32();
fb_name = ws.rQshiftStr(name_length);
conf.onDesktopName(that, fb_name);

if (conf.true_color && fb_name === "Intel(r) AMT KVM")
{
Expand Down
10 changes: 9 additions & 1 deletion include/ui.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
* noVNC: HTML5 VNC client
* Copyright (C) 2012 Joel Martin
* Copyright (C) 2013 Samuel Mannehed for Cendio AB
* Licensed under MPL 2.0 (see LICENSE.txt)
*
* See README.md for usage and integration instructions.
Expand Down Expand Up @@ -82,7 +83,8 @@ start: function(callback) {

UI.rfb = RFB({'target': $D('noVNC_canvas'),
'onUpdateState': UI.updateState,
'onClipboard': UI.clipReceive});
'onClipboard': UI.clipReceive,
'onDesktopName': UI.updateDocumentTitle});
UI.updateVisualState();

// Unfocus clipboard when over the VNC area
Expand Down Expand Up @@ -530,6 +532,12 @@ updateVisualState: function() {
},


// Display the desktop name in the document title
updateDocumentTitle: function(rfb, name) {
document.title = name + " - noVNC";
},


clipReceive: function(rfb, text) {
Util.Debug(">> UI.clipReceive: " + text.substr(0,40) + "...");
$D('noVNC_clipboard_text').value = text;
Expand Down

0 comments on commit df9d3d9

Please sign in to comment.