mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2025-01-24 03:12:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix interaction between failed drag save and pointer tracking (including page drag scrolling)

Browse Source 
svn path=/trunk/netsurf/; revision=3311
This commit is contained in:
Adrian Lees 2007-06-05 05:14:54 +00:00
parent 6807b4208a
commit 6890f816ed
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
riscos/save.c
View File

@ -64,6 +64,7 @@ typedef enum { LINK_ACORN, LINK_ANT, LINK_TEXT } link_format;
static bool ro_gui_save_complete(struct content *c, char *path);
static bool ro_gui_save_content(struct content *c, char *path);
static void ro_gui_save_bounced(wimp_message *message);
static void ro_gui_save_object_native(struct content *c, char *path);
static bool ro_gui_save_link(struct content *c, link_format format, char *path);
static void ro_gui_save_set_state(struct content *c, gui_save_type save_type,
@ -518,8 +519,8 @@ void ro_gui_save_drag_end(wimp_dragged *drag)
message.size = 44 + ((strlen(message.data.data_xfer.file_name) + 4) &
(~3u));
wimp_send_message_to_window(wimp_USER_MESSAGE, &message,
pointer.w, pointer.i);
ro_message_send_message_to_window(wimp_USER_MESSAGE_RECORDED, &message,
pointer.w, pointer.i, ro_gui_save_bounced, NULL);
free(local_name);
}
@ -540,12 +541,8 @@ void ro_gui_send_datasave(gui_save_type save_type, wimp_full_message_data_xfer *
xwimp_create_menu(wimp_CLOSE_MENU, 0, 0);
ro_gui_dialog_close(dialog_saveas);
error = xwimp_send_message(wimp_USER_MESSAGE, (wimp_message*)message, to);
if (error) {
LOG(("xwimp_send_message: 0x%x: %s", error->errnum, error->errmess));
warn_user("WimpError", error->errmess);
}
else {
if (ro_message_send_message(wimp_USER_MESSAGE_RECORDED, (wimp_message*)message,
to, ro_gui_save_bounced)) {
gui_save_current_type = save_type;
gui_save_sourcew = (wimp_w)-1;
saving_from_dialog = false;
@ -554,6 +551,16 @@ void ro_gui_send_datasave(gui_save_type save_type, wimp_full_message_data_xfer *
}
/**
* Handle lack of Message_DataSaveAck for drags, saveas dialogs and clipboard code
*/
void ro_gui_save_bounced(wimp_message *message)
{
gui_current_drag_type = GUI_DRAG_NONE;
}
/**
* Handle Message_DataSaveAck for a drag from the save dialog or browser window.
*/

1
riscos/window.c
View File

@ -1198,6 +1198,7 @@ bool gui_window_scroll_start(struct gui_window *g)
return false;
}
gui_track_gui_window = g;
gui_current_drag_type = GUI_DRAG_SCROLL;
return true;
}