From 6675aa62dc01f84f5ad29035a9ce551f13296571 Mon Sep 17 00:00:00 2001 From: Ole Loots Date: Mon, 15 Apr 2013 20:59:30 +0200 Subject: Refactored toolbar redraw Always use the callback pointer and introduced an standard callback. --- atari/gemtk/guiwin.c | 84 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 50 insertions(+), 34 deletions(-) diff --git a/atari/gemtk/guiwin.c b/atari/gemtk/guiwin.c index 24fba9396..6b46d78dc 100644 --- a/atari/gemtk/guiwin.c +++ b/atari/gemtk/guiwin.c @@ -37,7 +37,7 @@ struct gemtk_window_s { /** the generic event handler function for events passed to the client */ gemtk_wm_event_handler_f handler_func; - /** The custom toolbar redraw function, if any */ + /** The toolbar redraw function, if any */ gemtk_wm_redraw_f toolbar_redraw_func; /** window configuration */ @@ -294,7 +294,8 @@ static short preproc_wm(GUIWIN * gw, EVMULT_OUT *ev_out, short msg[8]) break; case WM_REDRAW: - if ((gw->flags & GEMTK_WM_FLAG_CUSTOM_TOOLBAR) == 0) { + if ((gw->flags & GEMTK_WM_FLAG_CUSTOM_TOOLBAR) == 0 + && (gw->toolbar != NULL)) { g.g_x = msg[4]; g.g_y = msg[5]; g.g_w = msg[6]; @@ -356,8 +357,9 @@ static short preproc_mu_button(GUIWIN * gw, EVMULT_OUT *ev_out, short msg[8]) uint16_t type = (gw->toolbar[obj_idx].ob_type & 0xFF); uint16_t nextobj; - DEBUG_PRINT(("toolbar item type: %d\n", type)); - // report mouse click to the tree: + DEBUG_PRINT(("toolbar item type: %d, toolbar_edit_obj: %d\n", + type, gw->toolbar_edit_obj)); + // Report mouse click to the tree: retval = form_wbutton(gw->toolbar, gw->toolbar_focus_obj, ev_out->emo_mclicks, &nextobj, gw->handle); @@ -463,26 +465,29 @@ static short preproc_mu_keybd(GUIWIN * gw, EVMULT_OUT *ev_out, short msg[8]) { short retval = 0; - if((gw->toolbar != NULL) && (gw->toolbar_edit_obj > -1) ) { + if ((gw->toolbar != NULL) && (gw->toolbar_edit_obj > -1)) { short next_edit_obj = gw->toolbar_edit_obj; short next_char = -1; short edit_idx; short r; + DEBUG_PRINT(("%s, gw: %p, toolbar_edit_obj: %d\n", __FUNCTION__, gw, + gw->toolbar_edit_obj)); + r = form_wkeybd(gw->toolbar, gw->toolbar_edit_obj, next_edit_obj, ev_out->emo_kreturn, &next_edit_obj, &next_char, gw->handle); if (next_edit_obj != gw->toolbar_edit_obj) { - gemtk_wm_set_toolbar_edit_obj(gw, next_edit_obj, ev_out->emo_kreturn); } else { - if(next_char > 13) + if (next_char > 13) { r = objc_wedit(gw->toolbar, gw->toolbar_edit_obj, ev_out->emo_kreturn, &edit_idx, EDCHAR, gw->handle); + } } //retval = 1; /*gemtk_wm_send_msg(gw, GEMTK_WM_WM_FORM_KEY, gw->toolbar_edit_obj, @@ -523,6 +528,33 @@ static short preproc_mu_keybd(GUIWIN * gw, EVMULT_OUT *ev_out, short msg[8]) return(retval); } +/** +* Default toolbar redraw function +*/ +static void std_toolbar_redraw(GUIWIN *gw, uint16_t msg, GRECT *clip) +{ + GRECT g; + + assert(gw->toolbar); + assert(gw->toolbar_idx >= 0); + + // Update object position: + gw->toolbar[gw->toolbar_idx].ob_x = clip->g_x; + gw->toolbar[gw->toolbar_idx].ob_y = clip->g_y; + gw->toolbar[gw->toolbar_idx].ob_width = clip->g_w; + gw->toolbar[gw->toolbar_idx].ob_height = clip->g_h; + + wind_get_grect(gw->handle, WF_FIRSTXYWH, &g); + while (g.g_h > 0 || g.g_w > 0) { + if(rc_intersect(clip, &g)) { + objc_draw(gw->toolbar, gw->toolbar_idx, 8, g.g_x, g.g_y, + g.g_w, g.g_h); + + } + wind_get_grect(gw->handle, WF_NEXTXYWH, &g); + } +} + /** * Event Dispatcher function. The guiwin API doesn't own an event loop, * so you have to inform it for every event that you want it to handle. @@ -1016,11 +1048,12 @@ void gemtk_wm_set_toolbar(GUIWIN *win, OBJECT *toolbar, short idx, uint32_t flag else { win->toolbar_size = win->toolbar[idx].ob_height; } + gemtk_wm_set_toolbar_redraw_func(win, std_toolbar_redraw); } /** Update width/height of the toolbar region * \param win the GUIWIN -* \param s depending on the flag GEMTK_WM_FLAG_HAS_VTOOLBAR this is the width or the height +* \param s the width or height, depending on the flag GEMTK_WM_FLAG_HAS_VTOOLBAR */ void gemtk_wm_set_toolbar_size(GUIWIN *win, uint16_t s) { @@ -1037,8 +1070,14 @@ void gemtk_wm_set_toolbar_edit_obj(GUIWIN *win, uint16_t obj, short kreturn) { short edit_idx; + DEBUG_PRINT(("%s, win: %p, obj: %d, kret: %d\n", __FUNCTION__, + win, obj, kreturn)); + if (obj != win->toolbar_edit_obj) { + DEBUG_PRINT(("%s, current edit obj: %d\n", __FUNCTION__, + win->toolbar_edit_obj)); + if(win->toolbar_edit_obj != -1) { objc_wedit(win->toolbar, win->toolbar_edit_obj, kreturn, &edit_idx, EDEND, win->handle); @@ -1048,6 +1087,8 @@ void gemtk_wm_set_toolbar_edit_obj(GUIWIN *win, uint16_t obj, short kreturn) objc_wedit(win->toolbar, win->toolbar_edit_obj, kreturn, &edit_idx, EDINIT, win->handle); + } else { + DEBUG_PRINT(("%s, nothing to do!\n", __FUNCTION__)); } } @@ -1257,32 +1298,7 @@ void gemtk_wm_toolbar_redraw(GUIWIN *gw, uint16_t msg, GRECT *clip) tb_area = tb_area_ro; if (rc_intersect(clip, &tb_area)) { - - if (gw->toolbar_redraw_func != NULL) { - - // customized redraw: - gw->toolbar_redraw_func(gw, msg, &tb_area); - - } else { - - // Default redraw action - - // Update object position: - gw->toolbar[gw->toolbar_idx].ob_x = tb_area_ro.g_x; - gw->toolbar[gw->toolbar_idx].ob_y = tb_area_ro.g_y; - gw->toolbar[gw->toolbar_idx].ob_width = tb_area_ro.g_w; - gw->toolbar[gw->toolbar_idx].ob_height = tb_area_ro.g_h; - - wind_get_grect(gw->handle, WF_FIRSTXYWH, &g); - while (g.g_h > 0 || g.g_w > 0) { - if(rc_intersect(&tb_area, &g)) { - objc_draw(gw->toolbar, gw->toolbar_idx, 8, g.g_x, g.g_y, - g.g_w, g.g_h); - - } - wind_get_grect(gw->handle, WF_NEXTXYWH, &g); - } - } + gw->toolbar_redraw_func(gw, msg, &tb_area); } } -- cgit v1.2.3 From 1dd92203df2d97398332940c2bc891ea3721ccf1 Mon Sep 17 00:00:00 2001 From: Ole Loots Date: Mon, 15 Apr 2013 21:02:34 +0200 Subject: Slightly improved intial hiding of toolbar search area. --- atari/rootwin.c | 6 +++--- atari/toolbar.c | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/atari/rootwin.c b/atari/rootwin.c index 03df72723..4b66510bc 100755 --- a/atari/rootwin.c +++ b/atari/rootwin.c @@ -403,13 +403,13 @@ void window_open(ROOTWIN *rootwin, struct gui_window *gw, GRECT pos) toolbar_set_dimensions(rootwin->toolbar, &g); /* initially hide the search area of the toolbar: */ - toolbar_set_visible(rootwin->toolbar, TOOLBAR_AREA_SEARCH, false); - window_get_grect(rootwin, BROWSER_AREA_TOOLBAR, &g); - gemtk_wm_set_toolbar_size(rootwin->win, g.g_h); + window_close_search(rootwin); window_update_back_forward(rootwin); window_set_focus(rootwin, BROWSER, rootwin->active_gui_window->browser); + + } void window_restore_active_gui_window(ROOTWIN *rootwin) diff --git a/atari/toolbar.c b/atari/toolbar.c index ade5ca3fc..18d8a456a 100644 --- a/atari/toolbar.c +++ b/atari/toolbar.c @@ -634,6 +634,12 @@ void toolbar_set_visible(struct s_toolbar *tb, short area, bool visible) else if (area == TOOLBAR_AREA_SEARCH) { tb->search_visible = visible; tb->reflow = true; + OBJECT *frm = toolbar_get_form(tb); + if(visible == false){ + frm[TOOLBAR_AREA_SEARCH].ob_flags |= OF_HIDETREE; + } else { + frm[TOOLBAR_AREA_SEARCH].ob_flags &= ~OF_HIDETREE; + } } } -- cgit v1.2.3