Merge lp:~henrikno/lookit/trunk into lp:lookit

[Henrik Nordvik]

[lp:~henrikno/lookit/trunk]

9. By Henrik Nordvik on 2010-05-26

Avoid errors when not dragging a selection area.

10. By Henrik Nordvik on 2010-05-26

Added an option to select directory to save screenshots.

11. By Henrik Nordvik on 2010-05-30

Using Xlib and grab_pointer to get window/area selection.

Unmerged revisions

11. By Henrik Nordvik on 2010-05-30

Using Xlib and grab_pointer to get window/area selection.

10. By Henrik Nordvik on 2010-05-26

Added an option to select directory to save screenshots.

9. By Henrik Nordvik on 2010-05-26

Avoid errors when not dragging a selection area.

8. By Henrik Nordvik on 2010-05-26

Added some error checking code.

=== modified file 'src/lookit/data/pref.xml'
--- src/lookit/data/pref.xml	2010-05-25 23:53:57 +0000
+++ src/lookit/data/pref.xml	2010-05-30 06:56:26 +0000
@@ -52,6 +52,39 @@
                   </packing>
                 </child>
                 <child>
+                  <object class="GtkHBox" id="hbox2">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkLabel" id="label10">
+                        <property name="visible">True</property>
+                        <property name="tooltip_text" translatable="yes">Select a directory to save the screenshots to.</property>
+                        <property name="label" translatable="yes">Directory:</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkFileChooserButton" id="savedir">
+                        <property name="visible">True</property>
+                        <property name="action">select-folder</property>
+                        <property name="title" translatable="yes">Select A Directory to save Screenshots</property>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
                   <placeholder/>
                 </child>
               </object>

=== modified file 'src/lookit/lookit'
--- src/lookit/lookit	2010-05-25 23:53:57 +0000
+++ src/lookit/lookit	2010-05-30 06:56:26 +0000
@@ -28,18 +28,18 @@
 import urllib
 import urlparse
 
-try:
+#try:
 	# Try to import these from current directory, in case running from src
-	import aboutdlg
-	import prefdlg
-	import screencapper
-	import uploader
-except ImportError:
-	# Then fall back to globally installed versions
-	from lookit import aboutdlg
-	from lookit import prefdlg
-	from lookit import screencapper
-	from lookit import uploader
+import aboutdlg
+import prefdlg
+import screencapper
+import uploader
+#except ImportError:
+	## Then fall back to globally installed versions
+	#from lookit import aboutdlg
+	#from lookit import prefdlg
+	#from lookit import screencapper
+	#from lookit import uploader
 
 CONF_FILE = os.path.expanduser('~/.config/lookit.conf')
 TRASH_DIR = os.path.expanduser('~/.local/share/Trash/files')
@@ -142,7 +142,7 @@
 		if pb != None:
 			m = hashlib.md5()
 			m.update(pb.get_pixels())
-			hashstring = m.hexdigest() + '.png'
+			hashstring = self.prefs['savedir'] + '/' + m.hexdigest() + '.png'
 			pb.save(hashstring, 'png')
 			self.upload_image(hashstring)
 		else:
@@ -170,6 +170,9 @@
 					)
 		elif proto == 'Imgur':
 			success, data = uploader.upload_file_imgur(image)
+		elif proto == 'None':
+			self.show_notification('Image saved', image)
+			return
 		else:
 			success = False
 			data = "Error: no such protocol: {0}".format(proto)

=== modified file 'src/lookit/prefdlg.py'
--- src/lookit/prefdlg.py	2010-05-25 23:53:57 +0000
+++ src/lookit/prefdlg.py	2010-05-30 06:56:26 +0000
@@ -1,4 +1,5 @@
 import gtk
+import gio
 import os
 import sys
 
@@ -29,6 +30,7 @@
 		
 		self.combobox = builder.get_object("combobox")
 		connections = gtk.ListStore(str)
+		connections.append(['None'])
 		for connection in CONNECTION_TYPES:
 			connections.append([connection])
 		self.combobox.set_model(connections)
@@ -43,6 +45,7 @@
 		self.password = builder.get_object("password")
 		self.directory = builder.get_object("directory")
 		self.url = builder.get_object("url")		
+		self.savedir = builder.get_object("savedir")
 
 		builder.connect_signals(self)
 
@@ -61,6 +64,7 @@
 			self.password.set_text(prefs['password'])
 			self.directory.set_text(prefs['directory'])
 			self.url.set_text(prefs['url'])
+			self.savedir.set_current_folder_file(gio.File(prefs['savedir']))
 		except KeyError:
 			if 'Imgur' in CONNECTION_TYPES:
 				self.combobox.set_active(
@@ -90,10 +94,13 @@
 			self.port.get_adjustment().set_value(21)
 		elif proto == 'SSH':
 			self.port.get_adjustment().set_value(22)
+		else:
+			self.port.get_adjustment().set_value(21)
 	
 			
 
 	def on_pref_dialog_response(self, widget, data=None):
+		print "on_pref_dialog_response"
 		if data == 1:
 			self.prefs['trash'] = self.trash.get_active()
 			self.prefs['shortenurl'] = self.shortenurl.get_active()
@@ -104,6 +111,7 @@
 			self.prefs['password'] = self.password.get_text()
 			self.prefs['directory'] = self.directory.get_text()
 			self.prefs['url'] = self.url.get_text()
+			self.prefs['savedir'] = self.savedir.get_current_folder_file().get_path()
 		else:
 			self.prefs = dict()
 		self.dialog.destroy()

=== modified file 'src/lookit/screencapper.py'
--- src/lookit/screencapper.py	2010-05-25 01:21:09 +0000
+++ src/lookit/screencapper.py	2010-05-30 06:56:26 +0000
@@ -1,50 +1,18 @@
 import gtk
 import gtk.gdk
 
+from Xlib.display import Display
+from Xlib import X
+from Xlib import XK
+from Xlib import Xcursorfont
+import Xlib
+
 class ScreenCapper:
 	def __init__(self):
+		self.pixbuf = None
 		self.root = gtk.gdk.get_default_root_window()
 		self.size = self.root.get_size()
 
-	def on_key_press(self, widget, event):
-		if event.keyval == gtk.keysyms.Escape:
-			self.pixbuf = None
-			self.overlay.destroy()
-			gtk.main_quit()
-
-	def on_mouse_up(self, widget, event):
-		self.x2 = int(event.x)
-		self.y2 = int(event.y)
-
-		sz_x = abs(self.x1 - self.x2)
-		sz_y = abs(self.y1 - self.y2)
-
-		print sz_x, sz_y, self.x1, self.x2, self.y1, self.y2
-
-		if sz_x == 0 and sz_y == 0:
-			# TODO: We should capture the window that was clicked
-			self.pixbuf = None
-			self.overlay.destroy()
-			gtk.main_quit()
-
-		self.pixbuf = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB,
-						False, 8, sz_x, sz_y)
-		self.pixbuf.get_from_drawable(self.root,
-						self.root.get_colormap(),
-						min(self.x1, self.x2),
-						min(self.y1, self.y2),
-						0, 0, sz_x, sz_y)
-
-		self.overlay.destroy()
-		gtk.main_quit()
-	
-	def on_mouse_down(self, widget, event):
-		self.x1 = int(event.x)
-		self.y1 = int(event.y)
-	
-	def realize_area(self, widget):
-		self.overlay.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.CROSS))
-	
 	def capture_screen(self):
 		self.pixbuf = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, False, 8,
 						self.size[0], self.size[1])
@@ -54,31 +22,92 @@
 						self.size[0], self.size[1])
 		return self.pixbuf
 	
+	def grab_area(self, start_x, start_y, width, height):
+		self.pixbuf = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, False, 8, 
+							   width, height)
+		self.pixbuf.get_from_drawable(self.root, self.root.get_colormap(),
+								start_x, start_y, 0, 0, width, height)
+
 	def capture_area(self):
-		self.has_result = False
-		
-		self.overlay = gtk.Window()
-		
-		self.overlay.connect("key_press_event", self.on_key_press)
-		self.overlay.connect("button_press_event", self.on_mouse_down)
-		self.overlay.connect("button_release_event", self.on_mouse_up)
-		self.overlay.connect("realize", self.realize_area)
-
-		self.overlay.set_events(gtk.gdk.BUTTON_PRESS_MASK |
-					gtk.gdk.BUTTON_RELEASE_MASK |
-					gtk.gdk.KEY_PRESS_MASK)
-
-		warning = gtk.Label('Warning: You must be using a window ' +
-			'manager that supports compositing. Press Esc to ' +
-			'exit.')
-		warning.show()
-		self.overlay.add(warning)
-
-		self.overlay.set_opacity(0)
-		self.overlay.fullscreen()
-		
-		self.overlay.show()
-
-		gtk.main()
-
+		try:
+			display = Display()
+			root = display.screen().root
+			cursor_font = display.open_font('cursor')
+			mycursor = cursor_font.create_glyph_cursor(cursor_font,
+												Xcursorfont.crosshair,
+												Xcursorfont.crosshair+1, (0,0,0),
+												(0xFFFF, 0xFFFF, 0xFFFF))
+			root.grab_pointer(True, X.ButtonPressMask | X.ButtonReleaseMask |
+						X.PointerMotionMask, X.GrabModeAsync, X.GrabModeAsync, 0,
+						mycursor, X.CurrentTime)
+			root.grab_keyboard(True, X.GrabModeAsync, X.GrabModeAsync,
+						X.CurrentTime)
+			colormap = display.screen().default_colormap
+
+			# (r,g,b) blue = (0,0,65535)
+			color = colormap.alloc_color(0, 0, 65535)
+			# Xor it because we'll draw with X.GXxor function 
+			xor_color = color.pixel ^ 0xffffff 
+
+			print hex(color.pixel), hex(xor_color) 
+
+			self.gc = root.create_gc(
+				line_width = 1,
+				line_style = X.LineSolid,
+				fill_style = X.FillSolid,
+				fill_rule  = X.WindingRule,
+				cap_style  = X.CapButt,
+				join_style = X.JoinMiter,
+				foreground = xor_color,
+				background = display.screen().black_pixel,
+				function = X.GXxor, 
+				graphics_exposures = False,
+				subwindow_mode = X.IncludeInferiors,
+				)  
+
+			pressed = False
+			done = False
+			lastx, lasty = None, None
+			while not done:
+				event = display.next_event()
+				if event.type == X.DestroyNotify: 
+					self.pixbuf = None
+					done = True
+				if event.type == X.KeyPress:
+					self.pixbuf = None
+					done = True
+				if event.type == X.MotionNotify:
+					if pressed:
+						if lastx and lasty:
+							ax = abs(startx - lastx)
+							ay = abs(starty - lasty)
+							root.rectangle(self.gc, min(startx, lastx), min(starty, lasty), ax, ay) 
+						lastx, lasty = event.root_x, event.root_y
+						ax = abs(startx - event.root_x)
+						ay = abs(starty - event.root_y)
+						root.rectangle(self.gc, min(startx, event.root_x), min(starty, event.root_y), ax, ay) 
+
+				elif event.type == X.ButtonPress and event.child != X.NONE:
+					startx, starty = event.event_x, event.event_y
+					pressed = True
+
+				elif event.type == X.ButtonRelease and event.child != X.NONE:
+					endx, endy = event.event_x, event.event_y
+					geometry = event.child.get_geometry()
+					width, height = geometry.width, geometry.height
+					window_x, window_y = geometry.x, geometry.y
+					diff_x = abs(startx - endx) 
+					diff_y = abs(starty - endy) 
+
+					if diff_x == 0 and diff_y == 0:
+						self.grab_area(window_x, window_y, width, height)
+					else:
+						self.grab_area(startx, starty, diff_x, diff_y)
+					done = True
+		except:
+			raise
+		finally:
+			display.ungrab_pointer(X.CurrentTime)
+			display.ungrab_keyboard(X.CurrentTime)
+			display.flush()
 		return self.pixbuf

=== modified file 'src/lookit/uploader.py'
--- src/lookit/uploader.py	2010-05-25 01:21:09 +0000
+++ src/lookit/uploader.py	2010-05-30 06:56:26 +0000
@@ -71,6 +71,10 @@
 	return PROTO_LIST
 
 def upload_file_ftp(f, hostname, port, username, password, directory, url):
+	if not 'FTP' in PROTO_LIST:
+		errormsg = 'Error: FTP support not installed. Install \'ftplib\' package.'
+		print errormsg
+		return False, errormsg
 	i = open(f, 'r')
 
 	try:
@@ -88,6 +92,10 @@
 	return True, None
 
 def upload_file_sftp(f, hostname, port, username, password, directory, url):
+	if not 'SSH' in PROTO_LIST:
+		errormsg = 'Error: SSH support not installed. Install \'paramiko\' package.'
+		print errormsg
+		return False, errormsg
 	t = paramiko.Transport((hostname, port))
 	t.connect(username=username, password=password)
 	sftp = paramiko.SFTPClient.from_transport(t)
@@ -102,10 +110,16 @@
 
 def upload_file_imgur(f):
 	if not 'Imgur' in PROTO_LIST:
-		print 'Error: Imgur not supported'
+		errormsg = 'Error: Imgur support not installed. Install \'pycurl\' package.'
+		print errormsg
+		return False, errormsg
 	i = ImgurUploader()
 	i.upload(f)
-	return True, i.mapping
+	print i.mapping
+	if not 'error_msg' in i.mapping:
+		return True, i.mapping
+	else:
+		return False, i.mapping.get('error_msg')
 
 def upload_file_ubuntuone(f):
 	pass