X-Git-Url: http://git.jankratochvil.net/?p=gnokii.git;a=blobdiff_plain;f=common%2Fgsm-bitmaps.c;h=b930431ea59db7ec8bd5c7c43278997ad6781f0e;hp=9114c5d37de44c3e5ede9a527e95127ec866b625;hb=49dd905279a8e62936e3713510ab0fd738e20ecb;hpb=2f2703c9133032c12671ca5c77ae626b8fb178d4

diff --git a/common/gsm-bitmaps.c b/common/gsm-bitmaps.c
index 9114c5d..b930431 100644
--- a/common/gsm-bitmaps.c
+++ b/common/gsm-bitmaps.c
@@ -4,10 +4,14 @@
 
   A Linux/Unix toolset and driver for Nokia mobile phones.
 
+  Copyright (C) 1999, 2000 Hugh Blemings & Pavel Janík ml. 
+
   Released under the terms of the GNU GPL, see file COPYING for more details.
 	
-  Functions for manipulating bitmaps
-  
+  Functions for common bitmap operations.
+ 
+  Last modified: Sat 18 Nov 2000 by Chris Kemp
+
 */
 
 #include <stdio.h>
@@ -18,179 +22,98 @@
 
 #include "gsm-common.h"
 #include "gsm-bitmaps.h"
-#include "gsm-sms.h"
-#include "gsm-coding.h"
-#include "gsm-networks.h"
+#include "gsm-api.h"
 
-void GSM_SetPointBitmap(GSM_Bitmap *bmp, int x, int y)
-{
-  int pixel;
-  if (bmp->type == GSM_StartupLogo || bmp->type == GSM_6210StartupLogo || bmp->type == GSM_7110StartupLogo)
-    bmp->bitmap[((y/8)*bmp->width)+x] |= 1 << (y%8);
-  if (bmp->type == GSM_OperatorLogo || bmp->type == GSM_7110OperatorLogo || bmp->type == GSM_CallerLogo) {
-    pixel=bmp->width*y + x;
-    bmp->bitmap[pixel/8] |= 1 << (7-(pixel%8));
-  }
+/* A few useful functions for bitmaps */
+
+void GSM_SetPointBitmap(GSM_Bitmap *bmp, int x, int y) {
+  if (bmp->type == GSM_StartupLogo) bmp->bitmap[((y/8)*bmp->width)+x] |= 1 << (y%8);
+  if (bmp->type == GSM_OperatorLogo || bmp->type == GSM_CallerLogo) bmp->bitmap[(y*bmp->width+x)/8] |= 1 << (7-((y*bmp->width+x)%8));
+
+  /* Testing only! */
   if (bmp->type == GSM_PictureImage) bmp->bitmap[9*y + (x/8)] |= 1 << (7-(x%8));
 }
-  
-void GSM_ClearPointBitmap(GSM_Bitmap *bmp, int x, int y)
-{
-  int pixel;
-  if (bmp->type == GSM_StartupLogo || bmp->type == GSM_6210StartupLogo || bmp->type == GSM_7110StartupLogo)
-    bmp->bitmap[((y/8)*bmp->width)+x] &= 255 - (1 << (y%8));
-  if (bmp->type == GSM_OperatorLogo || bmp->type == GSM_7110OperatorLogo || bmp->type == GSM_CallerLogo) {
-    pixel=bmp->width*y + x;
-    bmp->bitmap[pixel/8] &= ~(1 << (7-(pixel%8)));
-  }
+
+void GSM_ClearPointBitmap(GSM_Bitmap *bmp, int x, int y) {
+  if (bmp->type == GSM_StartupLogo) bmp->bitmap[((y/8)*bmp->width)+x] &= 255 - (1 << (y%8));
+if (bmp->type == GSM_OperatorLogo || bmp->type == GSM_CallerLogo) bmp->bitmap[(y*bmp->width+x)/8] &= 255 - (1 << (7-((y*bmp->width+x)%8)));
+
+  /* Testing only ! */
   if (bmp->type == GSM_PictureImage) bmp->bitmap[9*y + (x/8)] &= 255 - (1 << (7-(x%8)));
 }
 
-bool GSM_IsPointBitmap(GSM_Bitmap *bmp, int x, int y)
-{
+bool GSM_IsPointBitmap(GSM_Bitmap *bmp, int x, int y) {
   int i=0;
-  int pixel;
 
-  if (bmp->type == GSM_StartupLogo || bmp->type == GSM_6210StartupLogo || bmp->type == GSM_7110StartupLogo)
-    i=(bmp->bitmap[((y/8)*bmp->width) + x] & 1<<((y%8)));
-  if (bmp->type == GSM_OperatorLogo || bmp->type == GSM_7110OperatorLogo || bmp->type == GSM_CallerLogo) {
-    pixel=bmp->width*y + x;
-    i=(bmp->bitmap[pixel/8] & 1<<(7-(pixel%8)));
-  }
+  if (bmp->type == GSM_StartupLogo) i=(bmp->bitmap[((y/8)*bmp->width) + x] & 1<<((y%8)));
+  if (bmp->type == GSM_OperatorLogo || bmp->type == GSM_CallerLogo) i=(bmp->bitmap[(y*bmp->width+x)/8] & 1 << (7-((y*bmp->width+x)%8)));
+  /* Testing only ! */
   if (bmp->type == GSM_PictureImage) i=(bmp->bitmap[9*y + (x/8)] & 1<<(7-(x%8)));
-
+ 
   if (i) return true; else return false;
 }
-  
+
 void GSM_ClearBitmap(GSM_Bitmap *bmp)
 {
   int i;
+
   for (i=0;i<bmp->size;i++) bmp->bitmap[i]=0;
 }
 
-int GSM_GetBitmapSize(GSM_Bitmap *bitmap)
-{
-  switch (bitmap->type) {
-    case GSM_StartupLogo     : /*size 84*48*/
-    case GSM_OperatorLogo    : /*size 72*14*/
-    case GSM_CallerLogo      : /*size 72*14*/
-    case GSM_PictureImage    : /*size 72*28*/
-      return bitmap->height*bitmap->width/8;
-
-    case GSM_7110OperatorLogo: /*size 78*21*/
-      return (bitmap->width*bitmap->height + 7)/8;
-
-    case GSM_7110StartupLogo: /*size 96*65*/
-    case GSM_6210StartupLogo: /*size 96*60*/
-      return (bitmap->height+7)/8*bitmap->width;
-
-    default:
-      return 0;
-  }
-}
 
-GSM_Error GSM_ReadBitmap(GSM_SMSMessage *message, GSM_Bitmap *bitmap)
-{
-  int offset = 1;
-  unsigned char buffer[20];
-
-  switch (message->UDHType) {
-  case GSM_OpLogo:
-    EncodeUDHHeader(buffer, GSM_OperatorLogo);
-    if (message->Length!=133) return GE_UNKNOWN;
-    
-    bitmap->type = GSM_OperatorLogo;
-
-    DecodeNetworkCode(message->MessageText, bitmap->netcode);
-
-    offset = 4;
-    break;
-
-  case GSM_CallerIDLogo:
-    EncodeUDHHeader(buffer, GSM_CallerLogo);
-    if (message->Length!=130) return GE_UNKNOWN;
-    
-    bitmap->type=GSM_CallerLogo;
-
-    break;
-  default: /* error */
-    return GE_UNKNOWN;
-    break;
-  }
-  bitmap->width = message->MessageText[offset];
-  bitmap->height = message->MessageText[offset + 1];
-  
-  if (bitmap->width!=72 || bitmap->height!=14) return GE_INVALIDIMAGESIZE;
-  
-  bitmap->size = GSM_GetBitmapSize(bitmap);
-  memcpy(bitmap->bitmap, message->MessageText + offset + 3, bitmap->size);
-
-#ifdef DEBUG
-  fprintf(stdout, _("Bitmap from SMS: width %i, height %i\n"),bitmap->width,bitmap->height);
-#endif
-
-  return GE_NONE;
-}
-
-void GSM_ResizeBitmap(GSM_Bitmap *bitmap, GSM_Bitmap_Types target)
+void GSM_ResizeBitmap(GSM_Bitmap *bitmap, GSM_Bitmap_Types target, GSM_Information *info)
 {
   GSM_Bitmap backup;
-  int x,y,width,height;
-  
-  backup=*bitmap;
+  int x,y,copywidth,copyheight;
+
+  /* Copy into the backup */
+  memcpy(&backup,bitmap,sizeof(GSM_Bitmap));
       
   if (target==GSM_StartupLogo) {
-    bitmap->width=84;
-    bitmap->height=48;
-  }
-  if (target==GSM_7110StartupLogo) {
-    bitmap->width=96;
-    bitmap->height=65;
-  }
-  if (target==GSM_6210StartupLogo) {
-    bitmap->width=96;
-    bitmap->height=60;
-  }
-  if (target==GSM_OperatorLogo || target==GSM_CallerLogo) {
-    bitmap->width=72;
-    bitmap->height=14;
-  }
-  if (target==GSM_PictureImage ) {
+    bitmap->width=info->StartupLogoW;
+    bitmap->height=info->StartupLogoH;
+    bitmap->size=((bitmap->height/8)+(bitmap->height%8>0))*bitmap->width;
+  }
+  if (target==GSM_OperatorLogo) {
+    bitmap->width=info->OpLogoW;
+    bitmap->height=info->OpLogoH;
+    x=bitmap->width*bitmap->height;
+    bitmap->size=(x/8)+(x%8>0);
+  }
+  if (target==GSM_CallerLogo) {
+    bitmap->width=info->CallerLogoW;
+    bitmap->height=info->CallerLogoH;
+    x=bitmap->width*bitmap->height;
+    bitmap->size=(x/8)+(x%8>0);
+  }
+  if (target==GSM_PictureImage) {
     bitmap->width=72;
     bitmap->height=28;
-  }
-  if (target==GSM_7110OperatorLogo) {
-    bitmap->width=78;
-    bitmap->height=21;
+    bitmap->size=bitmap->width*bitmap->height/8;
   }
   bitmap->type=target;
-  bitmap->size=GSM_GetBitmapSize(bitmap);
-  
-  width=backup.width;
-  if (bitmap->width<width) {
-    width=bitmap->width;
+
+  if (backup.width>bitmap->width) {
+    copywidth=bitmap->width;
 #ifdef DEBUG
-    fprintf(stdout,_("We lost some part of image - it's cut (width from %i to %i) !\n"),backup.width,width);
+    fprintf(stdout,_("We lost some part of image - it's cut (width from %i to %i) !\n"),backup.width,bitmap->width);
 #endif /* DEBUG */
-  }
-  
-  height=backup.height;
-  if (bitmap->height<height) {
-    height=bitmap->height; 
+  } else copywidth=backup.width;
+
+  if (backup.height>bitmap->height) {
+    copyheight=bitmap->height;
 #ifdef DEBUG
-    fprintf(stdout,_("We lost some part of image - it's cut (height from %i to %i) !\n"),backup.height,height);
+    fprintf(stdout,_("We lost some part of image - it's cut (height from %i to %i) !\n"),backup.height,bitmap->height);
 #endif /* DEBUG */
-  }
+  } else copyheight=backup.height;
   
+
   GSM_ClearBitmap(bitmap);
   
-  for (y=0;y<height;y++) {
-    for (x=0;x<width;x++)
+  for (y=0;y<copyheight;y++) {
+    for (x=0;x<copywidth;x++)
       if (GSM_IsPointBitmap(&backup,x,y)) GSM_SetPointBitmap(bitmap,x,y);
   }
-  
-//GSM_PrintBitmap(&backup);
-//GSM_PrintBitmap(bitmap);
 }
 
 void GSM_PrintBitmap(GSM_Bitmap *bitmap)
@@ -209,95 +132,115 @@ void GSM_PrintBitmap(GSM_Bitmap *bitmap)
   }
 }
 
-int GSM_SaveBitmapToSMS(GSM_MultiSMSMessage *SMS, GSM_Bitmap *bitmap,
-                        bool ScreenSaver, bool UnicodeText)
-{
-  char MessageBuffer[GSM_MAX_SMS_8_BIT_LENGTH*4];
-  int MessageLength=0;
-  GSM_UDH UDHType=GSM_NoUDH;
-  
-  switch (bitmap->type) {
-    case GSM_OperatorLogo:
-      UDHType=GSM_OpLogo;
 
-      EncodeNetworkCode(MessageBuffer, bitmap->netcode);
-      MessageLength=3;
-
-      /* Set the logo size */
-      MessageBuffer[MessageLength++] = 0x00;
-      MessageBuffer[MessageLength++] = bitmap->width;
-      MessageBuffer[MessageLength++] = bitmap->height;
-      MessageBuffer[MessageLength++] = 0x01;
-
-      memcpy(MessageBuffer+MessageLength,bitmap->bitmap,bitmap->size);
-      MessageLength=MessageLength+bitmap->size;
-
-      break;
-    case GSM_CallerLogo:
-      UDHType=GSM_CallerIDLogo;
-
-      /* Set the logo size */
-      MessageBuffer[MessageLength++] = 0x00;
-      MessageBuffer[MessageLength++] = bitmap->width;
-      MessageBuffer[MessageLength++] = bitmap->height;
-      MessageBuffer[MessageLength++] = 0x01;
-
-      memcpy(MessageBuffer+MessageLength,bitmap->bitmap,bitmap->size);
-      MessageLength=MessageLength+bitmap->size;
+GSM_Error GSM_ReadSMSBitmap(GSM_SMSMessage *message, GSM_Bitmap *bitmap)
+{
+  int offset = 1;
 
-      break;
-    case GSM_PictureImage:
-      UDHType=GSM_ProfileUDH;
+  switch (SMS_DetectUDH(message)) {
+  case GSM_OpLogo:
+    if (message->MessageTextLength!=133+7) return GE_UNKNOWN;
+    
+    bitmap->type = GSM_OperatorLogo;
 
-      MessageBuffer[MessageLength++]=0x30;     //SM version. Here 3.0
+    bitmap->netcode[0] = '0' + (message->MessageText[0] & 0x0f);
+    bitmap->netcode[1] = '0' + (message->MessageText[0] >> 4);
+    bitmap->netcode[2] = '0' + (message->MessageText[1] & 0x0f);
+    bitmap->netcode[3] = ' ';
+    bitmap->netcode[4] = '0' + (message->MessageText[2] & 0x0f);
+    bitmap->netcode[5] = '0' + (message->MessageText[2] >> 4);
+    bitmap->netcode[6] = 0;
 
-      if (!ScreenSaver)
-        MessageBuffer[MessageLength++]=SM30_OTA; //ID for OTA bitmap
-      else
-        MessageBuffer[MessageLength++]=SM30_SCREENSAVER; //ID for screen saver
+    offset = 4;
+    break;
 
-      /* Length for picture part */
-      MessageBuffer[MessageLength++]=0x01;     //length hi
-      MessageBuffer[MessageLength++]=0x00;     //length lo
+  case GSM_CallerIDLogo:
+    if (message->MessageTextLength!=130+7) return GE_UNKNOWN;
+    bitmap->type=GSM_CallerLogo;
+    break;
+  default: /* error */
+    return GE_UNKNOWN;
+    break;
+  }
+  bitmap->width = message->MessageText[offset];
+  bitmap->height = message->MessageText[offset + 1];
+  
+  if (bitmap->width!=72 || bitmap->height!=14) return GE_INVALIDIMAGESIZE;
+  
+  bitmap->size = (bitmap->width * bitmap->height) / 8;
+  memcpy(bitmap->bitmap, message->MessageText + offset + 3, bitmap->size);
 
-      /* Set the logo size */
-      MessageBuffer[MessageLength++] = 0x00;
-      MessageBuffer[MessageLength++] = bitmap->width;
-      MessageBuffer[MessageLength++] = bitmap->height;
-      MessageBuffer[MessageLength++] = 0x01;
+#ifdef DEBUG
+  fprintf(stdout, _("Bitmap from SMS: width %i, height %i\n"),bitmap->width,bitmap->height);
+#endif
 
-      memcpy(MessageBuffer+MessageLength,bitmap->bitmap,bitmap->size);
-      MessageLength=MessageLength+bitmap->size;
+  return GE_NONE;
+}
 
-      if (strlen(bitmap->text)!=0) {
-        if (UnicodeText) {
-          MessageBuffer[MessageLength++]=SM30_UNICODETEXT; //ID for Unicode text
 
-          /* Length for text part */
-          MessageBuffer[MessageLength++]=0x00;             //length of text1
-          MessageBuffer[MessageLength++]=strlen(bitmap->text)*2;//length of text2
+/* Returns message length */
 
-          EncodeUnicode (MessageBuffer+MessageLength,bitmap->text,strlen(bitmap->text));
-          MessageLength=MessageLength+2*strlen(bitmap->text);
-        } else {
-          MessageBuffer[MessageLength++]=SM30_ISOTEXT;    //ID for ISO-8859-1 text
+int GSM_SaveSMSBitmap(GSM_SMSMessage *message, GSM_Bitmap *bitmap)
+{
+  int current=0;
+  
+  char UserDataHeader[7] = {	0x06, /* UDH Length */
+		  		0x05, /* IEI: application port addressing scheme, 16 bit address */
+		  		0x04, /* IEI length */
+                		0x15, /* destination address: high byte */
+				0x00, /* destination address: low byte */
+                		0x00, /* originator address */
+				0x00};
+
+  char Data[7] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+  
+  /* Default settings for SMS message:
+      - no delivery report
+      - Class Message 1
+      - no compression
+      - 8 bit data
+      - SMSC no. 1
+      - validity 3 days
+      - set UserDataHeaderIndicator
+  */
+
+  message->Type = GST_MO;
+  message->Class = 1;
+  message->Compression = false;
+  message->EightBit = true;
+  message->MessageCenter.No = 1;
+  message->Validity = 4320; /* 4320 minutes == 72 hours */
+  message->ReplyViaSameSMSC = false;
 
-          /* Length for text part */
-          MessageBuffer[MessageLength++]=0x00;            //length of text1
-          MessageBuffer[MessageLength++]=strlen(bitmap->text); //length of text2
+  switch (bitmap->type) {
+    case GSM_OperatorLogo:
+      message->UDHPresent = true;
+      UserDataHeader[4] = 0x82; /* NBS port 0x1582 */
+      
+      /* Set the network code */
+      Data[current++] = ((bitmap->netcode[1] & 0x0f) << 4) | (bitmap->netcode[0] & 0xf);
+      Data[current++] = 0xf0 | (bitmap->netcode[2] & 0x0f);
+      Data[current++] = ((bitmap->netcode[5] & 0x0f) << 4) | (bitmap->netcode[4] & 0xf);
 
-          memcpy(MessageBuffer+MessageLength,bitmap->text,strlen(bitmap->text));
-          MessageLength=MessageLength+strlen(bitmap->text);
-       }
-      }
       break;
-    
+    case GSM_CallerLogo:
+      message->UDHPresent = true;
+      UserDataHeader[4] = 0x83; /* NBS port 0x1583 */
+      break;
     default: /* error */
       break;
   }
         
-  GSM_MakeMultiPartSMS2(SMS,MessageBuffer,MessageLength, UDHType, GSM_Coding_Default);
+  /* Set the logo size */
+  current++;
+  Data[current++] = bitmap->width;
+  Data[current++] = bitmap->height;
 
-  return 0;
-}
+  Data[current++] = 0x01;
+
+  memcpy(message->UDH,UserDataHeader,7);
+  memcpy(message->MessageText,Data,current);
+  memcpy(message->MessageText+current,bitmap->bitmap,bitmap->size);
 
+  return current;
+}