diff options
Diffstat (limited to 'atari')
| -rw-r--r-- | atari/deskmenu.c | 8 | ||||
| -rw-r--r-- | atari/gui.c | 36 | ||||
| -rwxr-xr-x | atari/gui.h | 3 | ||||
| -rwxr-xr-x | atari/misc.c | 11 | ||||
| -rwxr-xr-x | atari/rootwin.c | 2 | ||||
| -rwxr-xr-x | atari/schedule.h | 15 | ||||
| -rw-r--r-- | atari/toolbar.h | 3 |
7 files changed, 39 insertions, 39 deletions
diff --git a/atari/deskmenu.c b/atari/deskmenu.c index 8de2e327f..96b2d02ce 100644 --- a/atari/deskmenu.c +++ b/atari/deskmenu.c @@ -394,7 +394,9 @@ static void __CDECL menu_inc_scale(short item, short title, void *data) if(input_window == NULL) return; - gui_window_set_scale(input_window, gui_window_get_scale(input_window)+0.25); + browser_window_set_scale(input_window->browser->bw, + browser_window_get_scale(input_window->browser->bw) + 0.25, + true); } @@ -403,7 +405,9 @@ static void __CDECL menu_dec_scale(short item, short title, void *data) if(input_window == NULL) return; - gui_window_set_scale(input_window, gui_window_get_scale(input_window)-0.25); + browser_window_set_scale(input_window->browser->bw, + browser_window_get_scale(input_window->browser->bw) - 0.25, + true); } diff --git a/atari/gui.c b/atari/gui.c index 7cac90c3b..f267b69a8 100644 --- a/atari/gui.c +++ b/atari/gui.c @@ -121,7 +121,7 @@ static void gui_poll(bool active) aes_event_in.emi_tlow = schedule_run(); - if(active || rendering){ + if(rendering){ aes_event_in.emi_tlow = nsoption_int(atari_gui_poll_timeout); } @@ -130,11 +130,10 @@ static void gui_poll(bool active) printf("long poll!\n"); } - if( !active ) { if(input_window && input_window->root->redraw_slots.areas_used > 0) { window_process_redraws(input_window->root); } - } + graf_mkstate(&mx, &my, &dummy, &dummy); aes_event_in.emi_m1.g_x = mx; @@ -202,7 +201,6 @@ gui_window_create(struct browser_window *bw, option_window_x, option_window_y, option_window_width, option_window_height }; - gui_window_set_scale(gw, 1.0); gui_window_set_url(gw, ""); gui_window_set_pointer(gw, BROWSER_POINTER_DEFAULT); gui_set_input_gui_window(gw); @@ -344,21 +342,14 @@ void gui_window_set_status(struct gui_window *w, const char *text) window_set_stauts(w->root, (char*)text); } -float gui_window_get_scale(struct gui_window *gw) -{ - return(gw->scale); -} - -void gui_window_set_scale(struct gui_window *gw, float scale) +static void atari_window_reformat(struct gui_window *gw) { - int width = 0, heigth = 0; + int width = 0, height = 0; - LOG(("scale: %f", scale)); - - gw->scale = MAX(scale, 0.25); - - gui_window_get_dimensions(gw, &width, &heigth, true); - browser_window_reformat(gw->browser->bw, false, width, heigth); + if (gw != NULL) { + gui_window_get_dimensions(gw, &width, &height, true); + browser_window_reformat(gw->browser->bw, false, width, height); + } } static void gui_window_redraw_window(struct gui_window *gw) @@ -403,10 +394,10 @@ bool gui_window_get_scroll(struct gui_window *w, int *sx, int *sy) static void gui_window_set_scroll(struct gui_window *w, int sx, int sy) { - if ((w == NULL) - || (w->browser->bw == NULL) - || (w->browser->bw->current_content == NULL)) - return; + if ( (w == NULL) + || (w->browser->bw == NULL) + || (!browser_window_has_content(w->browser->bw))) + return; LOG(("scroll (gui_window: %p) %d, %d\n", w, sx, sy)); window_scroll_by(w->root, sx, sy); @@ -421,7 +412,7 @@ static void gui_window_set_scroll(struct gui_window *w, int sx, int sy) static void gui_window_update_extent(struct gui_window *gw) { - if( gw->browser->bw->current_content != NULL ) { + if(browser_window_has_content(gw->browser->bw)) { // TODO: store content size! if(window_get_active_gui_window(gw->root) == gw) { window_set_content_size( gw->root, @@ -1018,6 +1009,7 @@ static struct gui_window_table atari_window_table = { .set_scroll = gui_window_set_scroll, .get_dimensions = gui_window_get_dimensions, .update_extent = gui_window_update_extent, + .reformat = atari_window_reformat, .set_title = gui_window_set_title, .set_url = gui_window_set_url, diff --git a/atari/gui.h b/atari/gui.h index 978c0d093..10736c5f8 100755 --- a/atari/gui.h +++ b/atari/gui.h @@ -149,7 +149,6 @@ struct gui_window { char * title; char * url; struct bitmap * icon; - float scale; struct s_caret caret; struct s_search_form_session *search; struct gui_window *next, *prev; @@ -168,7 +167,5 @@ char *gui_window_get_title(struct gui_window *gw); void gui_window_set_status(struct gui_window *w, const char *text); void gui_window_set_pointer(struct gui_window *gw, gui_pointer_shape shape); void gui_window_destroy(struct gui_window *w); -void gui_window_set_scale(struct gui_window *gw, float scale); -float gui_window_get_scale(struct gui_window *gw); #endif diff --git a/atari/misc.c b/atari/misc.c index e689b8249..bd3158406 100755 --- a/atari/misc.c +++ b/atari/misc.c @@ -203,12 +203,15 @@ static nserror load_icon_callback(hlcache_handle *handle, /** * utility function. Copied from NetSurf tree API. * - * \param name the name of the loaded icon, if it's not a full path the icon is - * looked for in the directory specified by icons_dir + * \param name the name of the loaded icon, if it's not a full path + * the icon is looked for in the directory specified by + * icons_dir. + * \param cb callback function to deal with hlcache callback. + * \param pw Context pointer to be passed to callback. * \return the icon in form of a content or NULL on failure */ -hlcache_handle *load_icon(const char *name, hlcache_handle_callback cb, - void * pw ) +hlcache_handle * +load_icon(const char *name, hlcache_handle_callback cb, void *pw) { hlcache_handle *c; nserror err; diff --git a/atari/rootwin.c b/atari/rootwin.c index fde0bd3b5..a9c958e04 100755 --- a/atari/rootwin.c +++ b/atari/rootwin.c @@ -834,7 +834,7 @@ static void window_redraw_content(ROOTWIN *rootwin, GRECT *content_area, plot_set_dimensions(content_area->g_x, content_area->g_y, content_area->g_w, content_area->g_h); - oldscale = plot_set_scale(gui_window_get_scale(rootwin->active_gui_window)); + oldscale = plot_set_scale(browser_window_get_scale(rootwin->active_gui_window->browser->bw)); /* first, we make the coords relative to the content area: */ content_area_rel.g_x = clip->g_x - content_area->g_x; diff --git a/atari/schedule.h b/atari/schedule.h index 47d8c2ddf..05eebb2d7 100755 --- a/atari/schedule.h +++ b/atari/schedule.h @@ -22,20 +22,23 @@ /** * Process events up to current time. + * + * \return The number of miliseconds until the next scheduled event. */ int schedule_run(void); /** * Schedule a callback. * - * \param tival interval before the callback should be made in ms - * \param callback callback function - * \param p user parameter, passed to callback function + * \param ival interval before the callback should be made in miliseconds. + * \param callback callback function. + * \param p user parameter, passed to callback function. + * \return NSERROR_OK on success or appropriate error code. * - * The callback function will be called as soon as possible after t ms have - * passed. + * The callback function will be called as soon as possible after \a ival + * ms have passed. */ -nserror atari_schedule(int cs_ival, void (*callback)(void *p), void *p); +nserror atari_schedule(int ival, void (*callback)(void *p), void *p); /** * LOG all current scheduled events. diff --git a/atari/toolbar.h b/atari/toolbar.h index be4bd038e..284376fcb 100644 --- a/atari/toolbar.h +++ b/atari/toolbar.h @@ -26,6 +26,7 @@ #include "desktop/browser.h" struct s_toolbar; +struct nsurl; enum toolbar_textarea { URL_INPUT_TEXT_AREA = 1 @@ -76,7 +77,7 @@ OBJECT *toolbar_get_form(struct s_toolbar *tb); struct textarea *toolbar_get_textarea(struct s_toolbar *tb, enum toolbar_textarea which); char *toolbar_get_url(struct s_toolbar *tb); -nsurl * toolbar_get_nsurl(struct s_toolbar * tb); +struct nsurl * toolbar_get_nsurl(struct s_toolbar * tb); void toolbar_set_throbber_state(struct s_toolbar *tb, bool active); void toolbar_set_attached(struct s_toolbar *tb, bool attached); void toolbar_set_visible(struct s_toolbar *tb, short area, bool visible); |