archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

2.5

Browse Source 
Bugfix: having multiple windows didnt read events anymore for other
windows. Caused by too much security escapes in event handlers.
This commit is contained in:
Ton Roosendaal
2009-01-26 15:22:10 +00:00
parent a34e2e1427
commit 14ad6ae4dc
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/windowmanager/intern/wm_event_system.c
View File

@@ -790,6 +790,7 @@ void wm_event_do_handlers(bContext *C)
int action;
CTX_wm_window_set(C, win);
/* we let modal handlers get active area/region, also wm_paintcursor_test needs it */
CTX_wm_area_set(C, area_event_inside(C, event->x, event->y));
CTX_wm_region_set(C, region_event_inside(C, event->x, event->y));
@@ -802,7 +803,7 @@ void wm_event_do_handlers(bContext *C)
/* fileread case */
if(CTX_wm_window(C)==NULL) {
wm_event_free(event);
break;
return;
}
if(wm_event_always_pass(event) || action==WM_HANDLER_CONTINUE) {
@@ -850,14 +851,8 @@ void wm_event_do_handlers(bContext *C)
}
wm_event_free(event);
CTX_wm_window_set(C, NULL);
CTX_wm_area_set(C, NULL);
CTX_wm_region_set(C, NULL);
}
/* fileread case */
if(CTX_wm_window(C)==NULL)
break;
CTX_wm_window_set(C, NULL);
}
}

3
source/blender/windowmanager/intern/wm_window.c
View File

@@ -279,7 +279,6 @@ void wm_window_add_ghostwindows(wmWindowManager *wm)
/* area-rip calls this */
wmWindow *WM_window_open(bContext *C, rcti *rect)
{
wmWindowManager *wm= CTX_wm_manager(C);
wmWindow *win= wm_window_new(C);
win->posx= rect->xmin;
@@ -290,7 +289,7 @@ wmWindow *WM_window_open(bContext *C, rcti *rect)
win->drawmethod= -1;
win->drawdata= NULL;
wm_window_add_ghostwindow(wm, "Blender", win);
wm_check(C);
return win;
}