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

Merge pull request #16 from TheSUPERCD/upstream-clone 

Resolve merge conflicts
This commit is contained in:
Chayan Deb 2025-03-14 15:06:59 +00:00 committed by GitHub
parent 333dc91b48 743266eb61
commit ab00028935
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 141 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/callback.c
View File

@ -2477,7 +2477,8 @@ static void handle_enter_notify(int draw_xhair, int crosshair_size)
} }
static void handle_motion_notify(int event, KeySym key, int state, int rstate, int button, static void handle_motion_notify(int event, KeySym key, int state, int rstate, int button,
int mx, int my, int aux, int draw_xhair, int enable_stretch, int snap_cursor, int wire_draw_active) int mx, int my, int aux, int draw_xhair, int enable_stretch,
int snap_cursor, int wire_draw_active)
{ {
char str[PATH_MAX + 100]; char str[PATH_MAX + 100];
if( waves_selected(event, key, state, button)) { if( waves_selected(event, key, state, button)) {
@ -2602,10 +2603,12 @@ static void handle_motion_notify(int event, KeySym key, int state, int rstate, i
} }
static void handle_key_press(int event, KeySym key, int state, int rstate, int mx, int my, static void handle_key_press(int event, KeySym key, int state, int rstate, int mx, int my,
int button, int aux, int infix_interface, int enable_stretch, const char *win_path, double c_snap, int button, int aux, int infix_interface, int enable_stretch,
const char *win_path, double c_snap,
int cadence_compat, int wire_draw_active, int snap_cursor) int cadence_compat, int wire_draw_active, int snap_cursor)
{ {
char str[PATH_MAX + 100]; char str[PATH_MAX + 100];
int dr_gr;
switch (key) { switch (key) {
case '0': case '0':
case '1': case '1':
@ -3761,12 +3764,16 @@ static void handle_key_press(int event, KeySym key, int state, int rstate, int m
break; break;
case ' ': case ' ':
if(xctx->ui_state & STARTWIRE) { /* & instead of == 20190409 */ if(xctx->ui_state & STARTMOVE) {
draw_selection(xctx->gctiled,0);
xctx->manhattan_lines++;
xctx->manhattan_lines %=3;
draw_selection(xctx->gc[SELLAYER], 0);
} else if(xctx->ui_state & STARTWIRE) { /* & instead of == 20190409 */
new_wire(RUBBER|CLEAR, xctx->mousex_snap, xctx->mousey_snap); new_wire(RUBBER|CLEAR, xctx->mousex_snap, xctx->mousey_snap);
xctx->manhattan_lines++; xctx->manhattan_lines++;
xctx->manhattan_lines %=3; xctx->manhattan_lines %=3;
new_wire(RUBBER, xctx->mousex_snap, xctx->mousey_snap); new_wire(RUBBER, xctx->mousex_snap, xctx->mousey_snap);
} else if(xctx->ui_state & STARTLINE) { } else if(xctx->ui_state & STARTLINE) {
new_line(RUBBER|CLEAR, xctx->mousex_snap, xctx->mousey_snap); new_line(RUBBER|CLEAR, xctx->mousex_snap, xctx->mousey_snap);
xctx->manhattan_lines++; xctx->manhattan_lines++;
@ -4373,7 +4380,8 @@ static void handle_button_press(int event, int state, int rstate, KeySym key, in
} }
static void handle_button_release(int event, KeySym key, int state, int button, int mx, int my, static void handle_button_release(int event, KeySym key, int state, int button, int mx, int my,
int aux, double c_snap, int enable_stretch, int draw_xhair, int snap_cursor, int wire_draw_active) int aux, double c_snap, int enable_stretch, int draw_xhair,
int snap_cursor, int wire_draw_active)
{ {
char str[PATH_MAX + 100]; char str[PATH_MAX + 100];
if(waves_selected(event, key, state, button)) { if(waves_selected(event, key, state, button)) {
@ -4602,7 +4610,8 @@ int wire_draw_active = (xctx->ui_state & STARTWIRE) ||
redraw_only = 1; redraw_only = 1;
new_schematic("switch_no_tcl_ctx", win_path, "", 1); new_schematic("switch_no_tcl_ctx", win_path, "", 1);
} else { } else {
dbg(1, "callback(): switching window context: %s --> %s, semaphore=%d\n", old_win_path, win_path, xctx->semaphore); dbg(1, "callback(): switching window context: %s --> %s, semaphore=%d\n",
old_win_path, win_path, xctx->semaphore);
new_schematic("switch", win_path, "", 1); new_schematic("switch", win_path, "", 1);
} }
tclvareval("housekeeping_ctx", NULL); tclvareval("housekeeping_ctx", NULL);

2
src/move.c
View File

@ -1136,11 +1136,13 @@ void move_objects(int what, int merge, double dx, double dy)
else if(wire[n].sel == SELECTED2) wire[n].sel = SELECTED1; else if(wire[n].sel == SELECTED2) wire[n].sel = SELECTED1;
} }
#if 0
if(wire[n].sel & (SELECTED|SELECTED1)) if(wire[n].sel & (SELECTED|SELECTED1))
{ {
if(xctx->manhattan_lines & 1) xctx->manhattan_lines=2; if(xctx->manhattan_lines & 1) xctx->manhattan_lines=2;
else if(xctx->manhattan_lines & 2) xctx->manhattan_lines=1; else if(xctx->manhattan_lines & 2) xctx->manhattan_lines=1;
} }
#endif
wire[n].x1 = xctx->rx1; wire[n].x1 = xctx->rx1;
wire[n].y1 = xctx->ry1; wire[n].y1 = xctx->ry1;
if(xctx->manhattan_lines&1) if(xctx->manhattan_lines&1)