diff options
| author | Robin Watts <robin.watts@artifex.com> | 2012-07-05 17:55:18 +0100 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2012-07-05 18:02:03 +0100 |
| commit | eeaccf8444a4884801a92c0d23f66bd54c986a67 (patch) | |
| tree | fc9e254dfeef4d61a80aace2f5dbbcd985580a9a /apps/pdfapp.c | |
| parent | b81be8d34b179d48e677463bd7b66ffdea129517 (diff) | |
| parent | 15fc25b0055dbdbfaf4257ac908d43fd5a2da19d (diff) | |
| download | mupdf-eeaccf8444a4884801a92c0d23f66bd54c986a67.tar.xz | |
Merge branch 'master' into forms
Diffstat (limited to 'apps/pdfapp.c')
| -rw-r--r-- | apps/pdfapp.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/apps/pdfapp.c b/apps/pdfapp.c index 6efa89ad..c02ed3f2 100644 --- a/apps/pdfapp.c +++ b/apps/pdfapp.c @@ -56,7 +56,7 @@ char *pdfapp_usage(pdfapp_t *app) "f\t\t-- fullscreen\n" "r\t\t-- reload file\n" ". pgdn right spc\t-- next page\n" - ", pgup left b\t-- previous page\n" + ", pgup left b bkspc\t-- previous page\n" ">\t\t-- next 10 pages\n" "<\t\t-- back 10 pages\n" "m\t\t-- mark page for snap back\n" @@ -894,6 +894,7 @@ void pdfapp_onkey(pdfapp_t *app, int c) app->pageno++; break; + case '\b': case 'b': panto = DONT_PAN; if (app->numberlen > 0) @@ -1131,10 +1132,10 @@ void pdfapp_onmouse(pdfapp_t *app, int x, int y, int btn, int modifiers, int sta if (app->iscopying) { app->iscopying = 0; - app->selr.x0 = MIN(app->selx, x) - app->panx + rect.x0; - app->selr.x1 = MAX(app->selx, x) - app->panx + rect.x0; - app->selr.y0 = MIN(app->sely, y) - app->pany + rect.y0; - app->selr.y1 = MAX(app->sely, y) - app->pany + rect.y0; + app->selr.x0 = fz_mini(app->selx, x) - app->panx + rect.x0; + app->selr.x1 = fz_maxi(app->selx, x) - app->panx + rect.x0; + app->selr.y0 = fz_mini(app->sely, y) - app->pany + rect.y0; + app->selr.y1 = fz_maxi(app->sely, y) - app->pany + rect.y0; winrepaint(app); if (app->selr.x0 < app->selr.x1 && app->selr.y0 < app->selr.y1) windocopy(app); @@ -1201,10 +1202,10 @@ void pdfapp_onmouse(pdfapp_t *app, int x, int y, int btn, int modifiers, int sta else if (app->iscopying) { - app->selr.x0 = MIN(app->selx, x) - app->panx + rect.x0; - app->selr.x1 = MAX(app->selx, x) - app->panx + rect.x0; - app->selr.y0 = MIN(app->sely, y) - app->pany + rect.y0; - app->selr.y1 = MAX(app->sely, y) - app->pany + rect.y0; + app->selr.x0 = fz_mini(app->selx, x) - app->panx + rect.x0; + app->selr.x1 = fz_maxi(app->selx, x) - app->panx + rect.x0; + app->selr.y0 = fz_mini(app->sely, y) - app->pany + rect.y0; + app->selr.y1 = fz_maxi(app->sely, y) - app->pany + rect.y0; winrepaint(app); } |