arcem/amiga arcem-os3.info, NONE, 1.1.2.1 ArcEm.info, 1.3.2.1, 1.3.2.2 DispKbd.c, 1.14.2.11, 1.14.2.12 wb.c, 1.3.2.4, 1.3.2.5

[Chris Young]

Update of /cvsroot/arcem/arcem/amiga
In directory vz-cvs-4.sog:/tmp/cvs-serv13745/amiga

Modified Files:
      Tag: arcem-fast
        ArcEm.info DispKbd.c wb.c 
Added Files:
      Tag: arcem-fast
        arcem-os3.info 
Log Message:
Fix tooltype reading, enable pointer update, fix OS4 build. Add shutdown obey 
file as most OS3 Amigas have no F12 key :)  d


--- NEW FILE: arcem-os3.info ---
(This appears to be a binary file; contents omitted.)

Index: DispKbd.c
===================================================================
RCS file: /cvsroot/arcem/arcem/amiga/DispKbd.c,v
retrieving revision 1.14.2.11
retrieving revision 1.14.2.12
diff -C2 -d -r1.14.2.11 -r1.14.2.12
*** DispKbd.c   30 Oct 2011 17:42:22 -0000      1.14.2.11
--- DispKbd.c   30 Oct 2011 19:44:50 -0000      1.14.2.12
***************
*** 345,349 ****
  
  // HorizPos,VertPos
! #ifdef __amigaos4__
        BltBitMapTags(BLITA_Width, 32,
                        BLITA_Height, height,
--- 345,353 ----
  
  // HorizPos,VertPos
! 
!       BltMaskBitMapRastPort(mouse_bm, 0, 0, window->RPort,
!               HorizPos, VertPos, 32, height, (ABC|ABNC|ANBC), mask);
! 
! #if 0
        BltBitMapTags(BLITA_Width, 32,
                        BLITA_Height, height,
***************
*** 588,592 ****
  
  // HorizPos,VertPos
! #ifdef __amigaos4__
        BltBitMapTags(BLITA_Width, 32,
                        BLITA_Height, height,
--- 592,600 ----
  
  // HorizPos,VertPos
! 
!       BltMaskBitMapRastPort(mouse_bm, 0, 0, window->RPort,
!               HorizPos, VertPos, 32, height, (ABC|ABNC|ANBC), mask);
! 
! #if 0
        BltBitMapTags(BLITA_Width, 32,
                        BLITA_Height, height,

Index: wb.c
===================================================================
RCS file: /cvsroot/arcem/arcem/amiga/wb.c,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -C2 -d -r1.3.2.4 -r1.3.2.5
*** wb.c        30 Oct 2011 17:42:22 -0000      1.3.2.4
--- wb.c        30 Oct 2011 19:44:50 -0000      1.3.2.5
***************
*** 42,46 ****
        char *s;
  
!       if((*wbarg->wa_Name) && (dobj=GetIconTags(wbarg->wa_Name,NULL)))
        {
                toolarray = (CONST_STRPTR *)dobj->do_ToolTypes;
--- 42,48 ----
        char *s;
  
!       force8bit = 0;
! 
!       if((*wbarg->wa_Name) && (dobj=GetDiskObject(wbarg->wa_Name)))
        {
                toolarray = (CONST_STRPTR *)dobj->do_ToolTypes;
***************
*** 186,193 ****
        #endif
        
!       if(IconBase = OpenLibrary("icon.library",45))
        {
        #ifdef __amigaos4__
!               IIcon = IExec->GetInterface(IconBase,"main",1,NULL);
        #endif
        }
--- 188,195 ----
        #endif
        
!       if(IconBase = OpenLibrary("icon.library",37))
        {
        #ifdef __amigaos4__
!               IIcon = GetInterface(IconBase,"main",1,NULL);
        #endif
        }
***************
*** 210,213 ****
--- 212,216 ----
        }
  
+       #ifdef __amigaos4__
        /* if we are launching from WB, we don't need console windows popping 
up */
                fclose(stderr);
***************
*** 216,220 ****
                fclose(stdout);
                stdout = fopen("NIL:","w");
! 
        for(i=0,wbarg=WBenchMsg->sm_ArgList;i<WBenchMsg->sm_NumArgs;i++,wbarg++)
        {
--- 219,224 ----
                fclose(stdout);
                stdout = fopen("NIL:","w");
!       #endif
!               
        for(i=0,wbarg=WBenchMsg->sm_ArgList;i<WBenchMsg->sm_NumArgs;i++,wbarg++)
        {

Index: ArcEm.info
===================================================================
RCS file: /cvsroot/arcem/arcem/amiga/ArcEm.info,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -d -r1.3.2.1 -r1.3.2.2
Binary files /tmp/cvsNNa4tx and /tmp/cvsuNtI3U differ


------------------------------------------------------------------------------
Get your Android app more play: Bring it to the BlackBerry PlayBook 
in minutes. BlackBerry App World&#153; now supports Android&#153; Apps 
for the BlackBerry&reg; PlayBook&#153;. Discover just how easy and simple 
it is! http://p.sf.net/sfu/android-dev2dev
-- 
arcem-cvs mailing list
arcem-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/arcem-cvs