mirror of
https://github.com/QB64Official/qb64.git
synced 2024-07-05 15:50:25 +00:00
F8 now runs a full line if there are multiple statements. Also:
Consistent coloring of breakpoints in the side bar. Breakpoints are hidden if $DEBUG is removed. F9 only sets breakpoints if $DEBUG is active.
This commit is contained in:
parent
9f8095a212
commit
ea7c90c6c0
|
@ -1532,7 +1532,9 @@ FUNCTION ide2 (ignore)
|
||||||
END IF
|
END IF
|
||||||
|
|
||||||
IF KB = KEY_F9 THEN 'toggle breakpoint
|
IF KB = KEY_F9 THEN 'toggle breakpoint
|
||||||
IdeBreakpoints(idecy) = NOT IdeBreakpoints(idecy)
|
IF vWatchOn THEN
|
||||||
|
IdeBreakpoints(idecy) = NOT IdeBreakpoints(idecy)
|
||||||
|
END IF
|
||||||
END IF
|
END IF
|
||||||
|
|
||||||
IF KB = KEY_F11 THEN 'make exe only
|
IF KB = KEY_F11 THEN 'make exe only
|
||||||
|
@ -2903,26 +2905,15 @@ FUNCTION ide2 (ignore)
|
||||||
wholeword.select = 0
|
wholeword.select = 0
|
||||||
END IF
|
END IF
|
||||||
ELSEIF mX > 1 AND mX <= 1 + maxLineNumberLength AND mY > 2 AND mY < (idewy - 5) AND ShowLineNumbers THEN
|
ELSEIF mX > 1 AND mX <= 1 + maxLineNumberLength AND mY > 2 AND mY < (idewy - 5) AND ShowLineNumbers THEN
|
||||||
'line numbers are visible and been clicked
|
'line numbers are visible and have been clicked
|
||||||
ideselect = 0
|
IF vWatchOn THEN
|
||||||
idecytemp = mY - 2 + idesy - 1
|
ideselect = 0
|
||||||
IF idecytemp =< iden THEN
|
idecytemp = mY - 2 + idesy - 1
|
||||||
'IF (NOT KSHIFT) THEN ideselectx1 = 1: ideselecty1 = idecy
|
IF idecytemp =< iden THEN
|
||||||
'idecy = idecy + 1
|
idecy = idecytemp
|
||||||
'idecx = 1
|
IdeBreakpoints(idecy) = NOT IdeBreakpoints(idecy)
|
||||||
idecy = idecytemp
|
END IF
|
||||||
IdeBreakpoints(idecy) = NOT IdeBreakpoints(idecy)
|
|
||||||
'ELSEIF idecy = iden THEN
|
|
||||||
' a$ = idegetline$(idecy)
|
|
||||||
' IF (NOT KSHIFT) THEN ideselectx1 = 1: ideselecty1 = idecy
|
|
||||||
' idecx = LEN(a$) + 1
|
|
||||||
'ELSEIF idecy > iden THEN
|
|
||||||
' idecy = iden
|
|
||||||
' ideselect = 0
|
|
||||||
' idecx = 1
|
|
||||||
END IF
|
END IF
|
||||||
'wholeword.select = 0
|
|
||||||
'idemouseselect = 0
|
|
||||||
END IF
|
END IF
|
||||||
END IF
|
END IF
|
||||||
|
|
||||||
|
@ -8934,13 +8925,13 @@ SUB ideshowtext
|
||||||
EXIT SUB
|
EXIT SUB
|
||||||
ShowLineNumber:
|
ShowLineNumber:
|
||||||
IF ShowLineNumbersUseBG THEN COLOR , 6
|
IF ShowLineNumbersUseBG THEN COLOR , 6
|
||||||
|
DO WHILE l > UBOUND(IdeBreakpoints)
|
||||||
|
REDIM _PRESERVE IdeBreakpoints(UBOUND(IdeBreakpoints) + 100) AS _BYTE
|
||||||
|
LOOP
|
||||||
|
IF vWatchOn = 1 AND IdeBreakpoints(l) <> 0 THEN COLOR , 4
|
||||||
_PRINTSTRING (2, y + 3), SPACE$(maxLineNumberLength)
|
_PRINTSTRING (2, y + 3), SPACE$(maxLineNumberLength)
|
||||||
IF l <= iden THEN
|
IF l <= iden THEN
|
||||||
l2$ = STR$(l)
|
l2$ = STR$(l)
|
||||||
DO WHILE l > UBOUND(IdeBreakpoints)
|
|
||||||
REDIM _PRESERVE IdeBreakpoints(UBOUND(IdeBreakpoints) + 100) AS _BYTE
|
|
||||||
LOOP
|
|
||||||
IF IdeBreakpoints(l) THEN COLOR , 4
|
|
||||||
IF 2 + maxLineNumberLength - (LEN(l2$) + 1) >= 2 THEN
|
IF 2 + maxLineNumberLength - (LEN(l2$) + 1) >= 2 THEN
|
||||||
_PRINTSTRING (2 + maxLineNumberLength - (LEN(l2$) + 1), y + 3), l2$
|
_PRINTSTRING (2 + maxLineNumberLength - (LEN(l2$) + 1), y + 3), l2$
|
||||||
END IF
|
END IF
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
$CHECKING:OFF
|
$CHECKING:OFF
|
||||||
|
|
||||||
SUB vwatch (linenumber AS LONG)
|
SUB vwatch (linenumber AS LONG)
|
||||||
STATIC AS LONG ide, breakpointCount, timeout, startLevel
|
STATIC AS LONG ide, breakpointCount, timeout, startLevel, lastLine
|
||||||
STATIC AS _BYTE pauseMode, stepOver, bypass
|
STATIC AS _BYTE pauseMode, stepOver, bypass
|
||||||
STATIC buffer$, endc$
|
STATIC buffer$, endc$
|
||||||
DIM AS LONG i
|
DIM AS LONG i
|
||||||
|
@ -56,6 +56,9 @@ SUB vwatch (linenumber AS LONG)
|
||||||
LOOP
|
LOOP
|
||||||
END IF
|
END IF
|
||||||
|
|
||||||
|
IF linenumber = lastLine THEN EXIT SUB
|
||||||
|
lastLine = linenumber
|
||||||
|
|
||||||
GOSUB GetCommand
|
GOSUB GetCommand
|
||||||
IF cmd$ = "break" THEN pauseMode = -1: stepOver = 0: cmd$ = ""
|
IF cmd$ = "break" THEN pauseMode = -1: stepOver = 0: cmd$ = ""
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue