mirror of
https://github.com/netsurf-browser/netsurf
synced 2024-11-28 09:13:08 +03:00
Fixed Mouse Selection / Mouse drag,
Fixed Content Redraw for plain text files. svn path=/trunk/netsurf/; revision=11616
This commit is contained in:
Ole Loots
parent
0291f96f27
commit
2886ee6386
166
atari/browser.c
166
atari/browser.c
@ -46,6 +46,8 @@
|
||||
#include "atari/font.h"
|
||||
|
||||
extern browser_mouse_state bmstate;
|
||||
extern int mouse_click_time[3];
|
||||
extern int mouse_hold_start[3];
|
||||
extern GEM_PLOTTER plotter;
|
||||
extern struct gui_window *input_window;
|
||||
|
||||
@ -83,14 +85,14 @@ struct s_browser * browser_create( struct gui_window * gw,
|
||||
else
|
||||
bw->scale = 1;
|
||||
|
||||
bnew->compwin = mt_WindCreate( &app, VSLIDE|HSLIDE, 40, 40, app.w, app.h);
|
||||
bnew->compwin = mt_WindCreate( &app, VSLIDE|HSLIDE, 1, 1, app.w, app.h);
|
||||
bnew->compwin->w_u = 1;
|
||||
bnew->compwin->h_u = 1;
|
||||
/* needs to be adjusted when content width is known: */
|
||||
bnew->compwin->ypos_max = w;
|
||||
bnew->compwin->xpos_max = w;
|
||||
mt_WindSlider( &app, bnew->compwin, HSLIDER|VSLIDER);
|
||||
bnew->comp = (COMPONENT*)comp_widget_create( (void*)&app, (WINDOW*)bnew->compwin, 100, 1 );
|
||||
bnew->comp = (COMPONENT*)comp_widget_create( (void*)&app, (WINDOW*)bnew->compwin, 1, 1 );
|
||||
if( bnew->comp == NULL ) {
|
||||
free(bnew);
|
||||
return(NULL);
|
||||
@ -165,11 +167,23 @@ bool browser_attach_frame( struct gui_window * container, struct gui_window * fr
|
||||
lt = CLT_VERTICAL;
|
||||
else
|
||||
lt = CLT_HORIZONTAL;
|
||||
/* todo: if first frame, destroy compwin, create browser frame with old component interface :/ */
|
||||
mt_CompAttach( &app, container->browser->comp, frame->browser->comp );
|
||||
|
||||
printf("attaching frame as: %s\n", (lt == CLT_VERTICAL) ? "CLT_VERTICAL" : "CLT_HORIZONTAL" );
|
||||
/* todo: if first frame, remove compwin, or something like that, because it is still occupiying space */
|
||||
container->browser->compwin->h_max = 0;
|
||||
container->browser->compwin->w_max = 0;
|
||||
container->browser->comp->flex = 0;
|
||||
container->browser->comp->size = 300;
|
||||
//container->browser->comp->bounds.max_height = 0;
|
||||
//container->browser->comp->bounds.min_height = 0;
|
||||
//WindClose( container->browser->compwin );
|
||||
|
||||
container->browser->comp->type = lt;
|
||||
mt_CompAttach( &app, container->browser->comp, frame->browser->comp );
|
||||
//win_comp_attach(&app, container->browser->compwin, frame->browser->comp);
|
||||
browser_update_rects( container );
|
||||
container->browser->attached = true;
|
||||
frame->browser->attached = true;
|
||||
//container->browser->attached = true;
|
||||
/*browser_update_rects( frame );
|
||||
LGRECT brect;
|
||||
browser_get_rect( frame, BR_CONTENT, &brect );
|
||||
@ -241,15 +255,19 @@ void browser_update_rects(struct gui_window * gw )
|
||||
void browser_set_content_size(struct gui_window * gw, int w, int h)
|
||||
{
|
||||
CMP_BROWSER b = gw->browser;
|
||||
b->compwin->ypos = 0;
|
||||
b->compwin->xpos = 0;
|
||||
LGRECT work;
|
||||
browser_get_rect( gw, BR_CONTENT, &work );
|
||||
b->compwin->ypos_max = h;
|
||||
b->compwin->xpos_max = w;
|
||||
/* TODO: instead of zeroin, recalculate scroll? */
|
||||
if( w < work.g_w + b->scroll.current.x || w < work.g_h + b->scroll.current.y ) {
|
||||
/* TODO: instead of zeroin, recalculate scroll */
|
||||
b->compwin->ypos = 0;
|
||||
b->compwin->xpos = 0;
|
||||
browser_scroll(gw, WA_LFLINE, 0, true );
|
||||
browser_scroll(gw, WA_UPLINE, 0, true );
|
||||
/* force update of scrollbars: */
|
||||
b->scroll.required = true;
|
||||
}
|
||||
}
|
||||
|
||||
static void __CDECL browser_evnt_wdestroy( WINDOW * c, short buff[8], void * data)
|
||||
@ -262,7 +280,7 @@ static void __CDECL browser_evnt_destroy( COMPONENT * c, long buff[8], void * da
|
||||
{
|
||||
struct s_browser * b = (struct s_browser*)data;
|
||||
struct gui_window * gw = b->bw->window;
|
||||
LOG(("%s: %s (%s)\n", __FUNCTION__ ,gw->browser->bw->name, ( gw->browser->type == BT_FRAME) ? "FRAME" : "NOFRAME"));
|
||||
LOG(("%s: %s (%s)\n", __FUNCTION__ ,gw->browser->bw->name, ( gw->browser->type ==BT_FRAME) ? "FRAME" : "NOFRAME"));
|
||||
|
||||
assert( b != NULL );
|
||||
assert( gw != NULL );
|
||||
@ -272,6 +290,7 @@ static void __CDECL browser_evnt_destroy( COMPONENT * c, long buff[8], void * da
|
||||
|
||||
free( b );
|
||||
gw->browser = NULL;
|
||||
LOG(("evnt_destroy done!"));
|
||||
}
|
||||
|
||||
|
||||
@ -325,39 +344,82 @@ void __CDECL browser_evnt_slider( WINDOW *win, short buff[8], void * data)
|
||||
static void __CDECL browser_evnt_mbutton( WINDOW * c, short buff[8], void * data)
|
||||
{
|
||||
long lbuff[8];
|
||||
short mx,my;
|
||||
browser_mouse_state bms;
|
||||
short i;
|
||||
short mbut, mkstat, mx, my;
|
||||
graf_mkstate(&mx, &my, &mbut, &mkstat);
|
||||
uint32_t tnow = clock()*1000 / CLOCKS_PER_SEC;
|
||||
LGRECT cwork;
|
||||
struct gui_window * gw = data;
|
||||
input_window = gw;
|
||||
window_set_focus( gw, BROWSER, (void*)gw->browser );
|
||||
browser_get_rect( gw, BR_CONTENT, &cwork );
|
||||
SBUF8_TO_LBUF8(buff, lbuff)
|
||||
bms = global_track_evnt_mbutton( gw->root->handle, lbuff, data );
|
||||
mx = evnt.mx - cwork.g_x + gw->browser->scroll.current.x;
|
||||
my = evnt.my - cwork.g_y + gw->browser->scroll.current.y;
|
||||
mx = evnt.mx - cwork.g_x; /*+ gw->browser->scroll.current.x*/;
|
||||
my = evnt.my - cwork.g_y; /*+ gw->browser->scroll.current.y*/;
|
||||
LOG(("mevent within %s at %d / %d", gw->browser->bw->name, mx, my ));
|
||||
if( bms & BROWSER_MOUSE_DRAG_1) {
|
||||
browser_window_mouse_track(gw->browser->bw, BROWSER_MOUSE_DRAG_1, mx, my );
|
||||
|
||||
if( (mkstat & K_RSHIFT) || (mkstat & K_LSHIFT) ){
|
||||
bmstate |= BROWSER_MOUSE_MOD_1;
|
||||
} else {
|
||||
bmstate &= ~(BROWSER_MOUSE_MOD_1);
|
||||
}
|
||||
if( (mkstat & K_CTRL) ){
|
||||
bmstate |= BROWSER_MOUSE_MOD_2;
|
||||
} else {
|
||||
bmstate &= ~(BROWSER_MOUSE_MOD_1);
|
||||
}
|
||||
if( (mkstat & K_ALT) ){
|
||||
bmstate |= BROWSER_MOUSE_MOD_3;
|
||||
} else {
|
||||
bmstate &= ~(BROWSER_MOUSE_MOD_2);
|
||||
}
|
||||
int sx = (mx + gw->browser->scroll.current.x);
|
||||
int sy = (my + gw->browser->scroll.current.y);
|
||||
for( i = 1; i<2; i++) {
|
||||
if( (mbut & i) ) {
|
||||
if( mouse_hold_start[i-1] == 0 ) {
|
||||
mouse_hold_start[i-1] = clock()*1000 / CLOCKS_PER_SEC;
|
||||
LOG(("Drag %d starts", i));
|
||||
if( i == 1 ) {
|
||||
browser_window_mouse_click(gw->browser->bw,BROWSER_MOUSE_PRESS_1,sx,sy);
|
||||
bmstate |= BROWSER_MOUSE_HOLDING_1 | BROWSER_MOUSE_DRAG_ON;
|
||||
LOG(("drag within %s at %d / %d", gw->browser->bw->name, mx, my ));
|
||||
}
|
||||
if( bms & BROWSER_MOUSE_DRAG_2) {
|
||||
browser_window_mouse_track(gw->browser->bw, BROWSER_MOUSE_DRAG_2, mx, my );
|
||||
if( i == 2 ) {
|
||||
browser_window_mouse_click(gw->browser->bw,BROWSER_MOUSE_PRESS_2,sx,sy);
|
||||
bmstate |= BROWSER_MOUSE_HOLDING_2 | BROWSER_MOUSE_DRAG_ON;
|
||||
LOG(("drag within %s at %d / %d", gw->browser->bw->name, mx, my ));
|
||||
}
|
||||
if( bms & BROWSER_MOUSE_CLICK_1) {
|
||||
window_set_focus( gw, BROWSER, (void*)gw->browser );
|
||||
browser_window_mouse_click(gw->browser->bw,BROWSER_MOUSE_PRESS_1,mx,my);
|
||||
browser_window_mouse_click(gw->browser->bw,BROWSER_MOUSE_CLICK_1,mx,my);
|
||||
LOG(("Click within %s at %d / %d", gw->browser->bw->name, mx, my ));
|
||||
} else {
|
||||
if( i == 1 ) {
|
||||
bmstate |= BROWSER_MOUSE_DRAG_1 | BROWSER_MOUSE_DRAG_ON;
|
||||
}
|
||||
if( bms & BROWSER_MOUSE_CLICK_2) {
|
||||
window_set_focus( gw, BROWSER, (void*)gw->browser );
|
||||
browser_window_mouse_click(gw->browser->bw,BROWSER_MOUSE_PRESS_2,mx,my);
|
||||
browser_window_mouse_click(gw->browser->bw,BROWSER_MOUSE_CLICK_2,mx,my);
|
||||
if( i == 2 ) {
|
||||
bmstate |= BROWSER_MOUSE_DRAG_2 | BROWSER_MOUSE_DRAG_ON;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
/* remember click time, so we can track double clicks: */
|
||||
/* this does not really work, because a normal double click is swallowed by evnt_multi */
|
||||
if( tnow - mouse_click_time[i-1] < 500 ) {
|
||||
/* double click */
|
||||
}
|
||||
mouse_click_time[i-1] = tnow; /* clock in ms */
|
||||
/* check if this event was during an drag op: */
|
||||
if( mouse_hold_start[i-1] < 10 ) {
|
||||
if( i == 1) {
|
||||
LOG(("Click within %s at %d / %d", gw->browser->bw->name, sx, sy ));
|
||||
browser_window_mouse_click(gw->browser->bw,BROWSER_MOUSE_PRESS_1,sx,sy);
|
||||
browser_window_mouse_click(gw->browser->bw,BROWSER_MOUSE_CLICK_1,sx,sy);
|
||||
bmstate &= ~( BROWSER_MOUSE_HOLDING_1 | BROWSER_MOUSE_DRAG_1 | BROWSER_MOUSE_CLICK_1);
|
||||
}
|
||||
|
||||
if( i == 2 ) {
|
||||
LOG(("Click within %s at %d / %d", gw->browser->bw->name, mx, my ));
|
||||
browser_window_mouse_click(gw->browser->bw,BROWSER_MOUSE_PRESS_1,sx,sy);
|
||||
browser_window_mouse_click(gw->browser->bw,BROWSER_MOUSE_CLICK_2,sx,sy);
|
||||
bmstate &= ~( BROWSER_MOUSE_HOLDING_2 | BROWSER_MOUSE_DRAG_2 | BROWSER_MOUSE_CLICK_2);
|
||||
}
|
||||
}
|
||||
mouse_hold_start[i-1] = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -744,8 +806,8 @@ static void browser_redraw_content( struct gui_window * gw, int xoff, int yoff )
|
||||
LGRECT work;
|
||||
CMP_BROWSER b = gw->browser;
|
||||
GRECT area;
|
||||
int clip_x0, clip_x1, clip_y0, clip_y1;
|
||||
|
||||
current_redraw_browser = b->bw;
|
||||
LOG(("%s clip: %d,%d - %d,%d\n", b->bw->name, b->redraw.area.x0,
|
||||
b->redraw.area.y0, b->redraw.area.x1, b->redraw.area.y1
|
||||
));
|
||||
@ -753,15 +815,43 @@ static void browser_redraw_content( struct gui_window * gw, int xoff, int yoff )
|
||||
area.g_y = b->redraw.area.y0;
|
||||
area.g_w = b->redraw.area.x1 - b->redraw.area.x0;
|
||||
area.g_h = b->redraw.area.y1 - b->redraw.area.y0;
|
||||
assert( area.g_w > 0 && area.g_h > 0 );
|
||||
|
||||
content_redraw( b->bw->current_content,
|
||||
xoff-b->scroll.current.x, yoff-b->scroll.current.y,
|
||||
area.g_w, area.g_h,
|
||||
b->redraw.area.x0, b->redraw.area.y0,
|
||||
b->redraw.area.x1, b->redraw.area.y1,
|
||||
b->bw->scale, 0xFFFFFF);
|
||||
current_redraw_browser = b->bw;
|
||||
|
||||
if(content_get_type(b->bw->current_content) == CONTENT_HTML ) {
|
||||
clip_x0 = b->redraw.area.x0;
|
||||
clip_y0 = b->redraw.area.y0;
|
||||
clip_x1 = b->redraw.area.x1;
|
||||
clip_y1 = b->redraw.area.y1;
|
||||
} else {
|
||||
/* totally different coords, I don't understand why! */
|
||||
clip_x0 = b->redraw.area.x0 + b->scroll.current.x;
|
||||
clip_y0 = b->redraw.area.y0 + b->scroll.current.y;
|
||||
clip_x1 = b->redraw.area.x1 + b->scroll.current.x;
|
||||
clip_y1 = b->redraw.area.y1 + b->scroll.current.y;
|
||||
/* must clear the surface: */
|
||||
plot.clip( b->redraw.area.x0, b->redraw.area.y0,
|
||||
b->redraw.area.x1, b->redraw.area.y1
|
||||
);
|
||||
plot.rectangle( b->redraw.area.x0,
|
||||
b->redraw.area.y0,
|
||||
b->redraw.area.x1,
|
||||
b->redraw.area.y1,
|
||||
plot_style_fill_white
|
||||
);
|
||||
}
|
||||
|
||||
content_redraw(
|
||||
b->bw->current_content,
|
||||
-b->scroll.current.x, -b->scroll.current.y,
|
||||
content_get_width( b->bw->current_content),
|
||||
content_get_height( b->bw->current_content),
|
||||
clip_x0, clip_y0,
|
||||
clip_x1, clip_y1,
|
||||
b->bw->scale, 0xFFFFFF
|
||||
);
|
||||
current_redraw_browser = NULL;
|
||||
|
||||
/* reset redraw area */
|
||||
b->redraw.area.x0 = INT_MAX;
|
||||
b->redraw.area.y0 = INT_MAX;
|
||||
|
||||
@ -354,59 +354,9 @@ void __CDECL global_evnt_keybd( WINDOW * win, short buff[8], void * data)
|
||||
}
|
||||
}
|
||||
|
||||
browser_mouse_state global_track_evnt_mbutton( WINDOW * win, long buff[8], void * data )
|
||||
{
|
||||
short i;
|
||||
short mbut, mkstat, mx, my;
|
||||
browser_mouse_state retval = 0;
|
||||
graf_mkstate(&mx, &my, &mbut, &mkstat);
|
||||
|
||||
if( (mkstat & K_RSHIFT) || (mkstat & K_LSHIFT) ){
|
||||
retval |= BROWSER_MOUSE_MOD_1;
|
||||
}
|
||||
if( (mkstat & K_CTRL) ){
|
||||
retval |= BROWSER_MOUSE_MOD_2;
|
||||
}
|
||||
if( (mkstat & K_ALT) ){
|
||||
retval |= BROWSER_MOUSE_MOD_3;
|
||||
}
|
||||
|
||||
for( i = 1; i<2; i++) {
|
||||
if( (mbut & i) ) {
|
||||
if( mouse_hold_start[i-1] == 0 ) {
|
||||
mouse_hold_start[i-1] = clock()*1000 / CLOCKS_PER_SEC;
|
||||
LOG(("Drag %d starts", i));
|
||||
if( i == 1 ) {
|
||||
retval |= BROWSER_MOUSE_DRAG_1 | BROWSER_MOUSE_DRAG_ON;
|
||||
}
|
||||
if( i == 2 ) {
|
||||
retval |= BROWSER_MOUSE_DRAG_2 | BROWSER_MOUSE_DRAG_ON;
|
||||
}
|
||||
} else {
|
||||
if( i == 1 ) {
|
||||
retval |= BROWSER_MOUSE_HOLDING_1 | BROWSER_MOUSE_DRAG_ON;
|
||||
}
|
||||
if( i == 2 ) {
|
||||
retval |= BROWSER_MOUSE_HOLDING_2 | BROWSER_MOUSE_DRAG_ON;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
/* remember click time, so we can track double clicks: */
|
||||
mouse_click_time[i-1] = clock()*1000 / CLOCKS_PER_SEC; /* clock in ms */
|
||||
/* check if this event was during an drag op: */
|
||||
if( mouse_hold_start[i-1] < 10 ) {
|
||||
if( i == 1)
|
||||
retval |= BROWSER_MOUSE_CLICK_1;
|
||||
if( i == 2 )
|
||||
retval |= BROWSER_MOUSE_CLICK_2;
|
||||
}
|
||||
mouse_hold_start[i-1] = 0;
|
||||
}
|
||||
}
|
||||
return( retval );
|
||||
}
|
||||
|
||||
/* this gets called at end of gui poll */
|
||||
/* this gets called at end of gui poll to track the mouse state and
|
||||
finally checks for released buttons.
|
||||
*/
|
||||
void global_track_mouse_state( void ){
|
||||
int i = 0;
|
||||
int nx, ny;
|
||||
@ -417,20 +367,27 @@ void global_track_mouse_state( void ){
|
||||
|
||||
if( !input_window ) {
|
||||
bmstate = 0;
|
||||
mouse_hold_start[0] = 0;
|
||||
mouse_hold_start[1] = 0;
|
||||
return;
|
||||
}
|
||||
graf_mkstate(&mx, &my, &mbut, &mkstat);
|
||||
|
||||
/* todo: creat function find_browser_window( mx, my ) */
|
||||
cmp = mt_CompFind( &app, input_window->root->cmproot, mx, my );
|
||||
if( cmp == NULL ) {
|
||||
printf("invalid call to mouse track!\n");
|
||||
bmstate = 0;
|
||||
mouse_hold_start[0] = 0;
|
||||
mouse_hold_start[1] = 0;
|
||||
return;
|
||||
}
|
||||
mt_CompGetLGrect( &app, cmp, WF_WORKXYWH, &cmprect );
|
||||
nx = mx - cmprect.g_x;
|
||||
ny = my - cmprect.g_y;
|
||||
|
||||
browser_get_rect( input_window, BR_CONTENT, &cmprect );
|
||||
nx = mx - cmprect.g_x; /*+ input_window->browser->scroll.current.x;*/
|
||||
ny = my - cmprect.g_y; /*+ input_window->browser->scroll.current.x;*/
|
||||
nx = (nx + input_window->browser->scroll.current.x);
|
||||
ny = (ny + input_window->browser->scroll.current.y);
|
||||
bmstate &= ~(BROWSER_MOUSE_MOD_1);
|
||||
bmstate &= ~(BROWSER_MOUSE_MOD_2);
|
||||
bmstate &= ~(BROWSER_MOUSE_MOD_3);
|
||||
@ -441,38 +398,29 @@ void global_track_mouse_state( void ){
|
||||
}
|
||||
|
||||
for( i = 1; i<3; i++ ) {
|
||||
if( (mbut & i) ) {
|
||||
/* the mouse is still pressed...
|
||||
report further dragging ?
|
||||
BROWSER_MOUSE_PRESS_2 needed ?
|
||||
*/
|
||||
if(i==1)
|
||||
bmstate |= BROWSER_MOUSE_DRAG_ON|BROWSER_MOUSE_HOLDING_1;
|
||||
if( i==2 )
|
||||
bmstate |= BROWSER_MOUSE_DRAG_ON|BROWSER_MOUSE_HOLDING_2;
|
||||
LOG(("still dragging %d, time ms: %d", i, (clock()*1000 / CLOCKS_PER_SEC) - mouse_hold_start[i-1] ));
|
||||
browser_window_mouse_track( input_window->browser->bw, bmstate, nx, ny );
|
||||
} else {
|
||||
if( !(mbut & i) ) {
|
||||
if( mouse_hold_start[i-1] > 0 ) {
|
||||
mouse_hold_start[i-1] = 0;
|
||||
LOG(("drag release %d", i));
|
||||
/* TODO: not just use the input window browser, find the right one by component! */
|
||||
if( i==1 ) {
|
||||
bmstate &= ~( BROWSER_MOUSE_HOLDING_1 );
|
||||
bmstate &= ~( BROWSER_MOUSE_HOLDING_1 | BROWSER_MOUSE_DRAG_1 ) ;
|
||||
LOG(("Drag for %d ended", i));
|
||||
browser_window_mouse_drag_end( input_window->browser->bw,
|
||||
bmstate, nx, ny);
|
||||
browser_window_mouse_drag_end(
|
||||
input_window->browser->bw,
|
||||
0, nx, ny
|
||||
);
|
||||
}
|
||||
if( i==2 ) {
|
||||
bmstate &= ~( BROWSER_MOUSE_HOLDING_2 );
|
||||
bmstate &= ~( BROWSER_MOUSE_HOLDING_2 | BROWSER_MOUSE_DRAG_2 ) ;
|
||||
LOG(("Drag for %d ended", i));
|
||||
browser_window_mouse_drag_end( input_window->browser->bw,
|
||||
bmstate, nx, ny);
|
||||
browser_window_mouse_drag_end(
|
||||
input_window->browser->bw,
|
||||
0, nx, ny
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
browser_mouse_state_dump(bmstate);
|
||||
browser_window_mouse_track(input_window->browser->bw, bmstate, nx, ny );
|
||||
}
|
||||
|
||||
@ -491,6 +439,7 @@ void __CDECL global_evnt_m1( WINDOW * win, short buff[8], void * data)
|
||||
|
||||
if( gw->root->toolbar )
|
||||
mt_CompGetLGrect(&app, gw->root->toolbar->url.comp, WF_WORKXYWH, &urlbox);
|
||||
/* todo: use get_browser_rect */
|
||||
mt_CompGetLGrect(&app, gw->browser->comp, WF_WORKXYWH, &bwbox);
|
||||
mt_CompGetLGrect(&app, gw->root->statusbar->comp, WF_WORKXYWH, &sbbox);
|
||||
|
||||
@ -525,8 +474,13 @@ void __CDECL global_evnt_m1( WINDOW * win, short buff[8], void * data)
|
||||
*/
|
||||
nx = evnt.mx - bwbox.g_x;
|
||||
ny = evnt.my - bwbox.g_y;
|
||||
/*printf("m1 bw: %p, x: %d, y: %d, state: %d\n" , input_window->browser->bw, nx, ny, bmstate);*/
|
||||
browser_window_mouse_track( input_window->browser->bw, 0, nx + gw->browser->scroll.current.x, ny + gw->browser->scroll.current.y );
|
||||
/*LOG(("m1 bw: %p, x: %d, y: %d, state: %d\n" , input_window->browser->bw, nx, ny, bmstate));*/
|
||||
browser_window_mouse_track(
|
||||
input_window->browser->bw,
|
||||
bmstate,
|
||||
nx + gw->browser->scroll.current.x,
|
||||
ny + gw->browser->scroll.current.y
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -55,11 +55,11 @@ struct s_menu_item_evnt {
|
||||
Global & Menu event handlers
|
||||
*/
|
||||
|
||||
/* Call this after each call to evnt_multi, to check for states that evnt_multi doesn't: */
|
||||
|
||||
void snd_redraw(short x, short y, short w, short h);
|
||||
void snd_win_redraw(WINDOW * win, short x, short y, short w, short h);
|
||||
/* Call this after each call to evnt_multi, to check for states that evnt_multi doesn't: */
|
||||
void global_track_mouse_state( void );
|
||||
browser_mouse_state global_track_evnt_mbutton( WINDOW * win, long buff[8], void * data );
|
||||
void bind_global_events( void );
|
||||
void unbind_global_events( void );
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user