diff options
Diffstat (limited to 'source/blender/windowmanager/WM_types.h')
| -rw-r--r-- | source/blender/windowmanager/WM_types.h | 38 |
1 files changed, 21 insertions, 17 deletions
diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h index 06f1e7942f7..c84a5e64889 100644 --- a/source/blender/windowmanager/WM_types.h +++ b/source/blender/windowmanager/WM_types.h @@ -1,5 +1,5 @@ /** - * $Id: + * $Id$ * * ***** BEGIN GPL LICENSE BLOCK ***** * @@ -157,6 +157,8 @@ typedef struct wmNotifier { #define ND_FILEREAD (1<<16) #define ND_FILESAVE (2<<16) #define ND_DATACHANGED (3<<16) +#define ND_HISTORY (4<<16) +#define ND_JOB (5<<16) /* NC_SCREEN screen */ #define ND_SCREENBROWSE (1<<16) @@ -181,7 +183,7 @@ typedef struct wmNotifier { #define ND_KEYINGSET (12<<16) #define ND_TOOLSETTINGS (13<<16) #define ND_LAYER (14<<16) -#define ND_SEQUENCER_SELECT (15<<16) +#define ND_FRAME_RANGE (15<<16) /* NC_OBJECT Object */ #define ND_TRANSFORM (16<<16) @@ -190,11 +192,11 @@ typedef struct wmNotifier { #define ND_BONE_ACTIVE (19<<16) #define ND_BONE_SELECT (20<<16) #define ND_DRAW (21<<16) -#define ND_MODIFIER (22<<16) /* modifiers edited */ +#define ND_MODIFIER (22<<16) #define ND_KEYS (23<<16) -#define ND_CONSTRAINT (24<<16) /* constraints edited */ -#define ND_PARTICLE_DATA (25<<16) /* particles edited */ -#define ND_PARTICLE_SELECT (26<<16) /* particles selecting change */ +#define ND_CONSTRAINT (24<<16) +#define ND_PARTICLE (25<<16) +#define ND_POINTCACHE (26<<16) /* NC_MATERIAL Material */ #define ND_SHADING (30<<16) @@ -213,15 +215,12 @@ typedef struct wmNotifier { #define ND_DISPLAY (51<<16) /* NC_ANIMATION Animato */ -#define ND_KEYFRAME_SELECT (70<<16) -#define ND_KEYFRAME_EDIT (71<<16) -#define ND_KEYFRAME_PROP (72<<16) -#define ND_ANIMCHAN_SELECT (73<<16) -#define ND_ANIMCHAN_EDIT (74<<16) -#define ND_NLA_SELECT (75<<16) -#define ND_NLA_EDIT (76<<16) -#define ND_NLA_ACTCHANGE (77<<16) -#define ND_FCURVES_ORDER (78<<16) +#define ND_KEYFRAME (70<<16) +#define ND_KEYFRAME_PROP (71<<16) +#define ND_ANIMCHAN (72<<16) +#define ND_NLA (73<<16) +#define ND_NLA_ACTCHANGE (74<<16) +#define ND_FCURVES_ORDER (75<<16) /* NC_GEOM Geometry */ /* Mesh, Curve, MetaBall, Armature, .. */ @@ -229,7 +228,6 @@ typedef struct wmNotifier { #define ND_DATA (91<<16) /* NC_NODE Nodes */ -#define ND_NODE_SELECT (1<<16) /* NC_SPACE */ #define ND_SPACE_CONSOLE (1<<16) /* general redraw */ @@ -267,6 +265,8 @@ typedef struct wmNotifier { #define NS_MODE_POSE (9<<8) #define NS_MODE_PARTICLE (10<<8) +/* subtype 3d view editing */ +#define NS_VIEW3D_GPU (16<<8) /* action classification */ #define NOTE_ACTION (0x000000FF) @@ -275,6 +275,7 @@ typedef struct wmNotifier { #define NA_ADDED 3 #define NA_REMOVED 4 #define NA_RENAME 5 +#define NA_SELECTED 6 /* ************** Gesture Manager data ************** */ @@ -285,6 +286,7 @@ typedef struct wmNotifier { #define WM_GESTURE_CROSS_RECT 3 #define WM_GESTURE_LASSO 4 #define WM_GESTURE_CIRCLE 5 +#define WM_GESTURE_STRAIGHTLINE 6 /* wmGesture is registered to window listbase, handled by operator callbacks */ /* tweak gesture is builtin feature */ @@ -301,6 +303,7 @@ typedef struct wmGesture { /* customdata for border is a recti */ /* customdata for circle is recti, (xmin, ymin) is center, xmax radius */ /* customdata for lasso is short array */ + /* customdata for straight line is a recti: (xmin,ymin) is start, (xmax, ymax) is end */ } wmGesture; /* ************** wmEvent ************************ */ @@ -323,6 +326,7 @@ typedef struct wmEvent { short prevval; short prevx, prevy; double prevclicktime; + short prevclickx, prevclicky; /* modifier states */ short shift, ctrl, alt, oskey; /* oskey is apple or windowskey, value denotes order of pressed */ @@ -492,7 +496,7 @@ typedef struct wmDropBox { typedef struct RecentFile { struct RecentFile *next, *prev; - char *filename; + char *filepath; } RecentFile; |