Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Synchronet
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Main
Synchronet
Commits
f79de8dc
Commit
f79de8dc
authored
3 months ago
by
Deucе
Browse files
Options
Downloads
Patches
Plain Diff
Fix Atari ST palettes and default attributes
Thanks Kirkman!
parent
64352121
No related branches found
No related tags found
No related merge requests found
Pipeline
#8204
passed
3 months ago
Stage: build
Stage: test
Stage: cleanup
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/conio/ciolib.c
+2
-2
2 additions, 2 deletions
src/conio/ciolib.c
src/conio/vidmodes.c
+7
-7
7 additions, 7 deletions
src/conio/vidmodes.c
with
9 additions
and
9 deletions
src/conio/ciolib.c
+
2
−
2
View file @
f79de8dc
...
...
@@ -588,7 +588,7 @@ CIOLIBEXPORT int initciolib(int mode)
case
ATARIST_40X25
:
case
ATARIST_80X25
:
case
ATARIST_80X25_MONO
:
cio_textinfo
.
normattr
=
0x
1
0
;
cio_textinfo
.
normattr
=
0x0
F
;
break
;
default:
cio_textinfo
.
normattr
=
LIGHTGRAY
;
...
...
@@ -1002,7 +1002,7 @@ CIOLIBEXPORT void ciolib_textmode(int mode)
case
ATARIST_40X25
:
case
ATARIST_80X25
:
case
ATARIST_80X25_MONO
:
cio_textinfo
.
normattr
=
0x
1
0
;
cio_textinfo
.
normattr
=
0x0
F
;
break
;
default:
cio_textinfo
.
normattr
=
LIGHTGRAY
;
...
...
This diff is collapsed.
Click to expand it.
src/conio/vidmodes.c
+
7
−
7
View file @
f79de8dc
...
...
@@ -127,11 +127,11 @@ struct video_params vparams[] = {
/* Prestel */
{
PRESTEL_40X25
,
PRESTEL_PALETTE
,
40
,
25
,
14
,
15
,
20
,
12
,
7
,
0
,
4
,
3
,
480
,
500
},
/* Atari ST 40X25 */
{
ATARIST_40X25
,
ATARI_PALETTE_16
,
40
,
25
,
7
,
7
,
8
,
8
,
1
6
,
0
,
4
,
3
,
320
,
200
},
{
ATARIST_40X25
,
ATARI_PALETTE_16
,
40
,
25
,
7
,
7
,
8
,
8
,
1
5
,
CIOLIB_VIDEO_BGBRIGHT
|
CIOLIB_VIDEO_NOBLINK
,
4
,
3
,
320
,
200
},
/* Atari ST 80X25 */
{
ATARIST_80X25
,
ATARI_PALETTE_4
,
80
,
25
,
7
,
7
,
8
,
8
,
1
6
,
0
,
4
,
3
,
640
,
200
},
{
ATARIST_80X25
,
ATARI_PALETTE_4
,
80
,
25
,
7
,
7
,
8
,
8
,
1
5
,
CIOLIB_VIDEO_BGBRIGHT
|
CIOLIB_VIDEO_NOBLINK
,
4
,
3
,
640
,
200
},
/* Atari ST 80X25 Mono */
{
ATARIST_80X25_MONO
,
ATARI_PALETTE_2
,
80
,
25
,
14
,
15
,
16
,
8
,
1
6
,
0
,
4
,
3
,
640
,
400
},
{
ATARIST_80X25_MONO
,
ATARI_PALETTE_2
,
80
,
25
,
14
,
15
,
16
,
8
,
1
5
,
CIOLIB_VIDEO_BGBRIGHT
|
CIOLIB_VIDEO_NOBLINK
,
4
,
3
,
640
,
400
},
/* Custom mode */
{
CIOLIB_MODE_CUSTOM
,
COLOUR_PALETTE
,
80
,
25
,
14
,
15
,
16
,
8
,
7
,
0
,
0
,
0
,
-
1
,
-
1
},
...
...
@@ -163,11 +163,11 @@ uint32_t palettes[9][16] = {
0
,
21
,
46
,
51
,
196
,
201
,
226
,
15
},
/* Atari ST 16-colour */
{
15
,
0
,
196
,
46
,
226
,
21
,
201
,
51
,
274
,
275
,
276
,
277
,
278
,
279
,
280
,
281
},
{
15
,
196
,
46
,
226
,
21
,
201
,
51
,
274
,
275
,
276
,
277
,
278
,
279
,
280
,
281
,
0
},
/* Atari ST 4-colour */
{
15
,
0
,
196
,
46
,
15
,
0
,
196
,
46
,
15
,
0
,
196
,
46
,
15
,
0
,
196
,
46
},
{
15
,
196
,
46
,
0
,
15
,
196
,
46
,
0
,
15
,
196
,
46
,
0
,
15
,
196
,
46
,
0
},
/* Atari ST 2-colour */
{
15
,
0
,
15
,
0
,
15
,
0
,
15
,
0
,
15
,
0
,
15
,
0
,
15
,
0
,
15
,
0
},
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment