2008-01-07 18:03:41 +00:00
|
|
|
/**
|
|
|
|
* $Id:
|
|
|
|
*
|
|
|
|
* ***** BEGIN GPL LICENSE BLOCK *****
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
* as published by the Free Software Foundation; either version 2
|
|
|
|
* of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
|
|
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
|
|
*
|
|
|
|
* The Original Code is Copyright (C) 2008 Blender Foundation.
|
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* Contributor(s): Blender Foundation
|
|
|
|
*
|
|
|
|
* ***** END GPL LICENSE BLOCK *****
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <string.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
|
|
|
|
#include "MEM_guardedalloc.h"
|
|
|
|
|
|
|
|
#include "BLI_blenlib.h"
|
|
|
|
#include "BLI_arithb.h"
|
|
|
|
#include "BLI_rand.h"
|
|
|
|
|
2008-12-18 02:56:48 +00:00
|
|
|
#include "BKE_context.h"
|
2008-12-21 17:18:36 +00:00
|
|
|
#include "BKE_global.h"
|
2008-01-07 18:03:41 +00:00
|
|
|
#include "BKE_screen.h"
|
|
|
|
#include "BKE_utildefines.h"
|
|
|
|
|
|
|
|
#include "WM_api.h"
|
|
|
|
#include "WM_types.h"
|
|
|
|
#include "wm_subwindow.h"
|
|
|
|
|
2008-12-19 12:48:30 +00:00
|
|
|
#include "ED_screen.h"
|
|
|
|
#include "ED_screen_types.h"
|
|
|
|
#include "ED_types.h"
|
|
|
|
|
2008-01-07 18:03:41 +00:00
|
|
|
#include "BIF_gl.h"
|
|
|
|
#include "BIF_glutil.h"
|
|
|
|
|
2008-12-10 13:56:54 +00:00
|
|
|
#include "UI_interface.h"
|
Port of part of the Interface code to 2.50.
This is based on the current trunk version, so these files should not need
merges. There's two things (clipboard and intptr_t) that are missing in 2.50
and commented out with XXX 2.48, these can be enabled again once trunk is
merged into this branch.
Further this is not all interface code, there are many parts commented out:
* interface.c: nearly all button types, missing: links, chartab, keyevent.
* interface_draw.c: almost all code, with some small exceptions.
* interface_ops.c: this replaces ui_do_but and uiDoBlocks with two operators,
making it non-blocking.
* interface_regions: this is a part of interface.c, split off, contains code to
create regions for tooltips, menus, pupmenu (that one is crashing currently),
color chooser, basically regions with buttons which is fairly independent of
core interface code.
* interface_panel.c and interface_icons.c: not ported over, so no panels and
icons yet. Panels should probably become (free floating) regions?
* text.c: (formerly language.c) for drawing text and translation. this works
but is using bad globals still and could be cleaned up.
Header Files:
* ED_datafiles.h now has declarations for datatoc_ files, so those extern
declarations can be #included instead of repeated.
* The user interface code is in UI_interface.h and other UI_* files.
Core:
* The API for creating blocks, buttons, etc is nearly the same still. Blocks
are now created per region instead of per area.
* The code was made non-blocking, which means that any changes and redraws
should be possible while editing a button. That means though that we need
some sort of persistence even though the blender model is to recreate buttons
for each redraw. So when a new block is created, some matching happens to
find out which buttons correspond to buttons in the previously created block,
and for activated buttons some data is then copied over to the new button.
* Added UI_init/UI_init_userdef/UI_exit functions that should initialize code
in this module, instead of multiple function calls in the windowmanager.
* Removed most static/globals from interface.c.
* Removed UIafterfunc_ I don't think it's needed anymore, and not sure how it
would integrate here?
* Currently only full window redraws are used, this should become per region
and maybe per button later.
Operators:
* Events are currently handled through two operators: button activate and menu
handle. Operators may not be the best way to implement this, since there are
currently some issues with events being missed, but they can become a special
handler type instead, this should not be a big change.
* The button activate operator runs as long as a button is active, and will
handle all interaction with that button until the button is not activated
anymore. This means clicking, text editing, number dragging, opening menu
blocks, etc.
* Since this operator has to be non-blocking, the ui_do_but code needed to made
non-blocking. That means variables that were previously on the stack, now
need to be stored away in a struct such that they can be accessed again when
the operator receives more events.
* Additionally the place in the ui_do_but code indicated the state, now that
needs to be set explicit in order to handle the right events in the right
state. So an activated button can be in one of these states: init, highlight,
wait_flash, wait_release, wait_key_event, num_editing, text_editing,
text_selecting, block_open, exit.
* For each button type an ui_apply_but_* function has also been separated out
from ui_do_but. This makes it possible to continuously apply the button as
text is being typed for example, and there is an option in the code to enable
this. Since the code non-blocking and can deal with the button being deleted
even, it should be safe to do this.
* When editing text, dragging numbers, etc, the actual data (but->poin) is not
being edited, since that would mean data is being edited without correct
updates happening, while some other part of blender may be accessing that
data in the meantime. So data values, strings, vectors are written to a
temporary location and only flush in the apply function.
Regions:
* Menus, color chooser, tooltips etc all create screen level regions. Such menu
blocks give a handle to the button that creates it, which will contain the
results of the menu block once a MESSAGE event is received from that menu
block.
* For this type of menu block the coordinates used to be in window space. They
are still created that way and ui_positionblock still works with window
coordinates, but after that the block and buttons are brought back to region
coordinates since these are now contained in a region.
* The flush/overdraw frontbuffer drawing code was removed, the windowmanager
should have enough information with these screen level regions to have full
control over what gets drawn when and to then do correct compositing.
Testing:
* The header in the time space currently has some buttons to test the UI code.
2008-11-11 18:31:32 +00:00
|
|
|
#include "UI_resources.h"
|
2008-12-10 13:56:54 +00:00
|
|
|
#include "UI_view2d.h"
|
Port of part of the Interface code to 2.50.
This is based on the current trunk version, so these files should not need
merges. There's two things (clipboard and intptr_t) that are missing in 2.50
and commented out with XXX 2.48, these can be enabled again once trunk is
merged into this branch.
Further this is not all interface code, there are many parts commented out:
* interface.c: nearly all button types, missing: links, chartab, keyevent.
* interface_draw.c: almost all code, with some small exceptions.
* interface_ops.c: this replaces ui_do_but and uiDoBlocks with two operators,
making it non-blocking.
* interface_regions: this is a part of interface.c, split off, contains code to
create regions for tooltips, menus, pupmenu (that one is crashing currently),
color chooser, basically regions with buttons which is fairly independent of
core interface code.
* interface_panel.c and interface_icons.c: not ported over, so no panels and
icons yet. Panels should probably become (free floating) regions?
* text.c: (formerly language.c) for drawing text and translation. this works
but is using bad globals still and could be cleaned up.
Header Files:
* ED_datafiles.h now has declarations for datatoc_ files, so those extern
declarations can be #included instead of repeated.
* The user interface code is in UI_interface.h and other UI_* files.
Core:
* The API for creating blocks, buttons, etc is nearly the same still. Blocks
are now created per region instead of per area.
* The code was made non-blocking, which means that any changes and redraws
should be possible while editing a button. That means though that we need
some sort of persistence even though the blender model is to recreate buttons
for each redraw. So when a new block is created, some matching happens to
find out which buttons correspond to buttons in the previously created block,
and for activated buttons some data is then copied over to the new button.
* Added UI_init/UI_init_userdef/UI_exit functions that should initialize code
in this module, instead of multiple function calls in the windowmanager.
* Removed most static/globals from interface.c.
* Removed UIafterfunc_ I don't think it's needed anymore, and not sure how it
would integrate here?
* Currently only full window redraws are used, this should become per region
and maybe per button later.
Operators:
* Events are currently handled through two operators: button activate and menu
handle. Operators may not be the best way to implement this, since there are
currently some issues with events being missed, but they can become a special
handler type instead, this should not be a big change.
* The button activate operator runs as long as a button is active, and will
handle all interaction with that button until the button is not activated
anymore. This means clicking, text editing, number dragging, opening menu
blocks, etc.
* Since this operator has to be non-blocking, the ui_do_but code needed to made
non-blocking. That means variables that were previously on the stack, now
need to be stored away in a struct such that they can be accessed again when
the operator receives more events.
* Additionally the place in the ui_do_but code indicated the state, now that
needs to be set explicit in order to handle the right events in the right
state. So an activated button can be in one of these states: init, highlight,
wait_flash, wait_release, wait_key_event, num_editing, text_editing,
text_selecting, block_open, exit.
* For each button type an ui_apply_but_* function has also been separated out
from ui_do_but. This makes it possible to continuously apply the button as
text is being typed for example, and there is an option in the code to enable
this. Since the code non-blocking and can deal with the button being deleted
even, it should be safe to do this.
* When editing text, dragging numbers, etc, the actual data (but->poin) is not
being edited, since that would mean data is being edited without correct
updates happening, while some other part of blender may be accessing that
data in the meantime. So data values, strings, vectors are written to a
temporary location and only flush in the apply function.
Regions:
* Menus, color chooser, tooltips etc all create screen level regions. Such menu
blocks give a handle to the button that creates it, which will contain the
results of the menu block once a MESSAGE event is received from that menu
block.
* For this type of menu block the coordinates used to be in window space. They
are still created that way and ui_positionblock still works with window
coordinates, but after that the block and buttons are brought back to region
coordinates since these are now contained in a region.
* The flush/overdraw frontbuffer drawing code was removed, the windowmanager
should have enough information with these screen level regions to have full
control over what gets drawn when and to then do correct compositing.
Testing:
* The header in the time space currently has some buttons to test the UI code.
2008-11-11 18:31:32 +00:00
|
|
|
|
2008-12-21 17:18:36 +00:00
|
|
|
#include "BMF_Api.h"
|
|
|
|
|
2008-11-24 21:57:58 +00:00
|
|
|
#ifndef DISABLE_PYTHON
|
2008-01-07 18:03:41 +00:00
|
|
|
#include "BPY_extern.h"
|
2008-11-24 21:57:58 +00:00
|
|
|
#endif
|
2008-01-07 18:03:41 +00:00
|
|
|
|
|
|
|
#include "screen_intern.h"
|
|
|
|
|
|
|
|
/* general area and region code */
|
|
|
|
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
static void region_draw_emboss(ARegion *ar, rcti *scirct)
|
2008-01-07 18:03:41 +00:00
|
|
|
{
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
rcti rect;
|
2008-01-07 18:03:41 +00:00
|
|
|
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
/* translate scissor rect to region space */
|
|
|
|
rect.xmin= scirct->xmin - ar->winrct.xmin;
|
|
|
|
rect.ymin= scirct->ymin - ar->winrct.ymin;
|
|
|
|
rect.xmax= scirct->xmax - ar->winrct.xmin;
|
|
|
|
rect.ymax= scirct->ymax - ar->winrct.ymin;
|
2008-01-07 18:03:41 +00:00
|
|
|
|
|
|
|
/* set transp line */
|
|
|
|
glEnable( GL_BLEND );
|
|
|
|
glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
|
|
|
|
|
|
|
|
/* right */
|
|
|
|
glColor4ub(0,0,0, 50);
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
sdrawline(rect.xmax, rect.ymin, rect.xmax, rect.ymax);
|
2008-01-07 18:03:41 +00:00
|
|
|
|
|
|
|
/* bottom */
|
|
|
|
glColor4ub(0,0,0, 80);
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
sdrawline(rect.xmin, rect.ymin, rect.xmax, rect.ymin);
|
2008-01-07 18:03:41 +00:00
|
|
|
|
|
|
|
/* top */
|
|
|
|
glColor4ub(255,255,255, 60);
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
sdrawline(rect.xmin, rect.ymax, rect.xmax, rect.ymax);
|
2008-01-07 18:03:41 +00:00
|
|
|
|
|
|
|
/* left */
|
|
|
|
glColor4ub(255,255,255, 50);
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
sdrawline(rect.xmin, rect.ymin, rect.xmin, rect.ymax);
|
2008-01-07 18:03:41 +00:00
|
|
|
|
|
|
|
glDisable( GL_BLEND );
|
|
|
|
}
|
|
|
|
|
2008-12-19 14:14:43 +00:00
|
|
|
void ED_region_pixelspace(ARegion *ar)
|
2.5: work on bringing back SpaceTime options
- RMB select, also with SHIFT
- RMB tweak for translate
- SHIFT+D dupli
- BKEY border select/deselect
- AKEY (de)select all
- XKEY delete
- GKEY grab
Added some XXX comments for future todos, especially for when other
spaces come back with time markers.
Also added ED_util for putting in all to-be-cleaned cruft
Context conflict: input methods for Markers can conflict with other
spacetypes. It was solved in pre-2.5 with manually tweaking it all over,
but I would prefer one keymap for all marker stuff. Needs some thinking...
could be solved with a boundbox check for bottom part of 2d window.
Tweak issue: both tweak styles are possible:
- Hold mouse button, move, operator ends on mouse release
- Hold mouse button, move, operator ends on mouse click
Problem is that modally handled operators use fixed keymaps... like ESC,
SPACE, ENTER, or press/release mousebutton for 'assign'. There's a lot
to say for making this all consistant, or become part of 1 general keymap?
Should also be possibe to define 'tweak' defaults for Tablet different
than for mouse...
2008-11-29 15:10:31 +00:00
|
|
|
{
|
|
|
|
int width= ar->winrct.xmax-ar->winrct.xmin+1;
|
|
|
|
int height= ar->winrct.ymax-ar->winrct.ymin+1;
|
|
|
|
|
2008-12-19 14:14:43 +00:00
|
|
|
wmOrtho2(-0.375, (float)width-0.375, -0.375, (float)height-0.375);
|
|
|
|
wmLoadIdentity();
|
2.5: work on bringing back SpaceTime options
- RMB select, also with SHIFT
- RMB tweak for translate
- SHIFT+D dupli
- BKEY border select/deselect
- AKEY (de)select all
- XKEY delete
- GKEY grab
Added some XXX comments for future todos, especially for when other
spaces come back with time markers.
Also added ED_util for putting in all to-be-cleaned cruft
Context conflict: input methods for Markers can conflict with other
spacetypes. It was solved in pre-2.5 with manually tweaking it all over,
but I would prefer one keymap for all marker stuff. Needs some thinking...
could be solved with a boundbox check for bottom part of 2d window.
Tweak issue: both tweak styles are possible:
- Hold mouse button, move, operator ends on mouse release
- Hold mouse button, move, operator ends on mouse click
Problem is that modally handled operators use fixed keymaps... like ESC,
SPACE, ENTER, or press/release mousebutton for 'assign'. There's a lot
to say for making this all consistant, or become part of 1 general keymap?
Should also be possibe to define 'tweak' defaults for Tablet different
than for mouse...
2008-11-29 15:10:31 +00:00
|
|
|
}
|
2008-01-07 18:03:41 +00:00
|
|
|
|
2009-01-04 17:45:54 +00:00
|
|
|
/* only exported for WM */
|
2008-01-07 18:03:41 +00:00
|
|
|
void ED_region_do_listen(ARegion *ar, wmNotifier *note)
|
|
|
|
{
|
2008-01-10 17:38:17 +00:00
|
|
|
/* generic notes first */
|
2008-12-27 16:09:56 +00:00
|
|
|
switch(note->category) {
|
2009-02-07 10:00:46 +00:00
|
|
|
case NC_WM:
|
|
|
|
if(note->data==ND_FILEREAD)
|
|
|
|
ED_region_tag_redraw(ar);
|
|
|
|
break;
|
2008-12-27 16:09:56 +00:00
|
|
|
case NC_WINDOW:
|
2008-12-16 12:28:00 +00:00
|
|
|
ED_region_tag_redraw(ar);
|
2008-01-10 17:38:17 +00:00
|
|
|
break;
|
2008-12-27 16:09:56 +00:00
|
|
|
case NC_SCREEN:
|
|
|
|
if(note->action==NA_EDITED)
|
2008-12-21 16:24:19 +00:00
|
|
|
ED_region_tag_redraw(ar);
|
2009-02-18 13:29:54 +00:00
|
|
|
/* pass on */
|
2008-01-10 17:38:17 +00:00
|
|
|
default:
|
2008-12-28 14:41:33 +00:00
|
|
|
if(ar->type && ar->type->listener)
|
2008-01-10 17:38:17 +00:00
|
|
|
ar->type->listener(ar, note);
|
|
|
|
}
|
2008-01-07 18:03:41 +00:00
|
|
|
}
|
|
|
|
|
2009-01-04 17:45:54 +00:00
|
|
|
/* only exported for WM */
|
|
|
|
void ED_area_do_listen(ScrArea *sa, wmNotifier *note)
|
|
|
|
{
|
|
|
|
/* no generic notes? */
|
|
|
|
if(sa->type && sa->type->listener) {
|
|
|
|
sa->type->listener(sa, note);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* only exported for WM */
|
|
|
|
void ED_area_do_refresh(bContext *C, ScrArea *sa)
|
|
|
|
{
|
|
|
|
/* no generic notes? */
|
|
|
|
if(sa->type && sa->type->refresh) {
|
|
|
|
sa->type->refresh(C, sa);
|
|
|
|
}
|
|
|
|
sa->do_refresh= 0;
|
|
|
|
}
|
|
|
|
|
2008-12-16 18:42:12 +00:00
|
|
|
/* based on screen region draw tags, set draw tags in azones, and future region tabs etc */
|
2009-01-04 17:45:54 +00:00
|
|
|
/* only exported for WM */
|
2.5: WIP commit for WM compositing.
* Drawing code from wm_event_system.c split into separate wm_draw.c file.
Now there's 3 different draw methods implemented, not sure what survives
or will be added but is useful for debugging.
* Draw All: redraws everything each time, for reference.
* Draw Overlap All: what the code did before this commit, only draw
regions marked for redraw, and anything that overlaps them.
* Triple Buffer: copies/retores all area regions into a texture, and
blits that before drawing. Menus, brushes, gestures, etc are redrawn
always on top of that.
Currently "Draw Overlap All" is set hardcoded to be used still. Triple
Buffer code is not complete, it doesn't handle window resize yet. Cards
that don't support non power of two textures can need quite large
textures as well, this could be split into multiple smaller ones.
2009-01-20 21:55:48 +00:00
|
|
|
void ED_area_overdraw_flush(bContext *C, ScrArea *sa, ARegion *ar)
|
2008-11-24 10:45:36 +00:00
|
|
|
{
|
2.5: WIP commit for WM compositing.
* Drawing code from wm_event_system.c split into separate wm_draw.c file.
Now there's 3 different draw methods implemented, not sure what survives
or will be added but is useful for debugging.
* Draw All: redraws everything each time, for reference.
* Draw Overlap All: what the code did before this commit, only draw
regions marked for redraw, and anything that overlaps them.
* Triple Buffer: copies/retores all area regions into a texture, and
blits that before drawing. Menus, brushes, gestures, etc are redrawn
always on top of that.
Currently "Draw Overlap All" is set hardcoded to be used still. Triple
Buffer code is not complete, it doesn't handle window resize yet. Cards
that don't support non power of two textures can need quite large
textures as well, this could be split into multiple smaller ones.
2009-01-20 21:55:48 +00:00
|
|
|
AZone *az;
|
2008-11-24 10:45:36 +00:00
|
|
|
|
2.5: WIP commit for WM compositing.
* Drawing code from wm_event_system.c split into separate wm_draw.c file.
Now there's 3 different draw methods implemented, not sure what survives
or will be added but is useful for debugging.
* Draw All: redraws everything each time, for reference.
* Draw Overlap All: what the code did before this commit, only draw
regions marked for redraw, and anything that overlaps them.
* Triple Buffer: copies/retores all area regions into a texture, and
blits that before drawing. Menus, brushes, gestures, etc are redrawn
always on top of that.
Currently "Draw Overlap All" is set hardcoded to be used still. Triple
Buffer code is not complete, it doesn't handle window resize yet. Cards
that don't support non power of two textures can need quite large
textures as well, this could be split into multiple smaller ones.
2009-01-20 21:55:48 +00:00
|
|
|
for(az= sa->actionzones.first; az; az= az->next) {
|
|
|
|
int xs= (az->x1+az->x2)/2, ys= (az->y1+az->y2)/2;
|
|
|
|
|
|
|
|
/* test if inside */
|
|
|
|
if(BLI_in_rcti(&ar->winrct, xs, ys)) {
|
|
|
|
az->do_draw= 1;
|
2008-12-16 18:42:12 +00:00
|
|
|
}
|
2.5: WIP commit for WM compositing.
* Drawing code from wm_event_system.c split into separate wm_draw.c file.
Now there's 3 different draw methods implemented, not sure what survives
or will be added but is useful for debugging.
* Draw All: redraws everything each time, for reference.
* Draw Overlap All: what the code did before this commit, only draw
regions marked for redraw, and anything that overlaps them.
* Triple Buffer: copies/retores all area regions into a texture, and
blits that before drawing. Menus, brushes, gestures, etc are redrawn
always on top of that.
Currently "Draw Overlap All" is set hardcoded to be used still. Triple
Buffer code is not complete, it doesn't handle window resize yet. Cards
that don't support non power of two textures can need quite large
textures as well, this could be split into multiple smaller ones.
2009-01-20 21:55:48 +00:00
|
|
|
}
|
2008-12-16 18:42:12 +00:00
|
|
|
}
|
|
|
|
|
2009-04-30 02:14:03 +00:00
|
|
|
static void area_draw_azone(short x1, short y1, short x2, short y2)
|
|
|
|
{
|
|
|
|
float xmin = x1;
|
|
|
|
float xmax = x2-2;
|
|
|
|
float ymin = y1-1;
|
|
|
|
float ymax = y2-3;
|
|
|
|
|
|
|
|
float dx= 0.3f*(xmax-xmin);
|
|
|
|
float dy= 0.3f*(ymax-ymin);
|
|
|
|
|
|
|
|
glColor4ub(255, 255, 255, 80);
|
|
|
|
fdrawline(xmin, ymax, xmax, ymin);
|
|
|
|
fdrawline(xmin, ymax-dy, xmax-dx, ymin);
|
|
|
|
fdrawline(xmin, ymax-2*dy, xmax-2*dx, ymin);
|
|
|
|
|
|
|
|
glColor4ub(0, 0, 0, 150);
|
|
|
|
fdrawline(xmin, ymax+1, xmax+1, ymin);
|
|
|
|
fdrawline(xmin, ymax-dy+1, xmax-dx+1, ymin);
|
|
|
|
fdrawline(xmin, ymax-2*dy+1, xmax-2*dx+1, ymin);
|
|
|
|
}
|
|
|
|
|
2009-01-04 17:45:54 +00:00
|
|
|
/* only exported for WM */
|
2008-12-16 18:42:12 +00:00
|
|
|
void ED_area_overdraw(bContext *C)
|
|
|
|
{
|
2008-12-18 02:56:48 +00:00
|
|
|
wmWindow *win= CTX_wm_window(C);
|
|
|
|
bScreen *screen= CTX_wm_screen(C);
|
2008-12-16 18:42:12 +00:00
|
|
|
ScrArea *sa;
|
|
|
|
|
|
|
|
/* Draw AZones, in screenspace */
|
2008-12-19 14:14:43 +00:00
|
|
|
wmSubWindowSet(win, screen->mainwin);
|
2008-12-16 18:42:12 +00:00
|
|
|
|
|
|
|
glEnable( GL_BLEND );
|
|
|
|
glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
|
2008-11-24 10:45:36 +00:00
|
|
|
|
2008-12-18 02:56:48 +00:00
|
|
|
for(sa= screen->areabase.first; sa; sa= sa->next) {
|
2008-12-16 18:42:12 +00:00
|
|
|
AZone *az;
|
|
|
|
for(az= sa->actionzones.first; az; az= az->next) {
|
|
|
|
if(az->do_draw) {
|
|
|
|
if(az->type==AZONE_TRI) {
|
2009-04-30 02:14:03 +00:00
|
|
|
area_draw_azone(az->x1, az->y1, az->x2, az->y2);
|
2008-12-16 18:42:12 +00:00
|
|
|
}
|
|
|
|
az->do_draw= 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
glDisable( GL_BLEND );
|
2008-11-24 10:45:36 +00:00
|
|
|
|
|
|
|
}
|
|
|
|
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
/* get scissor rect, checking overlapping regions */
|
|
|
|
static void region_scissor_winrct(ARegion *ar, rcti *winrct)
|
|
|
|
{
|
|
|
|
*winrct= ar->winrct;
|
|
|
|
|
|
|
|
if(ELEM(ar->alignment, RGN_OVERLAP_LEFT, RGN_OVERLAP_RIGHT))
|
|
|
|
return;
|
|
|
|
|
|
|
|
while(ar->prev) {
|
|
|
|
ar= ar->prev;
|
|
|
|
|
|
|
|
if(ar->flag & RGN_FLAG_HIDDEN);
|
|
|
|
else if(ar->alignment==RGN_OVERLAP_LEFT) {
|
|
|
|
winrct->xmin= ar->winrct.xmax + 1;
|
|
|
|
}
|
|
|
|
else if(ar->alignment==RGN_OVERLAP_RIGHT) {
|
|
|
|
winrct->xmax= ar->winrct.xmin - 1;
|
|
|
|
}
|
|
|
|
else break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-01-04 17:45:54 +00:00
|
|
|
/* only exported for WM */
|
2008-01-07 18:03:41 +00:00
|
|
|
void ED_region_do_draw(bContext *C, ARegion *ar)
|
|
|
|
{
|
2008-12-18 02:56:48 +00:00
|
|
|
wmWindow *win= CTX_wm_window(C);
|
|
|
|
ScrArea *sa= CTX_wm_area(C);
|
2008-01-07 18:03:41 +00:00
|
|
|
ARegionType *at= ar->type;
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
rcti winrct;
|
|
|
|
|
|
|
|
/* checks other overlapping regions */
|
|
|
|
region_scissor_winrct(ar, &winrct);
|
|
|
|
|
2.5: WM Compositing
* Triple Buffer is now more complete:
- Proper handling of window resize, duplicate, etc.
- It now uses 3x3 textures (or less) if the power of two sizes
do not match well. That still has a worst case wast of 23.4%,
but better than 300%.
- It can also use the ARB/NV/EXT_texture_rectangle extension
now, which may be supported on hardware that does not support
ARB_texture_non_power_of_two.
- Gesture, menu and brushe redraws now require no redraws at all
from the area regions. So even on a high poly scene just moving
the paint cursor or opening a menu should be fast.
* Testing can be done by setting the "Window Draw Method" in the
User Preferences in the outliner. "Overlap" is still default,
since "Triple Buffer" has not been tested on computers other than
mine, would like to avoid crashing Blender on startup in case
there is a common bug, but it's ready for testing now.
- For reference "Full" draws the full window each time.
- "Triple Buffer" should work for both swap copy and swap exchange
systems, the latter still need the -E command line option for
"Overlap".
- Resizing and going fullscreen still gives flicker here but no
more than "Full" drawing.
* Partial Redraw was added. ED_region_tag_redraw_partial takes a
rect in window coordinates to define a subarea of the region.
On region draw it will then set glScissor to a smaller area, and
ar->drawrct will always be set to either the partial or full
window rect. The latter can then be used for clipping in the 3D
view or clipping interface drawing. Neither is implemented yet.
2009-01-23 03:52:52 +00:00
|
|
|
/* if no partial draw rect set, full rect */
|
|
|
|
if(ar->drawrct.xmin == ar->drawrct.xmax)
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
ar->drawrct= winrct;
|
|
|
|
else {
|
|
|
|
/* extra clip for safety */
|
|
|
|
ar->drawrct.xmin= MAX2(winrct.xmin, ar->drawrct.xmin);
|
|
|
|
ar->drawrct.ymin= MAX2(winrct.ymin, ar->drawrct.ymin);
|
|
|
|
ar->drawrct.xmax= MIN2(winrct.xmax, ar->drawrct.xmax);
|
|
|
|
ar->drawrct.ymax= MIN2(winrct.ymax, ar->drawrct.ymax);
|
|
|
|
}
|
2008-01-07 18:03:41 +00:00
|
|
|
|
2008-12-19 14:14:43 +00:00
|
|
|
/* note; this sets state, so we can use wmOrtho and friends */
|
2.5: WM Compositing
* Triple Buffer is now more complete:
- Proper handling of window resize, duplicate, etc.
- It now uses 3x3 textures (or less) if the power of two sizes
do not match well. That still has a worst case wast of 23.4%,
but better than 300%.
- It can also use the ARB/NV/EXT_texture_rectangle extension
now, which may be supported on hardware that does not support
ARB_texture_non_power_of_two.
- Gesture, menu and brushe redraws now require no redraws at all
from the area regions. So even on a high poly scene just moving
the paint cursor or opening a menu should be fast.
* Testing can be done by setting the "Window Draw Method" in the
User Preferences in the outliner. "Overlap" is still default,
since "Triple Buffer" has not been tested on computers other than
mine, would like to avoid crashing Blender on startup in case
there is a common bug, but it's ready for testing now.
- For reference "Full" draws the full window each time.
- "Triple Buffer" should work for both swap copy and swap exchange
systems, the latter still need the -E command line option for
"Overlap".
- Resizing and going fullscreen still gives flicker here but no
more than "Full" drawing.
* Partial Redraw was added. ED_region_tag_redraw_partial takes a
rect in window coordinates to define a subarea of the region.
On region draw it will then set glScissor to a smaller area, and
ar->drawrct will always be set to either the partial or full
window rect. The latter can then be used for clipping in the 3D
view or clipping interface drawing. Neither is implemented yet.
2009-01-23 03:52:52 +00:00
|
|
|
wmSubWindowScissorSet(win, ar->swinid, &ar->drawrct);
|
2008-01-07 18:03:41 +00:00
|
|
|
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
UI_SetTheme(sa?sa->spacetype:0, ar->type?ar->type->regionid:0);
|
|
|
|
|
2.5
Vertex Paint back!
Added WM level "paint cursor" system, which manages a custom painting
cursor for tools or modes.
- Activate it with WM_paint_cursor_activate(). That function wants two
callbacks, a poll(C) to check whether there's a cursor in given context
and ARegion, and a draw(C, x, y) which gets called when appropriate.
- While paintcursor is active, the WM handles necessary redrawing events
for all regions, also to nicely clear the cursor on region exit.
- WM_paint_cursor_activate returns a handle, which you have to use to
end the paint cursor. This handle also means you can register as many
custom cursors as you want.
At the moment, vertex paint mode registers only a mousemove handler,
all other events are still normally handled. This is stuff for the
future todo.
2009-01-09 13:55:45 +00:00
|
|
|
/* optional header info instead? */
|
|
|
|
if(ar->headerstr) {
|
|
|
|
float col[3];
|
|
|
|
UI_GetThemeColor3fv(TH_HEADER, col);
|
|
|
|
glClearColor(col[0], col[1], col[2], 0.0);
|
|
|
|
glClear(GL_COLOR_BUFFER_BIT);
|
2008-11-27 17:58:46 +00:00
|
|
|
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
UI_ThemeColor(TH_TEXT);
|
2.5
Vertex Paint back!
Added WM level "paint cursor" system, which manages a custom painting
cursor for tools or modes.
- Activate it with WM_paint_cursor_activate(). That function wants two
callbacks, a poll(C) to check whether there's a cursor in given context
and ARegion, and a draw(C, x, y) which gets called when appropriate.
- While paintcursor is active, the WM handles necessary redrawing events
for all regions, also to nicely clear the cursor on region exit.
- WM_paint_cursor_activate returns a handle, which you have to use to
end the paint cursor. This handle also means you can register as many
custom cursors as you want.
At the moment, vertex paint mode registers only a mousemove handler,
all other events are still normally handled. This is stuff for the
future todo.
2009-01-09 13:55:45 +00:00
|
|
|
glRasterPos2i(20, 6);
|
|
|
|
BMF_DrawString(G.font, ar->headerstr);
|
|
|
|
}
|
|
|
|
else if(at->draw) {
|
|
|
|
at->draw(C, ar);
|
2008-01-07 18:03:41 +00:00
|
|
|
}
|
2.5: work on bringing back SpaceTime options
- RMB select, also with SHIFT
- RMB tweak for translate
- SHIFT+D dupli
- BKEY border select/deselect
- AKEY (de)select all
- XKEY delete
- GKEY grab
Added some XXX comments for future todos, especially for when other
spaces come back with time markers.
Also added ED_util for putting in all to-be-cleaned cruft
Context conflict: input methods for Markers can conflict with other
spacetypes. It was solved in pre-2.5 with manually tweaking it all over,
but I would prefer one keymap for all marker stuff. Needs some thinking...
could be solved with a boundbox check for bottom part of 2d window.
Tweak issue: both tweak styles are possible:
- Hold mouse button, move, operator ends on mouse release
- Hold mouse button, move, operator ends on mouse click
Problem is that modally handled operators use fixed keymaps... like ESC,
SPACE, ENTER, or press/release mousebutton for 'assign'. There's a lot
to say for making this all consistant, or become part of 1 general keymap?
Should also be possibe to define 'tweak' defaults for Tablet different
than for mouse...
2008-11-29 15:10:31 +00:00
|
|
|
|
2.5
Vertex Paint back!
Added WM level "paint cursor" system, which manages a custom painting
cursor for tools or modes.
- Activate it with WM_paint_cursor_activate(). That function wants two
callbacks, a poll(C) to check whether there's a cursor in given context
and ARegion, and a draw(C, x, y) which gets called when appropriate.
- While paintcursor is active, the WM handles necessary redrawing events
for all regions, also to nicely clear the cursor on region exit.
- WM_paint_cursor_activate returns a handle, which you have to use to
end the paint cursor. This handle also means you can register as many
custom cursors as you want.
At the moment, vertex paint mode registers only a mousemove handler,
all other events are still normally handled. This is stuff for the
future todo.
2009-01-09 13:55:45 +00:00
|
|
|
uiFreeInactiveBlocks(C, &ar->uiblocks);
|
|
|
|
|
2.5
Summary of ain features:
- Themes and Styles are now editable.
- CTRL+U "Save user defaults" now goes to new .B25.blend, so you
can use 2.4x and 2.5x next to each other. If B25 doesn't exist, it
reads the regular .B.blend
- Press Tkey in 3d window for (unfinished) toolbar WIP. It now only
shows the last operator, if appropriate.
Nkey properties moved to the other side.
A lot of work was done on removing old themes for good and properly
getting it work with the 2.5 region system. Here's some notes;
- Buttons now all have a complete set of colors, based on button classifications
(See outliner -> user prefs -> Interface
- Theme colors have been extended with basic colors for region types.
Currently colors are defined for Window, Header, List/Channels and
for Button/Tool views.
The screen manager handles this btw, so a TH_BACK will always pick the
right backdrop color.
- Menu backdrops are in in Button theme colors. Floating Panels will be in
the per-space type Themes.
- Styles were added in RNA too, but only for the font settings now.
Only Panel font, widget font and widget-label work now. The 'group label'
will be for templates mostly.
Style settings will be expanded with spacing defaults, label conventions,
etc.
- Label text colors are stored in per-space Theme too, to make sure they fit.
Same goes for Panel title color.
Note that 'shadow' for fonts can conflict with text colors; shadow color is
currently stored in Style... shadow code needs a bit of work still.
2009-04-27 13:44:11 +00:00
|
|
|
if(sa)
|
|
|
|
region_draw_emboss(ar, &winrct);
|
|
|
|
|
2.5
Vertex Paint back!
Added WM level "paint cursor" system, which manages a custom painting
cursor for tools or modes.
- Activate it with WM_paint_cursor_activate(). That function wants two
callbacks, a poll(C) to check whether there's a cursor in given context
and ARegion, and a draw(C, x, y) which gets called when appropriate.
- While paintcursor is active, the WM handles necessary redrawing events
for all regions, also to nicely clear the cursor on region exit.
- WM_paint_cursor_activate returns a handle, which you have to use to
end the paint cursor. This handle also means you can register as many
custom cursors as you want.
At the moment, vertex paint mode registers only a mousemove handler,
all other events are still normally handled. This is stuff for the
future todo.
2009-01-09 13:55:45 +00:00
|
|
|
/* XXX test: add convention to end regions always in pixel space, for drawing of borders/gestures etc */
|
|
|
|
ED_region_pixelspace(ar);
|
|
|
|
|
2008-01-07 18:03:41 +00:00
|
|
|
ar->do_draw= 0;
|
2.5: WM Compositing
* Triple Buffer is now more complete:
- Proper handling of window resize, duplicate, etc.
- It now uses 3x3 textures (or less) if the power of two sizes
do not match well. That still has a worst case wast of 23.4%,
but better than 300%.
- It can also use the ARB/NV/EXT_texture_rectangle extension
now, which may be supported on hardware that does not support
ARB_texture_non_power_of_two.
- Gesture, menu and brushe redraws now require no redraws at all
from the area regions. So even on a high poly scene just moving
the paint cursor or opening a menu should be fast.
* Testing can be done by setting the "Window Draw Method" in the
User Preferences in the outliner. "Overlap" is still default,
since "Triple Buffer" has not been tested on computers other than
mine, would like to avoid crashing Blender on startup in case
there is a common bug, but it's ready for testing now.
- For reference "Full" draws the full window each time.
- "Triple Buffer" should work for both swap copy and swap exchange
systems, the latter still need the -E command line option for
"Overlap".
- Resizing and going fullscreen still gives flicker here but no
more than "Full" drawing.
* Partial Redraw was added. ED_region_tag_redraw_partial takes a
rect in window coordinates to define a subarea of the region.
On region draw it will then set glScissor to a smaller area, and
ar->drawrct will always be set to either the partial or full
window rect. The latter can then be used for clipping in the 3D
view or clipping interface drawing. Neither is implemented yet.
2009-01-23 03:52:52 +00:00
|
|
|
memset(&ar->drawrct, 0, sizeof(ar->drawrct));
|
2008-01-07 18:03:41 +00:00
|
|
|
}
|
|
|
|
|
2008-12-16 12:28:00 +00:00
|
|
|
/* **********************************
|
|
|
|
maybe silly, but let's try for now
|
2009-01-04 17:45:54 +00:00
|
|
|
to keep these tags protected
|
2008-12-16 12:28:00 +00:00
|
|
|
********************************** */
|
|
|
|
|
|
|
|
void ED_region_tag_redraw(ARegion *ar)
|
|
|
|
{
|
2.5: WM Compositing
* Triple Buffer is now more complete:
- Proper handling of window resize, duplicate, etc.
- It now uses 3x3 textures (or less) if the power of two sizes
do not match well. That still has a worst case wast of 23.4%,
but better than 300%.
- It can also use the ARB/NV/EXT_texture_rectangle extension
now, which may be supported on hardware that does not support
ARB_texture_non_power_of_two.
- Gesture, menu and brushe redraws now require no redraws at all
from the area regions. So even on a high poly scene just moving
the paint cursor or opening a menu should be fast.
* Testing can be done by setting the "Window Draw Method" in the
User Preferences in the outliner. "Overlap" is still default,
since "Triple Buffer" has not been tested on computers other than
mine, would like to avoid crashing Blender on startup in case
there is a common bug, but it's ready for testing now.
- For reference "Full" draws the full window each time.
- "Triple Buffer" should work for both swap copy and swap exchange
systems, the latter still need the -E command line option for
"Overlap".
- Resizing and going fullscreen still gives flicker here but no
more than "Full" drawing.
* Partial Redraw was added. ED_region_tag_redraw_partial takes a
rect in window coordinates to define a subarea of the region.
On region draw it will then set glScissor to a smaller area, and
ar->drawrct will always be set to either the partial or full
window rect. The latter can then be used for clipping in the 3D
view or clipping interface drawing. Neither is implemented yet.
2009-01-23 03:52:52 +00:00
|
|
|
if(ar) {
|
|
|
|
/* zero region means full region redraw */
|
2008-12-16 18:42:12 +00:00
|
|
|
ar->do_draw= 1;
|
2.5: WM Compositing
* Triple Buffer is now more complete:
- Proper handling of window resize, duplicate, etc.
- It now uses 3x3 textures (or less) if the power of two sizes
do not match well. That still has a worst case wast of 23.4%,
but better than 300%.
- It can also use the ARB/NV/EXT_texture_rectangle extension
now, which may be supported on hardware that does not support
ARB_texture_non_power_of_two.
- Gesture, menu and brushe redraws now require no redraws at all
from the area regions. So even on a high poly scene just moving
the paint cursor or opening a menu should be fast.
* Testing can be done by setting the "Window Draw Method" in the
User Preferences in the outliner. "Overlap" is still default,
since "Triple Buffer" has not been tested on computers other than
mine, would like to avoid crashing Blender on startup in case
there is a common bug, but it's ready for testing now.
- For reference "Full" draws the full window each time.
- "Triple Buffer" should work for both swap copy and swap exchange
systems, the latter still need the -E command line option for
"Overlap".
- Resizing and going fullscreen still gives flicker here but no
more than "Full" drawing.
* Partial Redraw was added. ED_region_tag_redraw_partial takes a
rect in window coordinates to define a subarea of the region.
On region draw it will then set glScissor to a smaller area, and
ar->drawrct will always be set to either the partial or full
window rect. The latter can then be used for clipping in the 3D
view or clipping interface drawing. Neither is implemented yet.
2009-01-23 03:52:52 +00:00
|
|
|
memset(&ar->drawrct, 0, sizeof(ar->drawrct));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void ED_region_tag_redraw_partial(ARegion *ar, rcti *rct)
|
|
|
|
{
|
|
|
|
if(ar) {
|
|
|
|
if(!ar->do_draw) {
|
|
|
|
/* no redraw set yet, set partial region */
|
|
|
|
ar->do_draw= 1;
|
|
|
|
ar->drawrct= *rct;
|
|
|
|
}
|
|
|
|
else if(ar->drawrct.xmin != ar->drawrct.xmax) {
|
|
|
|
/* partial redraw already set, expand region */
|
|
|
|
ar->drawrct.xmin= MIN2(ar->drawrct.xmin, rct->xmin);
|
|
|
|
ar->drawrct.ymin= MIN2(ar->drawrct.ymin, rct->ymin);
|
|
|
|
ar->drawrct.xmax= MAX2(ar->drawrct.xmax, rct->xmax);
|
|
|
|
ar->drawrct.ymax= MAX2(ar->drawrct.ymax, rct->ymax);
|
|
|
|
}
|
|
|
|
}
|
2008-12-16 12:28:00 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void ED_area_tag_redraw(ScrArea *sa)
|
|
|
|
{
|
|
|
|
ARegion *ar;
|
|
|
|
|
2008-12-16 18:42:12 +00:00
|
|
|
if(sa)
|
|
|
|
for(ar= sa->regionbase.first; ar; ar= ar->next)
|
2.5: WM Compositing
* Triple Buffer is now more complete:
- Proper handling of window resize, duplicate, etc.
- It now uses 3x3 textures (or less) if the power of two sizes
do not match well. That still has a worst case wast of 23.4%,
but better than 300%.
- It can also use the ARB/NV/EXT_texture_rectangle extension
now, which may be supported on hardware that does not support
ARB_texture_non_power_of_two.
- Gesture, menu and brushe redraws now require no redraws at all
from the area regions. So even on a high poly scene just moving
the paint cursor or opening a menu should be fast.
* Testing can be done by setting the "Window Draw Method" in the
User Preferences in the outliner. "Overlap" is still default,
since "Triple Buffer" has not been tested on computers other than
mine, would like to avoid crashing Blender on startup in case
there is a common bug, but it's ready for testing now.
- For reference "Full" draws the full window each time.
- "Triple Buffer" should work for both swap copy and swap exchange
systems, the latter still need the -E command line option for
"Overlap".
- Resizing and going fullscreen still gives flicker here but no
more than "Full" drawing.
* Partial Redraw was added. ED_region_tag_redraw_partial takes a
rect in window coordinates to define a subarea of the region.
On region draw it will then set glScissor to a smaller area, and
ar->drawrct will always be set to either the partial or full
window rect. The latter can then be used for clipping in the 3D
view or clipping interface drawing. Neither is implemented yet.
2009-01-23 03:52:52 +00:00
|
|
|
ED_region_tag_redraw(ar);
|
2008-12-16 12:28:00 +00:00
|
|
|
}
|
|
|
|
|
2009-01-04 17:45:54 +00:00
|
|
|
void ED_area_tag_refresh(ScrArea *sa)
|
|
|
|
{
|
|
|
|
if(sa)
|
|
|
|
sa->do_refresh= 1;
|
|
|
|
}
|
2008-12-16 12:28:00 +00:00
|
|
|
|
2008-12-21 17:18:36 +00:00
|
|
|
/* *************************************************************** */
|
|
|
|
|
|
|
|
/* use NULL to disable it */
|
|
|
|
void ED_area_headerprint(ScrArea *sa, const char *str)
|
|
|
|
{
|
|
|
|
ARegion *ar;
|
|
|
|
|
|
|
|
for(ar= sa->regionbase.first; ar; ar= ar->next) {
|
|
|
|
if(ar->regiontype==RGN_TYPE_HEADER) {
|
|
|
|
if(str) {
|
|
|
|
if(ar->headerstr==NULL)
|
|
|
|
ar->headerstr= MEM_mallocN(256, "headerprint");
|
|
|
|
BLI_strncpy(ar->headerstr, str, 256);
|
|
|
|
}
|
|
|
|
else if(ar->headerstr) {
|
|
|
|
MEM_freeN(ar->headerstr);
|
|
|
|
ar->headerstr= NULL;
|
|
|
|
}
|
|
|
|
ED_region_tag_redraw(ar);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2008-12-16 12:28:00 +00:00
|
|
|
|
2008-01-07 18:03:41 +00:00
|
|
|
/* *************************************************************** */
|
|
|
|
|
2008-12-09 15:59:43 +00:00
|
|
|
/* dir is direction to check, not the splitting edge direction! */
|
2008-01-07 18:03:41 +00:00
|
|
|
static int rct_fits(rcti *rect, char dir, int size)
|
|
|
|
{
|
|
|
|
if(dir=='h') {
|
|
|
|
return rect->xmax-rect->xmin - size;
|
|
|
|
}
|
|
|
|
else { // 'v'
|
|
|
|
return rect->ymax-rect->ymin - size;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2.5
View3D has been split now in a local part (RegionView3D) and a
per-area part (old View3D). Currently local is:
- view transform
- camera zoom/offset
- gpencil (todo)
- custom clipping planes
Rest is in Area still, like active camera, draw type, layers,
localview, custom centers, around-settings, transform widget,
gridlines, and so on (mostly stuff as available in header).
To see it work; also added new feature for region split,
press SHIFT+ALT+CTRL+S for four-split.
The idea is to make a preset 4-split, configured to stick
to top/right/front views for three views.
Another cool idea to explore is to then box-clip all drawing
based on these 3 views.
Note about the code:
- currently view3d still stores some depricated settings, to
convert from older files. Not all settings are copied over
though, like custom clip planes or the 'lock view to object'.
- since some view3d ops are now on area level, the operators
for it should keep track of that.
Bugfix in transform: quat initialize in operator-invoke missed
one zero.
Als brought back GE to compile for missing Ipos and channels.
2009-01-19 16:54:41 +00:00
|
|
|
static void region_rect_recursive(ARegion *ar, rcti *remainder, int quad)
|
2008-01-07 18:03:41 +00:00
|
|
|
{
|
2009-02-20 19:11:35 +00:00
|
|
|
rcti *remainder_prev= remainder;
|
2008-12-10 13:56:54 +00:00
|
|
|
int prefsizex, prefsizey;
|
2009-02-20 19:11:35 +00:00
|
|
|
int alignment;
|
2008-12-10 13:56:54 +00:00
|
|
|
|
2008-01-07 18:03:41 +00:00
|
|
|
if(ar==NULL)
|
|
|
|
return;
|
|
|
|
|
2009-02-17 15:53:52 +00:00
|
|
|
BLI_init_rcti(&ar->winrct, 0, 0, 0, 0);
|
|
|
|
|
2009-02-20 19:11:35 +00:00
|
|
|
/* for test; allow split of previously defined region */
|
|
|
|
if(ar->alignment & RGN_SPLIT_PREV)
|
|
|
|
if(ar->prev)
|
|
|
|
remainder= &ar->prev->winrct;
|
|
|
|
|
|
|
|
alignment = ar->alignment & ~RGN_SPLIT_PREV;
|
|
|
|
|
2008-12-09 15:59:43 +00:00
|
|
|
/* clear state flags first */
|
2008-01-07 18:03:41 +00:00
|
|
|
ar->flag &= ~RGN_FLAG_TOO_SMALL;
|
2.5
View3D has been split now in a local part (RegionView3D) and a
per-area part (old View3D). Currently local is:
- view transform
- camera zoom/offset
- gpencil (todo)
- custom clipping planes
Rest is in Area still, like active camera, draw type, layers,
localview, custom centers, around-settings, transform widget,
gridlines, and so on (mostly stuff as available in header).
To see it work; also added new feature for region split,
press SHIFT+ALT+CTRL+S for four-split.
The idea is to make a preset 4-split, configured to stick
to top/right/front views for three views.
Another cool idea to explore is to then box-clip all drawing
based on these 3 views.
Note about the code:
- currently view3d still stores some depricated settings, to
convert from older files. Not all settings are copied over
though, like custom clip planes or the 'lock view to object'.
- since some view3d ops are now on area level, the operators
for it should keep track of that.
Bugfix in transform: quat initialize in operator-invoke missed
one zero.
Als brought back GE to compile for missing Ipos and channels.
2009-01-19 16:54:41 +00:00
|
|
|
/* user errors */
|
2009-02-20 19:11:35 +00:00
|
|
|
if(ar->next==NULL && alignment!=RGN_ALIGN_QSPLIT)
|
|
|
|
alignment= RGN_ALIGN_NONE;
|
2008-01-07 18:03:41 +00:00
|
|
|
|
2008-12-10 13:56:54 +00:00
|
|
|
prefsizex= ar->type->minsizex;
|
|
|
|
prefsizey= ar->type->minsizey;
|
2008-01-07 18:03:41 +00:00
|
|
|
|
|
|
|
/* hidden is user flag */
|
|
|
|
if(ar->flag & RGN_FLAG_HIDDEN);
|
Various changes made in the process of working on the UI code:
* Added functions to generate Timer events. There was some unfinished code to
create one timer per window, this replaces that with a way to let operators
or other handlers add/remove their own timers as needed. This is currently
delivered as an event with the timer handle, perhaps this should be a notifier
instead? Also includes some fixes in ghost for timer events that were not
delivered in time, due to passing negative timeout.
* Added a Message event, which is a generic event that can be added by any
operator. This is used in the UI code to communicate the results of opened
blocks. Again, this may be better as a notifier.
* These two events should not be blocked as they are intended for a specific
operator or handler, so there were exceptions added for this, which is one
of the reasons they might work better as notifiers, but currently these
things can't listen to notifier yet.
* Added an option to events to indicate if the customdata should be freed or
not.
* Added a free() callback for area regions, and added a free function for
area regions in blenkernel since it was already there for screens and areas.
* Added ED_screen/area/region_exit functions to clean up things like operators
and handlers when they are closed.
* Added screen level regions, these will draw over areas boundaries, with the
last created region on top. These are useful for tooltips, menus, etc, and
are not saved to file. It's using the same ARegion struct as areas to avoid
code duplication, but perhaps that should be renamed then. Note that redraws
currently go correct, because only full window redraws are used, for partial
redraws without any frontbuffer drawing, the window manager needs to get
support for compositing subwindows.
* Minor changes in the subwindow code to retrieve the matrix, and moved
setlinestyle to glutil.c.
* Reversed argument order in WM_event_add/remove_keymap_handler to be consistent
with modal_handler.
* Operators can now block events but not necessarily cancel/finish.
* Modal operators are now stored in a list in the window/area/region they were
created in. This means for example that when a transform operator is invoked
from a region but registers a handler at the window level (since mouse motion
across areas should work), it will still get removed when the region is closed
while the operator is running.
2008-11-11 15:18:21 +00:00
|
|
|
/* XXX floating area region, not handled yet here */
|
2009-02-20 19:11:35 +00:00
|
|
|
else if(alignment == RGN_ALIGN_FLOAT);
|
2008-01-07 18:03:41 +00:00
|
|
|
/* remainder is too small for any usage */
|
2008-12-09 15:59:43 +00:00
|
|
|
else if( rct_fits(remainder, 'v', 1)<0 || rct_fits(remainder, 'h', 1) < 0 ) {
|
2008-01-07 18:03:41 +00:00
|
|
|
ar->flag |= RGN_FLAG_TOO_SMALL;
|
|
|
|
}
|
2009-02-20 19:11:35 +00:00
|
|
|
else if(alignment==RGN_ALIGN_NONE) {
|
2008-01-07 18:03:41 +00:00
|
|
|
/* typically last region */
|
|
|
|
ar->winrct= *remainder;
|
|
|
|
BLI_init_rcti(remainder, 0, 0, 0, 0);
|
|
|
|
}
|
2009-02-20 19:11:35 +00:00
|
|
|
else if(alignment==RGN_ALIGN_TOP || alignment==RGN_ALIGN_BOTTOM) {
|
2008-01-07 18:03:41 +00:00
|
|
|
|
2008-12-10 13:56:54 +00:00
|
|
|
if( rct_fits(remainder, 'v', prefsizey) < 0 ) {
|
2008-01-07 18:03:41 +00:00
|
|
|
ar->flag |= RGN_FLAG_TOO_SMALL;
|
|
|
|
}
|
|
|
|
else {
|
2008-12-10 13:56:54 +00:00
|
|
|
int fac= rct_fits(remainder, 'v', prefsizey);
|
Various changes made in the process of working on the UI code:
* Added functions to generate Timer events. There was some unfinished code to
create one timer per window, this replaces that with a way to let operators
or other handlers add/remove their own timers as needed. This is currently
delivered as an event with the timer handle, perhaps this should be a notifier
instead? Also includes some fixes in ghost for timer events that were not
delivered in time, due to passing negative timeout.
* Added a Message event, which is a generic event that can be added by any
operator. This is used in the UI code to communicate the results of opened
blocks. Again, this may be better as a notifier.
* These two events should not be blocked as they are intended for a specific
operator or handler, so there were exceptions added for this, which is one
of the reasons they might work better as notifiers, but currently these
things can't listen to notifier yet.
* Added an option to events to indicate if the customdata should be freed or
not.
* Added a free() callback for area regions, and added a free function for
area regions in blenkernel since it was already there for screens and areas.
* Added ED_screen/area/region_exit functions to clean up things like operators
and handlers when they are closed.
* Added screen level regions, these will draw over areas boundaries, with the
last created region on top. These are useful for tooltips, menus, etc, and
are not saved to file. It's using the same ARegion struct as areas to avoid
code duplication, but perhaps that should be renamed then. Note that redraws
currently go correct, because only full window redraws are used, for partial
redraws without any frontbuffer drawing, the window manager needs to get
support for compositing subwindows.
* Minor changes in the subwindow code to retrieve the matrix, and moved
setlinestyle to glutil.c.
* Reversed argument order in WM_event_add/remove_keymap_handler to be consistent
with modal_handler.
* Operators can now block events but not necessarily cancel/finish.
* Modal operators are now stored in a list in the window/area/region they were
created in. This means for example that when a transform operator is invoked
from a region but registers a handler at the window level (since mouse motion
across areas should work), it will still get removed when the region is closed
while the operator is running.
2008-11-11 15:18:21 +00:00
|
|
|
|
2008-01-07 18:03:41 +00:00
|
|
|
if(fac < 0 )
|
2008-12-10 13:56:54 +00:00
|
|
|
prefsizey += fac;
|
2008-01-07 18:03:41 +00:00
|
|
|
|
|
|
|
ar->winrct= *remainder;
|
|
|
|
|
2009-02-20 19:11:35 +00:00
|
|
|
if(alignment==RGN_ALIGN_TOP) {
|
2008-12-12 16:29:33 +00:00
|
|
|
ar->winrct.ymin= ar->winrct.ymax - prefsizey + 1;
|
|
|
|
remainder->ymax= ar->winrct.ymin - 1;
|
2008-01-07 18:03:41 +00:00
|
|
|
}
|
|
|
|
else {
|
2008-12-12 16:29:33 +00:00
|
|
|
ar->winrct.ymax= ar->winrct.ymin + prefsizey - 1;
|
|
|
|
remainder->ymin= ar->winrct.ymax + 1;
|
2008-01-07 18:03:41 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2009-02-20 19:11:35 +00:00
|
|
|
else if( ELEM4(alignment, RGN_ALIGN_LEFT, RGN_ALIGN_RIGHT, RGN_OVERLAP_LEFT, RGN_OVERLAP_RIGHT)) {
|
2008-01-07 18:03:41 +00:00
|
|
|
|
2008-12-10 13:56:54 +00:00
|
|
|
if( rct_fits(remainder, 'h', prefsizex) < 0 ) {
|
2008-01-07 18:03:41 +00:00
|
|
|
ar->flag |= RGN_FLAG_TOO_SMALL;
|
|
|
|
}
|
|
|
|
else {
|
2008-12-10 13:56:54 +00:00
|
|
|
int fac= rct_fits(remainder, 'h', prefsizex);
|
2008-01-07 18:03:41 +00:00
|
|
|
|
|
|
|
if(fac < 0 )
|
2008-12-10 13:56:54 +00:00
|
|
|
prefsizex += fac;
|
2008-01-07 18:03:41 +00:00
|
|
|
|
|
|
|
ar->winrct= *remainder;
|
|
|
|
|
2009-02-20 19:11:35 +00:00
|
|
|
if(ELEM(alignment, RGN_ALIGN_RIGHT, RGN_OVERLAP_RIGHT)) {
|
2008-12-12 16:29:33 +00:00
|
|
|
ar->winrct.xmin= ar->winrct.xmax - prefsizex + 1;
|
2009-02-20 19:11:35 +00:00
|
|
|
if(alignment==RGN_ALIGN_RIGHT)
|
2009-02-10 15:38:00 +00:00
|
|
|
remainder->xmax= ar->winrct.xmin - 1;
|
2008-01-07 18:03:41 +00:00
|
|
|
}
|
|
|
|
else {
|
2008-12-12 16:29:33 +00:00
|
|
|
ar->winrct.xmax= ar->winrct.xmin + prefsizex - 1;
|
2009-02-20 19:11:35 +00:00
|
|
|
if(alignment==RGN_ALIGN_LEFT)
|
2009-02-10 15:38:00 +00:00
|
|
|
remainder->xmin= ar->winrct.xmax + 1;
|
2008-01-07 18:03:41 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2009-02-20 19:11:35 +00:00
|
|
|
else if(alignment==RGN_ALIGN_VSPLIT || alignment==RGN_ALIGN_HSPLIT) {
|
2008-01-07 18:03:41 +00:00
|
|
|
/* percentage subdiv*/
|
|
|
|
ar->winrct= *remainder;
|
|
|
|
|
2009-02-20 19:11:35 +00:00
|
|
|
if(alignment==RGN_ALIGN_HSPLIT) {
|
2008-12-10 13:56:54 +00:00
|
|
|
if( rct_fits(remainder, 'h', prefsizex) > 4) {
|
2008-12-09 15:59:43 +00:00
|
|
|
ar->winrct.xmax= (remainder->xmin+remainder->xmax)/2;
|
|
|
|
remainder->xmin= ar->winrct.xmax+1;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
BLI_init_rcti(remainder, 0, 0, 0, 0);
|
|
|
|
}
|
2008-01-07 18:03:41 +00:00
|
|
|
}
|
|
|
|
else {
|
2008-12-10 13:56:54 +00:00
|
|
|
if( rct_fits(remainder, 'v', prefsizey) > 4) {
|
2008-12-09 15:59:43 +00:00
|
|
|
ar->winrct.ymax= (remainder->ymin+remainder->ymax)/2;
|
|
|
|
remainder->ymin= ar->winrct.ymax+1;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
BLI_init_rcti(remainder, 0, 0, 0, 0);
|
|
|
|
}
|
2008-01-07 18:03:41 +00:00
|
|
|
}
|
|
|
|
}
|
2009-02-20 19:11:35 +00:00
|
|
|
else if(alignment==RGN_ALIGN_QSPLIT) {
|
2.5
View3D has been split now in a local part (RegionView3D) and a
per-area part (old View3D). Currently local is:
- view transform
- camera zoom/offset
- gpencil (todo)
- custom clipping planes
Rest is in Area still, like active camera, draw type, layers,
localview, custom centers, around-settings, transform widget,
gridlines, and so on (mostly stuff as available in header).
To see it work; also added new feature for region split,
press SHIFT+ALT+CTRL+S for four-split.
The idea is to make a preset 4-split, configured to stick
to top/right/front views for three views.
Another cool idea to explore is to then box-clip all drawing
based on these 3 views.
Note about the code:
- currently view3d still stores some depricated settings, to
convert from older files. Not all settings are copied over
though, like custom clip planes or the 'lock view to object'.
- since some view3d ops are now on area level, the operators
for it should keep track of that.
Bugfix in transform: quat initialize in operator-invoke missed
one zero.
Als brought back GE to compile for missing Ipos and channels.
2009-01-19 16:54:41 +00:00
|
|
|
ar->winrct= *remainder;
|
|
|
|
|
|
|
|
/* test if there's still 4 regions left */
|
|
|
|
if(quad==0) {
|
|
|
|
ARegion *artest= ar->next;
|
|
|
|
int count= 1;
|
|
|
|
|
|
|
|
while(artest) {
|
|
|
|
artest->alignment= RGN_ALIGN_QSPLIT;
|
|
|
|
artest= artest->next;
|
|
|
|
count++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(count!=4) {
|
|
|
|
/* let's stop adding regions */
|
|
|
|
BLI_init_rcti(remainder, 0, 0, 0, 0);
|
|
|
|
printf("region quadsplit failed\n");
|
|
|
|
}
|
|
|
|
else quad= 1;
|
|
|
|
}
|
|
|
|
if(quad) {
|
|
|
|
if(quad==1) { /* left bottom */
|
|
|
|
ar->winrct.xmax = (remainder->xmin + remainder->xmax)/2;
|
|
|
|
ar->winrct.ymax = (remainder->ymin + remainder->ymax)/2;
|
|
|
|
}
|
|
|
|
else if(quad==2) { /* left top */
|
|
|
|
ar->winrct.xmax = (remainder->xmin + remainder->xmax)/2;
|
|
|
|
ar->winrct.ymin = 1 + (remainder->ymin + remainder->ymax)/2;
|
|
|
|
}
|
|
|
|
else if(quad==3) { /* right bottom */
|
|
|
|
ar->winrct.xmin = 1 + (remainder->xmin + remainder->xmax)/2;
|
|
|
|
ar->winrct.ymax = (remainder->ymin + remainder->ymax)/2;
|
|
|
|
}
|
|
|
|
else { /* right top */
|
|
|
|
ar->winrct.xmin = 1 + (remainder->xmin + remainder->xmax)/2;
|
|
|
|
ar->winrct.ymin = 1 + (remainder->ymin + remainder->ymax)/2;
|
|
|
|
BLI_init_rcti(remainder, 0, 0, 0, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
quad++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-12-10 13:56:54 +00:00
|
|
|
/* for speedup */
|
|
|
|
ar->winx= ar->winrct.xmax - ar->winrct.xmin + 1;
|
|
|
|
ar->winy= ar->winrct.ymax - ar->winrct.ymin + 1;
|
2008-01-07 18:03:41 +00:00
|
|
|
|
2009-02-20 19:11:35 +00:00
|
|
|
/* restore test exception */
|
|
|
|
if(ar->alignment & RGN_SPLIT_PREV) {
|
|
|
|
if(ar->prev) {
|
|
|
|
remainder= remainder_prev;
|
|
|
|
ar->prev->winx= ar->prev->winrct.xmax - ar->prev->winrct.xmin + 1;
|
|
|
|
ar->prev->winy= ar->prev->winrct.ymax - ar->prev->winrct.ymin + 1;
|
|
|
|
}
|
|
|
|
}
|
2.5
View3D has been split now in a local part (RegionView3D) and a
per-area part (old View3D). Currently local is:
- view transform
- camera zoom/offset
- gpencil (todo)
- custom clipping planes
Rest is in Area still, like active camera, draw type, layers,
localview, custom centers, around-settings, transform widget,
gridlines, and so on (mostly stuff as available in header).
To see it work; also added new feature for region split,
press SHIFT+ALT+CTRL+S for four-split.
The idea is to make a preset 4-split, configured to stick
to top/right/front views for three views.
Another cool idea to explore is to then box-clip all drawing
based on these 3 views.
Note about the code:
- currently view3d still stores some depricated settings, to
convert from older files. Not all settings are copied over
though, like custom clip planes or the 'lock view to object'.
- since some view3d ops are now on area level, the operators
for it should keep track of that.
Bugfix in transform: quat initialize in operator-invoke missed
one zero.
Als brought back GE to compile for missing Ipos and channels.
2009-01-19 16:54:41 +00:00
|
|
|
region_rect_recursive(ar->next, remainder, quad);
|
2008-01-07 18:03:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void area_calc_totrct(ScrArea *sa, int sizex, int sizey)
|
|
|
|
{
|
|
|
|
|
|
|
|
if(sa->v1->vec.x>0) sa->totrct.xmin= sa->v1->vec.x+1;
|
|
|
|
else sa->totrct.xmin= sa->v1->vec.x;
|
|
|
|
if(sa->v4->vec.x<sizex-1) sa->totrct.xmax= sa->v4->vec.x-1;
|
|
|
|
else sa->totrct.xmax= sa->v4->vec.x;
|
|
|
|
|
|
|
|
if(sa->v1->vec.y>0) sa->totrct.ymin= sa->v1->vec.y+1;
|
|
|
|
else sa->totrct.ymin= sa->v1->vec.y;
|
|
|
|
if(sa->v2->vec.y<sizey-1) sa->totrct.ymax= sa->v2->vec.y-1;
|
|
|
|
else sa->totrct.ymax= sa->v2->vec.y;
|
|
|
|
|
|
|
|
/* for speedup */
|
|
|
|
sa->winx= sa->totrct.xmax-sa->totrct.xmin+1;
|
|
|
|
sa->winy= sa->totrct.ymax-sa->totrct.ymin+1;
|
|
|
|
}
|
|
|
|
|
2008-12-16 18:42:12 +00:00
|
|
|
|
2008-01-20 21:10:55 +00:00
|
|
|
#define AZONESPOT 12
|
2.5 getting-back-into-coding commit :)
- cleaned up join and split operations. Most noticable is operator callback
design, which should make a design based on user-less exec() first, then
wrap invoke() and modal() around it. The exec() should be callable with
only Context and properties.
- split now works again; and inversed as previously, if you drag from a
triangle (action zone) inside area it subdivides area as expected.
- dragging from triangle outside area, over an edge, joins areas
- split has been simplified, it had too many options... it could just work
simpler (now)
- 'action zone' now is an operator itself, a widget sending an ACTIONZONE event,
which can be handled by others (so other gestures can be added in action zone
too)
Still evaluating:
- context gets set where?
- code structure confuses... what are proper functions for operators?
- what is WM... should low level screen stuff more there?
- when do you send event, notifier?
- files grow to large, will clean
Oh yeah and docs, docs, docs. Coming! :)
2008-11-17 18:54:03 +00:00
|
|
|
void area_azone_initialize(ScrArea *sa)
|
|
|
|
{
|
2008-01-17 05:33:54 +00:00
|
|
|
AZone *az;
|
|
|
|
if(sa->actionzones.first==NULL) {
|
|
|
|
/* set action zones - should these actually be ARegions? With these we can easier check area hotzones */
|
2.5 getting-back-into-coding commit :)
- cleaned up join and split operations. Most noticable is operator callback
design, which should make a design based on user-less exec() first, then
wrap invoke() and modal() around it. The exec() should be callable with
only Context and properties.
- split now works again; and inversed as previously, if you drag from a
triangle (action zone) inside area it subdivides area as expected.
- dragging from triangle outside area, over an edge, joins areas
- split has been simplified, it had too many options... it could just work
simpler (now)
- 'action zone' now is an operator itself, a widget sending an ACTIONZONE event,
which can be handled by others (so other gestures can be added in action zone
too)
Still evaluating:
- context gets set where?
- code structure confuses... what are proper functions for operators?
- what is WM... should low level screen stuff more there?
- when do you send event, notifier?
- files grow to large, will clean
Oh yeah and docs, docs, docs. Coming! :)
2008-11-17 18:54:03 +00:00
|
|
|
/* (ton) for time being just area, ARegion split is not foreseen on user level */
|
2008-01-17 05:33:54 +00:00
|
|
|
az= (AZone *)MEM_callocN(sizeof(AZone), "actionzone");
|
|
|
|
BLI_addtail(&(sa->actionzones), az);
|
|
|
|
az->type= AZONE_TRI;
|
|
|
|
az->pos= AZONE_SW;
|
|
|
|
|
|
|
|
az= (AZone *)MEM_callocN(sizeof(AZone), "actionzone");
|
|
|
|
BLI_addtail(&(sa->actionzones), az);
|
|
|
|
az->type= AZONE_TRI;
|
|
|
|
az->pos= AZONE_NE;
|
|
|
|
}
|
|
|
|
|
|
|
|
for(az= sa->actionzones.first; az; az= az->next) {
|
|
|
|
if(az->pos==AZONE_SW) {
|
|
|
|
az->x1= sa->v1->vec.x+1;
|
|
|
|
az->y1= sa->v1->vec.y+1;
|
2008-01-17 23:03:37 +00:00
|
|
|
az->x2= sa->v1->vec.x+AZONESPOT;
|
|
|
|
az->y2= sa->v1->vec.y+AZONESPOT;
|
2008-11-24 10:45:36 +00:00
|
|
|
}
|
|
|
|
else if (az->pos==AZONE_NE) {
|
|
|
|
az->x1= sa->v3->vec.x;
|
|
|
|
az->y1= sa->v3->vec.y;
|
2008-01-17 23:03:37 +00:00
|
|
|
az->x2= sa->v3->vec.x-AZONESPOT;
|
|
|
|
az->y2= sa->v3->vec.y-AZONESPOT;
|
2008-01-17 05:33:54 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-12-10 13:56:54 +00:00
|
|
|
/* used for area initialize below */
|
|
|
|
static void region_subwindow(wmWindowManager *wm, wmWindow *win, ARegion *ar)
|
Various changes made in the process of working on the UI code:
* Added functions to generate Timer events. There was some unfinished code to
create one timer per window, this replaces that with a way to let operators
or other handlers add/remove their own timers as needed. This is currently
delivered as an event with the timer handle, perhaps this should be a notifier
instead? Also includes some fixes in ghost for timer events that were not
delivered in time, due to passing negative timeout.
* Added a Message event, which is a generic event that can be added by any
operator. This is used in the UI code to communicate the results of opened
blocks. Again, this may be better as a notifier.
* These two events should not be blocked as they are intended for a specific
operator or handler, so there were exceptions added for this, which is one
of the reasons they might work better as notifiers, but currently these
things can't listen to notifier yet.
* Added an option to events to indicate if the customdata should be freed or
not.
* Added a free() callback for area regions, and added a free function for
area regions in blenkernel since it was already there for screens and areas.
* Added ED_screen/area/region_exit functions to clean up things like operators
and handlers when they are closed.
* Added screen level regions, these will draw over areas boundaries, with the
last created region on top. These are useful for tooltips, menus, etc, and
are not saved to file. It's using the same ARegion struct as areas to avoid
code duplication, but perhaps that should be renamed then. Note that redraws
currently go correct, because only full window redraws are used, for partial
redraws without any frontbuffer drawing, the window manager needs to get
support for compositing subwindows.
* Minor changes in the subwindow code to retrieve the matrix, and moved
setlinestyle to glutil.c.
* Reversed argument order in WM_event_add/remove_keymap_handler to be consistent
with modal_handler.
* Operators can now block events but not necessarily cancel/finish.
* Modal operators are now stored in a list in the window/area/region they were
created in. This means for example that when a transform operator is invoked
from a region but registers a handler at the window level (since mouse motion
across areas should work), it will still get removed when the region is closed
while the operator is running.
2008-11-11 15:18:21 +00:00
|
|
|
{
|
|
|
|
if(ar->flag & (RGN_FLAG_HIDDEN|RGN_FLAG_TOO_SMALL)) {
|
|
|
|
if(ar->swinid)
|
|
|
|
wm_subwindow_close(win, ar->swinid);
|
|
|
|
ar->swinid= 0;
|
|
|
|
}
|
|
|
|
else if(ar->swinid==0)
|
|
|
|
ar->swinid= wm_subwindow_open(win, &ar->winrct);
|
|
|
|
else
|
|
|
|
wm_subwindow_position(win, ar->swinid, &ar->winrct);
|
|
|
|
}
|
|
|
|
|
2008-12-10 13:56:54 +00:00
|
|
|
static void ed_default_handlers(wmWindowManager *wm, ListBase *handlers, int flag)
|
|
|
|
{
|
|
|
|
/* note, add-handler checks if it already exists */
|
|
|
|
|
2008-12-21 08:02:24 +00:00
|
|
|
// XXX it would be good to have boundbox checks for some of these...
|
2008-12-10 13:56:54 +00:00
|
|
|
if(flag & ED_KEYMAP_UI) {
|
|
|
|
UI_add_region_handlers(handlers);
|
|
|
|
}
|
|
|
|
if(flag & ED_KEYMAP_VIEW2D) {
|
|
|
|
ListBase *keymap= WM_keymap_listbase(wm, "View2D", 0, 0);
|
|
|
|
WM_event_add_keymap_handler(handlers, keymap);
|
|
|
|
}
|
|
|
|
if(flag & ED_KEYMAP_MARKERS) {
|
|
|
|
ListBase *keymap= WM_keymap_listbase(wm, "Markers", 0, 0);
|
|
|
|
WM_event_add_keymap_handler(handlers, keymap);
|
2008-12-23 11:42:14 +00:00
|
|
|
// XXX need boundbox check urgently!!!
|
2008-12-10 13:56:54 +00:00
|
|
|
}
|
2008-12-21 08:02:24 +00:00
|
|
|
if(flag & ED_KEYMAP_ANIMATION) {
|
|
|
|
ListBase *keymap= WM_keymap_listbase(wm, "Animation", 0, 0);
|
|
|
|
WM_event_add_keymap_handler(handlers, keymap);
|
|
|
|
}
|
2009-01-23 14:43:25 +00:00
|
|
|
if(flag & ED_KEYMAP_FRAMES) {
|
|
|
|
ListBase *keymap= WM_keymap_listbase(wm, "Frames", 0, 0);
|
|
|
|
WM_event_add_keymap_handler(handlers, keymap);
|
|
|
|
}
|
2008-12-10 13:56:54 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* called in screen_refresh, or screens_init, also area size changes */
|
2008-01-07 18:03:41 +00:00
|
|
|
void ED_area_initialize(wmWindowManager *wm, wmWindow *win, ScrArea *sa)
|
|
|
|
{
|
|
|
|
ARegion *ar;
|
|
|
|
rcti rect;
|
|
|
|
|
|
|
|
/* set typedefinitions */
|
|
|
|
sa->type= BKE_spacetype_from_id(sa->spacetype);
|
2008-12-10 13:56:54 +00:00
|
|
|
|
2008-01-07 18:03:41 +00:00
|
|
|
if(sa->type==NULL) {
|
2008-12-12 18:47:12 +00:00
|
|
|
sa->butspacetype= sa->spacetype= SPACE_VIEW3D;
|
2008-01-07 18:03:41 +00:00
|
|
|
sa->type= BKE_spacetype_from_id(sa->spacetype);
|
|
|
|
}
|
|
|
|
|
2008-12-10 13:56:54 +00:00
|
|
|
for(ar= sa->regionbase.first; ar; ar= ar->next)
|
2.5
View3D has been split now in a local part (RegionView3D) and a
per-area part (old View3D). Currently local is:
- view transform
- camera zoom/offset
- gpencil (todo)
- custom clipping planes
Rest is in Area still, like active camera, draw type, layers,
localview, custom centers, around-settings, transform widget,
gridlines, and so on (mostly stuff as available in header).
To see it work; also added new feature for region split,
press SHIFT+ALT+CTRL+S for four-split.
The idea is to make a preset 4-split, configured to stick
to top/right/front views for three views.
Another cool idea to explore is to then box-clip all drawing
based on these 3 views.
Note about the code:
- currently view3d still stores some depricated settings, to
convert from older files. Not all settings are copied over
though, like custom clip planes or the 'lock view to object'.
- since some view3d ops are now on area level, the operators
for it should keep track of that.
Bugfix in transform: quat initialize in operator-invoke missed
one zero.
Als brought back GE to compile for missing Ipos and channels.
2009-01-19 16:54:41 +00:00
|
|
|
ar->type= BKE_regiontype_from_id(sa->type, ar->regiontype);
|
2008-01-07 18:03:41 +00:00
|
|
|
|
2008-12-10 13:56:54 +00:00
|
|
|
/* area sizes */
|
|
|
|
area_calc_totrct(sa, win->sizex, win->sizey);
|
2008-01-07 18:03:41 +00:00
|
|
|
|
|
|
|
/* region rect sizes */
|
|
|
|
rect= sa->totrct;
|
2.5
View3D has been split now in a local part (RegionView3D) and a
per-area part (old View3D). Currently local is:
- view transform
- camera zoom/offset
- gpencil (todo)
- custom clipping planes
Rest is in Area still, like active camera, draw type, layers,
localview, custom centers, around-settings, transform widget,
gridlines, and so on (mostly stuff as available in header).
To see it work; also added new feature for region split,
press SHIFT+ALT+CTRL+S for four-split.
The idea is to make a preset 4-split, configured to stick
to top/right/front views for three views.
Another cool idea to explore is to then box-clip all drawing
based on these 3 views.
Note about the code:
- currently view3d still stores some depricated settings, to
convert from older files. Not all settings are copied over
though, like custom clip planes or the 'lock view to object'.
- since some view3d ops are now on area level, the operators
for it should keep track of that.
Bugfix in transform: quat initialize in operator-invoke missed
one zero.
Als brought back GE to compile for missing Ipos and channels.
2009-01-19 16:54:41 +00:00
|
|
|
region_rect_recursive(sa->regionbase.first, &rect, 0);
|
2008-01-07 18:03:41 +00:00
|
|
|
|
2008-12-10 13:56:54 +00:00
|
|
|
/* default area handlers */
|
|
|
|
ed_default_handlers(wm, &sa->handlers, sa->type->keymapflag);
|
|
|
|
/* checks spacedata, adds own handlers */
|
|
|
|
if(sa->type->init)
|
|
|
|
sa->type->init(wm, sa);
|
2008-01-17 05:33:54 +00:00
|
|
|
|
2008-12-10 13:56:54 +00:00
|
|
|
/* region windows, default and own handlers */
|
|
|
|
for(ar= sa->regionbase.first; ar; ar= ar->next) {
|
|
|
|
region_subwindow(wm, win, ar);
|
|
|
|
|
2009-02-17 15:53:52 +00:00
|
|
|
if(ar->swinid) {
|
|
|
|
/* default region handlers */
|
|
|
|
ed_default_handlers(wm, &ar->handlers, ar->type->keymapflag);
|
2008-12-10 13:56:54 +00:00
|
|
|
|
2009-02-17 15:53:52 +00:00
|
|
|
if(ar->type->init)
|
|
|
|
ar->type->init(wm, ar);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* prevent uiblocks to run */
|
|
|
|
uiFreeBlocks(NULL, &ar->uiblocks);
|
|
|
|
}
|
2008-12-10 13:56:54 +00:00
|
|
|
|
|
|
|
}
|
2008-01-17 05:33:54 +00:00
|
|
|
area_azone_initialize(sa);
|
2008-01-07 18:03:41 +00:00
|
|
|
}
|
|
|
|
|
2008-12-10 13:56:54 +00:00
|
|
|
/* externally called for floating regions like menus */
|
|
|
|
void ED_region_init(bContext *C, ARegion *ar)
|
|
|
|
{
|
|
|
|
// ARegionType *at= ar->type;
|
|
|
|
|
|
|
|
/* refresh can be called before window opened */
|
2008-12-18 02:56:48 +00:00
|
|
|
region_subwindow(CTX_wm_manager(C), CTX_wm_window(C), ar);
|
2008-12-10 13:56:54 +00:00
|
|
|
|
2009-04-07 17:08:26 +00:00
|
|
|
ar->winx= ar->winrct.xmax - ar->winrct.xmin + 1;
|
|
|
|
ar->winy= ar->winrct.ymax - ar->winrct.ymin + 1;
|
2008-12-10 13:56:54 +00:00
|
|
|
}
|
|
|
|
|
2008-12-09 15:59:43 +00:00
|
|
|
|
2008-01-07 18:03:41 +00:00
|
|
|
/* sa2 to sa1, we swap spaces for fullscreen to keep all allocated data */
|
|
|
|
/* area vertices were set */
|
|
|
|
void area_copy_data(ScrArea *sa1, ScrArea *sa2, int swap_space)
|
|
|
|
{
|
2009-01-19 18:50:35 +00:00
|
|
|
SpaceType *st;
|
2008-01-07 18:03:41 +00:00
|
|
|
ARegion *ar;
|
|
|
|
|
|
|
|
sa1->headertype= sa2->headertype;
|
|
|
|
sa1->spacetype= sa2->spacetype;
|
2008-12-17 19:40:19 +00:00
|
|
|
sa1->butspacetype= sa2->butspacetype;
|
2008-01-07 18:03:41 +00:00
|
|
|
|
2009-03-11 20:22:06 +00:00
|
|
|
if(swap_space == 1) {
|
2008-01-07 18:03:41 +00:00
|
|
|
SWAP(ListBase, sa1->spacedata, sa2->spacedata);
|
|
|
|
/* exception: ensure preview is reset */
|
|
|
|
// if(sa1->spacetype==SPACE_VIEW3D)
|
|
|
|
// XXX BIF_view3d_previewrender_free(sa1->spacedata.first);
|
|
|
|
}
|
2009-03-11 20:22:06 +00:00
|
|
|
else if (swap_space == 2) {
|
|
|
|
BKE_spacedata_copylist(&sa1->spacedata, &sa2->spacedata);
|
|
|
|
}
|
2008-01-07 18:03:41 +00:00
|
|
|
else {
|
|
|
|
BKE_spacedata_freelist(&sa1->spacedata);
|
|
|
|
BKE_spacedata_copylist(&sa1->spacedata, &sa2->spacedata);
|
|
|
|
}
|
|
|
|
|
2009-02-08 12:16:35 +00:00
|
|
|
/* Note; SPACE_EMPTY is possible on new screens */
|
|
|
|
|
2.5
View3D has been split now in a local part (RegionView3D) and a
per-area part (old View3D). Currently local is:
- view transform
- camera zoom/offset
- gpencil (todo)
- custom clipping planes
Rest is in Area still, like active camera, draw type, layers,
localview, custom centers, around-settings, transform widget,
gridlines, and so on (mostly stuff as available in header).
To see it work; also added new feature for region split,
press SHIFT+ALT+CTRL+S for four-split.
The idea is to make a preset 4-split, configured to stick
to top/right/front views for three views.
Another cool idea to explore is to then box-clip all drawing
based on these 3 views.
Note about the code:
- currently view3d still stores some depricated settings, to
convert from older files. Not all settings are copied over
though, like custom clip planes or the 'lock view to object'.
- since some view3d ops are now on area level, the operators
for it should keep track of that.
Bugfix in transform: quat initialize in operator-invoke missed
one zero.
Als brought back GE to compile for missing Ipos and channels.
2009-01-19 16:54:41 +00:00
|
|
|
/* regions */
|
2009-03-11 20:22:06 +00:00
|
|
|
if(swap_space<2) {
|
|
|
|
st= BKE_spacetype_from_id(sa1->spacetype);
|
|
|
|
for(ar= sa1->regionbase.first; ar; ar= ar->next)
|
|
|
|
BKE_area_region_free(st, ar);
|
|
|
|
BLI_freelistN(&sa1->regionbase);
|
|
|
|
}
|
2008-12-09 15:59:43 +00:00
|
|
|
|
2009-01-19 18:50:35 +00:00
|
|
|
st= BKE_spacetype_from_id(sa2->spacetype);
|
2008-12-09 15:59:43 +00:00
|
|
|
for(ar= sa2->regionbase.first; ar; ar= ar->next) {
|
2009-01-19 18:50:35 +00:00
|
|
|
ARegion *newar= BKE_area_region_copy(st, ar);
|
2008-12-09 15:59:43 +00:00
|
|
|
BLI_addtail(&sa1->regionbase, newar);
|
Various changes made in the process of working on the UI code:
* Added functions to generate Timer events. There was some unfinished code to
create one timer per window, this replaces that with a way to let operators
or other handlers add/remove their own timers as needed. This is currently
delivered as an event with the timer handle, perhaps this should be a notifier
instead? Also includes some fixes in ghost for timer events that were not
delivered in time, due to passing negative timeout.
* Added a Message event, which is a generic event that can be added by any
operator. This is used in the UI code to communicate the results of opened
blocks. Again, this may be better as a notifier.
* These two events should not be blocked as they are intended for a specific
operator or handler, so there were exceptions added for this, which is one
of the reasons they might work better as notifiers, but currently these
things can't listen to notifier yet.
* Added an option to events to indicate if the customdata should be freed or
not.
* Added a free() callback for area regions, and added a free function for
area regions in blenkernel since it was already there for screens and areas.
* Added ED_screen/area/region_exit functions to clean up things like operators
and handlers when they are closed.
* Added screen level regions, these will draw over areas boundaries, with the
last created region on top. These are useful for tooltips, menus, etc, and
are not saved to file. It's using the same ARegion struct as areas to avoid
code duplication, but perhaps that should be renamed then. Note that redraws
currently go correct, because only full window redraws are used, for partial
redraws without any frontbuffer drawing, the window manager needs to get
support for compositing subwindows.
* Minor changes in the subwindow code to retrieve the matrix, and moved
setlinestyle to glutil.c.
* Reversed argument order in WM_event_add/remove_keymap_handler to be consistent
with modal_handler.
* Operators can now block events but not necessarily cancel/finish.
* Modal operators are now stored in a list in the window/area/region they were
created in. This means for example that when a transform operator is invoked
from a region but registers a handler at the window level (since mouse motion
across areas should work), it will still get removed when the region is closed
while the operator is running.
2008-11-11 15:18:21 +00:00
|
|
|
}
|
2008-01-17 08:26:58 +00:00
|
|
|
|
2008-11-24 21:57:58 +00:00
|
|
|
#ifndef DISABLE_PYTHON
|
2008-01-07 18:03:41 +00:00
|
|
|
/* scripts */
|
|
|
|
BPY_free_scriptlink(&sa1->scriptlink);
|
|
|
|
sa1->scriptlink= sa2->scriptlink;
|
|
|
|
BPY_copy_scriptlink(&sa1->scriptlink); /* copies internal pointers */
|
2008-11-24 21:57:58 +00:00
|
|
|
#endif
|
2008-01-07 18:03:41 +00:00
|
|
|
}
|
|
|
|
|
2009-01-06 18:14:37 +00:00
|
|
|
/* *********** Space switching code *********** */
|
2008-12-14 12:16:55 +00:00
|
|
|
|
2009-03-11 20:22:06 +00:00
|
|
|
void ED_area_swapspace(bContext *C, ScrArea *sa1, ScrArea *sa2)
|
|
|
|
{
|
|
|
|
ScrArea *tmp= MEM_callocN(sizeof(ScrArea), "addscrarea");
|
|
|
|
|
|
|
|
ED_area_exit(C, sa1);
|
|
|
|
ED_area_exit(C, sa2);
|
|
|
|
|
|
|
|
tmp->spacetype= sa1->spacetype;
|
|
|
|
tmp->butspacetype= sa1->butspacetype;
|
|
|
|
BKE_spacedata_copyfirst(&tmp->spacedata, &sa1->spacedata);
|
|
|
|
|
|
|
|
area_copy_data(tmp, sa1, 2);
|
|
|
|
area_copy_data(sa1, sa2, 0);
|
|
|
|
area_copy_data(sa2, tmp, 0);
|
|
|
|
ED_area_initialize(CTX_wm_manager(C), CTX_wm_window(C), sa1);
|
|
|
|
ED_area_initialize(CTX_wm_manager(C), CTX_wm_window(C), sa2);
|
|
|
|
|
|
|
|
BKE_screen_area_free(tmp);
|
|
|
|
MEM_freeN(tmp);
|
|
|
|
|
|
|
|
/* tell WM to refresh, cursor types etc */
|
|
|
|
WM_event_add_mousemove(C);
|
|
|
|
|
|
|
|
ED_area_tag_redraw(sa1);
|
|
|
|
ED_area_tag_refresh(sa1);
|
|
|
|
ED_area_tag_redraw(sa2);
|
|
|
|
ED_area_tag_refresh(sa2);
|
|
|
|
}
|
|
|
|
|
2009-01-06 18:14:37 +00:00
|
|
|
void ED_area_newspace(bContext *C, ScrArea *sa, int type)
|
2008-12-12 10:18:26 +00:00
|
|
|
{
|
|
|
|
if(sa->spacetype != type) {
|
2008-12-14 13:59:34 +00:00
|
|
|
SpaceType *st;
|
|
|
|
SpaceLink *slold;
|
2008-12-12 10:18:26 +00:00
|
|
|
SpaceLink *sl;
|
2008-12-14 13:59:34 +00:00
|
|
|
|
|
|
|
ED_area_exit(C, sa);
|
|
|
|
|
|
|
|
st= BKE_spacetype_from_id(type);
|
|
|
|
slold= sa->spacedata.first;
|
|
|
|
|
2008-12-12 10:18:26 +00:00
|
|
|
sa->spacetype= type;
|
|
|
|
sa->butspacetype= type;
|
2008-12-15 16:54:47 +00:00
|
|
|
sa->type= st;
|
2008-12-12 10:18:26 +00:00
|
|
|
|
|
|
|
/* check previously stored space */
|
|
|
|
for (sl= sa->spacedata.first; sl; sl= sl->next)
|
|
|
|
if(sl->spacetype==type)
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* old spacedata... happened during work on 2.50, remove */
|
|
|
|
if(sl && sl->regionbase.first==NULL) {
|
|
|
|
st->free(sl);
|
2008-12-23 01:08:02 +00:00
|
|
|
BLI_freelinkN(&sa->spacedata, sl);
|
2008-12-12 10:18:26 +00:00
|
|
|
sl= NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (sl) {
|
|
|
|
|
|
|
|
/* swap regions */
|
|
|
|
slold->regionbase= sa->regionbase;
|
|
|
|
sa->regionbase= sl->regionbase;
|
|
|
|
sl->regionbase.first= sl->regionbase.last= NULL;
|
|
|
|
|
|
|
|
/* put in front of list */
|
|
|
|
BLI_remlink(&sa->spacedata, sl);
|
|
|
|
BLI_addhead(&sa->spacedata, sl);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* new space */
|
|
|
|
if(st) {
|
2008-12-22 10:09:56 +00:00
|
|
|
sl= st->new(C);
|
2008-12-12 10:18:26 +00:00
|
|
|
BLI_addhead(&sa->spacedata, sl);
|
|
|
|
|
|
|
|
/* swap regions */
|
2008-12-17 19:40:19 +00:00
|
|
|
if(slold)
|
|
|
|
slold->regionbase= sa->regionbase;
|
2008-12-12 10:18:26 +00:00
|
|
|
sa->regionbase= sl->regionbase;
|
|
|
|
sl->regionbase.first= sl->regionbase.last= NULL;
|
|
|
|
}
|
|
|
|
}
|
2008-12-12 16:29:33 +00:00
|
|
|
|
2008-12-18 02:56:48 +00:00
|
|
|
ED_area_initialize(CTX_wm_manager(C), CTX_wm_window(C), sa);
|
2008-12-16 12:28:00 +00:00
|
|
|
|
2008-12-15 18:43:18 +00:00
|
|
|
/* tell WM to refresh, cursor types etc */
|
|
|
|
WM_event_add_mousemove(C);
|
2009-01-06 18:14:37 +00:00
|
|
|
|
|
|
|
ED_area_tag_redraw(sa);
|
2009-02-19 16:22:07 +00:00
|
|
|
ED_area_tag_refresh(sa);
|
2008-12-12 10:18:26 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-01-06 18:14:37 +00:00
|
|
|
void ED_area_prevspace(bContext *C)
|
2009-01-06 14:42:54 +00:00
|
|
|
{
|
|
|
|
SpaceLink *sl= CTX_wm_space_data(C);
|
|
|
|
ScrArea *sa= CTX_wm_area(C);
|
|
|
|
|
|
|
|
/* cleanup */
|
|
|
|
#if 0 // XXX needs to be space type specific
|
|
|
|
if(sfile->spacetype==SPACE_FILE) {
|
|
|
|
if(sfile->pupmenu) {
|
|
|
|
MEM_freeN(sfile->pupmenu);
|
|
|
|
sfile->pupmenu= NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
if(sl->next) {
|
|
|
|
|
|
|
|
#if 0 // XXX check whether this is still needed
|
|
|
|
if (sfile->spacetype == SPACE_SCRIPT) {
|
|
|
|
SpaceScript *sc = (SpaceScript *)sfile;
|
|
|
|
if (sc->script) sc->script->flags &=~SCRIPT_FILESEL;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2009-01-06 18:14:37 +00:00
|
|
|
ED_area_newspace(C, sa, sl->next->spacetype);
|
2009-01-06 14:42:54 +00:00
|
|
|
}
|
|
|
|
else {
|
2009-01-06 18:14:37 +00:00
|
|
|
ED_area_newspace(C, sa, SPACE_INFO);
|
2009-01-06 14:42:54 +00:00
|
|
|
}
|
2009-01-06 18:14:37 +00:00
|
|
|
ED_area_tag_redraw(sa);
|
2009-01-06 14:42:54 +00:00
|
|
|
}
|
|
|
|
|
2008-12-14 12:16:55 +00:00
|
|
|
static char *windowtype_pup(void)
|
|
|
|
{
|
|
|
|
return(
|
|
|
|
"Window type:%t" //14
|
|
|
|
"|3D View %x1" //30
|
|
|
|
|
|
|
|
"|%l" // 33
|
|
|
|
|
2009-01-26 23:18:27 +00:00
|
|
|
"|Graph Editor %x2" //54
|
2009-02-09 03:06:52 +00:00
|
|
|
"|DopeSheet %x12" //73
|
2008-12-14 12:16:55 +00:00
|
|
|
"|NLA Editor %x13" //94
|
|
|
|
|
|
|
|
"|%l" //97
|
|
|
|
|
|
|
|
"|UV/Image Editor %x6" //117
|
|
|
|
|
|
|
|
"|Video Sequence Editor %x8" //143
|
|
|
|
"|Timeline %x15" //163
|
|
|
|
"|Audio Window %x11" //163
|
|
|
|
"|Text Editor %x9" //179
|
|
|
|
|
|
|
|
"|%l" //192
|
|
|
|
|
|
|
|
|
|
|
|
"|User Preferences %x7" //213
|
|
|
|
"|Outliner %x3" //232
|
|
|
|
"|Buttons Window %x4" //251
|
|
|
|
"|Node Editor %x16"
|
|
|
|
"|%l" //254
|
|
|
|
|
|
|
|
"|File Browser %x5" //290
|
|
|
|
|
|
|
|
"|%l" //293
|
|
|
|
|
|
|
|
"|Scripts Window %x14"//313
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void spacefunc(struct bContext *C, void *arg1, void *arg2)
|
|
|
|
{
|
2009-01-06 18:14:37 +00:00
|
|
|
ED_area_newspace(C, CTX_wm_area(C), CTX_wm_area(C)->butspacetype);
|
2008-12-18 02:56:48 +00:00
|
|
|
ED_area_tag_redraw(CTX_wm_area(C));
|
2008-12-14 12:16:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* returns offset for next button in header */
|
|
|
|
int ED_area_header_standardbuttons(const bContext *C, uiBlock *block, int yco)
|
|
|
|
{
|
2008-12-18 02:56:48 +00:00
|
|
|
ScrArea *sa= CTX_wm_area(C);
|
2008-12-14 12:16:55 +00:00
|
|
|
uiBut *but;
|
|
|
|
int xco= 8;
|
|
|
|
|
|
|
|
but= uiDefIconTextButC(block, ICONTEXTROW, 0, ICON_VIEW3D,
|
|
|
|
windowtype_pup(), xco, yco, XIC+10, YIC,
|
2008-12-18 02:56:48 +00:00
|
|
|
&(sa->butspacetype), 1.0, SPACEICONMAX, 0, 0,
|
2008-12-14 12:16:55 +00:00
|
|
|
"Displays Current Window Type. "
|
|
|
|
"Click for menu of available types.");
|
|
|
|
uiButSetFunc(but, spacefunc, NULL, NULL);
|
|
|
|
|
|
|
|
xco += XIC + 14;
|
|
|
|
|
|
|
|
uiBlockSetEmboss(block, UI_EMBOSSN);
|
2008-12-18 02:56:48 +00:00
|
|
|
if (sa->flag & HEADER_NO_PULLDOWN) {
|
2008-12-14 12:16:55 +00:00
|
|
|
uiDefIconButBitS(block, TOG, HEADER_NO_PULLDOWN, 0,
|
|
|
|
ICON_DISCLOSURE_TRI_RIGHT,
|
|
|
|
xco,yco,XIC,YIC-2,
|
2008-12-18 02:56:48 +00:00
|
|
|
&(sa->flag), 0, 0, 0, 0,
|
2008-12-14 12:16:55 +00:00
|
|
|
"Show pulldown menus");
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
uiDefIconButBitS(block, TOG, HEADER_NO_PULLDOWN, 0,
|
|
|
|
ICON_DISCLOSURE_TRI_DOWN,
|
|
|
|
xco,yco,XIC,YIC-2,
|
2008-12-18 02:56:48 +00:00
|
|
|
&(sa->flag), 0, 0, 0, 0,
|
2008-12-14 12:16:55 +00:00
|
|
|
"Hide pulldown menus");
|
|
|
|
}
|
|
|
|
xco+=XIC;
|
|
|
|
|
2009-04-15 17:53:12 +00:00
|
|
|
uiBlockSetEmboss(block, UI_EMBOSS);
|
|
|
|
|
2008-12-14 12:16:55 +00:00
|
|
|
return xco;
|
|
|
|
}
|
2008-01-07 18:03:41 +00:00
|
|
|
|