diff options
author | Miller Puckette <millerpuckette@users.sourceforge.net> | 2004-11-28 21:20:43 +0000 |
---|---|---|
committer | Miller Puckette <millerpuckette@users.sourceforge.net> | 2004-11-28 21:20:43 +0000 |
commit | a346d52dfffc44999d3f10226642f7baa9c5463b (patch) | |
tree | 6fea81e2fcdc9812a3ee984e378900ee4f8e9fe9 /pd/src/g_editor.c | |
parent | aa82c4290982659a3364eca02573e070418b63e8 (diff) |
unified "array" and "struct array" code. Vast changes to "g_array.c" and
"g_template.c", and many smaller changes to various files. Not yet
well tested.
svn path=/trunk/; revision=2341
Diffstat (limited to 'pd/src/g_editor.c')
-rw-r--r-- | pd/src/g_editor.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/pd/src/g_editor.c b/pd/src/g_editor.c index 77d8cba5..02fe7726 100644 --- a/pd/src/g_editor.c +++ b/pd/src/g_editor.c @@ -712,14 +712,6 @@ void canvas_reload(t_symbol *name, t_symbol *dir, t_gobj *except) /* ------------------------ event handling ------------------------ */ -#define CURSOR_RUNMODE_NOTHING 0 -#define CURSOR_RUNMODE_CLICKME 1 -#define CURSOR_RUNMODE_THICKEN 2 -#define CURSOR_RUNMODE_ADDPOINT 3 -#define CURSOR_EDITMODE_NOTHING 4 -#define CURSOR_EDITMODE_CONNECT 5 -#define CURSOR_EDITMODE_DISCONNECT 6 - static char *cursorlist[] = { #ifdef MSW "right_ptr", /* CURSOR_RUNMODE_NOTHING */ @@ -1021,8 +1013,9 @@ void canvas_doclick(t_canvas *x, int xpos, int ypos, int which, /* check if the object wants to be clicked */ if (canvas_hitbox(x, y, xpos, ypos, &x1, &y1, &x2, &y2) && (clickreturned = gobj_click(y, x, xpos, ypos, - shiftmod, altmod, 0, doit))) - break; + shiftmod, ((mod & CTRLMOD) && (!x->gl_edit)) || altmod, + 0, doit))) + break; } if (!doit) { |