Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
N
noVNC
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
rasky
noVNC
Commits
b804b3e4
Commit
b804b3e4
authored
Jan 15, 2015
by
samhed
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes #428 - hides the local cursor when using the server-side cursor.
parent
fc00821e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
2 deletions
+10
-2
display.js
include/display.js
+6
-1
rfb.js
include/rfb.js
+4
-1
No files found.
include/display.js
View file @
b804b3e4
...
@@ -93,13 +93,14 @@ var Display;
...
@@ -93,13 +93,14 @@ var Display;
this
.
_cursor_uri
=
true
;
this
.
_cursor_uri
=
true
;
}
}
Util
.
Info
(
"Data URI scheme cursor supported"
);
Util
.
Info
(
"Data URI scheme cursor supported"
);
this
.
_target
.
style
.
cursor
=
curSave
;
}
else
{
}
else
{
if
(
this
.
_cursor_uri
===
null
||
this
.
_cursor_uri
===
undefined
)
{
if
(
this
.
_cursor_uri
===
null
||
this
.
_cursor_uri
===
undefined
)
{
this
.
_cursor_uri
=
false
;
this
.
_cursor_uri
=
false
;
}
}
Util
.
Warn
(
"Data URI scheme cursor not supported"
);
Util
.
Warn
(
"Data URI scheme cursor not supported"
);
this
.
_target
.
style
.
cursor
=
"none"
;
}
}
this
.
_target
.
style
.
cursor
=
curSave
;
}
catch
(
exc
)
{
}
catch
(
exc
)
{
Util
.
Error
(
"Data URI scheme cursor test exception: "
+
exc
);
Util
.
Error
(
"Data URI scheme cursor test exception: "
+
exc
);
this
.
_cursor_uri
=
false
;
this
.
_cursor_uri
=
false
;
...
@@ -470,6 +471,10 @@ var Display;
...
@@ -470,6 +471,10 @@ var Display;
this
.
_target
.
style
.
cursor
=
"default"
;
this
.
_target
.
style
.
cursor
=
"default"
;
},
},
disableLocalCursor
:
function
()
{
this
.
_target
.
style
.
cursor
=
"none"
;
},
// Overridden getters/setters
// Overridden getters/setters
get_context
:
function
()
{
get_context
:
function
()
{
return
this
.
_drawCtx
;
return
this
.
_drawCtx
;
...
...
include/rfb.js
View file @
b804b3e4
...
@@ -411,7 +411,9 @@ var RFB;
...
@@ -411,7 +411,9 @@ var RFB;
if
(
this
.
_display
&&
this
.
_display
.
get_context
())
{
if
(
this
.
_display
&&
this
.
_display
.
get_context
())
{
this
.
_keyboard
.
ungrab
();
this
.
_keyboard
.
ungrab
();
this
.
_mouse
.
ungrab
();
this
.
_mouse
.
ungrab
();
if
(
state
!==
'connect'
&&
state
!==
'loaded'
)
{
this
.
_display
.
defaultCursor
();
this
.
_display
.
defaultCursor
();
}
if
(
Util
.
get_logging
()
!==
'debug'
||
state
===
'loaded'
)
{
if
(
Util
.
get_logging
()
!==
'debug'
||
state
===
'loaded'
)
{
// Show noVNC logo on load and when disconnected, unless in
// Show noVNC logo on load and when disconnected, unless in
// debug mode
// debug mode
...
@@ -1215,6 +1217,7 @@ var RFB;
...
@@ -1215,6 +1217,7 @@ var RFB;
RFB
.
prototype
.
set_local_cursor
=
function
(
cursor
)
{
RFB
.
prototype
.
set_local_cursor
=
function
(
cursor
)
{
if
(
!
cursor
||
(
cursor
in
{
'0'
:
1
,
'no'
:
1
,
'false'
:
1
}))
{
if
(
!
cursor
||
(
cursor
in
{
'0'
:
1
,
'no'
:
1
,
'false'
:
1
}))
{
this
.
_local_cursor
=
false
;
this
.
_local_cursor
=
false
;
this
.
_display
.
disableLocalCursor
();
//Only show server-side cursor
}
else
{
}
else
{
if
(
this
.
_display
.
get_cursor_uri
())
{
if
(
this
.
_display
.
get_cursor_uri
())
{
this
.
_local_cursor
=
true
;
this
.
_local_cursor
=
true
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment