brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix redundant calls to global.get_pointer()

Browse Source 
Since we are keeping a current pointer position anyways, we
don't have to continually call global.get_pointer() which is
a round trip to the magnifier; make ZoomRegion simply fetch
a current position stored in the Magnifier object.

https://bugzilla.gnome.org/show_bug.cgi?id=633553
This commit is contained in:
Owen W. Taylor 2010-10-30 17:01:41 -04:00
parent 96fb6d8f16
commit 978cf9d3ab
1 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
js/ui/magnifier.js
View File

@ -66,11 +66,14 @@ Magnifier.prototype = {
// Create the first ZoomRegion and initialize it according to the // Create the first ZoomRegion and initialize it according to the
// magnification settings. // magnification settings.
let [xMouse, yMouse, mask] = global.get_pointer();
let mask;
[this.xMouse, this.yMouse, mask] = global.get_pointer();
let aZoomRegion = new ZoomRegion(this, this._cursorRoot); let aZoomRegion = new ZoomRegion(this, this._cursorRoot);
this._zoomRegions.push(aZoomRegion); this._zoomRegions.push(aZoomRegion);
let showAtLaunch = this._settingsInit(aZoomRegion); let showAtLaunch = this._settingsInit(aZoomRegion);
aZoomRegion.scrollContentsTo(xMouse, yMouse); aZoomRegion.scrollContentsTo(this.xMouse, this.yMouse);
xfixesCursor.connect('cursor-change', Lang.bind(this, this._updateMouseSprite)); xfixesCursor.connect('cursor-change', Lang.bind(this, this._updateMouseSprite));
this._xfixesCursor = xfixesCursor; this._xfixesCursor = xfixesCursor;
@ -138,12 +141,10 @@ Magnifier.prototype = {
* Turn on mouse tracking, if not already doing so. * Turn on mouse tracking, if not already doing so.
*/ */
startTrackingMouse: function() { startTrackingMouse: function() {
// initialize previous mouse coord to undefined.
let prevCoord = { x: NaN, y: NaN };
if (!this._mouseTrackingId) if (!this._mouseTrackingId)
this._mouseTrackingId = Mainloop.timeout_add( this._mouseTrackingId = Mainloop.timeout_add(
MOUSE_POLL_FREQUENCY, MOUSE_POLL_FREQUENCY,
Lang.bind(this, this.scrollToMousePos, prevCoord) Lang.bind(this, this.scrollToMousePos)
); );
}, },
@ -170,14 +171,15 @@ Magnifier.prototype = {
* scrollToMousePos: * scrollToMousePos:
* Position all zoom regions' ROI relative to the current location of the * Position all zoom regions' ROI relative to the current location of the
* system pointer. * system pointer.
* @prevCoord: The previous mouse coordinates. Used to stop scrolling if
* the new position is the same as the last one (optional).
* @return true. * @return true.
*/ */
scrollToMousePos: function(prevCoord) { scrollToMousePos: function() {
let [xMouse, yMouse, mask] = global.get_pointer(); let [xMouse, yMouse, mask] = global.get_pointer();
if (!prevCoord || prevCoord.x != xMouse || prevCoord.y != yMouse) { if (xMouse != this.xMouse || yMouse != this.yMouse) {
this.xMouse = xMouse;
this.yMouse = yMouse;
let sysMouseOverAny = false; let sysMouseOverAny = false;
this._zoomRegions.forEach(function(zoomRegion, index, array) { this._zoomRegions.forEach(function(zoomRegion, index, array) {
if (zoomRegion.scrollToMousePos()) if (zoomRegion.scrollToMousePos())
@ -187,11 +189,6 @@ Magnifier.prototype = {
this.hideSystemCursor(); this.hideSystemCursor();
else else
this.showSystemCursor(); this.showSystemCursor();
if (prevCoord) {
prevCoord.x = xMouse;
prevCoord.y = yMouse;
}
} }
return true; return true;
}, },
@ -1018,16 +1015,14 @@ ZoomRegion.prototype = {
this._updateMousePosition(); this._updateMousePosition();
}, },
_isMouseOverRegion: function(xMouse, yMouse) { _isMouseOverRegion: function() {
// Return whether the system mouse sprite is over this ZoomRegion. If the // Return whether the system mouse sprite is over this ZoomRegion. If the
// mouse's position is not given, then it is fetched. // mouse's position is not given, then it is fetched.
let mouseIsOver = false; let mouseIsOver = false;
if (this.isActive()) { if (this.isActive()) {
if (xMouse == null || yMouse == null) { let xMouse = this._magnifier.xMouse;
let [x, y, mask] = global.get_pointer(); let yMouse = this._magnifier.yMouse;
xMouse = x;
yMouse = y;
}
mouseIsOver = ( mouseIsOver = (
xMouse >= this._viewPortX && xMouse < (this._viewPortX + this._viewPortWidth) && xMouse >= this._viewPortX && xMouse < (this._viewPortX + this._viewPortWidth) &&
yMouse >= this._viewPortY && yMouse < (this._viewPortY + this._viewPortHeight) yMouse >= this._viewPortY && yMouse < (this._viewPortY + this._viewPortHeight)
@ -1053,7 +1048,8 @@ ZoomRegion.prototype = {
// Determines where the center should be given the current cursor // Determines where the center should be given the current cursor
// position and mouse tracking mode // position and mouse tracking mode
let [xMouse, yMouse, mask] = global.get_pointer(); let xMouse = this._magnifier.xMouse;
let yMouse = this._magnifier.yMouse;
if (this._mouseTrackingMode == MouseTrackingMode.PROPORTIONAL) { if (this._mouseTrackingMode == MouseTrackingMode.PROPORTIONAL) {
return this._centerFromMouseProportional(xMouse, yMouse); return this._centerFromMouseProportional(xMouse, yMouse);
@ -1147,8 +1143,8 @@ ZoomRegion.prototype = {
if (!this.isActive()) if (!this.isActive())
return; return;
let [xMouse, yMouse, mask] = global.get_pointer(); let [xMagMouse, yMagMouse] = this._screenToViewPort(this._magnifier.xMouse,
let [xMagMouse, yMagMouse] = this._screenToViewPort(xMouse, yMouse); this._magnifier.yMouse);
xMagMouse = Math.round(xMagMouse); xMagMouse = Math.round(xMagMouse);
yMagMouse = Math.round(yMagMouse); yMagMouse = Math.round(yMagMouse);