Revision: 21509
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21509
Author: jaguarandi
Date: 2009-07-10 23:49:40 +0200 (Fri, 10 Jul 2009)
Log Message:
-----------
svn merge -r 21372:21508
https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender
Modified Paths:
--------------
branches/soc-2009-jaguarandi/config/win32-mingw-config.py
branches/soc-2009-jaguarandi/intern/ghost/GHOST_C-api.h
branches/soc-2009-jaguarandi/intern/ghost/GHOST_IWindow.h
branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_C-api.cpp
branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_Window.cpp
branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_Window.h
branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_WindowX11.h
branches/soc-2009-jaguarandi/projectfiles_vc9/blender/blender.sln
branches/soc-2009-jaguarandi/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/soc-2009-jaguarandi/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
branches/soc-2009-jaguarandi/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
branches/soc-2009-jaguarandi/release/ui/buttons_data_armature.py
branches/soc-2009-jaguarandi/release/ui/buttons_data_bone.py
branches/soc-2009-jaguarandi/release/ui/buttons_data_camera.py
branches/soc-2009-jaguarandi/release/ui/buttons_data_curve.py
branches/soc-2009-jaguarandi/release/ui/buttons_data_lamp.py
branches/soc-2009-jaguarandi/release/ui/buttons_data_lattice.py
branches/soc-2009-jaguarandi/release/ui/buttons_data_mesh.py
branches/soc-2009-jaguarandi/release/ui/buttons_data_text.py
branches/soc-2009-jaguarandi/release/ui/buttons_material.py
branches/soc-2009-jaguarandi/release/ui/buttons_objects.py
branches/soc-2009-jaguarandi/release/ui/buttons_particle.py
branches/soc-2009-jaguarandi/release/ui/buttons_physics_softbody.py
branches/soc-2009-jaguarandi/release/ui/buttons_scene.py
branches/soc-2009-jaguarandi/release/ui/buttons_texture.py
branches/soc-2009-jaguarandi/release/ui/buttons_world.py
branches/soc-2009-jaguarandi/release/ui/space_filebrowser.py
branches/soc-2009-jaguarandi/release/ui/space_image.py
branches/soc-2009-jaguarandi/release/ui/space_sequencer.py
branches/soc-2009-jaguarandi/release/ui/space_view3d_toolbar.py
branches/soc-2009-jaguarandi/source/Makefile
branches/soc-2009-jaguarandi/source/blender/blenfont/BLF_api.h
branches/soc-2009-jaguarandi/source/blender/blenfont/intern/blf.c
branches/soc-2009-jaguarandi/source/blender/blenfont/intern/blf_font.c
branches/soc-2009-jaguarandi/source/blender/blenfont/intern/blf_glyph.c
branches/soc-2009-jaguarandi/source/blender/blenfont/intern/blf_internal_types.h
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/cloth.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/image.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/packedFile.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/particle.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/particle_system.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/pointcache.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/sequence.c
branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2009-jaguarandi/source/blender/blenlib/BLI_graph.h
branches/soc-2009-jaguarandi/source/blender/blenlib/BLI_util.h
branches/soc-2009-jaguarandi/source/blender/blenlib/intern/storage.c
branches/soc-2009-jaguarandi/source/blender/blenlib/intern/util.c
branches/soc-2009-jaguarandi/source/blender/blenloader/intern/readfile.c
branches/soc-2009-jaguarandi/source/blender/blenloader/intern/writefile.c
branches/soc-2009-jaguarandi/source/blender/editors/armature/BIF_retarget.h
branches/soc-2009-jaguarandi/source/blender/editors/armature/armature_intern.h
branches/soc-2009-jaguarandi/source/blender/editors/armature/armature_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/armature/editarmature.c
branches/soc-2009-jaguarandi/source/blender/editors/armature/editarmature_generate.c
branches/soc-2009-jaguarandi/source/blender/editors/armature/editarmature_retarget.c
branches/soc-2009-jaguarandi/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2009-jaguarandi/source/blender/editors/armature/poseobject.c
branches/soc-2009-jaguarandi/source/blender/editors/armature/reeb.c
branches/soc-2009-jaguarandi/source/blender/editors/armature/reeb.h
branches/soc-2009-jaguarandi/source/blender/editors/curve/curve_intern.h
branches/soc-2009-jaguarandi/source/blender/editors/curve/curve_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/curve/editcurve.c
branches/soc-2009-jaguarandi/source/blender/editors/datafiles/blenderbuttons.c
branches/soc-2009-jaguarandi/source/blender/editors/include/BIF_gl.h
branches/soc-2009-jaguarandi/source/blender/editors/include/BIF_glutil.h
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_armature.h
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_fileselect.h
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_mesh.h
branches/soc-2009-jaguarandi/source/blender/editors/include/UI_icons.h
branches/soc-2009-jaguarandi/source/blender/editors/include/UI_interface.h
branches/soc-2009-jaguarandi/source/blender/editors/interface/interface.c
branches/soc-2009-jaguarandi/source/blender/editors/interface/interface_handlers.c
branches/soc-2009-jaguarandi/source/blender/editors/interface/interface_icons.c
branches/soc-2009-jaguarandi/source/blender/editors/interface/interface_intern.h
branches/soc-2009-jaguarandi/source/blender/editors/interface/interface_layout.c
branches/soc-2009-jaguarandi/source/blender/editors/interface/interface_panel.c
branches/soc-2009-jaguarandi/source/blender/editors/interface/interface_regions.c
branches/soc-2009-jaguarandi/source/blender/editors/interface/interface_style.c
branches/soc-2009-jaguarandi/source/blender/editors/interface/interface_templates.c
branches/soc-2009-jaguarandi/source/blender/editors/interface/view2d.c
branches/soc-2009-jaguarandi/source/blender/editors/interface/view2d_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/mesh/editmesh.c
branches/soc-2009-jaguarandi/source/blender/editors/mesh/editmesh_add.c
branches/soc-2009-jaguarandi/source/blender/editors/mesh/editmesh_loop.c
branches/soc-2009-jaguarandi/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2009-jaguarandi/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2009-jaguarandi/source/blender/editors/mesh/mesh_intern.h
branches/soc-2009-jaguarandi/source/blender/editors/mesh/mesh_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/object/editgroup.c
branches/soc-2009-jaguarandi/source/blender/editors/object/object_edit.c
branches/soc-2009-jaguarandi/source/blender/editors/object/object_intern.h
branches/soc-2009-jaguarandi/source/blender/editors/object/object_modifier.c
branches/soc-2009-jaguarandi/source/blender/editors/object/object_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/physics/ed_pointcache.c
branches/soc-2009-jaguarandi/source/blender/editors/physics/editparticle.c
branches/soc-2009-jaguarandi/source/blender/editors/screen/area.c
branches/soc-2009-jaguarandi/source/blender/editors/screen/screen_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2009-jaguarandi/source/blender/editors/space_action/action_edit.c
branches/soc-2009-jaguarandi/source/blender/editors/space_action/action_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/space_buttons/buttons_context.c
branches/soc-2009-jaguarandi/source/blender/editors/space_buttons/buttons_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/space_file/file_draw.c
branches/soc-2009-jaguarandi/source/blender/editors/space_file/file_intern.h
branches/soc-2009-jaguarandi/source/blender/editors/space_file/file_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/space_file/file_panels.c
branches/soc-2009-jaguarandi/source/blender/editors/space_file/filelist.c
branches/soc-2009-jaguarandi/source/blender/editors/space_file/filelist.h
branches/soc-2009-jaguarandi/source/blender/editors/space_file/filesel.c
branches/soc-2009-jaguarandi/source/blender/editors/space_file/space_file.c
branches/soc-2009-jaguarandi/source/blender/editors/space_graph/graph_edit.c
branches/soc-2009-jaguarandi/source/blender/editors/space_graph/graph_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/space_image/image_draw.c
branches/soc-2009-jaguarandi/source/blender/editors/space_image/image_header.c
branches/soc-2009-jaguarandi/source/blender/editors/space_image/image_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/space_image/space_image.c
branches/soc-2009-jaguarandi/source/blender/editors/space_node/node_edit.c
branches/soc-2009-jaguarandi/source/blender/editors/space_node/node_intern.h
branches/soc-2009-jaguarandi/source/blender/editors/space_node/node_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2009-jaguarandi/source/blender/editors/space_sequencer/sequencer_intern.h
branches/soc-2009-jaguarandi/source/blender/editors/space_sequencer/sequencer_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2009-jaguarandi/source/blender/editors/space_text/text_draw.c
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/drawobject.c
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/view3d_toolbar.c
branches/soc-2009-jaguarandi/source/blender/editors/transform/transform.c
branches/soc-2009-jaguarandi/source/blender/editors/transform/transform.h
branches/soc-2009-jaguarandi/source/blender/editors/transform/transform_conversions.c
branches/soc-2009-jaguarandi/source/blender/editors/transform/transform_generics.c
branches/soc-2009-jaguarandi/source/blender/editors/transform/transform_input.c
branches/soc-2009-jaguarandi/source/blender/editors/transform/transform_manipulator.c
branches/soc-2009-jaguarandi/source/blender/editors/transform/transform_ndofinput.c
branches/soc-2009-jaguarandi/source/blender/editors/transform/transform_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/transform/transform_orientations.c
branches/soc-2009-jaguarandi/source/blender/editors/transform/transform_snap.c
branches/soc-2009-jaguarandi/source/blender/editors/util/undo.c
branches/soc-2009-jaguarandi/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2009-jaguarandi/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2009-jaguarandi/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_image_types.h
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_scene_types.h
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_screen_types.h
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_space_types.h
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_windowmanager_types.h
branches/soc-2009-jaguarandi/source/blender/makesdna/intern/dna_genfile.c
branches/soc-2009-jaguarandi/source/blender/makesdna/intern/makesdna.c
branches/soc-2009-jaguarandi/source/blender/makesrna/RNA_access.h
branches/soc-2009-jaguarandi/source/blender/makesrna/RNA_define.h
branches/soc-2009-jaguarandi/source/blender/makesrna/RNA_types.h
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/makesrna.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_access.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_define.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_internal_types.h
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_particle.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_rna.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_scene.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_sequence.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_space.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_ui.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_wm.c
branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_world.c
branches/soc-2009-jaguarandi/source/blender/python/BPY_extern.h
branches/soc-2009-jaguarandi/source/blender/python/generic/Mathutils.h
branches/soc-2009-jaguarandi/source/blender/python/generic/euler.c
branches/soc-2009-jaguarandi/source/blender/python/generic/quat.c
branches/soc-2009-jaguarandi/source/blender/python/generic/vector.c
branches/soc-2009-jaguarandi/source/blender/python/intern/bpy_compat.h
branches/soc-2009-jaguarandi/source/blender/python/intern/bpy_interface.c
branches/soc-2009-jaguarandi/source/blender/python/intern/bpy_operator.c
branches/soc-2009-jaguarandi/source/blender/python/intern/bpy_operator_wrap.c
branches/soc-2009-jaguarandi/source/blender/python/intern/bpy_rna.c
branches/soc-2009-jaguarandi/source/blender/python/intern/bpy_util.c
branches/soc-2009-jaguarandi/source/blender/render/intern/source/zbuf.c
branches/soc-2009-jaguarandi/source/blender/windowmanager/WM_api.h
branches/soc-2009-jaguarandi/source/blender/windowmanager/intern/wm_cursors.c
branches/soc-2009-jaguarandi/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2009-jaguarandi/source/blender/windowmanager/intern/wm_files.c
branches/soc-2009-jaguarandi/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_PythonInit.cpp
Added Paths:
-----------
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_retopo.h
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_transform.h
Removed Paths:
-------------
branches/soc-2009-jaguarandi/source/blender/editors/include/BIF_retopo.h
branches/soc-2009-jaguarandi/source/blender/editors/include/BIF_transform.h
branches/soc-2009-jaguarandi/source/blender/editors/include/ED_transform.h
branches/soc-2009-jaguarandi/source/blender/editors/interface/keyval.c
branches/soc-2009-jaguarandi/source/blender/editors/space_file/file_header.c
Modified: branches/soc-2009-jaguarandi/config/win32-mingw-config.py
===================================================================
--- branches/soc-2009-jaguarandi/config/win32-mingw-config.py 2009-07-10
20:43:32 UTC (rev 21508)
+++ branches/soc-2009-jaguarandi/config/win32-mingw-config.py 2009-07-10
21:49:40 UTC (rev 21509)
@@ -3,12 +3,16 @@
BF_PYTHON = LIBDIR + '/python'
BF_PYTHON_VERSION = '2.5'
+#BF_PYTHON_VERSION = '2.6'
WITH_BF_STATICPYTHON = False
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
BF_PYTHON_BINARY = 'python'
-BF_PYTHON_LIB = 'python25'
-BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib/lib25_vs2005'
-BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/lib25_vs2005/libpython25.a'
+#BF_PYTHON_LIB = 'python25'
+#BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib/lib25_vs2005'
+#BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/lib25_vs2005/libpython25.a'
+BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION[0]}${BF_PYTHON_VERSION[2]}'
+BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
+BF_PYTHON_LIB_STATIC =
'${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION[0]}${BF_PYTHON_VERSION[2]}.a'
WITH_BF_OPENAL = True
WITH_BF_STATICOPENAL = False
Modified: branches/soc-2009-jaguarandi/intern/ghost/GHOST_C-api.h
===================================================================
--- branches/soc-2009-jaguarandi/intern/ghost/GHOST_C-api.h 2009-07-10
20:43:32 UTC (rev 21508)
+++ branches/soc-2009-jaguarandi/intern/ghost/GHOST_C-api.h 2009-07-10
21:49:40 UTC (rev 21509)
@@ -367,6 +367,17 @@
GHOST_TInt32 x,
GHOST_TInt32 y);
+/**
+ * Grabs the cursor for a modal operation, to keep receiving
+ * events when the mouse is outside the window. X11 only, others
+ * do this automatically.
+ * @param windowhandle The handle to the window
+ * @param grab The new grab state of the cursor.
+ * @return Indication of success.
+ */
+extern GHOST_TSuccess GHOST_SetCursorGrab(GHOST_WindowHandle windowhandle,
+
int grab);
+
/***************************************************************************************
** Access to mouse button and keyboard states.
***************************************************************************************/
Modified: branches/soc-2009-jaguarandi/intern/ghost/GHOST_IWindow.h
===================================================================
--- branches/soc-2009-jaguarandi/intern/ghost/GHOST_IWindow.h 2009-07-10
20:43:32 UTC (rev 21508)
+++ branches/soc-2009-jaguarandi/intern/ghost/GHOST_IWindow.h 2009-07-10
21:49:40 UTC (rev 21509)
@@ -252,6 +252,14 @@
* @return Indication of success.
*/
virtual GHOST_TSuccess setCursorVisibility(bool visible) = 0;
+
+ /**
+ * Grabs the cursor for a modal operation.
+ * @param grab The new grab state of the cursor.
+ * @return Indication of success.
+ */
+ virtual GHOST_TSuccess setCursorGrab(bool grab) { return
GHOST_kSuccess; };
+
};
#endif // _GHOST_IWINDOW_H_
Modified: branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_C-api.cpp
===================================================================
--- branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_C-api.cpp
2009-07-10 20:43:32 UTC (rev 21508)
+++ branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_C-api.cpp
2009-07-10 21:49:40 UTC (rev 21509)
@@ -354,7 +354,15 @@
}
+GHOST_TSuccess GHOST_SetCursorGrab(GHOST_WindowHandle windowhandle,
+ int grab)
+{
+ GHOST_IWindow* window = (GHOST_IWindow*) windowhandle;
+
+ return window->setCursorGrab(grab?true:false);
+}
+
GHOST_TSuccess GHOST_GetModifierKeyState(GHOST_SystemHandle systemhandle,
GHOST_TModifierKeyMask mask,
int* isDown)
Modified: branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_SystemX11.cpp
2009-07-10 20:43:32 UTC (rev 21508)
+++ branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_SystemX11.cpp
2009-07-10 21:49:40 UTC (rev 21509)
@@ -550,11 +550,26 @@
// We're not interested in the following things.(yet...)
case NoExpose :
case GraphicsExpose :
+ break;
case EnterNotify:
case LeaveNotify:
+ {
// XCrossingEvents pointer leave enter window.
+ // also do cursor move here, MotionNotify only
+ // happens when motion starts & ends inside window
+ XCrossingEvent &xce = xe->xcrossing;
+
+ g_event = new
+ GHOST_EventCursor(
+ getMilliSeconds(),
+ GHOST_kEventCursorMove,
+ window,
+ xce.x_root,
+ xce.y_root
+ );
break;
+ }
case MapNotify:
/*
* From ICCCM:
Modified: branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_Window.cpp
===================================================================
--- branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_Window.cpp
2009-07-10 20:43:32 UTC (rev 21508)
+++ branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_Window.cpp
2009-07-10 21:49:40 UTC (rev 21509)
@@ -50,6 +50,7 @@
:
m_drawingContextType(type),
m_cursorVisible(true),
+ m_cursorGrabbed(true),
m_cursorShape(GHOST_kStandardCursorDefault),
m_stereoVisual(stereoVisual)
{
@@ -93,6 +94,20 @@
}
}
+GHOST_TSuccess GHOST_Window::setCursorGrab(bool grab)
+{
+ if(m_cursorGrabbed == grab)
+ return GHOST_kSuccess;
+
+ if (setWindowCursorGrab(grab)) {
+ m_cursorGrabbed = grab;
+ return GHOST_kSuccess;
+ }
+ else {
+ return GHOST_kFailure;
+ }
+}
+
GHOST_TSuccess GHOST_Window::setCursorShape(GHOST_TStandardCursor cursorShape)
{
if (setWindowCursorShape(cursorShape)) {
Modified: branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_Window.h
===================================================================
--- branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_Window.h
2009-07-10 20:43:32 UTC (rev 21508)
+++ branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_Window.h
2009-07-10 21:49:40 UTC (rev 21509)
@@ -167,6 +167,13 @@
virtual GHOST_TSuccess setCursorVisibility(bool visible);
/**
+ * Sets the cursor grab.
+ * @param grab The new grab state of the cursor.
+ * @return Indication of success.
+ */
+ virtual GHOST_TSuccess setCursorGrab(bool grab);
+
+ /**
* Returns the type of drawing context used in this window.
* @return The current type of drawing context.
*/
@@ -218,6 +225,12 @@
* native window system calls.
*/
virtual GHOST_TSuccess setWindowCursorVisibility(bool visible) = 0;
+
+ /**
+ * Sets the cursor grab on the window using
+ * native window system calls.
+ */
+ virtual GHOST_TSuccess setWindowCursorGrab(bool grab) { return
GHOST_kSuccess; };
/**
* Sets the cursor shape on the window using
@@ -242,6 +255,9 @@
/** The current visibility of the cursor */
bool m_cursorVisible;
+
+ /** The current grabbed state of the cursor */
+ bool m_cursorGrabbed;
/** The current shape of the cursor */
GHOST_TStandardCursor m_cursorShape;
Modified: branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_WindowX11.cpp
===================================================================
--- branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_WindowX11.cpp
2009-07-10 20:43:32 UTC (rev 21508)
+++ branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_WindowX11.cpp
2009-07-10 21:49:40 UTC (rev 21509)
@@ -1271,6 +1271,21 @@
GHOST_TSuccess
GHOST_WindowX11::
+setWindowCursorGrab(
+ bool grab
+){
+ if(grab)
+ XGrabPointer(m_display, m_window, True, ButtonPressMask|
ButtonReleaseMask|PointerMotionMask, GrabModeAsync, GrabModeAsync, None, None,
CurrentTime);
+ else
+ XUngrabPointer(m_display, CurrentTime);
+
+ XFlush(m_display);
+
+ return GHOST_kSuccess;
+}
+
+ GHOST_TSuccess
+GHOST_WindowX11::
setWindowCursorShape(
GHOST_TStandardCursor shape
){
Modified: branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_WindowX11.h
===================================================================
--- branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_WindowX11.h
2009-07-10 20:43:32 UTC (rev 21508)
+++ branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_WindowX11.h
2009-07-10 21:49:40 UTC (rev 21509)
@@ -250,6 +250,15 @@
);
/**
+ * Sets the cursor grab on the window using
+ * native window system calls.
+ */
+ GHOST_TSuccess
+ setWindowCursorGrab(
+ bool grab
+ );
+
+ /**
* Sets the cursor shape on the window using
* native window system calls.
*/
Modified: branches/soc-2009-jaguarandi/projectfiles_vc9/blender/blender.sln
===================================================================
--- branches/soc-2009-jaguarandi/projectfiles_vc9/blender/blender.sln
2009-07-10 20:43:32 UTC (rev 21508)
+++ branches/soc-2009-jaguarandi/projectfiles_vc9/blender/blender.sln
2009-07-10 21:49:40 UTC (rev 21509)
@@ -294,7 +294,6 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RNA_makesrna",
"makesrna\RNA_makesrna.vcproj", "{8C2BCCF8-4D9E-46D3-BABF-C1545A332CE6}"
ProjectSection(ProjectDependencies) = postProject
- {FB88301F-F725-401B-ACD7-D2ABBF333B71} =
{FB88301F-F725-401B-ACD7-D2ABBF333B71}
{7495FE37-933A-4AC1-BB2A-B3FDB4DE4284} =
{7495FE37-933A-4AC1-BB2A-B3FDB4DE4284}
EndProjectSection
EndProject
Modified:
branches/soc-2009-jaguarandi/projectfiles_vc9/blender/editors/ED_editors.vcproj
===================================================================
---
branches/soc-2009-jaguarandi/projectfiles_vc9/blender/editors/ED_editors.vcproj
2009-07-10 20:43:32 UTC (rev 21508)
+++
branches/soc-2009-jaguarandi/projectfiles_vc9/blender/editors/ED_editors.vcproj
2009-07-10 21:49:40 UTC (rev 21509)
@@ -182,14 +182,6 @@
>
</File>
<File
-
RelativePath="..\..\..\source\blender\editors\include\BIF_retopo.h"
- >
- </File>
- <File
-
RelativePath="..\..\..\source\blender\editors\include\BIF_transform.h"
- >
- </File>
- <File
RelativePath="..\..\..\source\blender\editors\include\ED_anim_api.h"
>
</File>
@@ -262,6 +254,10 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\editors\include\ED_physics.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\editors\include\ED_pointcache.h"
>
</File>
@@ -270,6 +266,10 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\editors\include\ED_retopo.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\editors\include\ED_screen.h"
>
</File>
@@ -427,10 +427,6 @@
>
</File>
<File
-
RelativePath="..\..\..\source\blender\editors\interface\keyval.c"
- >
- </File>
- <File
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
