Skip to content

Commit 548d5b0

Browse files
committed
and next find at untouched
1 parent ad302c9 commit 548d5b0

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

s/bar.c

+11-7
Original file line numberDiff line numberDiff line change
@@ -871,7 +871,8 @@ static void finds(bool phase,int number,int number_fix){//,bool*header_was){
871871
move(0,number3);
872872
while(dif>0){addch(' ');dif--;}
873873
}
874-
int nr=sprintf(buf,"%u",number+number_fix);
874+
number+=number_fix;
875+
int nr=sprintf(buf,"%u",number);
875876
fprevnumber=number;//for 10->9, 10/10->1/10, ... , 100/100->1/100, ...
876877
number3=getmaxx(stdscr)-number2-nr;
877878
mvaddstr(0,number3,buf);
@@ -917,14 +918,16 @@ static int find_core(WINDOW*w,size_t cursor,size_t xr,size_t xc,int y,size_t pos
917918
xc+=cursor;//add only when last was simple find
918919
number+=1;
919920
}else{
920-
if(forward/*true*/)number+=1;
921+
if(number<0)number+=1;
922+
// if(forward/*true*/)number+=1;
921923
//else if(number==0)finds_big_clean();//header switch
922924
}
923925
forward=true;
924926
}else if(a==prev_key){
925927
if(untouched/*true*/)number-=1;
926928
else{
927-
if(forward==false)number-=1;
929+
if(number>0)number-=1;
930+
// if(forward==false)number-=1;
928931
//else if(number==0)finds_big_clean();//header switch
929932
}
930933
forward=false;
@@ -954,7 +957,8 @@ static int find_core(WINDOW*w,size_t cursor,size_t xr,size_t xc,int y,size_t pos
954957
here_forward=true;
955958
}else{
956959
here_sense=-1;
957-
n=1;
960+
if(untouched/*true*/)n=1;
961+
else n=0;
958962
here_forward=false;
959963
}
960964
}
@@ -986,9 +990,9 @@ static int find_core(WINDOW*w,size_t cursor,size_t xr,size_t xc,int y,size_t pos
986990
finds_big_clean();//wnoutrefresh when not on delimiter
987991
}
988992
if(number!=0){//0 is on delimiter
989-
if(forward/*true*/)number-=1;
990-
else number+=1;
991-
fprevnumber=number;
993+
//if(forward/*true*/)number-=1;
994+
//else number+=1;
995+
//fprevnumber=number;
992996

993997
//if(delim_touch(y1,x1,cursorr)/*true*/){delimiter_touched=true;}else
994998
if(ytext==y1&&xtext<x1)x1-=cursor-cursorr;//this can be on delimiter but is observed outside

0 commit comments

Comments
 (0)