serdisplib-ruby 0.5.1-x86-linux → 0.5.2-x86-linux

data/build.sh

@@ -21,8 +21,10 @@ gem build serdisplib-ruby.gemspec
 # Build make source archive
 pushd ..
 find | grep \.svn$ | cut -c3- > exclude.txt
-tar cvfX serdisplib-ruby.tar.gz exclude.txt serdisplib-ruby/
-rm exclude.txt
+tar cvfX serdisplib-ruby.tar exclude.txt serdisplib-ruby/
+#rm exclude.txt
+gzip serdisplib-ruby.tar
+file serdisplib-ruby.tar.gz
 popd
 
 echo "Done."

data/examples/imlib2_util.rb

@@ -14,40 +14,49 @@ require 'imlib2'
 module Imlib2Util
   
   #
+  # Convert Imlib2 image ARGB 8-bit per channel data into a Ruby array.
   # 
+  # Note: Imlib2-Ruby returns the data as each array element being a pixel
+  # component (i.e. Alpha or Red or Blue or Green), this function combines
+  # them back to ARGB data.
   #
-  def Imlib2Util.imlib_image_to_serdisp_data( im )
+  def Imlib2Util.imlib_image_to_argb_serdisp_data( im )
   
     im_width = im.width
     im_height = im.height
     im_rgba_data = im.data_for_reading_only( )
     im_lcd_data = []
-    im_height.times do 
-      hoz_line = []
-      im_width.times do hoz_line << 0; end
-      im_lcd_data << hoz_line
+    im_height.times do
+      im_lcd_data << Array.new( im_width )
     end
-      
+    
     im_width.times do |x|
       im_height.times do |y|
 
-        ##### im_lcd_data[y][x] |= ( im_rgba_data[x + (y * im_width)] & 0x00FFFFFF )
-        im_lcd_data[y][x] = im_rgba_data[x + (y * im_width)]
-        
-	#im_lcd_data[y][x] |= ( im_rgba_data[0 + x + (y*im_width)] & 0x00FFFFFF ) > 0 ? 0x01 << 7 : 0x00 << 7;
-	#im_lcd_data[y][x] |= ( im_rgba_data[1 + x + (y*im_width)] & 0x00FFFFFF ) > 0 ? 0x01 << 6 : 0x00 << 6;
-	#im_lcd_data[y][x] |= ( im_rgba_data[2 + x + (y*im_width)] & 0x00FFFFFF ) > 0 ? 0x01 << 5 : 0x00 << 5;
-	#im_lcd_data[y][x] |= ( im_rgba_data[3 + x + (y*im_width)] & 0x00FFFFFF ) > 0 ? 0x01 << 4 : 0x00 << 4;
-	#im_lcd_data[y][x] |= ( im_rgba_data[4 + x + (y*im_width)] & 0x00FFFFFF ) > 0 ? 0x01 << 3 : 0x00 << 3;
-	#im_lcd_data[y][x] |= ( im_rgba_data[5 + x + (y*im_width)] & 0x00FFFFFF ) > 0 ? 0x01 << 2 : 0x00 << 2;
-	#im_lcd_data[y][x] |= ( im_rgba_data[6 + x + (y*im_width)] & 0x00FFFFFF ) > 0 ? 0x01 << 1 : 0x00 << 1;
-	#im_lcd_data[y][x] |= ( im_rgba_data[7 + x + (y*im_width)] & 0x00FFFFFF ) > 0 ? 0x01 << 0 : 0x00 << 0;        
+        pixel_ind = 4 * ( x + ( y * im_width ) )
+        a = im_rgba_data[pixel_ind + 0]
+        r = im_rgba_data[pixel_ind + 1]
+        g = im_rgba_data[pixel_ind + 2]
+        b = im_rgba_data[pixel_ind + 3]
+          
+        im_lcd_data[y][x] = ( a << 24 ) | ( r << 16 ) | ( g << 8 ) | b
       end
     end
       
     im_lcd_data
   end
   
+  #
+  # Render's centered text on the Imlib2 image buffer given a vertical 
+  # position.
+  #
+  def Imlib2Util.imlib_draw_centered_text( dd, ypos, im, font, text )
+          
+    fw, fh = font.size text
+    fx, fy = (im.width - fw) / 2, ypos
+    im.draw_text( font, text, fx, fy, Imlib2::Color::WHITE )    
+  end
+  
 end
 
 # End of imlib2_util.rb

data/examples/uptime.rb

@@ -79,9 +79,21 @@ def print_interpreter_usage( )
   puts "\n\n"
   puts "exit | quit | q          exit this program"
   puts "help | h                 display this usage information"
+  puts "invert | inv             toggle display inversion"
+  puts "rotate | rot             rotate display 180 degrees"
   puts "delay | d <[0-9]+>       update refresh delay in seconds (default: 2)\n\n"
 end
 
+#
+# Call `uptime` and parse uptime output, returning separate pieces as set.
+#
+def get_uptime_info( )
+  
+  uptime_output = `uptime`
+  uptime_output =~ /([A-Za-z0-9: ]+),[ \t]+([0-9]+)[ \t]+users,[ \t]+load average: ([0-9.]+), ([0-9.]+), ([0-9.]+)/
+  return $1.strip, $2.strip, $3.strip, $4.strip, $5.strip
+end
+
 #-----------------------------------------------------------------------------
 # Entry-Point
 #-----------------------------------------------------------------------------
@@ -142,28 +154,25 @@ if ( __FILE__ == $0 ) then
           h = serdisp_getheight( dd )
           w = serdisp_getwidth( dd )        
           im = Imlib2::Image.new( w, h )
-          Imlib2::Font.add_path '/home/dhm/projects/library.ruby/trunk/gem/serdisp/examples/fonts'
-          font = Imlib2::Font.new( 'yudit/10' ) 
-          text = "Testing: UPTIME INFO"
-          fw, fh = font.size text
-          fx, fy = (im.width - fw) / 2, (im.height / 2 - fh ) / 2
-          im.draw_text font, text, fx, fy, Imlib2::Color::RED
-          im.save( 'test.png' )
-
+          Imlib2::Font.add_path( 'fonts' )
+          font = Imlib2::Font.new( 'yudit/14' )
+          
           while ( g_loop )
-
-            uptime_output = `uptime`
-            puts "output: #{uptime_output}"
+            im.clear( )
+            time, users, load1, load5, load15 = get_uptime_info( )
+            Imlib2Util.imlib_draw_centered_text( dd, 5, im, font, time )
+            Imlib2Util.imlib_draw_centered_text( dd, 25, im, font, "#{users} users" )
+            Imlib2Util.imlib_draw_centered_text( dd, 45, im, font, "#{load1}, #{load5}, #{load15}" )
             
-            lcd_data = Imlib2Util.imlib_image_to_serdisp_data( im )
+            lcd_data = Imlib2Util.imlib_image_to_argb_serdisp_data( im )
             im.width.times do |x|
               im.height.times do |y|
 
-                serdisp_setcolour( dd, x, y, lcd_data[y][x] )
-                puts "Value: #{lcd_data[y][x]}" unless ( 0 == lcd_data[y][x] )
+                pixel = ( lcd_data[y][x] & 0x00FFFFFF ) > 0 ? g_fgcolour : g_bgcolour
+                serdisp_setcolour( dd, x, y, pixel )
+                  
               end
             end
-            puts "Done setting LCD."
             
             serdisp_update( dd )
             sleep( g_delay )
@@ -183,6 +192,13 @@ if ( __FILE__ == $0 ) then
           
         when 'q', 'quit', 'exit'
           g_loop = false
+        
+        when 'invert', 'inv'
+          serdisp_setoption( dd, 'INVERT', SD_OPTION_TOGGLE )
+          
+        when /rotate( [0-9]+)?/, /rot( [0-9]+)?/
+          rc = ( nil == $1 ) ? SD_OPTION_TOGGLE : $1.to_i
+          serdisp_setoption( dd, 'ROTATE', rc )
           
         when /delay ([0-9]+)?/, /d ([0-9]+)?/
           puts "Setting delay time to #{$1.to_i} seconds"

data/serdisplib-ruby.gemspec

@@ -1,7 +1,7 @@
 require 'date'
 Gem::Specification.new do |s|
    s.name = %q{serdisplib-ruby}
-   s.version = "0.5.1"
+   s.version = "0.5.2"
    s.date = Date.today.to_s
    s.author = %q{David Muir}
    s.email = %q{dhm@davidmuir.co.uk}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: serdisplib-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.2
 platform: x86-linux
 authors: 
 - David Muir
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-21 00:00:00 +01:00
+date: 2008-06-24 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -32,6 +32,7 @@ files:
 - ext/serdisplib/serdisplib_wrap.o
 - ext/serdisplib/serdisplib.i
 - ext/serdisplib/Makefile
+- serdisplib-ruby-0.5.2-x86-linux.gem
 - ChangeLog
 - setup.rb
 - README