Merge lp:~rakete/eidete/custom-recording-area-fix into lp:eidete

[Andreas Raster]

A few small fixes to make recording custom areas work for me on oneiric.

I couldn't record a custom area, it would always record the whole screen. Changing when the recording pipline is set to State.READY fixed that. I made the assumption that setting configuration values of the ximagesrc element needs to be able to allocate new resources, and that setting the pipeline to State.READY before would prevent that.

I made other small fixes like making sure the area coordinates are within a screen and to the discrete recantangle that marks the recording area after recording started, it shouldn't show up in the video.

I added a missing check to disable showing the super key when it is released in keyview.

[Tom Beckmann (tombeckmann)]

review: Approve

=== modified file 'src/Widgets/keyview.vala'
--- src/Widgets/keyview.vala	2012-01-20 19:34:41 +0000
+++ src/Widgets/keyview.vala	2012-03-23 15:47:18 +0000
@@ -150,6 +150,11 @@
 							this.alt = false;
 							this.queue_draw ();
 							break;
+						case "Super_L":
+						case "Super_R":
+							this.super = false;
+							this.queue_draw ();
+							return;
 					}
 				}else{
 					string res = keyvalue;

=== modified file 'src/Widgets/selectionarea.vala'
--- src/Widgets/selectionarea.vala	2012-01-14 22:32:06 +0000
+++ src/Widgets/selectionarea.vala	2012-03-23 15:47:18 +0000
@@ -40,13 +40,45 @@
 				this.begin_move_drag ((int)e.button, (int)e.x_root, (int)e.y_root, e.time);
 				return false;
 			});
-			
+
 			this.configure_event.connect ((e) => {
-				x = e.x;
-				y = e.y;
-				w = e.width;
-				h = e.height;
-				geometry_changed (e.x, e.y, e.width, e.height);
+				// check if coordinates are out of the screen and check
+				// if coordinate + width/height is out of the screen, then
+				// adjust coordinates to keep width and height (and aspect
+				// ratio) intact
+				if( e.x < 0 || e.x > e.window.get_screen().width() ) {
+					x = 0;
+				} else if( e.x + e.width > e.window.get_screen().width()
+						   && e.width < e.window.get_screen().width() ) {
+					x = e.window.get_screen().width() - e.width;
+				} else {
+					x = e.x;
+				}
+				
+				if( e.y < 0 ) {
+					y = 0;
+				} else if( e.y + e.height >= e.window.get_screen().height()
+						   && e.height < e.window.get_screen().height() ) {
+					y = e.window.get_screen().height() - e.height - 1;
+				} else {
+					y = e.y;
+				}
+
+				// just in case an edge is still outside of the screen
+				// we'll modify the width/height if thats the case
+				if( x + e.width > e.window.get_screen().width() ) {
+					w = e.window.get_screen().width() - x;
+				} else {
+					w = e.width;
+				}
+
+				if( y + e.height > e.window.get_screen().height() ) {
+					h = e.window.get_screen().height() - y;
+				} else {
+					h = e.height;
+				}
+				
+				geometry_changed (x, y, w, h);
 				return false;
 			});
 			
@@ -103,7 +135,7 @@
 			this.set_keep_above (true);
 			this.queue_draw ();
 			this.resize (w+6, h+6);
-			this.move (x, y);
+			this.move (x, y-1);
 			this.deletable = false;
 			
 			this.realize ();

=== modified file 'src/eidete.vala'
--- src/eidete.vala	2012-01-20 21:04:36 +0000
+++ src/eidete.vala	2012-03-23 15:47:18 +0000
@@ -431,7 +431,6 @@
 				                  audioconvert ! audioresample ! audiorate ! vorbisenc ! queue", true);
 			}catch (Error e){ stderr.printf ("Error: %s\n", e.message);}
 			
-			pipeline.set_state (State.READY);
 			
 			string cores;
 			try{
@@ -471,12 +470,13 @@
 			muxer.link (sink);
 			
 			pipeline.get_bus ().add_watch (bus_message_cb);
-			pipeline.set_state (State.PLAYING);
-			
+
+			pipeline.set_state (State.READY);
 			
 			if (selectionarea != null)
 				selectionarea.to_discrete ();
 			
+			pipeline.set_state (State.PLAYING);
 		}
 		
 		private bool bus_message_cb (Gst.Bus bus, Message msg){