Merge lp:~rakete/eidete/scratching-my-itches into lp:eidete

[Andreas Raster]

Focusing to stop recording wouldn't work, a missing save-dialog, missing keys in keyviews and some problems with the selectionarea were fixed.

- it now stops recording and shows the pause menu if you focus the keyview or the selectionarea, those are always the ones compiz focuses first when I alt-tab into eidete to stop recording

- contractor prevents a useable save-dialog for me on oneiric, I am not sure why. I made a hack so it will show up regardless and let me save the file. It works although save-dialog complains. I am not sure if that should be merged, rather contractor should be fixed I guess.

- I added some missing key captions in keyview, and I changed keycapture.c so it uses XkbKeycodeToKeysym, which can lookup the correct Keysym according to shift state. So now shifted key names are shown correctly.

- the previous selectionarea had the problem that the area within the rectangle wasn't actually the area that was recorded, it recorded the area of the window including the handles. The handles prevented correct placement at the edges of the screen. I made a new selectionarea fixing those issues.

(sorry for proposing this twice)

[Tom Beckmann (tombeckmann)]

review: Approve

=== modified file 'src/Widgets/end_dialog.vala'
--- src/Widgets/end_dialog.vala	2012-01-05 19:27:20 +0000
+++ src/Widgets/end_dialog.vala	2012-03-27 11:57:47 +0000
@@ -90,10 +90,12 @@
 					t.get_cursor (out path, null);
 					try{
 						Process.spawn_command_line_async (c[int.parse (path.to_string ())].lookup ("Exec"));
-					}catch (Error e){error (e.message);}
-					Gtk.main_quit ();
+					}catch (Error e){
+						print(e.message);
+						Gtk.main_quit ();
+					}
 				});
-			}else{
+			} else {
 				export.clicked.connect ( () => {
 					var source = File.new_for_path (app.settings.destination);
 					var file = new FileChooserDialog (_("Save"), null, FileChooserAction.SAVE, Stock.OK, ResponseType.OK);
 
=== modified file 'src/Widgets/keyview.vala'
--- src/Widgets/keyview.vala	2012-03-23 14:54:41 +0000
+++ src/Widgets/keyview.vala	2012-03-27 11:57:47 +0000
@@ -11,14 +11,16 @@
 		public bool shift;
 		public bool alt;
 		public bool super;
+		public bool iso_level3_shift;
 		public int count;
 		
-		public Key (string key, bool ctrl, bool shift, bool alt, bool super){
+		public Key (string key, bool ctrl, bool shift, bool alt, bool super, bool iso_level3_shift){
 			this.key = key;
 			this.ctrl = ctrl;
 			this.shift = shift;
 			this.alt = alt;
 			this.super = super;
+			this.iso_level3_shift = iso_level3_shift;
 			this.count = 1;
 		}
 	}
@@ -35,6 +37,7 @@
 		private bool shift;
 		private bool alt;
 		private bool super;
+		private bool iso_level3_shift;
 		
 		private int screen_h;
 		
@@ -57,9 +60,15 @@
 				
 				ctx.set_source_rgba (1.0, 1.0, 1.0, 1.0);
 				
-				int [] sizes = {0, 30, 45, 50, 65};
+				int [] sizes = {0, 30, 45, 55, 60};
 				print ("%i\n", keys.peek_nth (i).key.length);
-				ctx.set_font_size (key_size-  sizes[keys.peek_nth (i).key.length]);
+
+				if( keys.peek_nth (i).key.length >= sizes.length ) {
+					ctx.set_font_size (key_size - sizes[sizes.length - 1]);
+				} else {
+					ctx.set_font_size (key_size - sizes[keys.peek_nth (i).key.length]);
+				}
+
 				ctx.move_to (key_size - 40, screen_h - (i+1)*key_size-20);
 				ctx.show_text (keys.peek_nth (i).key);
 				
@@ -70,21 +79,25 @@
 				}
 				ctx.set_font_size (12);
 				if (keys.peek_nth (i).super){
-					ctx.move_to (5, screen_h - (i+1)*key_size-50);
+					ctx.move_to (5, screen_h - (i+1)*key_size-52);
 					ctx.show_text ("Super");
 				}
 				if (keys.peek_nth (i).ctrl){
-					ctx.move_to (5, screen_h - (i+1)*key_size-35);
+					ctx.move_to (5, screen_h - (i+1)*key_size-37);
 					ctx.show_text ("Ctrl");
 				}
 				if (keys.peek_nth (i).shift){
-					ctx.move_to (5, screen_h - (i+1)*key_size-20);
+					ctx.move_to (5, screen_h - (i+1)*key_size-22);
 					ctx.show_text ("Shift");
 				}
 				if (keys.peek_nth (i).alt){
-					ctx.move_to (5, screen_h - (i+1)*key_size-5);
+					ctx.move_to (5, screen_h - (i+1)*key_size-7);
 					ctx.show_text ("Alt");
 				}
+				if (keys.peek_nth (i).iso_level3_shift){
+					ctx.move_to (5, screen_h - (i+1)*key_size-12);
+					ctx.show_text ("AltGr");
+				}
 			}
 			
 			return base.draw (ctx);
@@ -100,21 +113,31 @@
 		public KeyView (){
 			this.key_size = 75;
 			this.fade_duration = 2000;
-			
+
+			this.stick ();
 			this.set_keep_above (true);
-			this.stick ();
-			this.type_hint = Gdk.WindowTypeHint.SPLASHSCREEN;
+			this.deletable = false;
+			this.resizable = false;
+			this.set_has_resize_grip (false);
 			this.skip_pager_hint = true;
 			this.skip_taskbar_hint = true;
+
+			this.type_hint = Gdk.WindowTypeHint.SPLASHSCREEN;
+			this.events = Gdk.EventMask.BUTTON_MOTION_MASK | Gdk.EventMask.BUTTON1_MOTION_MASK | 
+			    Gdk.EventMask.BUTTON_PRESS_MASK | Gdk.EventMask.BUTTON_RELEASE_MASK ;
+
+			this.realize();
 			
-			this.keys = new Queue<Key> ();
+			Cairo.RectangleInt rect = {0, 0, 1, 1};
+			this.get_window ().input_shape_combine_region (new Cairo.Region.rectangle (rect), 0, 0);
 			
 			this.enter_notify_event.connect ( () => {
-				Cairo.RectangleInt rect = {0, 0, 1, 1};
 				this.get_window ().input_shape_combine_region (new Cairo.Region.rectangle (rect), 0, 0);
 				return true;
 			});
 			
+			this.keys = new Queue<Key> ();
+			
 			//setup the key background
 			key_bg = new Cairo.ImageSurface (Cairo.Format.ARGB32, key_size, key_size);
 			var ctx = new Cairo.Context (key_bg);
@@ -155,6 +178,10 @@
 							this.super = false;
 							this.queue_draw ();
 							return;
+						case "ISO_Level3_Shift":
+							this.iso_level3_shift = false;
+							this.queue_draw ();
+							return;
 					}
 				}else{
 					string res = keyvalue;
@@ -179,18 +206,28 @@
 							this.super = true;
 							this.queue_draw ();
 							return;
+						case "ISO_Level3_Shift":
+							this.iso_level3_shift = true;
+							this.queue_draw ();
+							return;
 						case "Escape":
 							res = "Esc"; break;
 						case "Return":
 							res = "⏎"; break;
 						case "Delete":
 							res = "Del"; break;
+						case "Insert":
+							res = "Ins"; break;
 						case "comma":
 							res = ","; break;
 						case "period":
 							res = "."; break;
 						case "minus":
 							res = "-"; break;
+						case "plus":
+							res = "+"; break;
+						case "Tab":
+							res = "Tab"; break;
 						case "BackSpace":
 							res = "⌫"; break;
 						case "Left":
@@ -203,6 +240,64 @@
 							res = "▼"; break;
 						case "space":
 							res = " "; break;
+						case "backslash":
+							res = "\\"; break;
+						case "bracketleft":
+							res = "["; break;
+						case "bracketright":
+							res = "]"; break;
+						case "braceleft":
+							res = "{"; break;
+						case "braceright":
+							res = "}"; break;
+						case "apostrophe":
+							res = "'"; break;
+						case "asciitilde":
+							res = "~"; break;
+						case "grave":
+							res = "`"; break;
+						case "bar":
+							res = "|"; break;
+						case "ampersand":
+							res = "&"; break;
+						case "parenleft":
+							res = "("; break;
+						case "parenright":
+							res = ")"; break;
+						case "less":
+							res = "<"; break;
+						case "greater":
+							res = ">"; break;
+						case "equal":
+							res = "="; break;
+						case "exclam":
+							res = "!"; break;
+						case "quotedbl":
+							res = "\""; break;
+						case "numbersign":
+							res = "\""; break;
+						case "dollar":
+							res = "$"; break;
+						case "slash":
+							res = "/"; break;
+						case "asterisk":
+							res = "*"; break;
+						case "colon":
+							res = ":"; break;
+						case "semicolon":
+							res = ";"; break;
+						case "underscore":
+							res = "_"; break;
+						case "Next":
+							res = "Pg▲"; break;
+						case "Prior":
+							res = "Pg▼"; break;
+						case "asciicircum":
+							res = "^"; break;
+						case "at":
+							res = "@"; break;
+						case "question":
+							res = "?"; break;
 						default:
 							if (keyvalue.length > 9)
 								res = keyvalue.substring (0, 9);
@@ -212,12 +307,13 @@
 					if ((!keys.is_empty ()) &&
 					    (keys.peek_head ().key == res) && 
 					    (keys.peek_head ().ctrl == ctrl) && 
-					    (keys.peek_head ().shift == shift) && 
-					    (keys.peek_head ().alt == alt)){
+					    (keys.peek_head ().shift == shift) &&
+					    (keys.peek_head ().alt == alt) &&
+						(keys.peek_head ().iso_level3_shift == iso_level3_shift)){
 						keys.peek_head ().count ++;
 						this.queue_draw ();
 					}else{
-						var key = new Key (res, ctrl, shift, alt, super);
+						var key = new Key (res, ctrl, shift, alt, super, iso_level3_shift);
 						if (!released){
 							keys.push_head (key);
 							if (keys.length+2 > (screen_h / key_size))
 
=== modified file 'src/Widgets/selectionarea.vala'
--- src/Widgets/selectionarea.vala	2012-03-23 15:01:29 +0000
+++ src/Widgets/selectionarea.vala	2012-03-27 11:57:47 +0000
@@ -94,24 +94,28 @@
 		public override bool draw (Cairo.Context ctx){
 			int w = this.get_allocated_width  ();
 			int h = this.get_allocated_height ();
-			int r = 12;
+			int r = 16;
 			if (!discrete){
-				pos = {{r,r},{w/2,r},{w-r,r},{w-r,h/2},{w-r,h-r},{w/2,h-r},{r,h-r},{r,h/2}};
+				pos = {{1, 1}, // upper left
+					   {w/2, 1}, // upper midpoint
+					   {w-1, 1}, // upper right
+					   {w-1, h/2}, // right midpoint
+					   {w-1, h-1}, // lower right
+					   {w/2, h-1}, // lower midpoint
+					   {1, h-1}, // lower left
+					   {1, h/2}}; // left midpoint
+
 				
-				ctx.rectangle (r+1, r, w-2*r, h-2*r);
+				ctx.rectangle (0, 0, w, h);
 				ctx.set_source_rgba (0.1, 0.1, 0.1, 0.2);
 				ctx.fill ();
 				
 				for (var i=0;i<8;i++){
-					ctx.arc (pos[i,0], pos[i,1], r, 0.0, 2 * 3.14);
-					ctx.set_source_rgb (1.0, 1.0, 1.0);
+					ctx.arc (pos[i,0], pos[i,1], r, 0.0, 2*3.14);
+					ctx.set_source_rgb (0.7, 0.7, 0.7);
 					ctx.fill ();
-					ctx.arc (pos[i,0], pos[i,1], r+1, 0.0, 2 * 3.14);
-					ctx.set_line_width (1.0);
-					ctx.set_source_rgba (0.0, 0.0, 0.0, 0.3);
-					ctx.stroke ();
 				}
-				ctx.rectangle (r, r, w-2*r, h-2*r);
+				ctx.rectangle (0, 0, w, h);
 				ctx.set_source_rgb (1.0, 1.0, 1.0);
 				ctx.set_line_width (1.0);
 				ctx.stroke ();
@@ -135,7 +139,7 @@
 			this.set_keep_above (true);
 			this.queue_draw ();
 			this.resize (w+6, h+6);
-			this.move (x, y-1);
+			this.move (x-2, y-2);
 			this.deletable = false;
 			
 			this.realize ();
@@ -147,7 +151,6 @@
 				this.get_window ().input_shape_combine_region (new Cairo.Region.rectangle (rect), 0, 0);
 				return true;
 			});
-		
 		}
 	}
 }
 
=== modified file 'src/eidete.vala'
--- src/eidete.vala	2012-03-23 14:57:45 +0000
+++ src/eidete.vala	2012-03-27 11:57:47 +0000
@@ -37,10 +37,9 @@
 		public int sy;
 		public int ex;
 		public int ey;
-		public int screen;
+		public int monitor;
 		public bool audio;
 		public bool keyview;
-		public bool limits;
 		public string destination;
 	}
 	
@@ -83,12 +82,14 @@
 		public Grid pause_grid;
 		public Image pause_icon;
 		public Wnck.Window win;
+		public Gdk.Screen screen;
+		public Gdk.Rectangle monitor_rec;
 		
 		public Settings settings;
 		
 		public bool recording;
 		public bool typing_size;
-		
+
 		public EideteApp (){
 		}
 		
@@ -226,16 +227,25 @@
 			about_bt.clicked.connect ( () => {
 				this.show_about (this.main_window);
 			});
-			
-			settings.screen = 0;
+
+			this.screen = Gdk.Screen.get_default();
+			settings.monitor = 0;
 			monitors_combo.changed.connect ( () => {
-				settings.screen = int.parse (monitors_combo.active_id);
+				settings.monitor = int.parse (monitors_combo.active_id);
+				this.screen.get_monitor_geometry(settings.monitor, out this.monitor_rec);
+				settings.sx = this.monitor_rec.x;
+				settings.sy = this.monitor_rec.y;
+				settings.ex = settings.sx + this.monitor_rec.width - 1;
+				settings.ey = settings.sy + this.monitor_rec.height - 1;
 			});
 			
-			settings.sx = 0;
-			settings.sy = 0;
-			settings.ex = 0;
-			settings.ey = 0;
+			settings.monitor = int.parse (monitors_combo.active_id);
+			this.screen.get_monitor_geometry(settings.monitor, out this.monitor_rec);
+			settings.sx = this.monitor_rec.x;
+			settings.sy = this.monitor_rec.y;
+			settings.ex = settings.sx + this.monitor_rec.width - 1;
+			settings.ey = settings.sy + this.monitor_rec.height - 1;
+
 			recordingarea_combo.changed.connect ( () => {
 				if (recordingarea_combo.active_id != "full"){
 					selectionarea = new Eidete.Widgets.SelectionArea ();
@@ -248,18 +258,25 @@
 							height.value = (int)h;
 							settings.sx = x;
 							settings.sy = y;
-							settings.ex = settings.sx+w;
-							settings.ey = settings.sy+h;
-							settings.limits = true;
-						}
+							settings.ex = settings.sx+w-1;
+							settings.ey = settings.sy+h-1;
+						}
+					});
+					selectionarea.focus_in_event.connect( (ev) => {
+						if (this.recording){
+							this.main_window.deiconify();
+							this.main_window.present();
+						}
+						return false;
 					});
 				}else{
 					selectionarea.destroy ();
-					settings.sx = 0;
-					settings.sy = 0;
-					settings.ex = 0;
-					settings.ey = 0;
-					settings.limits = false;
+					settings.monitor = int.parse (monitors_combo.active_id);
+					this.screen.get_monitor_geometry(settings.monitor, out this.monitor_rec);
+					settings.sx = this.monitor_rec.x;
+					settings.sy = this.monitor_rec.y;
+					settings.ex = settings.sx + this.monitor_rec.width - 1;
+					settings.ey = settings.sy + this.monitor_rec.height - 1;
 					width.set_sensitive (false);
 					height.set_sensitive (false);
 				}
@@ -303,29 +320,40 @@
 			
 			settings.destination = GLib.Environment.get_tmp_dir ()+
 			    "/screencast"+new GLib.DateTime.now_local ().to_unix ().to_string ()+".webm";
-			
-			
-			ulong handle = 0;
-			handle = Wnck.Screen.get_default ().active_window_changed.connect ( () => {
-				this.win = Wnck.Screen.get_default ().get_active_window ();
-				this.win.state_changed.connect ( (changed_s, new_s) => {
-					if (recording && (new_s == 0)){
-						pipeline.set_state (State.PAUSED);
-						this.recording = false;
-						switch_to_paused (true);
-					}
-				});
-				Wnck.Screen.get_default ().disconnect (handle);
-			});
-			
-			
-			this.main_window.focus_in_event.connect ( (ev) => {
-				if (this.selectionarea != null && !this.selectionarea.not_visible){
-					//this.selectionarea.present ();
-					//this.main_window.present ();
+
+			// ulong handle = 0;
+			// handle = Wnck.Screen.get_default().active_window_changed.connect ( () => {
+			// 	this.win = Wnck.Screen.get_default().get_active_window ();
+			// 	print("setting active window\n");
+			// 	this.win.state_changed.connect ( (changed_s, new_s) => {
+			// 		print("active window changed\n");
+			// 		if (recording && (new_s == 0)){
+			// 			pipeline.set_state (State.PAUSED);
+			// 			this.recording = false;
+			// 			switch_to_paused (true);
+			// 		}
+			// 	});
+			// 	Wnck.Screen.get_default ().disconnect (handle);
+			// });
+			
+			// this.main_window.focus_in_event.connect ( (ev) => {
+			// 	if (this.selectionarea != null && !this.selectionarea.not_visible){
+			// 		//this.selectionarea.present ();
+			// 		//this.main_window.present ();
+			// 	}
+			// 	return false;
+			// });
+
+			this.main_window.visibility_notify_event.connect ( (ev) => {
+				if (this.recording && ev.state == 0){
+					print("pausing recording\n");
+					pipeline.set_state (State.PAUSED);
+					this.recording = false;
+					switch_to_paused (true);
 				}
 				return false;
 			});
+
 			
 			this.main_window.destroy.connect ( () => {
 				if (pipeline != null)
@@ -345,7 +373,7 @@
 			}
 		}
 		
-		private void buid_pause_ui (){
+		private void build_pause_ui (){
 			pause_grid = new Grid ();
 			pause_grid.margin = 12;
 			
@@ -380,7 +408,9 @@
 			/*
 			  Events
 			*/
-			cancel_bt.clicked.connect ( () => {this.main_window.destroy ();});
+			cancel_bt.clicked.connect ( () => {
+				this.main_window.destroy ();
+			});
 			
 			stop_bt.clicked.connect ( () => {
 				var end = new Eidete.Widgets.EndDialog (this);
@@ -390,25 +420,25 @@
 			
 			continue_bt.clicked.connect ( () => {
 				this.main_window.iconify ();
+				this.pipeline.set_state (State.PLAYING);
 				this.recording = true;
-				this.pipeline.set_state (State.PLAYING);
 				switch_to_paused (false);
 			});
 		}
 		
 		public void record (){
-			this.recording = true;
-			
 			if (settings.keyview){
 				keyview = new Eidete.Widgets.KeyView ();
-				if (settings.limits)
-					keyview.place (selectionarea.x+selectionarea.w, 
-					               selectionarea.y, 
-					               selectionarea.h);
-				else
-					keyview.place (Gdk.Screen.get_default ().get_width  (), 
-					               0, 
-					               Gdk.Screen.get_default ().get_height ());
+				keyview.focus_in_event.connect((ev) => {
+					if (this.recording){
+						this.main_window.deiconify();
+						this.main_window.present();
+					}
+					return false;
+				});
+				keyview.place (settings.ex,
+							   settings.sy, 
+							   settings.ey - settings.sy);
 				keyview.show_all ();
 			}
 			
@@ -439,12 +469,12 @@
 			
 			//configure
 			sink.set ("location", settings.destination);
-			videobin.get_by_name ("videosrc").set ("startx", this.settings.sx+2);
-			videobin.get_by_name ("videosrc").set ("starty", this.settings.sy+1);
-			videobin.get_by_name ("videosrc").set ("endx",   this.settings.ex+1);
+			videobin.get_by_name ("videosrc").set ("startx", this.settings.sx);
+			videobin.get_by_name ("videosrc").set ("starty", this.settings.sy);
+			videobin.get_by_name ("videosrc").set ("endx",   this.settings.ex);
 			videobin.get_by_name ("videosrc").set ("endy",   this.settings.ey);
 			videobin.get_by_name ("videosrc").set ("use-damage", false);
-			videobin.get_by_name ("videosrc").set ("screen-num", this.settings.screen);
+			videobin.get_by_name ("videosrc").set ("screen-num", this.settings.monitor);
 			
 			//videobin.get_by_name ("encoder").set  ("mode", 1);
 			videobin.get_by_name ("encoder").set  ("quality", 10.0);
@@ -477,6 +507,7 @@
 				selectionarea.to_discrete ();
 			
 			pipeline.set_state (State.PLAYING);
+			this.recording = true;
 		}
 		
 		private bool bus_message_cb (Gst.Bus bus, Message msg){
@@ -503,7 +534,7 @@
 				this.main_window.title = _("Recording paused");
 				this.main_window.remove (pause_icon);
 				if (pause_grid == null)
-					this.buid_pause_ui ();
+					this.build_pause_ui ();
 				this.main_window.add (pause_grid);
 				this.main_window.icon_name = "eidete";
 				this.app_icon = "eidete";
 
=== modified file 'src/keycapture.c'
--- src/keycapture.c	2012-01-02 22:50:13 +0000
+++ src/keycapture.c	2012-03-27 11:57:47 +0000
@@ -2,6 +2,7 @@
 #include <glib.h>
 #include <X11/Xproto.h>
 #include <X11/Xlib.h>
+#include <X11/XKBlib.h>
 #include <X11/extensions/record.h> //libxtst-dev, Xtst
 #include <gstreamer-0.10/gst/gst.h>
 #include <gstreamer-0.10/gst/gstinterface.h>
@@ -18,13 +19,22 @@
 
 void key_pressed_cb(XPointer arg, XRecordInterceptData *d) {
 	if (d->category != XRecordFromServer) return;
+
+    xEvent* event = (xEvent*)d->data;
+    
 	unsigned char type = ((unsigned char*)d->data)[0] & 0x7F;
 	unsigned char detail = ((unsigned char*)d->data)[1];
+    unsigned int shiftlevel = 0;
+
+    if( event->u.keyButtonPointer.state == 0 ||
+        event->u.keyButtonPointer.state == 1 ) {
+        shiftlevel = event->u.keyButtonPointer.state;
+    }
 	
 	if (type == KeyPress) {
-		g_signal_emit_by_name (arg, "captured", XKeysymToString (XKeycodeToKeysym (dpy, detail, 0)), FALSE);
+		g_signal_emit_by_name (arg, "captured", XKeysymToString (XkbKeycodeToKeysym (dpy, detail, 0, shiftlevel)), FALSE);
 	}else if (type == KeyRelease){
-		g_signal_emit_by_name (arg, "captured", XKeysymToString (XKeycodeToKeysym (dpy, detail, 0)), TRUE);
+		g_signal_emit_by_name (arg, "captured", XKeysymToString (XkbKeycodeToKeysym (dpy, detail, 0, shiftlevel)), TRUE);
 	}
 }
 
@@ -33,7 +43,7 @@
 	XRecordRange* rr;
 	dpy = XOpenDisplay (0);
 	
-	XKeysymToString (XKeycodeToKeysym (dpy, 11, 1));
+	XKeysymToString (XkbKeycodeToKeysym (dpy, 11, 1, 0));
 	
 	if (!(rr = XRecordAllocRange())) {
 		fprintf(stderr, "XRecordAllocRange error\n");