2.5 / Drag & Drop
authorElia Sarti <vekoon@gmail.com>
Wed, 29 Jul 2009 20:51:05 +0000 (20:51 +0000)
committerElia Sarti <vekoon@gmail.com>
Wed, 29 Jul 2009 20:51:05 +0000 (20:51 +0000)
Removed all related code. Talked with Ton about this and agreed to postpone it at indefinite time in the future, when things get more relaxed.
Files saved since my first commit should not break although I'm not 100% sure.

source/blender/editors/space_outliner/outliner.c
source/blender/editors/space_outliner/outliner_intern.h
source/blender/editors/space_outliner/outliner_ops.c
source/blender/editors/space_view3d/view3d_intern.h
source/blender/editors/space_view3d/view3d_ops.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/makesdna/DNA_windowmanager_types.h
source/blender/windowmanager/intern/wm_event_system.c
source/blender/windowmanager/wm_event_types.h

index b05d9637a693be1ec90e99246b9b61438e199ae7..84dea679767763acce94d8cd2cc1cf1b8dd6f24a 100644 (file)
@@ -3514,56 +3514,6 @@ void OUTLINER_OT_data_operation(wmOperatorType *ot)
 }
 
 
-/* ****** Drag & Drop ****** */
-
-static int outliner_drag_invoke(bContext *C, wmOperator *op, wmEvent *event)
-{
-       Object *ob= CTX_data_active_object(C);
-       PointerRNA ptr;
-
-       RNA_pointer_create(NULL, &RNA_Object, ob, &ptr);
-
-       return OPERATOR_RUNNING_MODAL;
-}
-
-static int outliner_drag_modal(bContext *C, wmOperator *op, wmEvent *event)
-{
-       switch(event->type) {
-               case MOUSEDRAG:
-
-                       break;
-               case MOUSEDROP:
-                       return OPERATOR_FINISHED;
-               case ESCKEY:
-                       return OPERATOR_CANCELLED;
-       }
-
-       return OPERATOR_RUNNING_MODAL;
-}
-
-static int outliner_drag_exec(bContext *C, wmOperator *op)
-{
-       return OPERATOR_FINISHED;
-}
-
-void OUTLINER_OT_drag(wmOperatorType *ot)
-{
-       /* identifiers */
-       ot->name= "Drag";
-       ot->idname= "OUTLINER_OT_drag";
-
-       /* api callbacks */
-       ot->invoke= outliner_drag_invoke;
-       ot->modal= outliner_drag_modal;
-       ot->exec= outliner_drag_exec;
-
-       ot->poll= ED_operator_outliner_active;
-
-       /* flags */
-       /* ot->flag= OPTYPE_UNDO; */
-}
-
-
 /* ******************** */
 
 
index 65b0708d64b429ef76d1c9a27c5649ee298867c0..4f9a0f686b97a4636898b2e5ac60a1d05a3993b7 100644 (file)
@@ -129,8 +129,6 @@ void OUTLINER_OT_group_operation(struct wmOperatorType *ot);
 void OUTLINER_OT_id_operation(struct wmOperatorType *ot);
 void OUTLINER_OT_data_operation(struct wmOperatorType *ot);
 
-void OUTLINER_OT_drag(struct wmOperatorType *ot);
-
 void OUTLINER_OT_show_one_level(struct wmOperatorType *ot);
 void OUTLINER_OT_show_active(struct wmOperatorType *ot);
 void OUTLINER_OT_show_hierarchy(struct wmOperatorType *ot);
index 417851982a33f27e08f70dfaa7c87eb773604ab8..2e11eb379b4905bf24fb0715dc54fb59f3a8a188 100644 (file)
@@ -56,8 +56,6 @@ void outliner_operatortypes(void)
        WM_operatortype_append(OUTLINER_OT_id_operation);
        WM_operatortype_append(OUTLINER_OT_data_operation);
 
-       WM_operatortype_append(OUTLINER_OT_drag);
-
        WM_operatortype_append(OUTLINER_OT_show_one_level);
        WM_operatortype_append(OUTLINER_OT_show_active);
        WM_operatortype_append(OUTLINER_OT_show_hierarchy);
@@ -89,9 +87,6 @@ void outliner_keymap(wmWindowManager *wm)
        WM_keymap_add_item(keymap, "OUTLINER_OT_item_rename", LEFTMOUSE, KM_PRESS, KM_CTRL, 0);
        WM_keymap_add_item(keymap, "OUTLINER_OT_operation", RIGHTMOUSE, KM_PRESS, 0, 0);
 
-       /* drag & drop */
-       WM_keymap_add_item(keymap, "OUTLINER_OT_drag", MOUSEDRAG, KM_ANY, 0, 0);
-
        WM_keymap_add_item(keymap, "OUTLINER_OT_show_hierarchy", HOMEKEY, KM_PRESS, 0, 0);
        
        WM_keymap_add_item(keymap, "OUTLINER_OT_show_active", PERIODKEY, KM_PRESS, 0, 0);
index 382ba68e95f926116e4a2dfaf1befbd479e06143..3e9382509f4ca9d15fe2e8be2fb098ca5df822d3 100644 (file)
@@ -115,7 +115,6 @@ void VIEW3D_OT_select_extend(struct wmOperatorType *ot);
 void VIEW3D_OT_select_circle(struct wmOperatorType *ot);
 void VIEW3D_OT_select_border(struct wmOperatorType *ot);
 void VIEW3D_OT_select_lasso(struct wmOperatorType *ot);
-void VIEW3D_OT_drag(struct wmOperatorType *ot);
 
 /* view3d_view.c */
 void VIEW3D_OT_smoothview(struct wmOperatorType *ot);
index c82db3bbe323b331768c558d1af0123ffee3488a..112847272e5312d9a0034708a4686c92b9e6b562 100644 (file)
@@ -73,7 +73,6 @@ void view3d_operatortypes(void)
        WM_operatortype_append(VIEW3D_OT_view_center);
        WM_operatortype_append(VIEW3D_OT_select);
        WM_operatortype_append(VIEW3D_OT_select_border);
-       WM_operatortype_append(VIEW3D_OT_drag);
        WM_operatortype_append(VIEW3D_OT_clip_border);
        WM_operatortype_append(VIEW3D_OT_select_circle);
        WM_operatortype_append(VIEW3D_OT_smoothview);
@@ -217,9 +216,6 @@ void view3d_keymap(wmWindowManager *wm)
        WM_keymap_add_item(keymap, "VIEW3D_OT_camera_to_view", PAD0, KM_PRESS, KM_ALT|KM_CTRL, 0);
        
        WM_keymap_add_item(keymap, "VIEW3D_OT_snap_menu", SKEY, KM_PRESS, KM_SHIFT, 0);
-
-       /* drag & drop (disabled) */
-//     WM_keymap_add_item(keymap, "VIEW3D_OT_drag", MOUSEDRAG, KM_ANY, 0, 0);
        
        /* radial control */
        RNA_enum_set(WM_keymap_add_item(keymap, "SCULPT_OT_radial_control", FKEY, KM_PRESS, 0, 0)->ptr, "mode", WM_RADIALCONTROL_SIZE);
index 4a702665c8858b8d6eb28c1d8ebda7c445f0a47e..54e556b58ed5cea26fb50f7fdd1863faacda0a12 100644 (file)
@@ -1602,56 +1602,6 @@ void VIEW3D_OT_select(wmOperatorType *ot)
 }
 
 
-/* ****** Drag & Drop ****** */
-
-static int view3d_drag_invoke(bContext *C, wmOperator *op, wmEvent *event)
-{
-       wmWindow *win= CTX_wm_window(C);
-       Object *ob= CTX_data_active_object(C);
-       PointerRNA ptr;
-
-       RNA_pointer_create(NULL, &RNA_Object, ob, &ptr);
-
-       return OPERATOR_RUNNING_MODAL;
-}
-
-static int view3d_drag_modal(bContext *C, wmOperator *op, wmEvent *event)
-{
-       switch(event->type) {
-               case MOUSEDRAG:
-
-                       break;
-               case MOUSEDROP:
-                       return OPERATOR_FINISHED;
-               case ESCKEY:
-                       return OPERATOR_CANCELLED;
-       }
-
-       return OPERATOR_RUNNING_MODAL;
-}
-
-static int view3d_drag_exec(bContext *C, wmOperator *op)
-{
-       return OPERATOR_FINISHED;
-}
-
-void VIEW3D_OT_drag(wmOperatorType *ot)
-{
-       /* identifiers */
-       ot->name= "Drag";
-       ot->idname= "VIEW3D_OT_drag";
-       
-       /* api callbacks */
-       ot->invoke= view3d_drag_invoke;
-       ot->modal= view3d_drag_modal;
-       ot->exec= view3d_drag_exec;
-       ot->poll= ED_operator_view3d_active;
-       
-       /* flags */
-       /* ot->flag= OPTYPE_UNDO; */
-}
-
-
 /* -------------------- circle select --------------------------------------------- */
 
 static void mesh_circle_doSelectVert(void *userData, EditVert *eve, int x, int y, int index)
index 704acbfd52b66854357de50a76339420d58655c0..b6a2b4c054484fd1ea8d0426c33e0f3bea0cd09e 100644 (file)
@@ -146,9 +146,7 @@ typedef struct wmWindow {
        short cursor;           /* current mouse cursor type */
        short lastcursor;       /* for temp waitcursor */
        short addmousemove;     /* internal: tag this for extra mousemove event, makes cursors/buttons active on UI switching */
-       short downstate; /* used for drag & drop: remembers mouse button down state */
-       short downx, downy; /* mouse coords for button down event */
-       short pad3, pad4, pad5;
+       int pad3;
        
        struct wmEvent *eventstate;     /* storage for event system */
        
index 33e8a392ba3164d9aedfd27f4819101ee82d1b78..3f668b23b24be0d1827ecdfe532268104f2bc6a6 100644 (file)
@@ -1485,23 +1485,6 @@ void wm_event_add_ghostevent(wmWindow *win, int type, void *customdata)
                                
                                update_tablet_data(win, &event);
                                wm_event_add(win, &event);
-
-                               cx = abs((win->downx - event.x));
-                               cy = abs((win->downy - event.y));
-
-                               /* probably minimum drag size should be #defined instead of hardcoded 3
-                                * also, cy seems always to be 6 pixels off, not sure why
-                                */
-                               if ((win->downstate == LEFTMOUSE || win->downstate == MOUSEDRAG) && (cx > 3 || cy > 9)) {
-                                       wmEvent dragevt= *evt;
-                                       dragevt.type= MOUSEDRAG;
-                                       dragevt.customdata= NULL;
-                                       dragevt.customdatafree= 0;
-
-                                       win->downstate= MOUSEDRAG;
-
-                                       wm_event_add(win, &dragevt);
-                               }
                        }
                        break;
                }
@@ -1525,28 +1508,6 @@ void wm_event_add_ghostevent(wmWindow *win, int type, void *customdata)
                        
                        update_tablet_data(win, &event);
                        wm_event_add(win, &event);
-
-                       if (event.val) {
-                               win->downstate= event.type;
-                               win->downx= event.x;
-                               win->downy= event.y;
-                       }
-                       else {
-                               short downstate= win->downstate;
-
-                               win->downstate= 0;
-                               win->downx= 0;
-                               win->downy= 0;
-
-                               if (downstate == MOUSEDRAG) {
-                                       wmEvent dropevt= *evt;
-                                       dropevt.type= MOUSEDROP;
-                                       dropevt.customdata= NULL;
-                                       dropevt.customdatafree= 0;
-
-                                       wm_event_add(win, &dropevt);
-                               }
-                       }
                        
                        break;
                }
index ee18a0fb45b8c79b49b5963ea190d92d5702e5d2..3da621bda8513593e0a767b6a871b8364a625e91 100644 (file)
@@ -56,9 +56,6 @@
                /* only use if you want user option switch possible */
 #define ACTIONMOUSE            0x005
 #define SELECTMOUSE            0x006
-               /* drag & drop support */
-#define MOUSEDRAG              0x007
-#define MOUSEDROP              0x008
                /* defaults from ghost */
 #define WHEELUPMOUSE   0x00a   
 #define WHEELDOWNMOUSE 0x00b