luke
/
xschem
mirror of https://github.com/StefanSchippers/xschem.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Code Refactoring]: Modified the source code for compatibility with the upstream repo (due to 'infix_wire' feature integration with new name 'infix_interface')

This commit is contained in:
Chayan Deb 2025-01-18 15:50:36 +05:30
parent 2f558ea1e0
commit 26df8d7d21
1 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/callback.c
View File

@ -2749,23 +2749,12 @@ int rstate; /* (reduced state, without ShiftMask) */
{ {
int prev_state = xctx->ui_state; int prev_state = xctx->ui_state;
if(xctx->semaphore >= 2) break; if(xctx->semaphore >= 2) break;
<<<<<<< HEAD
if(infix_interface) {
start_wire(xctx->mousex_snap, xctx->mousey_snap);
if(prev_state == STARTWIRE) {
tcleval("set constr_mv 0");
xctx->constr_mv = 0;
}
=======
if(infix_interface) { if(infix_interface) {
start_wire(xctx->mousex_snap, xctx->mousey_snap); start_wire(xctx->mousex_snap, xctx->mousey_snap);
if(prev_state == STARTWIRE) { if(prev_state == STARTWIRE) {
tcleval("set constr_mv 0" ); tcleval("set constr_mv 0" );
xctx->constr_mv=0; xctx->constr_mv=0;
} }
>>>>>>> 025823f14c8ca1f9562a1c452fffe267c7120905
} else { } else {
xctx->last_command = 0; xctx->last_command = 0;
xctx->ui_state |= MENUSTART; xctx->ui_state |= MENUSTART;
@ -2818,13 +2807,8 @@ int rstate; /* (reduced state, without ShiftMask) */
if(xctx->semaphore >= 2) break; if(xctx->semaphore >= 2) break;
dbg(1, "callback(): start polygon\n"); dbg(1, "callback(): start polygon\n");
if(infix_interface) { if(infix_interface) {
<<<<<<< HEAD
xctx->mx_double_save = xctx->mousex_snap;
xctx->my_double_save = xctx->mousey_snap;
=======
xctx->mx_double_save=xctx->mousex_snap; xctx->mx_double_save=xctx->mousex_snap;
xctx->my_double_save=xctx->mousey_snap; xctx->my_double_save=xctx->mousey_snap;
>>>>>>> 025823f14c8ca1f9562a1c452fffe267c7120905
xctx->last_command = 0; xctx->last_command = 0;
new_polygon(PLACE, xctx->mousex_snap, xctx->mousey_snap); new_polygon(PLACE, xctx->mousex_snap, xctx->mousey_snap);
} else { } else {
@ -2979,20 +2963,13 @@ int rstate; /* (reduced state, without ShiftMask) */
if(key=='r' /* && !xctx->ui_state */ && rstate==0) /* start rect */ if(key=='r' /* && !xctx->ui_state */ && rstate==0) /* start rect */
{ {
dbg(1, "callback(): start rect\n"); dbg(1, "callback(): start rect\n");
<<<<<<< HEAD
=======
if(xctx->semaphore >= 2) break; if(xctx->semaphore >= 2) break;
>>>>>>> 025823f14c8ca1f9562a1c452fffe267c7120905
if(infix_interface) { if(infix_interface) {
xctx->mx_double_save=xctx->mousex_snap; xctx->mx_double_save=xctx->mousex_snap;
xctx->my_double_save=xctx->mousey_snap; xctx->my_double_save=xctx->mousey_snap;
xctx->last_command = 0; xctx->last_command = 0;
new_rect(PLACE,xctx->mousex_snap, xctx->mousey_snap); new_rect(PLACE,xctx->mousex_snap, xctx->mousey_snap);
<<<<<<< HEAD
} else{
=======
} else { } else {
>>>>>>> 025823f14c8ca1f9562a1c452fffe267c7120905
xctx->ui_state |= MENUSTART; xctx->ui_state |= MENUSTART;
xctx->ui_state2 = MENUSTARTRECT; xctx->ui_state2 = MENUSTARTRECT;
} }
@ -3497,11 +3474,7 @@ int rstate; /* (reduced state, without ShiftMask) */
if(key=='l' /* && !xctx->ui_state */ && rstate == 0) /* start line */ if(key=='l' /* && !xctx->ui_state */ && rstate == 0) /* start line */
{ {
int prev_state = xctx->ui_state; int prev_state = xctx->ui_state;
<<<<<<< HEAD
if(xctx->semaphore>=2) break;
=======
if(xctx->semaphore >= 2) break; if(xctx->semaphore >= 2) break;
>>>>>>> 025823f14c8ca1f9562a1c452fffe267c7120905
if(infix_interface) { if(infix_interface) {
start_line(xctx->mousex_snap, xctx->mousey_snap); start_line(xctx->mousex_snap, xctx->mousey_snap);
if(prev_state == STARTLINE) { if(prev_state == STARTLINE) {