2 files changed, 49 insertions, 50 deletions

diff --git a/noncore/games/kpacman/score.cpp b/noncore/games/kpacman/score.cpp
index 6878b81..737f03b 100644
--- a/noncore/games/kpacman/score.cpp
+++ b/noncore/games/kpacman/score.cpp
@@ -114,261 +114,261 @@ void Score::paintEvent( QPaintEvent *e)
         if (rect(1, 6*1.25, tr("    YOU HAVE ARCHIEVED    ")).intersects(e->rect())) {
             QPixmap pix = bitfont->text(tr("    YOU HAVE ARCHIEVED    "), CYAN, BLACK);
             bitBlt(this, x(1), y(6*1.25), &pix);
         }
         if (rect(1, 7*1.25, tr("  A SCORE IN THE TOP 10.  ")).intersects(e->rect())) {
             QPixmap pix = bitfont->text(tr("  A SCORE IN THE TOP 10.  "), CYAN, BLACK);
             bitBlt(this, x(1), y(7*1.25), &pix);
         }
         if (rect(1, 8*1.25, tr("                          ")).intersects(e->rect())) {
             QPixmap pix = bitfont->text(tr("                          "), CYAN, BLACK);
             bitBlt(this, x(1), y(8*1.25), &pix);
         }
     }
 
     if (rect(1, 9.5*1.25, tr("RNK   SCORE  NAME   DATE")).intersects(e->rect())) {
             QPixmap pix = bitfont->text(tr("RNK   SCORE  NAME   DATE"), WHITE, BLACK);
         bitBlt(this, x(1), y(9.5*1.25), &pix);
     }
 
     for (int i = 0; i < 10; i++) {
         s.sprintf("%2d%9d  %-3.3s  %-8.8s",
             i+1, hallOfFame[i].points, hallOfFame[i].name.utf8().data(),
             formatDate(hallOfFame[i].moment.date()).data());
         if (rect(1, (11+i)*1.25, s).intersects(e->rect())) {
             QPixmap pix = bitfont->text(s, (i == lastScore) ? YELLOW : WHITE, BLACK);
             bitBlt(this, x(1), y((11+i)*1.25), &pix);
         }
     }
 
     if (cursor.x != -1 && cursor.y != -1 && cursor.on) {
         if (rect(cursor.x, (cursor.y*1.25), cursor.chr).intersects(e->rect())) {
             QPixmap pix = bitfont->text(cursor.chr, BLACK, YELLOW);
             bitBlt(this, x(cursor.x), y(cursor.y*1.25), &pix);
         }
     }
 
     if (paused) {
 
         QPixmap pix = bitfont->text(tr("PAUSED"), RED, BLACK);
         QRect r = bitfont->rect(tr("PAUSED"));
         r.moveCenter(QPoint(this->width()/2, this->height()/2));
 
         bitBlt(this, r.x(), r.y(), &pix);
     }
 }
 
 void Score::timerEvent(QTimerEvent*)
 {
     cursor.on = !cursor.on;
 
     if (paused)
         return;
 
     if (cursor.x != -1 && cursor.y != -1)
         repaint(rect(cursor.x, cursor.y*1.25, cursor.chr), FALSE);
     scrollRepeat = FALSE;
 
     if (lastPlayer == 0)
         repaint(rect(1, 0, tr("  1UP ")), FALSE);
 
     if (lastPlayer == 1)
         repaint(rect(21, 0, tr("  2UP ")), FALSE);
 }
 
 void Score::keyPressEvent(QKeyEvent *k)
 {
     if (lastScore < 0 || lastPlayer < 0 || lastPlayer >= maxPlayer || paused) {
         k->ignore();
         return;
     }
 
     int x = cursor.x;
     int y = cursor.y;
 
     uint key = k->key();
 
     if (scrollRepeat && (key == UpKey || key == Key_Up || key == DownKey || key == Key_Down)) {
         k->ignore();
         return;
     }
 
     if (key != Key_Return) {
         if (key == RightKey || key == Key_Right)
             if (++cursor.x > 16)
                 cursor.x = 14;
         if (key == LeftKey || key == Key_Left)
             if (--cursor.x < 14)
                 cursor.x = 16;
         if (key == UpKey || key == Key_Up)
             if (cursor.chr.unicode() < bitfont->lastChar())
                 cursor.chr = cursor.chr.unicode()+1;
             else
                 cursor.chr = bitfont->firstChar();
         if (key == DownKey || key == Key_Down)
             if (cursor.chr.unicode() > bitfont->firstChar())
                 cursor.chr = cursor.chr.unicode()-1;
             else
                 cursor.chr = bitfont->lastChar();
 
         if (cursor.x == x && cursor.y == y &&
             cursor.chr == hallOfFame[lastScore].name.at(cursor.x-14)) {
             uint ascii = k->ascii();
 
             if (ascii < bitfont->firstChar() || ascii > bitfont->lastChar())
                 ascii = toupper(ascii);
 
             if (ascii >= bitfont->firstChar() && ascii <= bitfont->lastChar()) {
                 cursor.chr = ascii;
                 hallOfFame[lastScore].name.at(cursor.x-14) = cursor.chr;
                 if (++cursor.x > 16)
                     cursor.x = 14;
             }
         }
     }
 
     if (key == Key_Return) {
         playerName[lastPlayer] = hallOfFame[lastScore].name;
         write();
         read();
         lastScore = -1;
         cursor.x = -1;
         cursor.y = -1;
 //      killTimers();
         emit toggleNew();
         end();
     }
 
     if (x != cursor.x || y != cursor.y) {
-        if (cursor.x != -1)
+        if (cursor.x != -1 && lastScore >= 0)
             cursor.chr = hallOfFame[lastScore].name.at(cursor.x-14);
         scrollRepeat = FALSE;
         repaint(rect(x, y*1.25, cursor.chr), FALSE);
-    } else
+    } else if (lastScore >= 0)
         hallOfFame[lastScore].name.at(cursor.x-14) = cursor.chr;
 
     if (key == UpKey || key == Key_Up || key == DownKey || key == Key_Down)
        scrollRepeat = TRUE;
     else
        repaint(rect(cursor.x, cursor.y*1.25, cursor.chr), FALSE);
 }
 
 void Score::initKeys()
 {
     APP_CONFIG_BEGIN( cfg );
     QString up("Up");
     up = cfg->readEntry("upKey", (const char*) up);
     UpKey    = KAccel::stringToKey(up);
 
     QString down("Down");
     down = cfg->readEntry("downKey", (const char*) down);
     DownKey  = KAccel::stringToKey(down);
 
     QString left("Left");
     left = cfg->readEntry("leftKey", (const char*) left);
     LeftKey  = KAccel::stringToKey(left);
 
     QString right("Right");
     right = cfg->readEntry("rightKey", (const char*) right);
     RightKey = KAccel::stringToKey(right);
     APP_CONFIG_END( cfg );
 }
 
 void Score::confTiming(bool defGroup)
 {
     APP_CONFIG_BEGIN( cfg );
     if (defGroup || cfg->hasKey("CursorBlinkMS"))
         cursorBlinkMS = cfg->readNumEntry("CursorBlinkMS", 250);
     if (defGroup || cfg->hasKey("HallOfFameMS"))
         hallOfFameMS = cfg->readNumEntry("HallOfFameMS", 7000);
     if (defGroup || cfg->hasKey("AfterPauseMS"))
         afterPauseMS = cfg->readNumEntry("AfterPauseMS", 1000);
     APP_CONFIG_END( cfg );
 }
 
 void Score::confScheme()
 {
     APP_CONFIG_BEGIN( cfg );
     SAVE_CONFIG_GROUP( cfg, oldgroup );
     QString newgroup;
 
     // if not set, read mode and scheme from the configfile
     if (mode == -1 && scheme == -1) {
         scheme = cfg->readNumEntry("Scheme", -1);
         mode = cfg->readNumEntry("Mode", -1);
 
         // if mode is not set in the defGroup-group, lookup the scheme group
         if (scheme != -1 || mode == -1) {
             newgroup.sprintf("Scheme %d", scheme);
             cfg->setGroup(newgroup);
 
             mode = cfg->readNumEntry("Mode", -1);
             RESTORE_CONFIG_GROUP( cfg, oldgroup );
         }
     }
 
     int oldCursorBlinkMS = cursorBlinkMS;
 
     confTiming();
 
     if (mode != -1) {
         newgroup.sprintf("Mode %d", mode);
         cfg->setGroup(newgroup);
 
         confTiming(FALSE);
     }
 
     if (scheme != -1) {
         newgroup.sprintf("Scheme %d", scheme);
         cfg->setGroup(newgroup);
 
         confTiming(FALSE);
     }
 
     if (cursorBlinkMS != oldCursorBlinkMS) {
         if (cursorBlinkTimer)
             killTimer(cursorBlinkTimer);
         cursorBlinkTimer = startTimer(cursorBlinkMS);
     }
 
     RESTORE_CONFIG_GROUP( cfg, oldgroup );
     APP_CONFIG_END( cfg );
 }
 
 void Score::setScheme(int Scheme, int Mode, Bitfont *font)
 {
     mode = Mode;
     scheme = Scheme;
 
     confScheme();
 
     bitfont = font;
 
     for (int p = 0; p < maxPlayer; p++)
         for (uint i = 0; i < playerName[p].length(); i++)
             if (playerName[p].at(i) < bitfont->firstChar() ||
                 playerName[p].at(i) > bitfont->lastChar())
                 playerName[p].at(i) = playerName[p].at(i).upper();
 
     for (int i = 0; i < 10; i++)
         for (uint j = 0; j < hallOfFame[i].name.length(); j++)
             if (hallOfFame[i].name.at(j) < bitfont->firstChar() ||
                 hallOfFame[i].name.at(j) > bitfont->lastChar())
                 hallOfFame[i].name.at(j) = hallOfFame[i].name.at(j).upper();
 
     if (cursor.chr.unicode() < bitfont->firstChar() ||
         cursor.chr.unicode() > bitfont->lastChar())
         cursor.chr = cursor.chr.upper();
 }
 
 void Score::set(int score)
 {
     set(score, 0);
 }
 
 void Score::set(int score, int player)
 {
     if (player < 0 || player >= maxPlayer)
         return;
 
     lastPlayer = player;
     playerScore[lastPlayer] = score;
diff --git a/noncore/todayplugins/stockticker/libstocks/http.c b/noncore/todayplugins/stockticker/libstocks/http.c
index cc78ab7..155ce4b 100644
--- a/noncore/todayplugins/stockticker/libstocks/http.c
+++ b/noncore/todayplugins/stockticker/libstocks/http.c
@@ -1,303 +1,302 @@
 /* libstocks - Library to get current stock quotes from Yahoo Finance
  *
  * Copyright (C) 2000 Eric Laeuffer
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
 
 #define __HTTP_C__
 #ifndef __UNIX__
 #define __UNIX__
 #endif
 
 #ifdef __UNIX__
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <unistd.h>
 #elif __WINDOWS__
 #include <winsock.h>
 #include <mbstring.h>
 #endif
 
 #include <sys/types.h>
 #include <ctype.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 
 #include "http.h"
 #include "stocks.h"
 
 #define BUF_SIZE 1024
 #define HEADER_MAXBUF 512
 
 /* pointer to proxy server name or NULL */
 char *http_proxy_server=NULL;
 /* proxy server port number or 0 */
 int http_proxy_port=0;
 
 /*****************************************************************************/
 /* Gets the file from http://http_server/http_file                           */
 /* This function is used to get quotes csv file from yahoo.                  */
 /* It allocates memory for the file and defines *pdata (the pointer of datas)*/
 /*****************************************************************************/
 libstocks_return_code http_get(char *http_file, char *http_server, char **pdata)
 {
   struct hostent *host;          /* structs needed by socket */
   struct sockaddr_in server;
   int s;                         /* socket descriptor */
   char header[HEADER_MAXBUF];    /* request header */
   int hlg;                       /* header length */
   char buf[BUF_SIZE+1];          /* tempory buffer from socket read */
   int r;                         /* number of bytes read by read function */
   char *data=NULL;               /* http server response */
   int data_lgr;                  /* http server response length */
   char *temp;                    /* pointer used to split header and csv */
   int error_code;                /* error code returned by http server */
   char *csv_ptr;                 /* pointer to the csv content */
   int header_founded;            /* test if header is founded */
 
 #ifdef DEBUG
   printf("*http_get\n");
 #endif
 
   /* get host info by name :*/
   if ((host = gethostbyname( http_proxy_server ? http_proxy_server : http_server)))
     {
       memset((char *) &server,0, sizeof(server));
       memmove((char *) &server.sin_addr, host->h_addr, host->h_length);
       server.sin_family = host->h_addrtype;
       server.sin_port = (unsigned short) htons( http_proxy_server ? http_proxy_port : 80 );
 
-    } else 
-      {
-
+    }
+  else
+    {
 #ifdef DEBUG
-  printf(" gethostbyname : NOK\n");
+      printf(" gethostbyname : NOK\n");
 #endif
-  return ERRHOST;
-      }
+      return ERRHOST;
+    }
 
   /* create socket */
   if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0) 
     {
-
 #ifdef DEBUG
       printf(" create socket : NOK\n");
 #endif
       return ERRSOCK;
     }
 
   setsockopt(s, SOL_SOCKET, SO_KEEPALIVE, 0, 0);
 
   /* connect to server */
   if (connect(s, &server, sizeof(server)) < 0)
     {
 #ifdef DEBUG
       printf(" connect to server : NOK\n");
 #endif
 
 #ifdef __UNIX__
       close(s);
 #elif __WINDOWS__
       closesocket(s);
 #endif
       return ERRCONN;
     }
 
   /* create header */
   if (http_proxy_server) 
     {
       sprintf(header,"GET http://%.128s:80%.256s HTTP/1.0\015\012\015\012",
-         http_server, http_file);
+              http_server, http_file);
     }
   else 
     {
       sprintf(header,"GET %s HTTP/1.0\015\012\015\012",http_file);
     }
 
   hlg=strlen(header);
   
   /* send header */
 #ifdef __UNIX__
   if (write(s,header,hlg)!=hlg) 
 #elif __WINDOWS__
   if (send(s,header,hlg, 0)!=hlg)
 #endif
     {
 #ifdef DEBUG
-  printf(" send header : NOK\n");
+      printf(" send header : NOK\n");
 #endif
       return ERRWHEA;         
     }
 
   data_lgr = 0;
   r=1;
   while(r)
     {
       /* Clear Buffer */
       memset(buf,0,BUF_SIZE+1);
 
 #ifdef __UNIX__
       r=read(s,buf,BUF_SIZE);
 #elif __WINDOWS__
       r=recv(s,buf,BUF_SIZE,0);
 #endif      
       
-      if (r)
-  {
-    if(!data_lgr)
-      {
-        if((data = malloc(r+1))==NULL)
-    {
-      fprintf(stderr,"Memory allocating error (%s line %d)\n"
-        ,__FILE__, __LINE__);
-      exit(1);
-    }
+      if (r > 0)
+        {
+          if(!data_lgr)
+            {
+              if((data = malloc(r+1))==NULL)
+                {
+                  fprintf(stderr,"Memory allocating error (%s line %d)\n",
+                          __FILE__, __LINE__);
+                  exit(1);
+                }
         
-        memcpy(data,buf,r);
-        data_lgr = r;
-        data[r]=0;
-      }
-    else
-      {
-        if((temp = malloc(r+data_lgr+1))==NULL)
-    {
-      fprintf(stderr,"Memory allocating error (%s line %d)\n"
-        ,__FILE__, __LINE__);
-      exit(1);
-    }
-        memcpy(temp, data, data_lgr);
-        memcpy(temp+data_lgr, buf, r);
-        temp[r+data_lgr]=0;
-        data_lgr += r;
-        free(data);
-        data = temp;
-      }
-  }
+              memcpy(data,buf,r);
+              data_lgr = r;
+              data[r]=0;
+            }
+          else
+            {
+              if((temp = malloc(r+data_lgr+1))==NULL)
+                {
+                  fprintf(stderr,"Memory allocating error (%s line %d)\n",
+                          __FILE__, __LINE__);
+                  exit(1);
+                }
+              memcpy(temp, data, data_lgr);
+              memcpy(temp+data_lgr, buf, r);
+              temp[r+data_lgr]=0;
+              data_lgr += r;
+              free(data);
+              data = temp;
+            }
+        }
     }
   
   /* close socket */
 #ifdef __UNIX__
   close(s);
 #elif __WINDOWS__
   closesocket(s);
 #endif
 
 #ifdef DEBUG
   printf("%s\n", data);
 #endif
 
   /* get headers to test status line */
   /* and to split headers and content */
   
   temp = data;
   header_founded = 0;
   while( !header_founded )
     {
       if (!temp || *temp==0) return ERRRHEA;
 
       if( *temp==0x0A )
-  {
-    /* test if it is the header end */
-    temp ++;
-    if (*temp == 0x0D) temp++;
-    if (*temp == 0x0A) header_founded = 1;
-  }
+        {
+          /* test if it is the header end */
+          temp ++;
+          if (*temp == 0x0D) temp++;
+          if (*temp == 0x0A) header_founded = 1;
+        }
       else
-  temp++;
+          temp++;
     }
 
   *temp = 0;
   temp++;
 
   sscanf(data,"HTTP/1.%*d %03d",&error_code);
   
   if (error_code != 200)
     {
 #ifdef DEBUG
       printf(" HTTP error code : %d\n", error_code);
 #endif
       free(data);
       return ERRPAHD;
     }
 
   if ((csv_ptr = malloc(strlen(temp)+1))==NULL)
     {
       free(data);
-      fprintf(stderr,"Memory allocating error (%s line %d)\n"
-        ,__FILE__, __LINE__);
+      fprintf(stderr,"Memory allocating error (%s line %d)\n",
+              __FILE__, __LINE__);
       exit(1);
     }
       
   memcpy(csv_ptr, temp, strlen(temp)+1);
   free(data);
 
 #ifdef DEBUG
   printf(" CSV\n");
   printf("%s,\n", csv_ptr);
 #endif
 
   *pdata = csv_ptr;
   
   return 0;
 }
 
 /******************************************************************************/
 /* Set the proxy server to use                                                */
 /******************************************************************************/
 libstocks_return_code set_proxy(char *proxy)
 {
   char *ptr;
   char c;
 
 #ifdef DEBUG
   printf("*set_proxy\n");
 #endif
 
   /* Parse the proxy URL - It must start with http://  */
 #ifdef __UNIX__
   if (strncasecmp("http://",proxy,7)) return ERRPROX;
 #elif __WINDOWS__
   if (_mbsnbicmp("http://",proxy,7)) return ERRPROX;
 #endif
 
   proxy+=7;
 
   /* find ":" in the proxy url */
   ptr = proxy;
   for (c=*ptr; (c && c!=':');) c=*ptr++;
 
   /* ptr points just after the ":" or at the end of proxy if : not founded */
   *(ptr-1)=0;  /* clear the ":"  */
 
   http_proxy_server=strdup(proxy);
   
 #ifdef DEBUG
   printf("http_proxy_server : %s\n", http_proxy_server);
 #endif
 
   /* get the port number of the url */
   if (sscanf(ptr,"%d",&http_proxy_port)!=1) return ERRPROX;
 
 #ifdef DEBUG
   printf("http_proxy_port : %d\n", http_proxy_port);
 #endif
 
   return 0;
 }