mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert WINDOW_Qualifier change which was supposed to make shift and ctrl keyboard 

reading more reliable, but for some reason wasn't returning the keyboard state as it
should.

svn path=/trunk/netsurf/; revision=6034
This commit is contained in:
Chris Young 2009-01-10 22:57:23 +00:00
parent a161809cdb
commit ccbf443125
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
amiga/gui.c
View File

@ -626,7 +626,7 @@ void ami_update_quals(struct gui_window_2 *gwin)
uint16 quals = 0; uint16 quals = 0;
GetAttr(WINDOW_Qualifier,gwin->objects[OID_MAIN],(uint16 *)&quals); GetAttr(WINDOW_Qualifier,gwin->objects[OID_MAIN],(uint16 *)&quals);
printf("%lx\n",quals);
gwin->key_state = 0; gwin->key_state = 0;
if((quals & IEQUALIFIER_LSHIFT) || (quals & IEQUALIFIER_RSHIFT)) if((quals & IEQUALIFIER_LSHIFT) || (quals & IEQUALIFIER_RSHIFT))
@ -723,7 +723,7 @@ void ami_handle_msg(void)
if((x>=xs) && (y>=ys) && (x<width+xs) && (y<height+ys)) if((x>=xs) && (y>=ys) && (x<width+xs) && (y<height+ys))
{ {
ami_update_quals(gwin); //ami_update_quals(gwin);
if(option_context_menu && rmbtrapped == FALSE) if(option_context_menu && rmbtrapped == FALSE)
{ {
@ -768,7 +768,7 @@ void ami_handle_msg(void)
width=bbox->Width; width=bbox->Width;
height=bbox->Height; height=bbox->Height;
ami_update_quals(gwin); //ami_update_quals(gwin);
if((x>=xs) && (y>=ys) && (x<width+xs) && (y<height+ys)) if((x>=xs) && (y>=ys) && (x<width+xs) && (y<height+ys))
{ {
@ -852,7 +852,7 @@ void ami_handle_msg(void)
break; break;
case GID_RELOAD: case GID_RELOAD:
ami_update_quals(gwin); //ami_update_quals(gwin);
if(gwin->key_state & BROWSER_MOUSE_MOD_1) if(gwin->key_state & BROWSER_MOUSE_MOD_1)
{ {
@ -941,7 +941,6 @@ void ami_handle_msg(void)
case RAWKEY_ESC: case RAWKEY_ESC:
browser_window_key_press(gwin->bw,27); browser_window_key_press(gwin->bw,27);
break; break;
/*
case RAWKEY_LSHIFT: case RAWKEY_LSHIFT:
gwin->key_state = BROWSER_MOUSE_MOD_1; gwin->key_state = BROWSER_MOUSE_MOD_1;
break; break;
@ -954,7 +953,6 @@ void ami_handle_msg(void)
case 0xe3: // lctrl up case 0xe3: // lctrl up
gwin->key_state = 0; gwin->key_state = 0;
break; break;
*/
default: default:
/*MapRawKey etc */ /*MapRawKey etc */
break; break;
@ -1873,6 +1871,9 @@ void gui_window_destroy(struct gui_window *g)
if(!g) return; if(!g) return;
// if(g->shared->searchwin)
// if(g->shared->searchwin->gwin == g) ami_search_close();
if(g->shared->tabs > 1) if(g->shared->tabs > 1)
{ {
SetGadgetAttrs(g->shared->gadgets[GID_TABS],g->shared->win,NULL, SetGadgetAttrs(g->shared->gadgets[GID_TABS],g->shared->win,NULL,
@ -1898,7 +1899,6 @@ void gui_window_destroy(struct gui_window *g)
} }
curbw = NULL; curbw = NULL;
if(g->shared->searchwin) ami_search_close();
DisposeObject(g->shared->objects[OID_MAIN]); DisposeObject(g->shared->objects[OID_MAIN]);
DelObject(g->shared->node); DelObject(g->shared->node);