Apple-2-SW
/
antoine-source
mirror of https://github.com/antoinevignau/source.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

LE orders 

Order of line edits in controls windows updated to follow a std top-down display
This commit is contained in:
Antoine Vignau 2020-11-05 13:39:54 +01:00
parent a7db357d4f
commit 5d021a1d01
3 changed files with 125 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

252
genesys/edit/MMCONTROL.S
View File

@ -7074,6 +7074,8 @@ L023BFA JSL L0222F2
TCS TCS
RTL RTL
theLENGTH ds 2 ; length of the Line Edit text
theHANDLE ds 4 ; handle to the line edit control
thePOINTER ds 4 ; pointer to the pwCHAR on feedback thePOINTER ds 4 ; pointer to the pwCHAR on feedback
thePWCHAR ds 2 ; the returned value thePWCHAR ds 2 ; the returned value
theKEYMASK ds 2 ; the second returned value theKEYMASK ds 2 ; the second returned value
@ -10349,15 +10351,23 @@ rectNEXT
ldy #$1e ; get the handle to the text ldy #$1e ; get the handle to the text
lda [$00],y lda [$00],y
sta theHANDLE+2
pha pha
ldy #$1c ldy #$1c
lda [$00],y lda [$00],y
sta theHANDLE
pha pha
_LEGetTextHand _LEGetTextHand
pla pla
sta $00 sta $00
pla pla
sta $02 sta $02
pha ; get the length of the text
PushLong theHANDLE
_LEGetTextLen
pla
sta theLENGTH
ldy #2 ; we point to the text now ldy #2 ; we point to the text now
lda [$00],y lda [$00],y
@ -10373,13 +10383,11 @@ rectNEXT
STX $02 STX $02
; we do not init the value ; we do not init the value
pha ; from a hex string to a int value pha ; from a dec string to an unsigned int value
lda thePOINTER+2 PushLong thePOINTER
pha PushWord theLENGTH
lda thePOINTER PushWord #0
pha _Dec2Int
pea $0004
_Hex2Int
pla pla
bcs rectNEXT2 bcs rectNEXT2
@ -10414,9 +10422,11 @@ rectNEXT2
ldy #$1e ; get the handle to the text ldy #$1e ; get the handle to the text
lda [$00],y lda [$00],y
sta theHANDLE+2
pha pha
ldy #$1c ldy #$1c
lda [$00],y lda [$00],y
sta theHANDLE
pha pha
_LEGetTextHand _LEGetTextHand
pla pla
@ -10424,6 +10434,12 @@ rectNEXT2
pla pla
sta $02 sta $02
pha ; get the length of the text
PushLong theHANDLE
_LEGetTextLen
pla
sta theLENGTH
ldy #2 ; we point to the text now ldy #2 ; we point to the text now
lda [$00],y lda [$00],y
sta thePOINTER+2 sta thePOINTER+2
@ -10438,13 +10454,11 @@ rectNEXT2
STX $02 STX $02
; we do not init the value ; we do not init the value
pha ; from a hex string to a int value pha ; from a dec string to an unsigned int value
lda thePOINTER+2 PushLong thePOINTER
pha PushWord theLENGTH
lda thePOINTER PushWord #0
pha _Dec2Int
pea $0004
_Hex2Int
pla pla
bcs rectNEXT3 bcs rectNEXT3
@ -10755,15 +10769,23 @@ thermoNEXT
ldy #$1e ; get the handle to the text ldy #$1e ; get the handle to the text
lda [$00],y lda [$00],y
sta theHANDLE+2
pha pha
ldy #$1c ldy #$1c
lda [$00],y lda [$00],y
sta theHANDLE
pha pha
_LEGetTextHand _LEGetTextHand
pla pla
sta $00 sta $00
pla pla
sta $02 sta $02
pha ; get the length of the text
PushLong theHANDLE
_LEGetTextLen
pla
sta theLENGTH
ldy #2 ; we point to the text now ldy #2 ; we point to the text now
lda [$00],y lda [$00],y
@ -10779,13 +10801,11 @@ thermoNEXT
STX $02 STX $02
; we do not init the value ; we do not init the value
pha ; from a hex string to a int value pha ; from a dec string to an unsigned int value
lda thePOINTER+2 PushLong thePOINTER
pha PushWord theLENGTH
lda thePOINTER PushWord #0
pha _Dec2Int
pea $0004
_Hex2Int
pla pla
bcs thermoNEXT2 bcs thermoNEXT2
@ -10820,15 +10840,23 @@ thermoNEXT2
ldy #$1e ; get the handle to the text ldy #$1e ; get the handle to the text
lda [$00],y lda [$00],y
sta theHANDLE+2
pha pha
ldy #$1c ldy #$1c
lda [$00],y lda [$00],y
sta theHANDLE
pha pha
_LEGetTextHand _LEGetTextHand
pla pla
sta $00 sta $00
pla pla
sta $02 sta $02
pha ; get the length of the text
PushLong theHANDLE
_LEGetTextLen
pla
sta theLENGTH
ldy #2 ; we point to the text now ldy #2 ; we point to the text now
lda [$00],y lda [$00],y
@ -10844,13 +10872,11 @@ thermoNEXT2
STX $02 STX $02
; we do not init the value ; we do not init the value
pha ; from a hex string to a int value pha ; from a dec string to an unsigned int value
lda thePOINTER+2 PushLong thePOINTER
pha PushWord theLENGTH
lda thePOINTER PushWord #0
pha _Dec2Int
pea $0004
_Hex2Int
pla pla
bcs thermoNEXT3 bcs thermoNEXT3
@ -19690,25 +19716,26 @@ L029C59 ENT
PLD PLD
RTL RTL
L029CA8 ADRL L029E2C ; 1 L029CA8
adrl ctlPWCHAR ; D
adrl ctlNOTAPWD ; F
adrl ctlKEYMASK ; 10
adrl ctlLEDOLLAR1 ; 12
adrl ctlLEDOLLAR2 ; 13
ADRL L029E2C ; 1
ADRL L029E0C ; 2 ADRL L029E0C ; 2
ADRL L029DEC ; 3 ADRL L029DEC ; 3
ADRL L029D8C ; 4 ADRL L029D8C ; 4
ADRL L029D6C ; 5 ADRL L029DCC ; 9 refCon text
ADRL L029D4C ; 6 ADRL L029D4C ; 7 Text string
ADRL L029D2C ; 7 ADRL L029DAC ; 8 refCon value
ADRL L029DCC ; 8 adrl ctlKEYMASKVALUE ; 11 keyMask value
ADRL L029DAC ; 9 adrl ctlPWCHARVALUE ; E pwChar value
ADRL L029D6C ; 4 maxChar value
ADRL L029D2C ; 6 Text value
ADRL L029E4C ; A ADRL L029E4C ; A
ADRL L029D04 ; B ADRL L029D04 ; B
ADRL L029CDC ; C ADRL L029CDC ; C
adrl ctlPWCHAR ; D
adrl ctlPWCHARVALUE ; E
adrl ctlNOTAPWD ; F
adrl ctlKEYMASK ; 10
adrl ctlKEYMASKVALUE ; 11
adrl ctlLEDOLLAR1 ; 12
adrl ctlLEDOLLAR2 ; 13
ADRL $00000000 ADRL $00000000
ctlLEDOLLAR1 DW $0008 ; pCount - pwChar $ ctlLEDOLLAR1 DW $0008 ; pCount - pwChar $
@ -20100,23 +20127,21 @@ clrRECTANGLE
titleRECTANGLE str ' Rectangle ' titleRECTANGLE str ' Rectangle '
ctlRECTANGLE ctlRECTANGLE
adrl ctlRECT1 adrl ctlRECTF ; penWidth
adrl ctlRECT2
adrl ctlRECT3
adrl ctlRECT4
adrl ctlRECT5
adrl ctlRECT6
adrl ctlRECT7
adrl ctlRECT8
adrl ctlRECT9
adrl ctlRECTA
adrl ctlRECTB
adrl ctlRECTC
adrl ctlRECTD
adrl ctlRECTE adrl ctlRECTE
adrl ctlRECTF adrl ctlRECTD ; penHeight
adrl ctlRECT10 adrl ctlRECTC
adrl ctlRECT11 adrl ctlRECTB
adrl ctlRECTA
adrl ctlRECT9
adrl ctlRECT8
adrl ctlRECT7
adrl ctlRECT6 ; refCon value
adrl ctlRECT5
adrl ctlRECT4
adrl ctlRECT3
adrl ctlRECT2
adrl ctlRECT1
adrl $0 adrl $0
ctlRECT1 DW $0009 ; pCount - Change button ctlRECT1 DW $0009 ; pCount - Change button
@ -20288,12 +20313,12 @@ ctlRECTD DW $0008 ; pCount - Pen height value
DW 79 ; rect DW 79 ; rect
DW 114 DW 114
DW 92 DW 92
DW 162 DW 172 ; 162 - LOGO
ADRL $83000000 ; procRef ADRL $83000000 ; procRef
DW $0000 ; flag DW $0000 ; flag
DW $7000 ; moreFlags DW $7000 ; moreFlags
ADRL $00000000 ; refCon ADRL $00000000 ; refCon
DW $0004 ; maxSize DW $0005 ; maxSize - $0004 LOGO
ADRL strRECTD ; defaultRef ADRL strRECTD ; defaultRef
ctlRECTE DW $0008 ; pCount - Pen width text ctlRECTE DW $0008 ; pCount - Pen width text
@ -20314,39 +20339,13 @@ ctlRECTF DW $0008 ; pCount - Pen width value
DW 79 ; rect DW 79 ; rect
DW 264 DW 264
DW 92 DW 92
DW 312 DW 322
ADRL $83000000 ; procRef ADRL $83000000 ; procRef
DW $0000 ; flag DW $0000 ; flag
DW $7000 ; moreFlags DW $7000 ; moreFlags
ADRL $00000000 ; refCon ADRL $00000000 ; refCon
DW $0004 ; maxSize DW $0005 ; maxSize
ADRL strRECTF ; defaultRef ADRL strRECTF ; defaultRef
ctlRECT10 DW $0008 ; pCount - Pen height $
ADRL $00000010 ; ID
DW 81 ; rect
DW 104
DW 90
DW 113
ADRL $81000000 ; procRef
DW $0000 ; flag
DW $1000 ; moreFlags
ADRL $00000000 ; refCon
ADRL strRECT10 ; textRef
DW 1 ; textSize
ctlRECT11 DW $0008 ; pCount - Pen width $
ADRL $00000011 ; ID
DW 81 ; rect
DW 254
DW 90
DW 263
ADRL $81000000 ; procRef
DW $0000 ; flag
DW $1000 ; moreFlags
ADRL $00000000 ; refCon
ADRL strRECT10 ; textRef
DW 1 ; textSize
strRECT1 str 'Change' strRECT1 str 'Change'
strRECT2 str 'Cancel' strRECT2 str 'Cancel'
@ -20358,14 +20357,13 @@ strRECT9 str 'Transparent'
strRECTA str 'Grey pattern' strRECTA str 'Grey pattern'
strRECTB str 'Black pattern' strRECTB str 'Black pattern'
strRECTC asc 'Pen height' strRECTC asc 'Pen height'
strRECTD db $04 strRECTD db $05
strRECTD2 ENT strRECTD2 ENT
asc '0001' asc '00001'
strRECTE asc 'Pen width' strRECTE asc 'Pen width'
strRECTF db $04 strRECTF db $05
strRECTF2 ENT strRECTF2 ENT
asc '0002' asc '00002'
strRECT10 asc '$'
*--- *---
@ -20440,22 +20438,20 @@ clrTHERMOMETER
titleTHERMOMETER str ' Thermometer ' titleTHERMOMETER str ' Thermometer '
ctlTHERMOMETER ctlTHERMOMETER
adrl ctlTHERMO1
adrl ctlTHERMO2
adrl ctlTHERMO3
adrl ctlTHERMO4
adrl ctlTHERMO5
adrl ctlTHERMO6
adrl ctlTHERMO7
adrl ctlTHERMO8
adrl ctlTHERMO9
adrl ctlTHERMOA ; no B control
adrl ctlTHERMOC
adrl ctlTHERMOD
adrl ctlTHERMOE
adrl ctlTHERMOF adrl ctlTHERMOF
adrl ctlTHERMO10 adrl ctlTHERMOE
adrl ctlTHERMO11 adrl ctlTHERMOD
adrl ctlTHERMOC
adrl ctlTHERMOA ; no B control
adrl ctlTHERMO9
adrl ctlTHERMO8
adrl ctlTHERMO7
adrl ctlTHERMO6
adrl ctlTHERMO5
adrl ctlTHERMO4
adrl ctlTHERMO3
adrl ctlTHERMO2
adrl ctlTHERMO1
adrl $0 adrl $0
ctlTHERMO1 DW $0009 ; pCount - Change button ctlTHERMO1 DW $0009 ; pCount - Change button
@ -20614,12 +20610,12 @@ ctlTHERMOD DW $0008 ; pCount - Position value
DW 68 ; rect DW 68 ; rect
DW 114 DW 114
DW 81 DW 81
DW 162 DW 172
ADRL $83000000 ; procRef ADRL $83000000 ; procRef
DW $0000 ; flag DW $0000 ; flag
DW $7000 ; moreFlags DW $7000 ; moreFlags
ADRL $00000000 ; refCon ADRL $00000000 ; refCon
DW $0004 ; maxSize DW $0005 ; maxSize
ADRL strTHERMOD ; defaultRef ADRL strTHERMOD ; defaultRef
ctlTHERMOE DW $0008 ; pCount - Scale text ctlTHERMOE DW $0008 ; pCount - Scale text
@ -20640,39 +20636,14 @@ ctlTHERMOF DW $0008 ; pCount - Scale value
DW 84 ; rect DW 84 ; rect
DW 114 DW 114
DW 97 DW 97
DW 162 DW 172
ADRL $83000000 ; procRef ADRL $83000000 ; procRef
DW $0000 ; flag DW $0000 ; flag
DW $7000 ; moreFlags DW $7000 ; moreFlags
ADRL $00000000 ; refCon ADRL $00000000 ; refCon
DW $0004 ; maxSize DW $0005 ; maxSize
ADRL strTHERMOF ; defaultRef ADRL strTHERMOF ; defaultRef
ctlTHERMO10 DW $0008 ; pCount - Position $
ADRL $00000010 ; ID
DW 70 ; rect
DW 104
DW 79
DW 113
ADRL $81000000 ; procRef
DW $0000 ; flag
DW $1000 ; moreFlags
ADRL $00000000 ; refCon
ADRL strTHERMO10 ; textRef
DW 1 ; textSize
ctlTHERMO11 DW $0008 ; pCount - Scale $
ADRL $00000011 ; ID
DW 86 ; rect
DW 104
DW 95
DW 113
ADRL $81000000 ; procRef
DW $0000 ; flag
DW $1000 ; moreFlags
ADRL $00000000 ; refCon
ADRL strTHERMO10 ; textRef
DW 1 ; textSize
strTHERMO1 str 'Change' strTHERMO1 str 'Change'
strTHERMO2 str 'Cancel' strTHERMO2 str 'Cancel'
@ -20683,14 +20654,13 @@ strTHERMO8 asc 'Orientation'
strTHERMO9 str 'Vertical' strTHERMO9 str 'Vertical'
strTHERMOA str 'Horizontal' strTHERMOA str 'Horizontal'
strTHERMOC asc 'Position' strTHERMOC asc 'Position'
strTHERMOD db $04 strTHERMOD db $05
strTHERMOD2 ENT strTHERMOD2 ENT
asc '0001' asc '00001'
strTHERMOE asc 'Scale' strTHERMOE asc 'Scale'
strTHERMOF db $04 strTHERMOF db $05
strTHERMOF2 ENT strTHERMOF2 ENT
asc '0002' asc '00002'
strTHERMO10 asc '$'
*--- *---

46
genesys/edit/MMDIALOGS.S
View File

@ -2157,29 +2157,20 @@ okRECT
lda [$00],y lda [$00],y
pha pha
PushLong #strRECTD2 PushLong #strRECTD2
PushWord #4 PushWord #5
_Int2Hex PushWord #0
_Int2Dec
ldy #$1c ; get penHeight ldy #$1c ; get penHeight
lda [$00],y lda [$00],y
pha pha
PushLong #strRECTF2 PushLong #strRECTF2
PushWord #4 PushWord #5
_Int2Hex PushWord #0
_Int2Dec
*--- Reset all controls (and we'll change the value afterwards) *--- Reset all controls (and we'll change the value afterwards)
* lda #$0000 ; invisible
* pha
* pha
* pha
* pha
* pha
* pha
* pea $0007
* _GetCtlHandleFromID
* _SetCtlValue
lda #$0000 ; transparent lda #$0000 ; transparent
pha pha
pha pha
@ -2431,33 +2422,24 @@ okTHERMO
PHA PHA
JSL L030000 JSL L030000
ldy #$1a ; get penWidth ldy #$1a ; get position
lda [$00],y lda [$00],y
pha pha
PushLong #strTHERMOD2 PushLong #strTHERMOD2
PushWord #4 PushWord #5
_Int2Hex PushWord #0
_Int2Dec
ldy #$1c ; get penHeight ldy #$1c ; get scale
lda [$00],y lda [$00],y
pha pha
PushLong #strTHERMOF2 PushLong #strTHERMOF2
PushWord #4 PushWord #5
_Int2Hex PushWord #0
_Int2Dec
*--- Reset all controls (and we'll change the value afterwards) *--- Reset all controls (and we'll change the value afterwards)
* lda #$0000 ; invisible
* pha
* pha
* pha
* pha
* pha
* pha
* pea $0007
* _GetCtlHandleFromID
* _SetCtlValue
lda #$0000 ; vertical lda #$0000 ; vertical
pha pha
pha pha

BIN
genesys/genesys_2020.po
View File

Binary file not shown.