gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-05 06:45:45 +01:00
Code Issues Projects Releases Wiki Activity

break up buffer.scrollAbsolute and buffer.scrollRelative into smaller, more

Browse Source 
specific, methods
This commit is contained in:
Doug Kearns
2007-08-14 15:32:55 +00:00
parent 9f79ec4d71
commit ca3ce21fdc
4 changed files with 148 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
chrome/content/vimperator/buffers.js
View File

@@ -59,8 +59,8 @@ function Buffer() //{{{
}
// NOTE: this is only needed as there's currently no way to specify a
// {count} when calling ZM.reduce()/ZM.enlarge(). TODO: see if we can get
// this added to ZoomManager.
// multiplier when calling ZM.reduce()/ZM.enlarge(). TODO: see if we can
// get this added to ZoomManager
function bumpZoomLevel(steps)
{
var adjusted_zoom = zoom_manager.snap(zoom_manager.textZoom);
@@ -83,6 +83,32 @@ function Buffer() //{{{
setZoom(zoom_manager.zoomFactors[next]);
}
function checkScrollYBounds(win, direction)
{
// NOTE: it's possible to have scrollY > scrollMaxY - FF bug?
if (direction > 0 && win.scrollY >= win.scrollMaxY || direction < 0 && win.scrollY == 0)
vimperator.beep();
}
// both values are given in percent, -1 means no change
function scrollToPercentiles(horizontal, vertical)
{
var win = document.commandDispatcher.focusedWindow;
var h, v;
if (horizontal < 0)
h = win.scrollX;
else
h = win.scrollMaxX / 100 * horizontal;
if (vertical < 0)
v = win.scrollY;
else
v = win.scrollMaxY / 100 * vertical;
win.scrollTo(h, v);
}
/////////////////////////////////////////////////////////////////////////////}}}
////////////////////// PUBLIC SECTION //////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////{{{
@@ -112,56 +138,54 @@ function Buffer() //{{{
return window.content.document.title;
});
// both values are given in percent, -1 means no change
this.scrollAbsolute = function(horizontal, vertical)
this.scrollBottom = function()
{
var win = document.commandDispatcher.focusedWindow;
//var win = window.content;
var horiz, vert;
if (horizontal < 0)
horiz = win.scrollX;
else
horiz = win.scrollMaxX / 100 * horizontal;
if (vertical < 0)
vert = win.scrollY;
else
vert = win.scrollMaxY / 100 * vertical;
win.scrollTo(horiz, vert);
scrollToPercentiles(-1, 100);
}
this.scrollRelative = function(right, down)
this.scrollColumns = function(cols)
{
var win = window.document.commandDispatcher.focusedWindow;
//var win = window.content; // XXX: This would fix scrolling when the tab has focus, but breaks when it has frames --MST
const COL_WIDTH = 20;
// beep if we can't go there
if (down > 0)
{
// NOTE: it's possible to have scrollY > scrollMaxY - FF bug?
if (win.scrollY >= win.scrollMaxY)
vimperator.beep();
}
else if (down < 0)
{
if (win.scrollY == 0)
vimperator.beep();
}
if (cols > 0 && win.scrollX >= win.scrollMaxX || cols < 0 && win.scrollX == 0)
vimperator.beep();
if (right > 0)
{
if (win.scrollX >= win.scrollMaxX)
vimperator.beep();
}
else if (right < 0)
{
if (win.scrollX == 0)
vimperator.beep();
}
win.scrollBy(COL_WIDTH * cols, 0);
}
win.scrollBy(right * 20, down * 20);
this.scrollEnd = function()
{
scrollToPercentiles(100, -1);
}
this.scrollLines = function(lines)
{
var win = window.document.commandDispatcher.focusedWindow;
checkScrollYBounds(win, lines);
win.scrollByLines(lines);
}
this.scrollPages = function(pages)
{
var win = window.document.commandDispatcher.focusedWindow;
checkScrollYBounds(win, pages);
win.scrollByPages(pages);
}
this.scrollToPercentile = function(percentage)
{
scrollToPercentiles(-1, percentage);
}
this.scrollStart = function()
{
scrollToPercentiles(0, -1);
}
this.scrollTop = function()
{
scrollToPercentiles(-1, 0);
}
// TODO: allow callback for filtering out unwanted frames? User defined?
@@ -261,8 +285,8 @@ function Buffer() //{{{
}
catch (e)
{
//vimperator.echoerr(e);
// FIXME: fail silently here for now
//vimperator.log(e);
}
}

2
chrome/content/vimperator/events.js
View File

@@ -439,7 +439,7 @@ function Events() //{{{
{
if (map.always_active || vimperator.hints.currentState() == 1)
{
map.execute();
map.execute(null, vimperator.input.count);
if (map.cancel_mode) // stop processing this event
{
vimperator.hints.disableHahMode();

149
chrome/content/vimperator/mappings.js
View File

@@ -583,28 +583,28 @@ function Mappings() //{{{
}
));
addDefaultMap(new Map(vimperator.modes.NORMAL, ["zi", "+"],
function(count) { vimperator.buffer.zoomIn(count > 0 ? count : 1); },
function(count) { vimperator.buffer.zoomIn(count > 1 ? count : 1); },
{
short_help: "Zoom in current web page by 25%",
flags: Mappings.flags.COUNT
}
));
addDefaultMap(new Map(vimperator.modes.NORMAL, ["zI"],
function(count) { vimperator.buffer.zoomIn((count > 0 ? count : 1) * 4); },
function(count) { vimperator.buffer.zoomIn((count > 1 ? count : 1) * 4); },
{
short_help: "Zoom in current web page by 100%",
flags: Mappings.flags.COUNT
}
));
addDefaultMap(new Map(vimperator.modes.NORMAL, ["zo", "-"],
function(count) { vimperator.buffer.zoomOut(count > 0 ? count : 1); },
function(count) { vimperator.buffer.zoomOut(count > 1 ? count : 1); },
{
short_help: "Zoom out current web page by 25%",
flags: Mappings.flags.COUNT
}
));
addDefaultMap(new Map(vimperator.modes.NORMAL, ["zO"],
function(count) { vimperator.buffer.zoomOut((count > 0 ? count : 1) * 4); },
function(count) { vimperator.buffer.zoomOut((count > 1 ? count : 1) * 4); },
{
short_help: "Zoom out current web page by 100%",
flags: Mappings.flags.COUNT
@@ -612,7 +612,7 @@ function Mappings() //{{{
));
addDefaultMap(new Map(vimperator.modes.NORMAL, ["zz"],
// FIXME: does it make sense to use count for this? Just use it for returning to 100%?
function(count) { vimperator.buffer.textZoom = count > 0 ? count : 100; },
function(count) { vimperator.buffer.textZoom = count > 1 ? count : 100; },
{
short_help: "Set zoom value of the web page",
help: "Zoom value can be between 1 and 2000%. If it is omitted, zoom is reset to 100%.",
@@ -637,20 +637,20 @@ function Mappings() //{{{
// scrolling commands
addDefaultMap(new Map(vimperator.modes.NORMAL, ["0", "^"],
function() { vimperator.buffer.scrollAbsolute(0, -1); },
function() { vimperator.buffer.scrollStart(); },
{
short_help: "Scroll to the absolute left of the document",
help: "Unlike in vim, <code class=\"mapping\">0</code> and <code class=\"mapping\">^</code> work exactly the same way."
}
));
addDefaultMap(new Map(vimperator.modes.NORMAL, ["$"],
function() { vimperator.buffer.scrollAbsolute(100, -1); },
function() { vimperator.buffer.scrollEnd(); },
{
short_help: "Scroll to the absolute right of the document"
}
));
addDefaultMap(new Map(vimperator.modes.NORMAL, ["gg", "<Home>"],
function(count) { vimperator.buffer.scrollAbsolute(-1, count > 0 ? count : 0); },
function(count) { vimperator.buffer.scrollToPercentile(count > 0 ? count : 0); },
{
short_help: "Goto the top of the document",
help: "Count is supported: <code class=\"mapping\">35gg</code> vertically goes to 35% of the document.",
@@ -658,7 +658,7 @@ function Mappings() //{{{
}
));
addDefaultMap(new Map(vimperator.modes.NORMAL, ["G", "<End>"],
function(count) { vimperator.buffer.scrollAbsolute(-1, count >= 0 ? count : 100); },
function(count) { vimperator.buffer.scrollToPercentile(count >= 0 ? count : 100); },
{
short_help: "Goto the end of the document",
help: "Count is supported: <code class=\"mapping\">35G</code> vertically goes to 35% of the document.",
@@ -666,7 +666,7 @@ function Mappings() //{{{
}
));
addDefaultMap(new Map(vimperator.modes.NORMAL, ["h", "<Left>"],
function(count) { vimperator.buffer.scrollRelative(count > 1 ? -count : -1, 0); },
function(count) { vimperator.buffer.scrollColumns(-(count > 1 ? count : 1)); },
{
short_help: "Scroll document to the left",
help: "Count is supported: <code class=\"mapping\">10h</code> will move 10 times as much to the left.<br/>" +
@@ -675,7 +675,7 @@ function Mappings() //{{{
}
));
addDefaultMap(new Map(vimperator.modes.NORMAL, ["j", "<Down>", "<C-e>"],
function(count) { vimperator.buffer.scrollRelative(0, count > 1 ? count : 1); },
function(count) { vimperator.buffer.scrollLines(count > 1 ? count : 1); },
{
short_help: "Scroll document down",
help: "Count is supported: <code class=\"mapping\">10j</code> will move 10 times as much down.<br/>" +
@@ -684,7 +684,7 @@ function Mappings() //{{{
}
));
addDefaultMap(new Map(vimperator.modes.NORMAL, ["k", "<Up>", "<C-y>"],
function(count) { vimperator.buffer.scrollRelative(0, count > 1 ? -count : -1); },
function(count) { vimperator.buffer.scrollLines(-(count > 1 ? count : 1)); },
{
short_help: "Scroll document up",
help: "Count is supported: <code class=\"mapping\">10k</code> will move 10 times as much up.<br/>" +
@@ -692,23 +692,24 @@ function Mappings() //{{{
flags: Mappings.flags.COUNT
}
));
function getScrollSize(count)
function scrollByScrollSize(count, direction)
{
var lines;
if (count > 0)
vimperator.options["scroll"] = count;
if (vimperator.options["scroll"] == 0) // the default value of half a page
// FIXME: when updating the scroll methods in v.buffer!
lines = vimperator.buffer.pageHeight / (2 * 20); // NOTE: a line is currently 20 pixels rather than a true line.
if (vimperator.options["scroll"] > 0)
{
vimperator.buffer.scrollLines(vimperator.options["scroll"] * direction);
}
else
lines = vimperator.options["scroll"];
return lines;
{
// scroll half a page down in pixels
var win = document.commandDispatcher.focusedWindow;
win.scrollBy(0, vimperator.buffer.pageHeight / 2 * direction);
}
}
addDefaultMap(new Map(vimperator.modes.NORMAL, ["<C-d>"],
function(count) { vimperator.buffer.scrollRelative(0, getScrollSize(count)); },
function(count) { scrollByScrollSize(count, 1); },
{
short_help: "Scroll window downwards in the buffer",
help: "The number of lines is set by the <code class=\"option\">'scroll'</code> option which defaults to half a page. " +
@@ -717,7 +718,7 @@ function Mappings() //{{{
}
));
addDefaultMap(new Map(vimperator.modes.NORMAL, ["<C-u>"],
function(count) { vimperator.buffer.scrollRelative(0, -getScrollSize(count)); },
function(count) { scrollByScrollSize(count, -1); },
{
short_help: "Scroll window upwards in the buffer",
help: "The number of lines is set by the <code class=\"option\">'scroll'</code> option which defaults to half a page. " +
@@ -726,7 +727,7 @@ function Mappings() //{{{
}
));
addDefaultMap(new Map(vimperator.modes.NORMAL, ["l", "<Right>"],
function(count) { vimperator.buffer.scrollRelative(count > 1 ? count : 1, 0); },
function(count) { vimperator.buffer.scrollColumns(count > 1 ? count : 1); },
{
short_help: "Scroll document to the right",
help: "Count is supported: <code class=\"mapping\">10l</code> will move 10 times as much to the right.<br/>" +
@@ -735,23 +736,25 @@ function Mappings() //{{{
}
));
addDefaultMap(new Map(vimperator.modes.NORMAL, ["<C-b>", "<PageUp>", "<S-Space>"],
function() { goDoCommand('cmd_scrollPageUp'); },
function(count) { vimperator.buffer.scrollPages(-(count > 1 ? count : 1)); },
{
short_help: "Scroll up a full page of the current document",
help: "No count support for now."
help: "TODO",
flags: Mappings.flags.COUNT
}
));
addDefaultMap(new Map(vimperator.modes.NORMAL, ["<C-f>", "<PageDown>", "<Space>"],
function() { goDoCommand('cmd_scrollPageDown'); },
function(count) { vimperator.buffer.scrollPages(count > 1 ? count : 1); },
{
short_help: "Scroll down a full page of the current document",
help: "No count support for now."
help: "TODO",
flags: Mappings.flags.COUNT
}
));
// history manipulation and jumplist
addDefaultMap(new Map(vimperator.modes.NORMAL, ["<C-o>"],
function(count) { vimperator.history.stepTo(count > 0 ? -1 * count : -1); },
function(count) { vimperator.history.stepTo(-(count > 1 ? count : 1)); },
{
short_help: "Go to an older position in the jump list",
help: "The jump list is just the browser history for now.",
@@ -759,7 +762,7 @@ function Mappings() //{{{
}
));
addDefaultMap(new Map(vimperator.modes.NORMAL, ["<C-i>"],
function(count) { vimperator.history.stepTo(count > 0 ? count : 1); },
function(count) { vimperator.history.stepTo(count > 1 ? count : 1); },
{
short_help: "Go to a newer position in the jump list",
help: "The jump list is just the browser history for now.",
@@ -767,7 +770,7 @@ function Mappings() //{{{
}
));
addDefaultMap(new Map(vimperator.modes.NORMAL, ["H", "<A-Left>", "<M-Left>"],
function(count) { vimperator.history.stepTo(count > 0 ? -1 * count : -1); },
function(count) { vimperator.history.stepTo(-(count > 1 ? count : 1)); },
{
short_help: "Go back in the browser history",
help: "Count is supported: <code class=\"mapping\">3H</code> goes back 3 steps.",
@@ -775,7 +778,7 @@ function Mappings() //{{{
}
));
addDefaultMap(new Map(vimperator.modes.NORMAL, ["L", "<A-Right>", "<M-Right>"],
function(count) { vimperator.history.stepTo(count > 0 ? count : 1); },
function(count) { vimperator.history.stepTo(count > 1 ? count : 1); },
{
short_help: "Go forward in the browser history",
help: "Count is supported: <code class=\"mapping\">3L</code> goes forward 3 steps.",
@@ -1023,87 +1026,81 @@ function Mappings() //{{{
// movement keys
addDefaultMap(new Map(vimperator.modes.HINTS, ["<C-e>"],
function() { vimperator.buffer.scrollRelative(0, count > 1 ? count : 1); },
function(count) { vimperator.buffer.scrollLines(count > 1 ? count : 1); },
{
cancel_mode: false,
always_active: true
always_active: true,
flags: Mappings.flags.COUNT
}
));
addDefaultMap(new Map(vimperator.modes.HINTS, ["<C-y>"],
function() { vimperator.buffer.scrollRelative(0, count > 1 ? -count : -1); },
function(count) { vimperator.buffer.scrollLines(-(count > 1 ? count : 1)); },
{
cancel_mode: false,
always_active: true
always_active: true,
flags: Mappings.flags.COUNT
}
));
addDefaultMap(new Map(vimperator.modes.HINTS, ["<Home>"],
function() { vimperator.buffer.scrollAbsolute(-1, 0); },
function() { vimperator.buffer.scrollTop(); },
{
cancel_mode: false,
always_active: true
}
));
addDefaultMap(new Map(vimperator.modes.HINTS, ["<End>"],
function() { vimperator.buffer.scrollAbsolute(-1, 100); },
function() { vimperator.buffer.scrollBottom(); },
{
cancel_mode: false,
always_active: true
}
));
addDefaultMap(new Map(vimperator.modes.HINTS, ["<C-b>"],
function() { goDoCommand('cmd_scrollPageUp'); },
addDefaultMap(new Map(vimperator.modes.HINTS, ["<PageUp>", "<C-b>"],
function(count) { vimperator.buffer.scrollPages(-(count > 1 ? count : 1)); },
{
cancel_mode: false,
always_active: true
always_active: true,
flags: Mappings.flags.COUNT
}
));
addDefaultMap(new Map(vimperator.modes.HINTS, ["<PageUp>"],
function() { goDoCommand('cmd_scrollPageUp'); },
addDefaultMap(new Map(vimperator.modes.HINTS, ["<PageDown>", "<C-f>"],
function(count) { vimperator.buffer.scrollPages(count > 1 ? count : 1); },
{
cancel_mode: false,
always_active: true
}
));
addDefaultMap(new Map(vimperator.modes.HINTS, ["<C-f>"],
function() { goDoCommand('cmd_scrollPageDown'); },
{
cancel_mode: false,
always_active: true
}
));
addDefaultMap(new Map(vimperator.modes.HINTS, ["<PageDown>"],
function() { goDoCommand('cmd_scrollPageDown'); },
{
cancel_mode: false,
always_active: true
always_active: true,
flags: Mappings.flags.COUNT
}
));
addDefaultMap(new Map(vimperator.modes.HINTS, ["<Left>"],
function() { vimperator.buffer.scrollRelative(count > 1 ? -count : -1, 0); },
function() { vimperator.buffer.scrollColumns(-(count > 1 ? count : 1)); },
{
cancel_mode: false,
always_active: true
always_active: true,
flags: Mappings.flags.COUNT
}
));
addDefaultMap(new Map(vimperator.modes.HINTS, ["<Down>"],
function() { vimperator.buffer.scrollRelative(0, count > 1 ? count : 1); },
function() { vimperator.buffer.scrollLines(count > 1 ? count : 1); },
{
cancel_mode: false,
always_active: true
always_active: true,
flags: Mappings.flags.COUNT
}
));
addDefaultMap(new Map(vimperator.modes.HINTS, ["<Up>"],
function() { vimperator.buffer.scrollRelative(0, count > 1 ? -count : -1); },
function() { vimperator.buffer.scrollLines(-(count > 1 ? count : 1)); },
{
cancel_mode: false,
always_active: true
always_active: true,
flags: Mappings.flags.COUNT
}
));
addDefaultMap(new Map(vimperator.modes.HINTS, ["<Right>"],
function() { vimperator.buffer.scrollRelative(count > 1 ? count : 1, 0); },
function() { vimperator.buffer.scrollColumns(count > 1 ? count : 1); },
{
cancel_mode: false,
always_active: true
always_active: true,
flags: Mappings.flags.COUNT
}
));
@@ -1125,31 +1122,35 @@ function Mappings() //{{{
// navigation
addDefaultMap(new Map(vimperator.modes.HINTS, ["<C-o>"],
function() { vimperator.history.stepTo(vimperator.input.count > 0 ? -1 * vimperator.input.count : -1); },
function(count) { vimperator.history.stepTo(count > 0 ? -count : -1); },
{
cancel_mode: false,
always_active: true
always_active: true,
flags: Mappings.flags.COUNT
}
));
addDefaultMap(new Map(vimperator.modes.HINTS, ["<C-i>"],
function() { vimperator.history.stepTo(vimperator.input.count > 0 ? vimperator.input.count : 1); },
function(count) { vimperator.history.stepTo(count > 1 ? count : 1); },
{
cancel_mode: false,
always_active: true
always_active: true,
flags: Mappings.flags.COUNT
}
));
addDefaultMap(new Map(vimperator.modes.HINTS, ["<C-h>"],
function() { vimperator.history.stepTo(vimperator.input.count > 0 ? -1 * vimperator.input.count : -1); },
function(count) { vimperator.history.stepTo(count > 0 ? -count : -1); },
{
cancel_mode: false,
always_active: true
always_active: true,
flags: Mappings.flags.COUNT
}
));
addDefaultMap(new Map(vimperator.modes.HINTS, ["<C-l>"],
function() { vimperator.history.stepTo(vimperator.input.count > 0 ? vimperator.input.count : 1); },
function(count) { vimperator.history.stepTo(count > 1 ? count : 1); },
{
cancel_mode: false,
always_active: true
always_active: true,
flags: Mappings.flags.COUNT
}
));
addDefaultMap(new Map(vimperator.modes.HINTS, ["<C-d>"],

4
chrome/content/vimperator/options.js
View File

@@ -425,7 +425,9 @@ function Options() //{{{
addOption(new Option(["scroll", "scr"], "number",
{
short_help: "Number of lines to scroll with <code class=\"mapping\">C-u</code> and <code class=\"mapping\">C-d</code> commands",
help: "TODO",
help: "The number of lines scrolled defaults to half the window size. " +
"When a <code class=\"argument\">{count}</code> is specified to the <code class=\"mapping\">&lt;C-u&gt;</code> or <code class=\"mapping\">&lt;C-d&gt;</code> commands this is used to set the value of <code class=\"option\">'scroll'</code> and also used for the current command. " +
"The value can be reset to half the window height with <code class=\"command\">:set scroll=0</code>.",
default_value: 0,
validator: function (value) { if (value >= 0) return true; else return false; }
}