[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17678] branches/blender2.5/blender/source /blender: Lots of stuff; couldn't commit in parts because of refactor work.
Ton Roosendaal
ton at blender.org
Tue Dec 2 15:22:55 CET 2008
Revision: 17678
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17678
Author: ton
Date: 2008-12-02 15:22:52 +0100 (Tue, 02 Dec 2008)
Log Message:
-----------
Lots of stuff; couldn't commit in parts because of refactor work.
* Changes in interface/ module
This commit brings back the way how buttons/menus work under control
of WM event system. The previous implementation extended usage of
handlers and operators in an interesting but confusing way. Better to
try it first according the design specs. :)
Most obviously:
- modal-handler operators are not stored anymore in regions/areas/windows.
such modal handlers own their operator, and should remove it themselves.
- removed code to move handlers from one queue to another.
(needs review with brecht!)
- WM fix: the API call to remove a modal handler got removed. This was a
dangerous thing anyway, and you should leave that to the event system.
Now, if a handler modal() call gets a cancel/finish return, it frees
itself in event system. WM_event_remove_modal_handler was a confusing
call anyway!
Todo:
- allow button-activate to refresh after using button
- re-enable arrow keys for menus
(do both after commit)
- review return values of operator callbacks in interface_ops.c
* Fixes in WM system
- Freeing areas/regions/windows, also on quit, now correctly closes
running modal handlers
- On starting a modal handler, the handler now stores previous area
and region context, so they send proper notifiers etc.
* Other fixes
- Area-split operator had bug, wrong minimal size checking. This
solves error when trying to split a very narrow area.
- removed DNA_USHORT_FIX from screen_types.h, gave warning
- operators didn't get ID name copied when activated, needed for
later re-use or saving.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/blenkernel/intern/screen.c
branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
branches/blender2.5/blender/source/blender/editors/interface/interface_ops.c
branches/blender2.5/blender/source/blender/editors/interface/view2d_ops.c
branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c
branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
branches/blender2.5/blender/source/blender/editors/space_time/ed_markers.c
branches/blender2.5/blender/source/blender/editors/space_time/time_ops.c
branches/blender2.5/blender/source/blender/makesdna/DNA_screen_types.h
branches/blender2.5/blender/source/blender/makesdna/DNA_windowmanager_types.h
branches/blender2.5/blender/source/blender/nodes/intern/CMP_util.h
branches/blender2.5/blender/source/blender/nodes/intern/SHD_util.h
branches/blender2.5/blender/source/blender/nodes/intern/TEX_util.h
branches/blender2.5/blender/source/blender/windowmanager/WM_api.h
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_init_exit.c
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_operators.c
branches/blender2.5/blender/source/blender/windowmanager/wm_event_system.h
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/screen.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/screen.c 2008-12-02 10:10:07 UTC (rev 17677)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/screen.c 2008-12-02 14:22:52 UTC (rev 17678)
@@ -127,7 +127,12 @@
void free_screen(bScreen *sc)
{
ScrArea *sa;
+ ARegion *ar;
+ for(ar=sc->regionbase.first; ar; ar=ar->next)
+ BKE_area_region_free(ar);
+ BLI_freelistN(&sc->regionbase);
+
for(sa= sc->areabase.first; sa; sa= sa->next)
BKE_screen_area_free(sa);
Modified: branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c 2008-12-02 10:10:07 UTC (rev 17677)
+++ branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c 2008-12-02 14:22:52 UTC (rev 17678)
@@ -3780,7 +3780,6 @@
win->queue.first= win->queue.last= NULL;
win->handlers.first= win->handlers.last= NULL;
- win->modalops.first= win->modalops.last= NULL;
win->subwindows.first= win->subwindows.last= NULL;
}
@@ -4207,7 +4206,6 @@
link_list(fd, &(sa->regionbase));
sa->handlers.first= sa->handlers.last= NULL;
- sa->modalops.first= sa->modalops.last= NULL;
sa->uiblocks.first= sa->uiblocks.last= NULL;
sa->type= NULL; /* spacetype callbacks */
@@ -4287,7 +4285,6 @@
for(ar= sa->regionbase.first; ar; ar= ar->next) {
ar->handlers.first= ar->handlers.last= NULL;
- ar->modalops.first= ar->modalops.last= NULL;
ar->uiblocks.first= ar->uiblocks.last= NULL;
ar->regiondata= NULL;
ar->swinid= 0;
Modified: branches/blender2.5/blender/source/blender/editors/interface/interface_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/interface_ops.c 2008-12-02 10:10:07 UTC (rev 17677)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface_ops.c 2008-12-02 14:22:52 UTC (rev 17678)
@@ -2627,13 +2627,15 @@
ui_blockopen_begin(C, but, data);
/* note we move the handler to the region when the block is open,
* so we don't interfere with the events as long as it's open */
- WM_event_remove_modal_handler(&C->window->handlers, data->operator);
- WM_event_add_modal_handler(&data->region->handlers, data->operator);
+ /* XXX (to brecht) removing this makes thing work proper */
+ //WM_event_remove_modal_handler(&C->window->handlers, data->operator);
+ //WM_event_add_modal_handler(C, &data->region->handlers, data->operator);
}
else if(data->state == BUTTON_STATE_BLOCK_OPEN) {
ui_blockopen_end(C, but, data);
- WM_event_remove_modal_handler(&data->region->handlers, data->operator);
- WM_event_add_modal_handler(&C->window->handlers, data->operator);
+ /* XXX (to brecht) removing this makes thing work proper */
+ //WM_event_remove_modal_handler(&data->region->handlers, data->operator);
+ //WM_event_add_modal_handler(C, &C->window->handlers, data->operator);
}
if(state == BUTTON_STATE_WAIT_FLASH) {
@@ -2673,9 +2675,9 @@
if(!lastbut && but->block->auto_open)
if(but->block->auto_open_last+BUTTON_AUTO_OPEN_THRESH < PIL_check_seconds_timer())
but->block->auto_open= 0;
-
+
/* modal handler */
- WM_event_add_modal_handler(&C->window->handlers, op);
+ WM_event_add_modal_handler(C, &C->window->handlers, op);
button_activate_state(C, but, BUTTON_STATE_HIGHLIGHT);
@@ -2708,10 +2710,7 @@
if(data->state == BUTTON_STATE_BLOCK_OPEN) {
ui_blockopen_end(C, but, data);
- WM_event_remove_modal_handler(&data->region->handlers, data->operator);
}
- else
- WM_event_remove_modal_handler(&C->window->handlers, op);
if(but) {
/* if someone is expecting a message */
@@ -2792,7 +2791,7 @@
ARegion *ar;
uiActivateBut *data;
uiBut *but;
- int state;
+ int state= OPERATOR_FINISHED;
data= op->customdata;
ar= data->region;
@@ -2801,7 +2800,8 @@
/* exit the current button, but try to re-init as well */
button_activate_exit(C, op->customdata, op);
- state= button_activate_try_init(C, ar, op, event, but);
+ /* XXX re-init has to be done differently... */
+ /* XXX state= button_activate_try_init(C, ar, op, event, but); */
return (state != OPERATOR_RUNNING_MODAL);
}
@@ -2830,7 +2830,10 @@
int handled= 0;
data= op->customdata;
-
+ /* XXX (for brecht) this happens when cancel() frees, and modal handler still runs */
+ if(data==NULL)
+ return OPERATOR_FINISHED;
+
/* check if the button dissappeared somehow */
if(!(but= ui_but_find_activated(data->region, data, &block))) {
data->cancel= 1;
@@ -3031,7 +3034,6 @@
if(op->customdata) {
MEM_freeN(op->customdata);
op->customdata= NULL;
- WM_event_remove_modal_handler(&C->window->handlers, op);
}
return OPERATOR_CANCELLED;
@@ -3057,7 +3059,7 @@
handle->region= C->region;
op->customdata= handle;
- WM_event_add_modal_handler(&C->window->handlers, op);
+ WM_event_add_modal_handler(C, &C->window->handlers, op);
return OPERATOR_RUNNING_MODAL|OPERATOR_PASS_THROUGH;
}
@@ -3077,13 +3079,25 @@
return 0;
}
+#include "wm_event_system.h"
+static void testing123(bContext *C)
+{
+ wmEventHandler *handler;
+
+ for(handler= C->window->handlers.first; handler; handler= handler->next) {
+ if(handler->op)
+ printf("handler has op %s\n", handler->op->type->idname);
+ }
+}
+
+/* moves focus on button/menu from mousemove-based to hotkey */
static void menu_block_handle_activate_button(bContext *C, wmEvent *event, ARegion *butregion, uiBut *but, int activateflag)
{
wmOperatorType *ot;
ot= WM_operatortype_find("ED_UI_OT_button_activate");
-
- WM_operator_cancel(C, &butregion->modalops, ot);
+ testing123(C);
+// XXX WM_operator_cancel(C, &butregion->modalops, ot);
but->activateflag= activateflag;
SWAP(ARegion*, C->region, butregion); /* XXX 2.50 bad state manipulation? */
@@ -3173,6 +3187,10 @@
int inside, act, count, mx, my, handled;
bhandle= op->customdata;
+ /* XXX (for brecht) this happens when cancel() frees, and modal handler still runs */
+ if(bhandle==NULL)
+ return OPERATOR_FINISHED;
+
ar= bhandle->region;
block= ar->uiblocks.first;
Modified: branches/blender2.5/blender/source/blender/editors/interface/view2d_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/view2d_ops.c 2008-12-02 10:10:07 UTC (rev 17677)
+++ branches/blender2.5/blender/source/blender/editors/interface/view2d_ops.c 2008-12-02 14:22:52 UTC (rev 17678)
@@ -184,7 +184,7 @@
#endif // XXX - enable this when cursors are working properly
/* add temp handler */
- WM_event_add_modal_handler(&C->window->handlers, op);
+ WM_event_add_modal_handler(C, &C->window->handlers, op);
return OPERATOR_RUNNING_MODAL;
}
@@ -216,7 +216,6 @@
view_pan_exit(C, op);
//WM_set_cursor(C, CURSOR_STD); // XXX - enable this when cursors are working properly
- WM_event_remove_modal_handler(&C->window->handlers, op);
return OPERATOR_FINISHED;
}
Modified: branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c 2008-12-02 10:10:07 UTC (rev 17677)
+++ branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c 2008-12-02 14:22:52 UTC (rev 17678)
@@ -268,8 +268,8 @@
short x, y;
// area big enough?
- if(sa->v4->vec.x- sa->v1->vec.x <= 2*AREAMINX) return 0;
- if(sa->v2->vec.y- sa->v1->vec.y <= 2*AREAMINY) return 0;
+ if(dir=='v' && (sa->v4->vec.x- sa->v1->vec.x <= 2*AREAMINX)) return 0;
+ if(dir=='h' && (sa->v2->vec.y- sa->v1->vec.y <= 2*AREAMINY)) return 0;
// to be sure
if(fac<0.0) fac= 0.0;
@@ -305,7 +305,7 @@
ScrVert *sv1, *sv2;
short split;
- if(sa==0) return NULL;
+ if(sa==NULL) return NULL;
split= testsplitpoint(win, sa, dir, fac);
if(split==0) return NULL;
@@ -920,8 +920,7 @@
void ED_region_exit(bContext *C, ARegion *ar)
{
- WM_operator_cancel(C, &ar->modalops, NULL);
- WM_event_remove_handlers(&ar->handlers);
+ WM_event_remove_handlers(C, &ar->handlers);
}
void ED_area_exit(bContext *C, ScrArea *sa)
@@ -931,8 +930,7 @@
for(ar= sa->regionbase.first; ar; ar= ar->next)
ED_region_exit(C, ar);
- WM_operator_cancel(C, &sa->modalops, NULL);
- WM_event_remove_handlers(&sa->handlers);
+ WM_event_remove_handlers(C, &sa->handlers);
}
void ED_screen_exit(bContext *C, wmWindow *window, bScreen *screen)
@@ -946,8 +944,7 @@
for(sa= screen->areabase.first; sa; sa= sa->next)
ED_area_exit(C, sa);
- WM_operator_cancel(C, &window->modalops, NULL);
- WM_event_remove_handlers(&window->handlers);
+ WM_event_remove_handlers(C, &window->handlers);
}
Modified: branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c 2008-12-02 10:10:07 UTC (rev 17677)
+++ branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c 2008-12-02 14:22:52 UTC (rev 17678)
@@ -125,7 +125,7 @@
int i= 0;
for(az= sa->actionzones.first, i= 0; az; az= az->next, i++) {
- if(az && az->type == AZONE_TRI) {
+ if(az->type == AZONE_TRI) {
if(IsPointInTri2DInts(az->x1, az->y1, az->x2, az->y2, x, y))
break;
}
@@ -154,7 +154,7 @@
sad->x= event->x; sad->y= event->y;
/* add modal handler */
- WM_event_add_modal_handler(&C->window->handlers, op);
+ WM_event_add_modal_handler(C, &C->window->handlers, op);
return OPERATOR_RUNNING_MODAL;
}
@@ -209,15 +209,12 @@
actionzone_apply(C, op);
actionzone_exit(C, op);
- WM_event_remove_modal_handler(&C->window->handlers, op);
-
return OPERATOR_FINISHED;
}
break;
case ESCKEY:
case LEFTMOUSE:
actionzone_exit(C, op);
- WM_event_remove_modal_handler(&C->window->handlers, op);
return OPERATOR_CANCELLED;
}
@@ -560,14 +557,13 @@
return OPERATOR_PASS_THROUGH;
/* add temp handler */
- WM_event_add_modal_handler(&C->window->handlers, op);
+ WM_event_add_modal_handler(C, &C->window->handlers, op);
return OPERATOR_RUNNING_MODAL;
}
static int area_move_cancel(bContext *C, wmOperator *op)
{
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list