← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to source/blender/makesdna/DNA_screen_types.h

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/makesdna/DNA_screen_types.h
77
77
        
78
78
        struct wmTimer *animtimer;                      /* if set, screen has timer handler added in window */
79
79
        void *context;                                          /* context callback */
80
 
        
81
 
        short handler[8];                                       /* similar to space handler */
82
80
} bScreen;
83
81
 
84
82
typedef struct ScrVert {
85
83
        struct ScrVert *next, *prev, *newv;
86
84
        vec2s vec;
87
 
        int flag;
 
85
        /* first one used internally, second one for tools */
 
86
        short flag, editflag;
88
87
} ScrVert;
89
88
 
90
89
typedef struct ScrEdge {
111
110
        int sortorder;                  /* panels are aligned according to increasing sortorder */
112
111
        struct Panel *paneltab;         /* this panel is tabbed in *paneltab */
113
112
        void *activedata;                       /* runtime for panel manipulation */
114
 
 
115
 
        int list_scroll, list_size;
116
 
        int list_last_len, list_grip_size;
117
 
        char list_search[64];
118
113
} Panel;
119
114
 
 
115
typedef struct uiList {                         /* some list UI data need to be saved in file */
 
116
        struct uiList *next, *prev;
 
117
 
 
118
        struct uiListType *type;                /* runtime */
 
119
        void *padp;
 
120
 
 
121
        char list_id[64];                               /* defined as UI_MAX_NAME_STR */
 
122
 
 
123
        int layout_type;                                /* How items are layedout in the list */
 
124
        int padi;
 
125
 
 
126
        int list_scroll;
 
127
        int list_size;
 
128
        int list_last_len;
 
129
        int list_grip_size;
 
130
/*      char list_search[64]; */
 
131
} uiList;
 
132
 
120
133
typedef struct ScrArea {
121
134
        struct ScrArea *next, *prev;
122
135
        
129
142
        short winx, winy;                               /* size */
130
143
        
131
144
        short headertype;                               /* OLD! 0=no header, 1= down, 2= up */
132
 
        short pad;
133
145
        short do_refresh;                               /* private, for spacetype refresh callback */
134
 
        short cursor, flag;
 
146
        short flag;
 
147
        short region_active_win;                /* index of last used region of 'RGN_TYPE_WINDOW'
 
148
                                                                         * runtuime variable, updated by executing operators */
 
149
        short pad;
135
150
        
136
151
        struct SpaceType *type;         /* callbacks for this space type */
137
152
        
161
176
        short do_draw;                          /* private, cached notifier events */
162
177
        short do_draw_overlay;          /* private, cached notifier events */
163
178
        short swap;                                     /* private, indicator to survive swap-exchange */
164
 
        short pad[3];
 
179
        short overlap;                          /* private, set for indicate drawing overlapped */
 
180
        short pad[2];
165
181
        
166
182
        struct ARegionType *type;       /* callbacks for this region type */
167
183
        
168
184
        ListBase uiblocks;                      /* uiBlock */
169
185
        ListBase panels;                        /* Panel */
 
186
        ListBase ui_lists;                      /* uiList */
170
187
        ListBase handlers;                      /* wmEventHandler */
171
188
        
 
189
        struct wmTimer *regiontimer; /* blend in/out */
 
190
        
172
191
        char *headerstr;                        /* use this string to draw info */
173
192
        void *regiondata;                       /* XXX 2.50, need spacedata equivalent? */
174
193
} ARegion;
214
233
#define PNL_DEFAULT_CLOSED              1
215
234
#define PNL_NO_HEADER                   2
216
235
 
217
 
/* screen handlers */
218
 
#define SCREEN_MAXHANDLER               8
219
 
 
220
 
#define SCREEN_HANDLER_ANIM             1
221
 
#define SCREEN_HANDLER_PYTHON   2
222
 
#define SCREEN_HANDLER_VERSE    3
 
236
/* uilist layout_type */
 
237
enum {
 
238
        UILST_LAYOUT_DEFAULT          = 0,
 
239
        UILST_LAYOUT_COMPACT          = 1,
 
240
        UILST_LAYOUT_GRID             = 2,
 
241
};
223
242
 
224
243
/* regiontype, first two are the default set */
225
244
/* Do NOT change order, append on end. Types are hardcoded needed */
226
245
enum {
227
246
        RGN_TYPE_WINDOW = 0,
228
 
        RGN_TYPE_HEADER,
229
 
        RGN_TYPE_CHANNELS,
230
 
        RGN_TYPE_TEMPORARY,
231
 
        RGN_TYPE_UI,
232
 
        RGN_TYPE_TOOLS,
233
 
        RGN_TYPE_TOOL_PROPS,
234
 
        RGN_TYPE_PREVIEW
 
247
        RGN_TYPE_HEADER = 1,
 
248
        RGN_TYPE_CHANNELS = 2,
 
249
        RGN_TYPE_TEMPORARY = 3,
 
250
        RGN_TYPE_UI = 4,
 
251
        RGN_TYPE_TOOLS = 5,
 
252
        RGN_TYPE_TOOL_PROPS = 6,
 
253
        RGN_TYPE_PREVIEW = 7
235
254
};
236
255
 
237
256
/* region alignment */
244
263
#define RGN_ALIGN_VSPLIT        6
245
264
#define RGN_ALIGN_FLOAT         7
246
265
#define RGN_ALIGN_QSPLIT        8
247
 
#define RGN_OVERLAP_TOP         9
248
 
#define RGN_OVERLAP_BOTTOM      10
249
 
#define RGN_OVERLAP_LEFT        11
250
 
#define RGN_OVERLAP_RIGHT       12
251
266
 
252
267
#define RGN_SPLIT_PREV          32
253
268