X-Git-Url: https://hackdaworld.org/gitweb/?p=my-code%2Fdfb-photoshow.git;a=blobdiff_plain;f=dfb-photoshow.c;h=c3da3659ecc57a677c7a90c47b73aa51dba71463;hp=0bc3ac4552e9a1176f050ef5c2506b7e0e11177e;hb=1a271d36354a6963451c441666ac8e489172c74f;hpb=9e8631941741fb36401f9ec5075b65cad7921130

diff --git a/dfb-photoshow.c b/dfb-photoshow.c
index 0bc3ac4..c3da365 100644
--- a/dfb-photoshow.c
+++ b/dfb-photoshow.c
@@ -39,7 +39,7 @@ IDirectFBEventBuffer *k_buf=NULL;
 char *title_txt="directfb photoshow";
 char *exp_txt="an image presenter ...";
 char *hp_txt="http://hackdaworld.dyndns.org";
-char *msg1_txt="(press key to continue ...)";
+char *msg1_txt="(press key to continue, space pauses, left key for last image, esc quits ...)";
 
 void clear_primary(void) {
  DFBCHECK(primary->SetColor(primary,0x00,0x00,0x00,0x00));
@@ -89,40 +89,65 @@ int main(int argc,char **argv) {
  DFBCHECK(primary->DrawString(primary,msg1_txt,-1,(screen_width-str_width)/2,(screen_height/2)+3*font_dsc.height,DSTF_LEFT));
  DFBCHECK(primary->Flip(primary,NULL,DSFLIP_WAITFORSYNC));
  DFBCHECK(k_buf->WaitForEvent(k_buf));
- font->Release(font);
 
  /* display pictures */
  i=2;
  while(i<argc) {
-  while(k_buf->GetEvent(k_buf,DFB_EVENT(&k_event))==DFB_OK) {
-   if(k_event.type==DIET_KEYPRESS) {
-    if(k_event.key_id==DIKI_ESCAPE) i=argc;
-    if(k_event.key_id==DIKI_SPACE) DFBCHECK(k_buf->WaitForEvent(k_buf));
-   }
-   else {
-    DFBCHECK(dfb->CreateImageProvider(dfb,argv[i],&img_prov));
-    DFBCHECK(img_prov->GetSurfaceDescription(img_prov,&dsc));
-    DFBCHECK(dfb->CreateSurface(dfb,&dsc,&logo ));
-    DFBCHECK(img_prov->RenderTo(img_prov,logo,NULL));
-    img_prov->Release(img_prov);
-    DFBCHECK (primary->SetColor(primary,0x00,0x00,0x00,0x00));
-    DFBCHECK(primary->FillRectangle(primary,0,0,screen_width,screen_height));
-    DFBCHECK(primary->SetColor(primary,0x80,0x80,0xff,0xff));
-    DFBCHECK(primary->DrawLine(primary,0,0,screen_width-1,screen_height-1));
-    if((screen_width>=dsc.width)&&(screen_height>=dsc.height)) {
-     DFBCHECK(primary->Blit(primary,logo,NULL,(screen_width-dsc.width)/2,(screen_height-dsc.height)/2));
+  do {
+   printf("image: %s\n",argv[i]);
+   if((int)k_buf->GetEvent(k_buf,DFB_EVENT(&k_event))!=0) {
+    if(k_event.type==DIET_KEYPRESS) {
+     int a;
+     a=(int)k_event.key_id;
+     if(a==(int)DIKI_ESCAPE) {
+      i=argc;
+      break;
+     }
+     if(a==(int)DIKI_SPACE) {
+      char *pause_txt="paused (press button to continue)";
+      DFBCHECK(font->GetStringWidth(font,pause_txt,-1,&str_width));
+      DFBCHECK(primary->SetColor(primary,0x80,0x80,0xff,0xff));
+      DFBCHECK(primary->DrawString(primary,pause_txt,-1,(screen_width-str_width)/2,screen_height/2,DSTF_LEFT));
+      DFBCHECK(primary->Flip(primary,NULL,DSFLIP_WAITFORSYNC));
+      DFBCHECK(k_buf->Reset(k_buf));
+      DFBCHECK(k_buf->WaitForEvent(k_buf));
+      k_event.key_id=DIKI_A; /* no longer pause! */
+     }
+     if(a==(int)DIKI_LEFT) {
+      i=((i<=3)?2:i-2);
+      k_event.key_id=DIKI_A; /* no longer back key! */
+      break;
+     }
     }
-    else {
-     DFBCHECK(primary->StretchBlit(primary,logo,NULL,NULL));
+   }
+   DFBCHECK(dfb->CreateImageProvider(dfb,argv[i],&img_prov));
+   DFBCHECK(img_prov->GetSurfaceDescription(img_prov,&dsc));
+   if((screen_width<dsc.width)||(screen_height<dsc.height)) {
+    float q_w=(float)(dsc.width)/screen_width;
+    float q_h=(float)(dsc.height)/screen_height;
+    if(q_w>=q_h) {
+     dsc.width=(int)(dsc.width/q_w);
+     dsc.height=(int)(dsc.height/q_w);
+    } else {
+     dsc.width=(int)(dsc.width/q_h);
+     dsc.height=(int)(dsc.height/q_h);
     }
-    DFBCHECK(primary->Flip(primary,NULL,DSFLIP_WAITFORSYNC));
-    DFBCHECK(k_buf->WaitForEventWithTimeout(k_buf,atoi(argv[1]),0));
-    logo->Release(logo);
-    ++i;
    }
-  }
+   DFBCHECK(dfb->CreateSurface(dfb,&dsc,&logo ));
+   DFBCHECK(img_prov->RenderTo(img_prov,logo,NULL));
+   img_prov->Release(img_prov);
+   clear_primary();
+   DFBCHECK(primary->Blit(primary,logo,NULL,(screen_width-dsc.width)/2,(screen_height-dsc.height)/2));
+   DFBCHECK(primary->Flip(primary,NULL,DSFLIP_WAITFORSYNC));
+   DFBCHECK(k_buf->Reset(k_buf));
+   k_buf->WaitForEventWithTimeout(k_buf,atoi(argv[1]),0);
+   logo->Release(logo);
+   ++i;
+   if(i==argc) break;
+  } while(k_buf->GetEvent(k_buf,DFB_EVENT(&k_event))==DFB_OK);
  }
 
+ font->Release(font);
  k_buf->Release(k_buf);
  keyboard->Release(keyboard);
  logo->Release(logo);
@@ -131,4 +156,3 @@ int main(int argc,char **argv) {
 
  return 23; /* ;) */
 }
-