Commit: 330e77c71f91004dbecfa906d4b055438fed1108
Author: Julian Eisel
Date: Wed Dec 23 23:54:07 2015 +0100
Branches: temp_widgets_c++_experiment
https://developer.blender.org/rB330e77c71f91004dbecfa906d4b055438fed1108
Cleanup: Remove C version of widget-map, unneeded struct declarations
===================================================================
M source/blender/blenkernel/BKE_context.h
M source/blender/blenkernel/intern/context.c
M source/blender/editors/armature/pose_select.c
M source/blender/editors/include/ED_transform.h
M source/blender/editors/include/ED_view3d.h
M source/blender/editors/include/UI_interface.h
M source/blender/editors/space_graph/graph_edit.c
M source/blender/editors/space_sequencer/sequencer_view.c
M source/blender/editors/transform/transform_manipulator.c
M source/blender/makesdna/DNA_screen_types.h
M source/blender/windowmanager/WM_types.h
M source/blender/windowmanager/intern/widgets/wm_widgetgroup.cc
M source/blender/windowmanager/intern/wm_event_system.c
M source/blender/windowmanager/intern/wm_operators.c
M source/blender/windowmanager/wm.h
M source/blender/windowmanager/wm_event_system.h
M source/blenderplayer/bad_level_call_stubs/stubs.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_context.h
b/source/blender/blenkernel/BKE_context.h
index 205b96c..f7af3a7 100644
--- a/source/blender/blenkernel/BKE_context.h
+++ b/source/blender/blenkernel/BKE_context.h
@@ -58,7 +58,6 @@ struct bPoseChannel;
struct bGPdata;
struct bGPDlayer;
struct bGPDframe;
-struct wmWidget;
struct wmWindow;
struct wmWindowManager;
struct SpaceText;
diff --git a/source/blender/blenkernel/intern/context.c
b/source/blender/blenkernel/intern/context.c
index 91343d9..d223a3a 100644
--- a/source/blender/blenkernel/intern/context.c
+++ b/source/blender/blenkernel/intern/context.c
@@ -58,8 +58,6 @@
/* struct */
-struct wmWidget;
-
struct bContext {
int thread;
diff --git a/source/blender/editors/armature/pose_select.c
b/source/blender/editors/armature/pose_select.c
index c99d32b..bf148e1 100644
--- a/source/blender/editors/armature/pose_select.c
+++ b/source/blender/editors/armature/pose_select.c
@@ -370,7 +370,7 @@ static int pose_de_select_all_exec(bContext *C, wmOperator
*op)
CTX_DATA_END;
/* handle widget selection */
- WM_widgetmap_select_all((struct wmWidgetMap *)ar->widgetmaps.first, C,
action);
+ WM_widgetmap_select_all((wmWidgetMap *)ar->widgetmaps.first, C, action);
WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, NULL);
diff --git a/source/blender/editors/include/ED_transform.h
b/source/blender/editors/include/ED_transform.h
index 555fb49..05cae80 100644
--- a/source/blender/editors/include/ED_transform.h
+++ b/source/blender/editors/include/ED_transform.h
@@ -114,7 +114,6 @@ struct ScrArea;
struct Base;
struct Scene;
struct Object;
-struct wmWidget;
struct wmWidgetGroup;
struct wmWidgetGroupType;
diff --git a/source/blender/editors/include/ED_view3d.h
b/source/blender/editors/include/ED_view3d.h
index ea0fafe..4b249c8 100644
--- a/source/blender/editors/include/ED_view3d.h
+++ b/source/blender/editors/include/ED_view3d.h
@@ -67,7 +67,6 @@ struct wmOperator;
struct wmOperatorType;
struct wmWindow;
struct wmWindowManager;
-struct wmWidget;
struct wmWidgetGroup;
struct wmWidgetGroupType;
struct GPUFX;
diff --git a/source/blender/editors/include/UI_interface.h
b/source/blender/editors/include/UI_interface.h
index e5472fa..d4b723b 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -72,8 +72,6 @@ struct bNodeSocket;
struct wmDropBox;
struct wmDrag;
struct wmEvent;
-struct wmWidget;
-struct wmWidgetGroup;
typedef struct uiBut uiBut;
typedef struct uiBlock uiBlock;
diff --git a/source/blender/editors/space_graph/graph_edit.c
b/source/blender/editors/space_graph/graph_edit.c
index 9ec3a61..a66d48d 100644
--- a/source/blender/editors/space_graph/graph_edit.c
+++ b/source/blender/editors/space_graph/graph_edit.c
@@ -2713,11 +2713,11 @@ static int
graph_widget_backdrop_transform_modal(bContext *C, wmOperator *op, co
case RIGHTMOUSE:
{
ARegion *ar = CTX_wm_region(C);
- wmWidgetMapC *wmap = ar->widgetmaps.first;
+ wmWidgetMap *wmap = ar->widgetmaps.first;
SpaceIpo *sipo = CTX_wm_space_graph(C);
/* only end modal if we're not dragging a widget */
- if (!wmap->wmap_context.active_widget && event->val ==
KM_PRESS) {
+ if (!wm_widgetmap_active_widget_get(wmap) && event->val
== KM_PRESS) {
copy_v2_v2(sipo->backdrop_offset,
data->init_offset);
sipo->backdrop_zoom = data->init_zoom;
diff --git a/source/blender/editors/space_sequencer/sequencer_view.c
b/source/blender/editors/space_sequencer/sequencer_view.c
index cb8163b..dc8f6dc 100644
--- a/source/blender/editors/space_sequencer/sequencer_view.c
+++ b/source/blender/editors/space_sequencer/sequencer_view.c
@@ -373,11 +373,11 @@ static int sequencer_overdrop_transform_modal(bContext
*C, wmOperator *op, const
case RIGHTMOUSE:
{
ARegion *ar = CTX_wm_region(C);
- wmWidgetMapC *wmap = ar->widgetmaps.first;
+ wmWidgetMap *wmap = ar->widgetmaps.first;
SpaceSeq *sseq = CTX_wm_space_seq(C);
/* only end modal if we're not dragging a widget */
- if (!wmap->wmap_context.active_widget && event->val ==
KM_PRESS) {
+ if (!wm_widgetmap_active_widget_get(wmap) && event->val
== KM_PRESS) {
copy_v2_v2(sseq->overdrop_offset,
data->init_offset);
sseq->overdrop_zoom = data->init_zoom;
@@ -513,7 +513,7 @@ static int sequencer_image_transform_widget_modal(bContext
*C, wmOperator *op, c
{
ARegion *ar = CTX_wm_region(C);
Scene *scene = CTX_data_scene(C);
- wmWidgetMapC *wmap = ar->widgetmaps.first;
+ wmWidgetMap *wmap = ar->widgetmaps.first;
float scale_fac = RNA_float_get(op->ptr, "scale");
float new_size[2];
float offset[2];
@@ -530,7 +530,7 @@ static int sequencer_image_transform_widget_modal(bContext
*C, wmOperator *op, c
/* no offset needed in this case */
offset[0] = offset[1] = 0;
- WM_widget_set_offset(wmap->wmap_context.active_widget,
offset);
+
WM_widget_set_offset(wm_widgetmap_active_widget_get(wmap), offset);
break;
}
diff --git a/source/blender/editors/transform/transform_manipulator.c
b/source/blender/editors/transform/transform_manipulator.c
index c27287b..a888bc7 100644
--- a/source/blender/editors/transform/transform_manipulator.c
+++ b/source/blender/editors/transform/transform_manipulator.c
@@ -145,26 +145,26 @@ enum {
};
typedef struct ManipulatorGroup {
- struct wmWidget *translate_x,
- *translate_y,
- *translate_z,
- *translate_xy,
- *translate_yz,
- *translate_zx,
- *translate_c,
-
- *rotate_x,
- *rotate_y,
- *rotate_z,
- *rotate_c,
-
- *scale_x,
- *scale_y,
- *scale_z,
- *scale_xy,
- *scale_yz,
- *scale_zx,
- *scale_c;
+ wmWidget *translate_x,
+ *translate_y,
+ *translate_z,
+ *translate_xy,
+ *translate_yz,
+ *translate_zx,
+ *translate_c,
+
+ *rotate_x,
+ *rotate_y,
+ *rotate_z,
+ *rotate_c,
+
+ *scale_x,
+ *scale_y,
+ *scale_z,
+ *scale_xy,
+ *scale_yz,
+ *scale_zx,
+ *scale_c;
} ManipulatorGroup;
@@ -1024,7 +1024,7 @@ static void manipulator_line_range(const View3D *v3d,
const short axis_type, flo
/* **************** Actual Widget Stuff **************** */
static ManipulatorGroup *manipulatorgroup_init(
- struct wmWidgetGroup *wgroup, const bool init_trans, const bool
init_rot, const bool init_scale)
+ wmWidgetGroup *wgroup, const bool init_trans, const bool init_rot,
const bool init_scale)
{
ManipulatorGroup *man;
@@ -1083,7 +1083,7 @@ static int manipulator_handler(bContext *C, const wmEvent
*UNUSED(event), wmWidg
return OPERATOR_PASS_THROUGH;
}
-void WIDGETGROUP_manipulator_create(const struct bContext *C, struct
wmWidgetGroup *wgroup)
+void WIDGETGROUP_manipulator_create(const bContext *C, wmWidgetGroup *wgroup)
{
const ScrArea *sa = CTX_wm_area(C);
const ARegion *ar = CTX_wm_region(C);
@@ -1216,7 +1216,7 @@ void WIDGETGROUP_manipulator_create(const struct bContext
*C, struct wmWidgetGro
MEM_freeN(man);
}
-int WIDGETGROUP_manipulator_poll(const struct bContext *C, struct
wmWidgetGroupType *UNUSED(wgrouptype))
+int WIDGETGROUP_manipulator_poll(const bContext *C, struct wmWidgetGroupType
*UNUSED(wgrouptype))
{
/* it's a given we only use this in 3D view */
const ScrArea *sa = CTX_wm_area(C);
@@ -1225,7 +1225,7 @@ int WIDGETGROUP_manipulator_poll(const struct bContext
*C, struct wmWidgetGroupT
return ((v3d->twflag & V3D_USE_MANIPULATOR) != 0);
}
-void WIDGETGROUP_object_manipulator_create(const struct bContext *C, struct
wmWidgetGroup *wgroup)
+void WIDGETGROUP_object_manipulator_create(const bContext *C, wmWidgetGroup
*wgroup)
{
Object *ob = ED_object_active_context((bContext *)C);
@@ -1236,7 +1236,7 @@ void WIDGETGROUP_object_manipulator_create(const struct
bContext *C, struct wmWi
WIDGETGROUP_manipulator_create(C, wgroup);
}
-int WIDGETGROUP_object_manipulator_poll(const struct bContext *C, struct
wmWidgetGroupType *wgrouptype)
+int WIDGETGROUP_object_manipulator_poll(const bContext *C, struct
wmWidgetGroupType *wgrouptype)
{
Object *ob = ED_object_active_context((bContext *)C);
diff --git a/source/blender/makesdna/DNA_screen_types.h
b/source/blender/makesdna/DNA_screen_types.h
index 6852faa..5b772f2 100644
--- a/source/blender/makesdna/DNA_screen_types.h
+++ b/source/blender/makesdna/DNA_screen_types.h
@@ -44,7 +44,6 @@ struct PanelType;
struct Scene;
struct uiLayout;
struct wmTimer;
-struct wmWidgetMapC;
typedef struct bScreen {
ID id;
diff --git a/source/blender/windowmanager/WM_types.h
b/source/blender/windowmanager/WM_types.h
index 4a217d6..9b8affa 100644
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@ -122,6 +122,12 @@ struct ImBuf;
#include "wm_cursors.h"
#include "wm_event_types.h"
+typedef struct wmWidget wmWidget;
+typedef struct wmWidgetGroup wmWidgetGroup;
+typedef struct wmWidgetMapType wmWidgetMapType;
+typedef struct wmWidgetMap wmWidgetMap;
+
+
/* ************** wmOperatorType ************************ */
/* flag */
@@ -672,40 +678,6 @@ typedef struct wmDropBox {
} wmDropBox;
-
-/* WidgetGroups store and manage groups of widgets.
- * They are responsible for drawing necessary widgets and updating their state
and position. */
-typedef struct wmWidget wmWidget;
-typedef struct wmWidgetGroup wmWidgetGroup;
-typedef struct wmWidgetMapType wmWidgetMapType;
-
-typedef struct wmWidgetMapC {
- struct wmWidgetMapC *next, *prev;
-
- wmWidgetMapType *type;
- ListBase widgetgroups;
-
- /**
- * \brief Widget map runtime context
- *
- * Contains information about this widget map. Currently
- * highlighted widget, currently selected widgets, ...
- */
- struct {
- /* we redraw the widgetmap when this changes */
- wmWidget *highlighted_widget;
- /* user has clicked this widget and it gets all input */
- wmWidget *active_widget;
- /* array for all selected widgets
-
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
