diff options
| author | Michael Drake <tlsa@netsurf-browser.org> | 2014-10-16 21:30:27 +0100 |
|---|---|---|
| committer | Michael Drake <tlsa@netsurf-browser.org> | 2014-10-16 21:30:27 +0100 |
| commit | d9e5f5f0a63bfabc98eb83d70e4dec2a38d0a63d (patch) | |
| tree | f24726b873ca0a2c3f1dd1140e9e8c56e2f35605 /riscos | |
| parent | ecd7cb8ca3749d96f949c4d99befac363793b5c9 (diff) | |
| download | netsurf-d9e5f5f0a63bfabc98eb83d70e4dec2a38d0a63d.tar.gz netsurf-d9e5f5f0a63bfabc98eb83d70e4dec2a38d0a63d.tar.bz2 | |
Avoid dealing with hlcache_handle in key handling.
Diffstat (limited to 'riscos')
| -rw-r--r-- | riscos/window.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/riscos/window.c b/riscos/window.c index a446fd7ab..f030e2301 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -1863,7 +1863,6 @@ bool ro_gui_window_toolbar_keypress(void *data, wimp_key *key) bool ro_gui_window_handle_local_keypress(struct gui_window *g, wimp_key *key, bool is_toolbar) { - hlcache_handle *h; struct contextual_content cont; os_error *ro_error; wimp_pointer pointer; @@ -1888,9 +1887,6 @@ bool ro_gui_window_handle_local_keypress(struct gui_window *g, wimp_key *key, if (!ro_gui_window_to_window_pos(g, pointer.pos.x, pointer.pos.y, &pos)) return false; - - h = g->bw->current_content; - browser_window_get_contextual_content(g->bw, pos.x, pos.y, &cont); switch (c) { @@ -1978,7 +1974,8 @@ bool ro_gui_window_handle_local_keypress(struct gui_window *g, wimp_key *key, return true; case IS_WIMP_KEY + wimp_KEY_F8: /* View source */ - ro_gui_view_source((cont.main != NULL) ? cont.main : h); + ro_gui_view_source((cont.main != NULL) ? cont.main : + browser_window_get_content(bw)); return true; case IS_WIMP_KEY + wimp_KEY_F9: @@ -2029,7 +2026,7 @@ bool ro_gui_window_handle_local_keypress(struct gui_window *g, wimp_key *key, case 17: /* CTRL+Q (Zoom out) */ case 23: /* CTRL+W (Zoom in) */ - if (!h) + if (browser_window_has_content(bw) == false) break; scale = g->scale; if (ro_gui_shift_pressed() && c == 17) |