Commit 5443a7f5 authored by Ben Avison's avatar Ben Avison
Browse files

Minor bugfix.

  On previous Wimps, if you chose to disassociate the Wimp's physical colour
  mapping from the Wimp palette (using SWI Wimp_SetColourMapping), then
  subsequent calls to Wimp_SetPalette would write over the physical colour
  mapping instead of the Wimp palette. *WimpPalette, conversely, had the
  correct behaviour (ie it only ever affected the Wimp palette).
  There are actually loads of remaining bugs in the Wimp regarding the
  subtle difference between the physical colour mapping and the palette. Some
  calls try to cause a screen redraw in some circumstances, generally the
  wrong circumstances, and without all the necessary internal Wimp variables
  having been reset (so for example, you might find that window borders end
  up ibeing rendered incorrectly). It probably hasn't all worked properly
  since RISC OS 3.1...

Version 4.53. Tagged as 'Wimp-4_53'
parent 45a23f3f
......@@ -8,11 +8,11 @@
GBLS Module_FullVersion
GBLS Module_ApplicationDate2
GBLS Module_ApplicationDate4
Module_MajorVersion SETS "4.52"
Module_Version SETA 452
Module_MajorVersion SETS "4.53"
Module_Version SETA 453
Module_MinorVersion SETS ""
Module_Date SETS "15 Jun 2000"
Module_ApplicationDate2 SETS "15-Jun-00"
Module_ApplicationDate4 SETS "15-Jun-2000"
Module_FullVersion SETS "4.52"
Module_Date SETS "20 Jun 2000"
Module_ApplicationDate2 SETS "20-Jun-00"
Module_ApplicationDate4 SETS "20-Jun-2000"
Module_FullVersion SETS "4.53"
/* (4.52)
/* (4.53)
* This file is automatically maintained by srccommit, do not edit manually.
#define Module_MajorVersion_CMHG 4.52
#define Module_MajorVersion_CMHG 4.53
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 15 Jun 2000
#define Module_Date_CMHG 20 Jun 2000
#define Module_MajorVersion "4.52"
#define Module_Version 452
#define Module_MajorVersion "4.53"
#define Module_Version 453
#define Module_MinorVersion ""
#define Module_Date "15 Jun 2000"
#define Module_Date "20 Jun 2000"
#define Module_ApplicationDate2 "15-Jun-00"
#define Module_ApplicationDate4 "15-Jun-2000"
#define Module_ApplicationDate2 "20-Jun-00"
#define Module_ApplicationDate4 "20-Jun-2000"
#define Module_FullVersion "4.52"
#define Module_FullVersion "4.53"
......@@ -2033,7 +2033,8 @@ int_setpalette
LDR R3,=&F0F0F000 ; R3 = mask to apply to all entries
ORREQ R3,R3,R3,LSR #4 ; if R2 ="TRUE" on entry read as 24bit values
BL getpalpointer ; address the palette table
; BL getpalpointer ; address the palette table
ADRL R14,paltable ; BJGA 16-Jun-00: don't overwrite the values set by Wimp_SetColourMapping
MOV R1,#16 ; copy the first 16 entries
00 LDR R4,[userblk],#4
AND R4,R4,R3 ; extract only the useful bits
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment