Gtk3

README.markdown

@@ -60,12 +60,27 @@ To build GeanyPy you need the following dependencies:
 
 * Python 2.6+ and development files (I don't think Python 3 will work).
 * Geany 0.21+ and development files (from SVN)
+
+** For Gtk2 **
+
 * PyGTK 2.0 and development files
 
+** For Gtk3 **
+
+* GObject Introspection is needed [pygtk not needed.]
+
 On Debian/Ubuntu, the (non-Geany) dependencies can be installed like this:
 
-    $ apt-get install python python-dev python-gtk2 python-gtk2-dev
+    $ sudo apt-get install python python-dev
+
+** For Gtk2 **
+
+    $ sudo apt-get install python-gtk2 python-gtk2-dev
+
+** For Gtk3 **
 
+    $ sudo apt-get install python-gi python-gi-dev
+
 See Geany's documentation/website for information on compiling it from the
 Subversion or Git repositories.
 
@@ -90,4 +105,4 @@ far.  I imagine 2.7 series will also work fine.
 Running on Windows
 ------------------
 
-See `README.win32` for more information.
+See `README.win32` for more information.

configure.ac

@@ -22,7 +22,7 @@ LT_INIT([disable-static])
 # Check for headers, libraries and packages
 AC_CHECK_HEADERS([stdio.h string.h dlfcn.h])
 PKG_CHECK_MODULES([GEANY], [geany >= 0.21])
-PKG_CHECK_MODULES([PYGTK], [pygtk-2.0])
+PKG_CHECK_MODULES([PYGOBJECT], [pygobject-3.0])
 AX_PYTHON_DEVEL([>= '2.6'])
 AX_PYTHON_LIBRARY(,[AC_MSG_ERROR([Cannot determine location of the Python DSO])])
 AC_SUBST([PYTHON])
@@ -41,3 +41,5 @@ AC_CONFIG_FILES([
     plugins/Makefile
 ])
 AC_OUTPUT
+m4_pattern_allow([AM_PROG_AR])
+AM_PROG_AR

geany/__init__.py

@@ -8,6 +8,7 @@
 """
 
 import app
+import bindings
 import console
 import dialogs
 import document
@@ -67,5 +68,8 @@
 # GObject to connect signal handlers on and which emits signals.
 signals = SignalManager()
 
+# Initialize the keybindings manager
+bindings.init()
+
 import plugin
 from plugin import Plugin

geany/console.py

@@ -37,6 +37,14 @@
 # inside: GtkTextView is not a terminal.
 # The use case is: you have a python program, you create this widget,
 # and inspect your program interiors.
+try:
+    from gi import pygtkcompat
+except ImportError:
+    pygtkcompat = None
+
+if pygtkcompat is not None:
+    pygtkcompat.enable() 
+    pygtkcompat.enable_gtk(version='3.0')
 
 import gtk
 import gtk.gdk as gdk
@@ -160,7 +168,7 @@ def raw_input(self, ps=None):
             self.thaw_undo()
 
         self.__move_cursor_to(iter)
-        self.scroll_to_mark(self.cursor, 0.2)
+        self.scroll_to_mark(self.cursor, 0.2, use_align=False, xalign=0.5, yalign=0.5)
 
         self.in_raw_input = True
 
@@ -177,7 +185,7 @@ def on_buf_mark_set(self, buffer, iter, mark):
         if iter.compare(self.__get_start()) >= 0 and \
            iter.compare(self.__get_end()) <= 0:
                 buffer.move_mark_by_name("cursor", iter)
-                self.scroll_to_mark(self.cursor, 0.2)
+                self.scroll_to_mark(self.cursor, 0.2, use_align=False, xalign=0.5, yalign=0.5)
 
     def __insert(self, iter, text):
         self.do_insert = True
@@ -286,7 +294,7 @@ def do_key_press_event(self, event, parent_type):
             handled = False
 
         if not handled:
-            return parent_type.do_key_press_event(self, event)
+            return parent_type.do_key_press_event(self, event.key if hasattr(event, "key") else event)
         else:
             return True
 
@@ -296,7 +304,7 @@ def __history(self, dir):
         if not new_text is None:
             self.__replace_line(new_text)
         self.__move_cursor(0)
-        self.scroll_to_mark(self.cursor, 0.2)
+        self.scroll_to_mark(self.cursor, 0.2, use_align=False, xalign=0.5, yalign=0.5)
 
     def __get_cursor(self):
         return self.buffer.get_iter_at_mark(self.cursor)
@@ -343,7 +351,7 @@ def __delete_at_cursor(self, howmany):
         self.__delete(iter, end)
 
     def __get_width(self):
-        if not (self.flags() & gtk.REALIZED):
+        if not (self.get_realized()):
             return 80
         layout = pango.Layout(self.get_pango_context())
         letters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
@@ -386,7 +394,7 @@ def __print_completions(self, completions):
         self.__insert(iter, "%s%s%s" % (self.ps, line_start, line_end))
         iter.set_line_offset(len(self.ps) + len(line_start))
         self.__move_cursor_to(iter)
-        self.scroll_to_mark(self.cursor, 0.2)
+        self.scroll_to_mark(self.cursor, 0.2, use_align=False, xalign=0.5, yalign=0.5)
 
     def __complete(self):
         text = self.__get_text(self.__get_start(), self.__get_cursor())