sdl-ios-xcode: src/video/riscos/SDL

annotate src/video/riscos/SDL_riscosASM.S @ 4170:092c0bc69155 SDL-1.2

Fixed bug #618 Description From Tim Angus 2008-08-30 12:23:56 (-) [reply] As we all know SDL 1.2 doesn't handle dead keys well since one key press potentially equals two (or more) characters. For example, on many layouts, keying <backquote>,<space> results in <no character>,<backquote><space>. Since the unicode member of the SDL_keysym struct only has room for one character, only one can be returned. On Linux, the first character is returned. On Windows however, unless the exact number of characters generated by the keypress is 1, nothing is returned. The following patch addresses this inconsistency. Updated patch which includes a further fix to the handling of the numpad when numlock is on. This further fix is courtesy Amanieu d'Antras.

author	Sam Lantinga <slouken@libsdl.org>
date	Mon, 13 Apr 2009 08:42:09 +0000
parents	a1b03ba2fcd0
children

rev	line source
1459 1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1 ;
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2 ; SDL - Simple DirectMedia Layer
4159 a1b03ba2fcd0 Updated copyright date Sam Lantinga <slouken@libsdl.org> parents: 1459 diff changeset	3 ; Copyright (C) 1997-2009 Sam Lantinga
1459 1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	4 ;
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	5 ; This library is free software; you can redistribute it and/or
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	6 ; modify it under the terms of the GNU Library General Public
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	7 ; License as published by the Free Software Foundation; either
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	8 ; version 2 of the License, or (at your option) any later version.
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	9 ;
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	10 ; This library is distributed in the hope that it will be useful,
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	11 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	12 ; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	13 ; Library General Public License for more details.
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	14 ;
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	15 ; You should have received a copy of the GNU Library General Public
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	16 ; License along with this library; if not, write to the Free
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	17 ; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	18 ;
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	19 ; Sam Lantinga
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	20 ; slouken@libsdl.org
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	21 ;
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	22 ; Assembler routines for RISC OS display
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	23 ;
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	24
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	25 AREA \|C$$CODE\|
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	26
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	27 EXPORT \|RISCOS_Put32\|
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	28
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	29 ; Display 32bpp to 32bpp, 1:1
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	30 ;
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	31 ; Code provided by Adrain Lees
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	32 ;
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	33 ; entry a1 -> destination
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	34 ; a2 = dest width in pixels
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	35 ; a3 = dest line length in bytes
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	36 ; a4 = dest height in scanlines
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	37 ; arg5 -> source
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	38 ; arg6 = byte offset from end of source line to start of next
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	39
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	40 Arg5 * 10*4
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	41 Arg6 * Arg5+4
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	42
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	43 RISCOS_Put32 ROUT
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	44 STMFD sp!,{a2,v1-v6,sl,fp,lr}
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	45 LDR ip,[sp,#Arg5]
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	46 MOV lr,a1
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	47 B ucp64lp
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	48
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	49 00 ;tail strip of 1-15 pixels
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	50
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	51 LDR v1,[ip],#4
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	52 01 SUBS a2,a2,#1
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	53 STR v1,[lr],#4
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	54 LDRHI v1,[ip],#4
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	55 BHI %01
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	56 B %02
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	57
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	58 ucp64end ADDS a2,a2,#16
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	59 BNE %00
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	60
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	61 02 SUBS a4,a4,#1 ;height--
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	62 LDRHI v1,[sp,#Arg6]
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	63 LDRHI a2,[sp] ;reload width
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	64 BLS %03
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	65
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	66 ;move to start of next scanline
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	67
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	68 ADD lr,a1,a3
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	69 ADD a1,a1,a3
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	70 ADD ip,ip,v1
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	71
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	72 ucp64lp SUBS a2,a2,#16
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	73 BLO ucp64end
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	74
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	75 PLD [ip,#64]
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	76
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	77 LDR v1,[ip],#4
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	78 LDR v2,[ip],#4
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	79 LDR v3,[ip],#4
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	80 LDR v4,[ip],#4
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	81 LDR v5,[ip],#4
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	82 LDR v6,[ip],#4
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	83 LDR sl,[ip],#4
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	84 LDR fp,[ip],#4
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	85 STR v1,[lr],#4
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	86 STR v2,[lr],#4
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	87 STR v3,[lr],#4
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	88 STR v4,[lr],#4
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	89 STR v5,[lr],#4
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	90 STR v6,[lr],#4
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	91 STR sl,[lr],#4
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	92 STR fp,[lr],#4
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	93
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	94 PLD [ip,#64]
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	95
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	96 LDR v1,[ip],#4
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	97 LDR v2,[ip],#4
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	98 LDR v3,[ip],#4
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	99 LDR v4,[ip],#4
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	100 LDR v5,[ip],#4
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	101 LDR v6,[ip],#4
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	102 LDR sl,[ip],#4
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	103 LDR fp,[ip],#4
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	104 STR v1,[lr],#4
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	105 STR v2,[lr],#4
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	106 STR v3,[lr],#4
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	107 STR v4,[lr],#4
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	108 STR v5,[lr],#4
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	109 STR v6,[lr],#4
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	110 STR sl,[lr],#4
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	111 STR fp,[lr],#4
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	112
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	113 B ucp64lp
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	114
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	115 03 LDMFD sp!,{a2,v1-v6,sl,fp,pc}
1e8582152d44 Date: Wed, 01 Mar 2006 10:14:31 +0000 Sam Lantinga <slouken@libsdl.org> parents: diff changeset	116

Mercurial > sdl-ios-xcode

annotate src/video/riscos/SDL_riscosASM.S @ 4170:092c0bc69155 SDL-1.2