From f0d856560f40bca77e316bcf81d61babc79159fc Mon Sep 17 00:00:00 2001 From: Stefan Frederik Date: Mon, 17 Jan 2022 22:41:36 +0100 Subject: [PATCH] removed useless old pan command --- src/actions.c | 27 +-------------------------- src/callback.c | 46 ++++++++++++++++------------------------------ src/xschem.h | 7 +++---- 3 files changed, 20 insertions(+), 60 deletions(-) diff --git a/src/actions.c b/src/actions.c index 1789a936..b8a39a11 100644 --- a/src/actions.c +++ b/src/actions.c @@ -2480,7 +2480,7 @@ int place_text(int draw_text, double mx, double my) return 1; } -void pan2(int what, int mx, int my) +void pan(int what, int mx, int my) { int dx, dy, ddx, ddy; if(what & START) { @@ -2504,31 +2504,6 @@ void pan2(int what, int mx, int my) } } -void pan(int what) -{ - if(what & RUBBER) - { - xctx->p_xx1 = xctx->xpan; xctx->p_yy1 = xctx->ypan; xctx->p_xx2 = xctx->xpan2; xctx->p_yy2 = xctx->ypan2; - ORDER(xctx->p_xx1, xctx->p_yy1, xctx->p_xx2, xctx->p_yy2); - drawtempline(xctx->gctiled, NOW, xctx->p_xx1, xctx->p_yy1, xctx->p_xx2, xctx->p_yy2); - xctx->xpan2 = xctx->mousex_snap; xctx->ypan2 = xctx->mousey_snap; - xctx->p_xx1 = xctx->xpan; xctx->p_yy1 = xctx->ypan; xctx->p_xx2 = xctx->xpan2; xctx->p_yy2 = xctx->ypan2; - ORDER(xctx->p_xx1, xctx->p_yy1, xctx->p_xx2, xctx->p_yy2); - drawtempline(xctx->gc[SELLAYER], NOW, xctx->p_xx1, xctx->p_yy1, xctx->p_xx2, xctx->p_yy2); - } - if(what & START) - { - xctx->ui_state |= STARTPAN; - xctx->xpan=xctx->mousex_snap;xctx->ypan=xctx->mousey_snap;xctx->xpan2=xctx->xpan;xctx->ypan2=xctx->ypan; - } - if(what & END) - { - xctx->ui_state &= ~STARTPAN; - xctx->xorigin+=-xctx->xpan+xctx->mousex_snap;xctx->yorigin+=-xctx->ypan+xctx->mousey_snap; - draw(); - } -} - /* 20150927 select=1: select objects, select=0: unselect objects */ void select_rect(int what, int select) { diff --git a/src/callback.c b/src/callback.c index 228b2298..e7fb1a47 100644 --- a/src/callback.c +++ b/src/callback.c @@ -26,7 +26,7 @@ static int waves_selected(int event, int key, int state, int button) { int i; int is_inside = 0, skip = 0; - static int excl = STARTZOOM | STARTRECT | STARTLINE | STARTWIRE | STARTPAN2 | STARTSELECT | STARTMOVE | STARTCOPY; + static int excl = STARTZOOM | STARTRECT | STARTLINE | STARTWIRE | STARTPAN | STARTSELECT | STARTMOVE | STARTCOPY; if(xctx->ui_state & excl) skip = 1; else if(state & Mod1Mask) skip = 1; else if(event == MotionNotify && (state & Button2Mask)) skip = 1; @@ -895,24 +895,19 @@ int callback(const char *winpath, int event, int mx, int my, KeySym key, waves_callback(event, mx, my, key, button, aux, state); break; } - if(xctx->ui_state & STARTPAN2) pan2(RUBBER, mx, my); + if(xctx->ui_state & STARTPAN) pan(RUBBER, mx, my); #ifndef __unix__ if ((xctx->ui_state & STARTWIRE) || (xctx->ui_state & STARTARC) || (xctx->ui_state & STARTLINE) || (xctx->ui_state & STARTMOVE) || (xctx->ui_state & STARTCOPY) || (xctx->ui_state & STARTRECT) || - (xctx->ui_state & STARTPOLYGON) || (xctx->ui_state & STARTPAN2) || - (xctx->ui_state & STARTPAN) || (xctx->ui_state & STARTSELECT)) { + (xctx->ui_state & STARTPOLYGON) || (xctx->ui_state & STARTPAN) || + (xctx->ui_state & STARTSELECT)) { XCopyArea(display, xctx->save_pixmap, xctx->window, xctx->gctiled, xctx->xrect[0].x, xctx->xrect[0].y, xctx->xrect[0].width, xctx->xrect[0].height, xctx->xrect[0].x, xctx->xrect[0].y); } #endif if(xctx->semaphore >= 2) break; if(xctx->ui_state) { - #ifdef TURBOX_FIX - /* fix Exceed TurboX bugs when drawing with pixmap tiled fill pattern */ - /* *NOT* a solution but at least makes the program useable. 20171130 */ - XSetClipRectangles(display, xctx->gctiled, 0,0, xctx->xrect, 1, Unsorted); - #endif my_snprintf(str, S(str), "mouse = %.16g %.16g - selected: %d w=%.16g h=%.16g", xctx->mousex_snap, xctx->mousey_snap, xctx->lastsel , @@ -920,9 +915,8 @@ int callback(const char *winpath, int event, int mx, int my, KeySym key, ); statusmsg(str,1); } - if(xctx->ui_state & STARTPAN) pan(RUBBER); if(xctx->ui_state & STARTZOOM) zoom_rectangle(RUBBER); - if(xctx->ui_state & STARTSELECT && !(xctx->ui_state & (PLACE_SYMBOL | STARTPAN2 | PLACE_TEXT)) ) { + if(xctx->ui_state & STARTSELECT && !(xctx->ui_state & (PLACE_SYMBOL | STARTPAN | PLACE_TEXT)) ) { if( (state & Button1Mask) && (state & Mod1Mask)) { /* 20171026 added unselect by area */ select_rect(RUBBER,0); } else if(state & Button1Mask) { @@ -943,7 +937,7 @@ int callback(const char *winpath, int event, int mx, int my, KeySym key, redraw_w_a_l_r_p_rubbers(); /* start of a mouse area select */ if(!(xctx->ui_state & STARTPOLYGON) && (state&Button1Mask) && !(xctx->ui_state & STARTWIRE) && - !(xctx->ui_state & STARTPAN2) && !(state & Mod1Mask) && + !(xctx->ui_state & STARTPAN) && !(state & Mod1Mask) && !(state & ShiftMask) && !(xctx->ui_state & (PLACE_SYMBOL | PLACE_TEXT))) { if(mx != xctx->mx_save || my != xctx->my_save) { @@ -962,7 +956,7 @@ int callback(const char *winpath, int event, int mx, int my, KeySym key, } } if((state & Button1Mask) && (state & Mod1Mask) && !(state & ShiftMask) && - !(xctx->ui_state & STARTPAN2) && + !(xctx->ui_state & STARTPAN) && !(xctx->ui_state & (PLACE_SYMBOL | PLACE_TEXT))) { /* unselect area */ if( !(xctx->ui_state & STARTSELECT)) { select_rect(START,0); @@ -970,7 +964,7 @@ int callback(const char *winpath, int event, int mx, int my, KeySym key, } else if((state&Button1Mask) && (state & ShiftMask) && !(xctx->ui_state & (PLACE_SYMBOL | PLACE_TEXT)) && - !(xctx->ui_state & STARTPAN2) ) { + !(xctx->ui_state & STARTPAN) ) { if(mx != xctx->mx_save || my != xctx->my_save) { if( !(xctx->ui_state & STARTSELECT)) { select_rect(START,1); @@ -1003,8 +997,8 @@ int callback(const char *winpath, int event, int mx, int my, KeySym key, if(xctx->semaphore<2) { rebuild_selected_array(); /* sets or clears xctx->ui_state SELECTION flag */ } - pan2(START, mx, my); - xctx->ui_state |= STARTPAN2; + pan(START, mx, my); + xctx->ui_state |= STARTPAN; } break; } @@ -1283,10 +1277,6 @@ int callback(const char *winpath, int event, int mx, int my, KeySym key, new_polygon(PLACE); break; } - if(key=='p' && state == ControlMask) /* pan */ - { - pan(START);break; - } if(key=='P' && state == ShiftMask) /* pan, other way to. */ { xctx->xorigin=-xctx->mousex_snap+xctx->areaw*xctx->zoom/2.0; @@ -2130,8 +2120,8 @@ int callback(const char *winpath, int event, int mx, int my, KeySym key, waves_callback(event, mx, my, key, button, aux, state); break; } - if(xctx->ui_state & STARTPAN2) { - xctx->ui_state &=~STARTPAN2; + if(xctx->ui_state & STARTPAN) { + xctx->ui_state &=~STARTPAN; xctx->mx_save = mx; xctx->my_save = my; xctx->mx_double_save=xctx->mousex_snap; xctx->my_double_save=xctx->mousey_snap; @@ -2325,8 +2315,8 @@ int callback(const char *winpath, int event, int mx, int my, KeySym key, rebuild_selected_array(); /* sets or clears xctx->ui_state SELECTION flag */ } else if(button==Button2 && (state == 0)) { - pan2(START, mx, my); - xctx->ui_state |= STARTPAN2; + pan(START, mx, my); + xctx->ui_state |= STARTPAN; } else if(xctx->semaphore >= 2) { /* button1 click to select another instance while edit prop dialog open */ if(button==Button1 && state==0 && tclgetvar("edit_symbol_prop_new_sel")[0]) { @@ -2400,10 +2390,6 @@ int callback(const char *winpath, int event, int mx, int my, KeySym key, xctx->ui_state &=~MENUSTARTZOOM; break; } - if(xctx->ui_state & STARTPAN) { - pan(END); - break; - } if(xctx->ui_state & STARTZOOM) { zoom_rectangle(END); break; @@ -2519,8 +2505,8 @@ int callback(const char *winpath, int event, int mx, int my, KeySym key, waves_callback(event, mx, my, key, button, aux, state); break; } - if(xctx->ui_state & STARTPAN2) { - xctx->ui_state &=~STARTPAN2; + if(xctx->ui_state & STARTPAN) { + xctx->ui_state &=~STARTPAN; xctx->mx_save = mx; xctx->my_save = my; xctx->mx_double_save=xctx->mousex_snap; xctx->my_double_save=xctx->mousey_snap; diff --git a/src/xschem.h b/src/xschem.h index 05b2961d..f2d290f8 100644 --- a/src/xschem.h +++ b/src/xschem.h @@ -175,7 +175,7 @@ extern char win_temp_dir[PATH_MAX]; #define CAD_SYMBOL_ATTRS 5 #define STARTWIRE 1 /* possible states, encoded in global 'rubber' */ -#define STARTPAN 2 + #define STARTRECT 4 #define STARTLINE 8 #define SELECTION 16 /* signals that some objects are selected. */ @@ -188,7 +188,7 @@ extern char win_temp_dir[PATH_MAX]; #define MENUSTARTLINE 2048 /* start line invoked from menu */ #define MENUSTARTRECT 4096 /* start rect invoked from menu */ #define MENUSTARTZOOM 8192 /* start zoom box invoked from menu */ -#define STARTPAN2 16384 /* new pan method with mouse button3 */ +#define STARTPAN 16384 /* new pan method with mouse button3 */ #define PLACE_TEXT 32768 #define MENUSTARTSNAPWIRE 65536 /* start wire invoked from menu, snap to pin variant 20171022 */ #define STARTPOLYGON 131072 @@ -1215,8 +1215,7 @@ extern void check_collapsing_objects(); extern void redraw_w_a_l_r_p_rubbers(void); /* redraw wire, arcs, line, polygon rubbers */ extern void copy_objects(int what); extern void find_inst_to_be_redrawn(int what); -extern void pan(int what); -extern void pan2(int what, int mx, int my); +extern void pan(int what, int mx, int my); extern void zoom_rectangle(int what); extern void zoom_box(double x1, double y1, double x2, double y2, double factor); extern void save_restore_zoom(int save);