Changeset 849

Timestamp:

01/28/08 18:03:27 (10 months ago)

Author:

michux

Message:

added pingpong scrolling

Location:

trunk

Files:

• widget_text.c (modified) (6 diffs)
• widget_text.h (modified) (2 diffs)

trunk/widget_text.c

@@ -6 +6 @@
  * Copyright (C) 2003, 2004 Michael Reinelt <michael@reinelt.co.at>
  * Copyright (C) 2004 The LCD4Linux Team <lcd4linux-devel@users.sourceforge.net>
+ * Copyright (C) 2008 Michael Vogt <michu@neophob.com> 
  *
  * This program is free software; you can redistribute it and/or modify
@@ -96 +97 @@
   if (T->scroll >= width + len)
       T->scroll = 0;
+  break;  
+    case ALIGN_PINGPONG:
+#define PINGPONGWAIT 2
+
+  /* scrolling is not necessary - center the string */
+  if (len <= width) {
+      pad = (width - len) / 2;
+  }
+  else {
+      if (T->direction == 1)
+    T->scroll++;    /* scroll right */
+      else
+    T->scroll--;    /* scroll left */
+    
+      /*pad = if positive, add leading space characters, else offset of string begin */ 
+      pad = 0-T->scroll;
+      
+      if (pad < 0-(len-width)) {
+    if (T->delay-- < 1) { /* wait before switch direction */
+        T->direction = 0; /* change scroll direction */
+        T->delay = PINGPONGWAIT;
+        T->scroll -= PINGPONGWAIT;
+    } /* else debug("wait1"); */
+    pad = 0-(len-width);
+      } 
+      else
+      if (pad > 0) {
+    if (T->delay-- < 1) {
+        T->direction = 1;
+        T->delay = PINGPONGWAIT;
+        T->scroll += PINGPONGWAIT;
+    } /* else debug("wait2"); */
+    pad = 0;
+      }
+      
+  }
   break;
     default:      /* not reached  */
@@ -220 +257 @@
     /* something has changed and should be updated */
     if (update) {
-  /* reset marquee counter if content has changed */
+  /* reset marquee counter if content has changed */  
   T->scroll = 0;
+  
+  /* Init pingpong scroller. start scrolling left (wrong way) to get a delay */
+  if (T->align == ALIGN_PINGPONG) {
+      T->direction = 0; 
+      T->delay = PINGPONGWAIT;
+  }
   /* if there's a marquee scroller active, it has its own */
   /* update callback timer, so we do nothing here; otherwise */
   /* we simply call this scroll callback directly */
-  if (T->align != ALIGN_MARQUEE || T->align != ALIGN_AUTOMATIC) {
+  if (T->align != ALIGN_MARQUEE || T->align != ALIGN_AUTOMATIC || T->align != ALIGN_PINGPONG) {
       widget_text_scroll(Self);
   }
@@ -288 +331 @@
   Text->align = ALIGN_AUTOMATIC;
   break;
+    case 'P':
+  Text->align = ALIGN_PINGPONG;
+  break;              
     default:
   error("widget %s has unknown alignment '%s', using 'Left'", section, c);
@@ -301 +347 @@
 
     /* marquee scroller speed: interval (msec), default 500msec */
-    if (Text->align == ALIGN_MARQUEE || Text->align == ALIGN_AUTOMATIC) {
+    if (Text->align == ALIGN_MARQUEE || Text->align == ALIGN_AUTOMATIC || Text->align == ALIGN_PINGPONG) {
   cfg_number(section, "speed", 500, 10, -1, &(Text->speed));
     }
@@ -315 +361 @@
 
     /* a marquee scroller has its own timer and callback */
-    if (Text->align == ALIGN_MARQUEE || Text->align == ALIGN_AUTOMATIC) {
+    if (Text->align == ALIGN_MARQUEE || Text->align == ALIGN_AUTOMATIC || Text->align == ALIGN_PINGPONG) {
   timer_add(widget_text_scroll, Self, Text->speed, 0);
     }

trunk/widget_text.h

@@ -31 +31 @@
 #include "property.h"
 
-typedef enum { ALIGN_LEFT, ALIGN_CENTER, ALIGN_RIGHT, ALIGN_MARQUEE, ALIGN_AUTOMATIC } TEXT_ALIGN;
+typedef enum { ALIGN_LEFT, ALIGN_CENTER, ALIGN_RIGHT, ALIGN_MARQUEE, ALIGN_AUTOMATIC, ALIGN_PINGPONG } TEXT_ALIGN;
 
 typedef struct WIDGET_TEXT {
@@ -46 +46 @@
     int scroll;     /* marquee starting point */
     int speed;      /* marquee scrolling speed */
+    int direction;    /* pingpong direction, 0=right, 1=left */
+    int delay;      /* pingpong scrolling, wait before switch direction */
 } WIDGET_TEXT;