tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Cleanup: pass window to listeners, instead of screen + workspace.

This commit is contained in:
Brecht Van Lommel 2018-07-04 15:14:57 +02:00
parent 5a1aa5b935
commit 2bef8ca1b8
23 changed files with 65 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/blenkernel/BKE_screen.h
View File

@ -88,9 +88,8 @@ typedef struct SpaceType {
/* exit is called when the area is hidden or removed */
void (*exit)(struct wmWindowManager *wm, struct ScrArea *sa);
/* Listeners can react to bContext changes */
void (*listener)(struct bScreen *sc, struct ScrArea *sa,
struct wmNotifier *wmn, struct Scene *scene,
struct WorkSpace *workspace);
void (*listener)(struct wmWindow *win, struct ScrArea *sa,
struct wmNotifier *wmn, struct Scene *scene);
/* refresh context, called after filereads, ED_area_tag_refresh() */
void (*refresh)(const struct bContext *C, struct ScrArea *sa);
@ -146,7 +145,7 @@ typedef struct ARegionType {
/* snap the size of the region (can be NULL for no snapping). */
int (*snap_size)(const struct ARegion *ar, int size, int axis);
/* contextual changes should be handled here */
void (*listener)(struct bScreen *sc, struct ScrArea *sa, struct ARegion *ar,
void (*listener)(struct wmWindow *win, struct ScrArea *sa, struct ARegion *ar,
struct wmNotifier *wmn, const struct Scene *scene);
/* Optional callback to generate subscriptions. */
void (*message_subscribe)(

5
source/blender/editors/include/ED_screen.h
View File

@ -67,7 +67,7 @@ struct PropertyRNA;
/* regions */
void ED_region_do_listen(
struct bScreen *sc, struct ScrArea *sa, struct ARegion *ar,
struct wmWindow *win, struct ScrArea *sa, struct ARegion *ar,
struct wmNotifier *note, const Scene *scene);
void ED_region_do_layout(struct bContext *C, struct ARegion *ar);
void ED_region_do_draw(struct bContext *C, struct ARegion *ar);
@ -137,8 +137,7 @@ void ED_area_exit(struct bContext *C, struct ScrArea *sa);
int ED_screen_area_active(const struct bContext *C);
void ED_screen_global_areas_create(
struct wmWindow *win);
void ED_area_do_listen(struct bScreen *sc, ScrArea *sa, struct wmNotifier *note, Scene *scene,
struct WorkSpace *workspace);
void ED_area_do_listen(struct wmWindow *win, ScrArea *sa, struct wmNotifier *note, Scene *scene);
void ED_area_tag_redraw(ScrArea *sa);
void ED_area_tag_redraw_no_rebuild(ScrArea *sa);
void ED_area_tag_redraw_regiontype(ScrArea *sa, int type);

2
source/blender/editors/interface/interface_region_popup.c
View File

@ -342,7 +342,7 @@ static void ui_block_region_draw(const bContext *C, ARegion *ar)
* Use to refresh centered popups on screen resizing (for splash).
*/
static void ui_block_region_popup_window_listener(
bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn, const Scene *UNUSED(scene))
wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn, const Scene *UNUSED(scene))
{
switch (wmn->category) {
case NC_WINDOW:

8
source/blender/editors/screen/area.c
View File

@ -150,7 +150,7 @@ void ED_region_pixelspace(ARegion *ar)
}
/* only exported for WM */
void ED_region_do_listen(bScreen *sc, ScrArea *sa, ARegion *ar, wmNotifier *note, const Scene *scene)
void ED_region_do_listen(wmWindow *win, ScrArea *sa, ARegion *ar, wmNotifier *note, const Scene *scene)
{
/* generic notes first */
switch (note->category) {
@ -164,15 +164,15 @@ void ED_region_do_listen(bScreen *sc, ScrArea *sa, ARegion *ar, wmNotifier *note
}
if (ar->type && ar->type->listener)
ar->type->listener(sc, sa, ar, note, scene);
ar->type->listener(win, sa, ar, note, scene);
}
/* only exported for WM */
void ED_area_do_listen(bScreen *sc, ScrArea *sa, wmNotifier *note, Scene *scene, WorkSpace *workspace)
void ED_area_do_listen(wmWindow *win, ScrArea *sa, wmNotifier *note, Scene *scene)
{
/* no generic notes? */
if (sa->type && sa->type->listener) {
sa->type->listener(sc, sa, note, scene, workspace);
sa->type->listener(win, sa, note, scene);
}
}

11
source/blender/editors/space_action/space_action.c
View File

@ -341,7 +341,7 @@ static void action_header_region_draw(const bContext *C, ARegion *ar)
}
static void action_channel_region_listener(
bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *ar,
wmNotifier *wmn, const Scene *UNUSED(scene))
{
/* context changes */
@ -432,7 +432,7 @@ static void saction_channel_region_message_subscribe(
}
static void action_main_region_listener(
bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *ar,
wmNotifier *wmn, const Scene *UNUSED(scene))
{
/* context changes */
@ -531,8 +531,7 @@ static void saction_main_region_message_subscribe(
/* editor level listener */
static void action_listener(
bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn, Scene *UNUSED(scene),
WorkSpace *UNUSED(workspace))
wmWindow *UNUSED(win), ScrArea *sa, wmNotifier *wmn, Scene *UNUSED(scene))
{
SpaceAction *saction = (SpaceAction *)sa->spacedata.first;
@ -686,7 +685,7 @@ static void action_listener(
}
static void action_header_region_listener(
bScreen *UNUSED(sc), ScrArea *sa, ARegion *ar,
wmWindow *UNUSED(win), ScrArea *sa, ARegion *ar,
wmNotifier *wmn, const Scene *UNUSED(scene))
{
SpaceAction *saction = (SpaceAction *)sa->spacedata.first;
@ -760,7 +759,7 @@ static void action_buttons_area_draw(const bContext *C, ARegion *ar)
}
static void action_region_listener(
bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *ar,
wmNotifier *wmn, const Scene *UNUSED(scene))
{
/* context changes */

5
source/blender/editors/space_buttons/space_buttons.c
View File

@ -283,7 +283,7 @@ static void buttons_main_region_layout(const bContext *C, ARegion *ar)
}
static void buttons_main_region_listener(
bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn,
wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn,
const Scene *UNUSED(scene))
{
/* context changes */
@ -361,8 +361,7 @@ static void buttons_area_redraw(ScrArea *sa, short buttons)
/* reused! */
static void buttons_area_listener(
bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn, Scene *UNUSED(scene),
WorkSpace *UNUSED(workspace))
wmWindow *UNUSED(win), ScrArea *sa, wmNotifier *wmn, Scene *UNUSED(scene))
{
SpaceButs *sbuts = sa->spacedata.first;

15
source/blender/editors/space_clip/space_clip.c
View File

@ -323,8 +323,7 @@ static SpaceLink *clip_duplicate(SpaceLink *sl)
return (SpaceLink *)scn;
}
static void clip_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn, Scene *UNUSED(scene),
WorkSpace *UNUSED(workspace))
static void clip_listener(wmWindow *UNUSED(win), ScrArea *sa, wmNotifier *wmn, Scene *UNUSED(scene))
{
/* context changes */
switch (wmn->category) {
@ -1212,7 +1211,7 @@ static void clip_main_region_draw(const bContext *C, ARegion *ar)
}
static void clip_main_region_listener(
bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *ar,
wmNotifier *wmn, const Scene *UNUSED(scene))
{
/* context changes */
@ -1343,7 +1342,7 @@ static void clip_preview_region_draw(const bContext *C, ARegion *ar)
}
static void clip_preview_region_listener(
bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *UNUSED(ar),
wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *UNUSED(ar),
wmNotifier *UNUSED(wmn), const Scene *UNUSED(scene))
{
}
@ -1386,7 +1385,7 @@ static void clip_channels_region_draw(const bContext *C, ARegion *ar)
}
static void clip_channels_region_listener(
bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *UNUSED(ar),
wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *UNUSED(ar),
wmNotifier *UNUSED(wmn), const Scene *UNUSED(scene))
{
}
@ -1405,7 +1404,7 @@ static void clip_header_region_draw(const bContext *C, ARegion *ar)
}
static void clip_header_region_listener(
bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *ar,
wmNotifier *wmn, const Scene *UNUSED(scene))
{
/* context changes */
@ -1447,7 +1446,7 @@ static void clip_tools_region_draw(const bContext *C, ARegion *ar)
/****************** tool properties region ******************/
static void clip_props_region_listener(
bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *ar,
wmNotifier *wmn, const Scene *UNUSED(scene))
{
/* context changes */
@ -1494,7 +1493,7 @@ static void clip_properties_region_draw(const bContext *C, ARegion *ar)
}
static void clip_properties_region_listener(
bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *ar,
wmNotifier *wmn, const Scene *UNUSED(scene))
{
/* context changes */

2
source/blender/editors/space_console/space_console.c
View File

@ -370,7 +370,7 @@ static void console_header_region_draw(const bContext *C, ARegion *ar)
}
static void console_main_region_listener(
bScreen *UNUSED(sc), ScrArea *sa, ARegion *ar,
wmWindow *UNUSED(win), ScrArea *sa, ARegion *ar,
wmNotifier *wmn, const Scene *UNUSED(scene))
{
// SpaceInfo *sinfo = sa->spacedata.first;

9
source/blender/editors/space_file/space_file.c
View File

@ -298,8 +298,7 @@ static void file_refresh(const bContext *C, ScrArea *sa)
ED_area_tag_redraw(sa);
}
static void file_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn, Scene *UNUSED(scene),
WorkSpace *UNUSED(workspace))
static void file_listener(wmWindow *UNUSED(win), ScrArea *sa, wmNotifier *wmn, Scene *UNUSED(scene))
{
SpaceFile *sfile = (SpaceFile *)sa->spacedata.first;
@ -339,7 +338,7 @@ static void file_main_region_init(wmWindowManager *wm, ARegion *ar)
}
static void file_main_region_listener(
bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *ar,
wmNotifier *wmn, const Scene *UNUSED(scene))
{
/* context changes */
@ -642,7 +641,7 @@ static void file_tools_region_draw(const bContext *C, ARegion *ar)
}
static void file_tools_region_listener(
bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *UNUSED(ar),
wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *UNUSED(ar),
wmNotifier *UNUSED(wmn), const Scene *UNUSED(scene))
{
#if 0
@ -706,7 +705,7 @@ static void file_ui_region_draw(const bContext *C, ARegion *ar)
}
static void file_ui_region_listener(
bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *ar,
wmNotifier *wmn, const Scene *UNUSED(scene))
{
/* context changes */

5
source/blender/editors/space_graph/space_graph.c
View File

@ -430,7 +430,7 @@ static void graph_buttons_region_draw(const bContext *C, ARegion *ar)
}
static void graph_region_listener(
bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *ar,
wmNotifier *wmn, const Scene *UNUSED(scene))
{
/* context changes */
@ -568,8 +568,7 @@ static void graph_region_message_subscribe(
}
/* editor level listener */
static void graph_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn, Scene *UNUSED(scene),
WorkSpace *UNUSED(workspace))
static void graph_listener(wmWindow *UNUSED(win), ScrArea *sa, wmNotifier *wmn, Scene *UNUSED(scene))
{
SpaceIpo *sipo = (SpaceIpo *)sa->spacedata.first;

13
source/blender/editors/space_image/space_image.c
View File

@ -434,8 +434,7 @@ static void image_refresh(const bContext *C, ScrArea *sa)
}
}
static void image_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn, Scene *scene,
WorkSpace *workspace)
static void image_listener(wmWindow *win, ScrArea *sa, wmNotifier *wmn, Scene *UNUSED(scene))
{
SpaceImage *sima = (SpaceImage *)sa->spacedata.first;
@ -529,7 +528,7 @@ static void image_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn, Sc
case ND_TRANSFORM:
case ND_MODIFIER:
{
ViewLayer *view_layer = BKE_view_layer_from_workspace_get(scene, workspace);
ViewLayer *view_layer = WM_window_get_active_view_layer(win);
Object *ob = OBACT(view_layer);
if (ob && (ob == wmn->reference) && (ob->mode & OB_MODE_EDIT)) {
if (sima->lock && (sima->flag & SI_DRAWSHADOW)) {
@ -821,7 +820,7 @@ static void image_main_region_draw(const bContext *C, ARegion *ar)
}
static void image_main_region_listener(
bScreen *UNUSED(sc), ScrArea *sa, ARegion *ar,
wmWindow *UNUSED(win), ScrArea *sa, ARegion *ar,
wmNotifier *wmn, const Scene *UNUSED(scene))
{
/* context changes */
@ -877,7 +876,7 @@ static void image_buttons_region_draw(const bContext *C, ARegion *ar)
}
static void image_buttons_region_listener(
bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *ar,
wmNotifier *wmn, const Scene *UNUSED(scene))
{
/* context changes */
@ -952,7 +951,7 @@ static void image_tools_region_draw(const bContext *C, ARegion *ar)
}
static void image_tools_region_listener(
bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *ar,
wmNotifier *wmn, const Scene *UNUSED(scene))
{
/* context changes */
@ -1020,7 +1019,7 @@ static void image_header_region_draw(const bContext *C, ARegion *ar)
}
static void image_header_region_listener(
bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *ar,
wmNotifier *wmn, const Scene *UNUSED(scene))
{
/* context changes */

4
source/blender/editors/space_info/space_info.c
View File

@ -243,7 +243,7 @@ static void info_header_region_draw(const bContext *C, ARegion *ar)
}
static void info_main_region_listener(
bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *ar,
wmNotifier *wmn, const Scene *UNUSED(scene))
{
// SpaceInfo *sinfo = sa->spacedata.first;
@ -260,7 +260,7 @@ static void info_main_region_listener(
}
static void info_header_listener(
bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *ar,
wmNotifier *wmn, const Scene *UNUSED(scene))
{
/* context changes */

9
source/blender/editors/space_nla/space_nla.c
View File

@ -365,7 +365,7 @@ static void nla_buttons_region_draw(const bContext *C, ARegion *ar)
}
static void nla_region_listener(
bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *ar,
wmNotifier *wmn, const Scene *UNUSED(scene))
{
/* context changes */
@ -400,7 +400,7 @@ static void nla_region_listener(
static void nla_main_region_listener(
bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *ar,
wmNotifier *wmn, const Scene *UNUSED(scene))
{
/* context changes */
@ -493,7 +493,7 @@ static void nla_main_region_message_subscribe(
}
static void nla_channel_region_listener(
bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *ar,
wmNotifier *wmn, const Scene *UNUSED(scene))
{
/* context changes */
@ -564,8 +564,7 @@ static void nla_channel_region_message_subscribe(
}
/* editor level listener */
static void nla_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn, Scene *UNUSED(scene),
WorkSpace *UNUSED(workspace))
static void nla_listener(wmWindow *UNUSED(win), ScrArea *sa, wmNotifier *wmn, Scene *UNUSED(scene))
{
/* context changes */
switch (wmn->category) {

5
source/blender/editors/space_node/space_node.c
View File

@ -384,8 +384,7 @@ static void node_init(struct wmWindowManager *UNUSED(wm), ScrArea *UNUSED(sa))
}
static void node_area_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn, Scene *UNUSED(scene),
WorkSpace *UNUSED(workspace))
static void node_area_listener(wmWindow *UNUSED(win), ScrArea *sa, wmNotifier *wmn, Scene *UNUSED(scene))
{
/* note, ED_area_tag_refresh will re-execute compositor */
SpaceNode *snode = sa->spacedata.first;
@ -750,7 +749,7 @@ static void node_header_region_draw(const bContext *C, ARegion *ar)
/* used for header + main region */
static void node_region_listener(
bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *ar,
wmNotifier *wmn, const Scene *UNUSED(scene))
{
wmManipulatorMap *mmap = ar->manipulator_map;

4
source/blender/editors/space_outliner/space_outliner.c
View File

@ -310,7 +310,7 @@ static void outliner_main_region_free(ARegion *UNUSED(ar))
}
static void outliner_main_region_listener(
bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *ar,
wmNotifier *wmn, const Scene *UNUSED(scene))
{
/* context changes */
@ -459,7 +459,7 @@ static void outliner_header_region_free(ARegion *UNUSED(ar))
}
static void outliner_header_region_listener(
bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *ar,
wmNotifier *wmn, const Scene *UNUSED(scene))
{
/* context changes */

2
source/blender/editors/space_script/space_script.c
View File

@ -178,7 +178,7 @@ static void script_header_region_draw(const bContext *C, ARegion *ar)
}
static void script_main_region_listener(
bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *UNUSED(ar),
wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *UNUSED(ar),
wmNotifier *UNUSED(wmn), const Scene *UNUSED(scene))
{
/* context changes */

9
source/blender/editors/space_sequencer/space_sequencer.c
View File

@ -340,8 +340,7 @@ static SpaceLink *sequencer_duplicate(SpaceLink *sl)
}
static void sequencer_listener(
bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn, Scene *UNUSED(scene),
WorkSpace *UNUSED(workspace))
wmWindow *UNUSED(win), ScrArea *sa, wmNotifier *wmn, Scene *UNUSED(scene))
{
/* context changes */
switch (wmn->category) {
@ -496,7 +495,7 @@ static void sequencer_main_region_draw(const bContext *C, ARegion *ar)
}
static void sequencer_main_region_listener(
bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *ar,
wmNotifier *wmn, const Scene *UNUSED(scene))
{
/* context changes */
@ -644,7 +643,7 @@ static void sequencer_preview_region_draw(const bContext *C, ARegion *ar)
}
static void sequencer_preview_region_listener(
bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *ar,
wmNotifier *wmn, const Scene *UNUSED(scene))
{
/* context changes */
@ -712,7 +711,7 @@ static void sequencer_buttons_region_draw(const bContext *C, ARegion *ar)
}
static void sequencer_buttons_region_listener(
bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *ar,
wmNotifier *wmn, const Scene *UNUSED(scene))
{
/* context changes */

2
source/blender/editors/space_statusbar/space_statusbar.c
View File

@ -109,7 +109,7 @@ static void statusbar_keymap(struct wmKeyConfig *UNUSED(keyconf))
}
static void statusbar_header_region_listener(
bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *ar,
wmNotifier *wmn, const Scene *UNUSED(scene))
{
/* context changes */

3
source/blender/editors/space_text/space_text.c
View File

@ -126,8 +126,7 @@ static SpaceLink *text_duplicate(SpaceLink *sl)
return (SpaceLink *)stextn;
}
static void text_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn, Scene *UNUSED(scene),
WorkSpace *UNUSED(workspace))
static void text_listener(wmWindow *UNUSED(win), ScrArea *sa, wmNotifier *wmn, Scene *UNUSED(scene))
{
SpaceText *st = sa->spacedata.first;

4
source/blender/editors/space_topbar/space_topbar.c
View File

@ -151,7 +151,7 @@ static void topbar_header_region_init(wmWindowManager *UNUSED(wm), ARegion *ar)
ED_region_header_init(ar);
}
static void topbar_main_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
static void topbar_main_region_listener(wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *ar,
wmNotifier *wmn, const Scene *UNUSED(scene))
{
/* context changes */
@ -171,7 +171,7 @@ static void topbar_main_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa)
}
}
static void topbar_header_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
static void topbar_header_listener(wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *ar,
wmNotifier *wmn, const Scene *UNUSED(scene))
{
/* context changes */

4
source/blender/editors/space_userpref/space_userpref.c
View File

@ -137,14 +137,14 @@ static void userpref_header_region_draw(const bContext *C, ARegion *ar)
}
static void userpref_main_region_listener(
bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *UNUSED(ar),
wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *UNUSED(ar),
wmNotifier *UNUSED(wmn), const Scene *UNUSED(scene))
{
/* context changes */
}
static void userpref_header_listener(
bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *UNUSED(ar),
wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *UNUSED(ar),
wmNotifier *UNUSED(wmn), const Scene *UNUSED(scene))
{
/* context changes */

9
source/blender/editors/space_view3d/space_view3d.c
View File

@ -776,7 +776,7 @@ static void view3d_recalc_used_layers(ARegion *ar, wmNotifier *wmn, const Scene
}
static void view3d_main_region_listener(
bScreen *UNUSED(sc), ScrArea *sa, ARegion *ar,
wmWindow *UNUSED(win), ScrArea *sa, ARegion *ar,
wmNotifier *wmn, const Scene *scene)
{
View3D *v3d = sa->spacedata.first;
@ -1150,7 +1150,7 @@ static void view3d_header_region_draw(const bContext *C, ARegion *ar)
}
static void view3d_header_region_listener(
bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *ar,
wmNotifier *wmn, const Scene *UNUSED(scene))
{
/* context changes */
@ -1228,7 +1228,7 @@ static void view3d_buttons_region_draw(const bContext *C, ARegion *ar)
}
static void view3d_buttons_region_listener(
bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar,
wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *ar,
wmNotifier *wmn, const Scene *UNUSED(scene))
{
/* context changes */
@ -1358,8 +1358,7 @@ static void view3d_tools_region_draw(const bContext *C, ARegion *ar)
/* area (not region) level listener */
static void space_view3d_listener(
bScreen *UNUSED(sc), ScrArea *sa, struct wmNotifier *wmn, Scene *UNUSED(scene),
WorkSpace *UNUSED(workspace))
wmWindow *UNUSED(win), ScrArea *sa, struct wmNotifier *wmn, Scene *UNUSED(scene))
{
View3D *v3d = sa->spacedata.first;

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

@ -473,13 +473,13 @@ void wm_event_do_notifiers(bContext *C)
ED_screen_do_listen(C, note);
for (ar = screen->regionbase.first; ar; ar = ar->next) {
ED_region_do_listen(screen, NULL, ar, note, scene);
ED_region_do_listen(win, NULL, ar, note, scene);
}
ED_screen_areas_iter(win, screen, sa) {
ED_area_do_listen(screen, sa, note, scene, workspace);
ED_area_do_listen(win, sa, note, scene);
for (ar = sa->regionbase.first; ar; ar = ar->next) {
ED_region_do_listen(screen, sa, ar, note, scene);
ED_region_do_listen(win, sa, ar, note, scene);
}
}
}