diff options
Diffstat (limited to 'platform/x11')
-rw-r--r-- | platform/x11/pdfapp.c | 12 | ||||
-rw-r--r-- | platform/x11/pdfapp.h | 2 | ||||
-rw-r--r-- | platform/x11/win_main.c | 2 | ||||
-rw-r--r-- | platform/x11/x11_main.c | 8 |
4 files changed, 12 insertions, 12 deletions
diff --git a/platform/x11/pdfapp.c b/platform/x11/pdfapp.c index 707c0a2a..34e14ac4 100644 --- a/platform/x11/pdfapp.c +++ b/platform/x11/pdfapp.c @@ -863,7 +863,7 @@ static void pdfapp_gotouri(pdfapp_t *app, char *uri) void pdfapp_gotopage(pdfapp_t *app, int number) { - app->isediting = 0; + app->issearching = 0; winrepaint(app); if (app->histlen + 1 == 256) @@ -954,7 +954,7 @@ void pdfapp_onkey(pdfapp_t *app, int c) enum panning panto = PAN_TO_TOP; int loadpage = 1; - if (app->isediting) + if (app->issearching) { int n = strlen(app->search); if (c < ' ') @@ -966,7 +966,7 @@ void pdfapp_onkey(pdfapp_t *app, int c) } if (c == '\n' || c == '\r') { - app->isediting = 0; + app->issearching = 0; if (n > 0) { winrepaintsearch(app); @@ -987,7 +987,7 @@ void pdfapp_onkey(pdfapp_t *app, int c) } if (c == '\033') { - app->isediting = 0; + app->issearching = 0; winrepaint(app); } } @@ -1247,7 +1247,7 @@ void pdfapp_onkey(pdfapp_t *app, int c) */ case '?': - app->isediting = 1; + app->issearching = 1; app->searchdir = -1; app->search[0] = 0; app->hit_count = 0; @@ -1256,7 +1256,7 @@ void pdfapp_onkey(pdfapp_t *app, int c) break; case '/': - app->isediting = 1; + app->issearching = 1; app->searchdir = 1; app->search[0] = 0; app->hit_count = 0; diff --git a/platform/x11/pdfapp.h b/platform/x11/pdfapp.h index 9c1dcd0a..6fb1f57f 100644 --- a/platform/x11/pdfapp.h +++ b/platform/x11/pdfapp.h @@ -118,7 +118,7 @@ struct pdfapp_s int nowaitcursor; /* search state */ - int isediting; + int issearching; int searchdir; char search[512]; int searchpage; diff --git a/platform/x11/win_main.c b/platform/x11/win_main.c index 6ddd171a..5c431ee2 100644 --- a/platform/x11/win_main.c +++ b/platform/x11/win_main.c @@ -709,7 +709,7 @@ void windrawstring(pdfapp_t *app, int x, int y, char *s) void winblitsearch() { - if (gapp.isediting) + if (gapp.issearching) { char buf[sizeof(gapp.search) + 50]; sprintf(buf, "Search: %s", gapp.search); diff --git a/platform/x11/x11_main.c b/platform/x11/x11_main.c index 04195f5c..67763ea0 100644 --- a/platform/x11/x11_main.c +++ b/platform/x11/x11_main.c @@ -459,7 +459,7 @@ static void fillrect(int x, int y, int w, int h) static void winblitstatusbar(pdfapp_t *app) { - if (gapp.isediting) + if (gapp.issearching) { char buf[sizeof(gapp.search) + 50]; sprintf(buf, "Search: %s", gapp.search); @@ -744,7 +744,7 @@ static void onkey(int c) winrepaint(&gapp); } - if (!gapp.isediting && c == 'P') + if (!gapp.issearching && c == 'P') { struct timeval now; struct timeval tmo; @@ -759,7 +759,7 @@ static void onkey(int c) pdfapp_onkey(&gapp, c); - if (gapp.isediting) + if (gapp.issearching) { showingpage = 0; showingmessage = 0; @@ -893,7 +893,7 @@ int main(int argc, char **argv) case KeyPress: len = XLookupString(&xevt.xkey, buf, sizeof buf, &keysym, NULL); - if (!gapp.isediting) + if (!gapp.issearching) switch (keysym) { case XK_Escape: |