diff options
author | Karl Berry <karl@freefriends.org> | 2015-05-11 22:12:25 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-05-11 22:12:25 +0000 |
commit | 0417a4fa56359c545358f5fb8c9b3f88a1845db2 (patch) | |
tree | ed331ec191a82fe896f05005dee844269e406281 /Build/source/utils/asymptote/glrender.cc | |
parent | e7256bd4adc1d8df03ed8434e3f9cc15817b6f22 (diff) |
asy 2.33 sources
git-svn-id: svn://tug.org/texlive/trunk@37343 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils/asymptote/glrender.cc')
-rw-r--r-- | Build/source/utils/asymptote/glrender.cc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/Build/source/utils/asymptote/glrender.cc b/Build/source/utils/asymptote/glrender.cc index 401f7a91ecd..0ee98868e8a 100644 --- a/Build/source/utils/asymptote/glrender.cc +++ b/Build/source/utils/asymptote/glrender.cc @@ -654,7 +654,6 @@ void screen() void nextframe(int) { - glFinish(); #ifdef HAVE_PTHREAD endwait(readySignal,readyLock); #endif @@ -950,6 +949,19 @@ void mouse(int button, int state, int x, int y) int mod=glutGetModifiers(); string Action=action(button,mod); + if(!Menu) { + if(mod == 0 && state == GLUT_UP && !Motion && Action == "zoom/menu") { + MenuButton=button; + glutMotionFunc(NULL); + glutTimerFunc(getSetting<Int>("doubleclick"),timeout,0); + glutAttachMenu(button); + Menu=true; + return; + } else Motion=false; + } + + disableMenu(); + if(Action == "zoomin") { glutMotionFunc(NULL); mousewheel(0,1,x,y); @@ -961,18 +973,6 @@ void mouse(int button, int state, int x, int y) return; } - if(Menu) disableMenu(); - else { - if(mod == 0 && state == GLUT_UP && !Motion && Action == "zoom/menu") { - MenuButton=button; - glutMotionFunc(NULL); - glutAttachMenu(button); - Menu=true; - glutTimerFunc(getSetting<Int>("doubleclick"),timeout,0); - return; - } else Motion=false; - } - if(state == GLUT_DOWN) { if(Action == "rotate" || Action == "rotateX" || Action == "rotateY") { arcball.mouse_down(x,Height-y); |