Revision: 6938
Author: nogu.dev
Date: Fri Feb 11 19:07:35 2011
Log: * Makefile.am
- (SUBDIRS): Add gtk3.
* configure.ac
- Add "--with-gtk3".
* gtk3/Makefile.am
* gtk3/pad/Makefile.am
* gtk3/switcher/Makefile.am
* gtk3/toolbar/Makefile.am
- New file.
* helper/im-switcher-gtk.c
- (main): Don't call gtk_set_locale()
because gtk_init() automatically does what gtk_set_locale() does.
* helper/input-pad-ja.c
- (main): Ditto.
* helper/toolbar-standalone-gtk.c
- (main): Ditto.
- (helper_win_set_position, motion_notify_event_cb,
handle_expose_event_cb):
Use gdk_window_get_width() and gdk_window_get_height()
instead of gdk_drawable_get_size() in GTK+3.
* helper/toolbar-common-gtk.c
- (calc_menu_position): Use gdk_window_get_height()
instead of gdk_drawable_get_size() in GTK+3.
http://code.google.com/p/uim/source/detail?r=6938
Added:
/trunk/gtk3
/trunk/gtk3/Makefile.am
/trunk/gtk3/pad
/trunk/gtk3/pad/Makefile.am
/trunk/gtk3/switcher
/trunk/gtk3/switcher/Makefile.am
/trunk/gtk3/toolbar
/trunk/gtk3/toolbar/Makefile.am
Modified:
/trunk/Makefile.am
/trunk/configure.ac
/trunk/helper/im-switcher-gtk.c
/trunk/helper/input-pad-ja.c
/trunk/helper/toolbar-common-gtk.c
/trunk/helper/toolbar-standalone-gtk.c
=======================================
--- /dev/null
+++ /trunk/gtk3/Makefile.am Fri Feb 11 19:07:35 2011
@@ -0,0 +1,2 @@
+#SUBDIRS = candwin chardict edittest immodule pref toolbar
+SUBDIRS = pad switcher toolbar
=======================================
--- /dev/null
+++ /trunk/gtk3/pad/Makefile.am Fri Feb 11 19:07:35 2011
@@ -0,0 +1,9 @@
+if GTK3
+bin_PROGRAMS = uim-input-pad-ja-gtk3
+uim_input_pad_ja_gtk3_SOURCES = ../../helper/input-pad-ja.c
+uim_input_pad_ja_gtk3_LDADD = @GTK3_LIBS@
$(top_builddir)/uim/libuim-scm.la \
+ $(top_builddir)/uim/libuim.la
+uim_input_pad_ja_gtk3_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
+uim_input_pad_ja_gtk3_CFLAGS = @GTK3_CFLAGS@
+
+endif
=======================================
--- /dev/null
+++ /trunk/gtk3/switcher/Makefile.am Fri Feb 11 19:07:35 2011
@@ -0,0 +1,11 @@
+if GTK3
+bin_PROGRAMS = uim-im-switcher-gtk3
+uim_im_switcher_gtk3_SOURCES = ../../helper/im-switcher-gtk.c
+uim_im_switcher_gtk3_LDADD = @GTK3_LIBS@
$(top_builddir)/uim/libuim-scm.la \
+ $(top_builddir)/uim/libuim-custom.la \
+ $(top_builddir)/uim/libuim-scm.la \
+ $(top_builddir)/uim/libuim.la
+uim_im_switcher_gtk3_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
+uim_im_switcher_gtk3_CFLAGS = @GTK3_CFLAGS@
+
+endif
=======================================
--- /dev/null
+++ /trunk/gtk3/toolbar/Makefile.am Fri Feb 11 19:07:35 2011
@@ -0,0 +1,10 @@
+if GTK3
+bin_PROGRAMS = uim-toolbar-gtk3
+uim_toolbar_gtk3_SOURCES = ../../helper/toolbar-standalone-gtk.c \
+ ../../helper/toolbar-common-gtk.c
+uim_toolbar_gtk3_LDADD = @GTK3_LIBS@ $(top_builddir)/uim/libuim-scm.la \
+ $(top_builddir)/uim/libuim.la \
+ $(top_builddir)/uim/libuim-custom.la
+uim_toolbar_gtk3_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
+uim_toolbar_gtk3_CFLAGS = @GTK3_CFLAGS@
+endif
=======================================
--- /trunk/Makefile.am Wed Jun 2 05:21:11 2010
+++ /trunk/Makefile.am Fri Feb 11 19:07:35 2011
@@ -2,7 +2,7 @@
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = m4 doc replace sigscheme uim scm test test2 \
- gtk helper qt notify
+ gtk helper gtk3 qt notify
SUBDIRS += qt4
SUBDIRS += xim fep emacs po pixmaps examples tables
=======================================
--- /trunk/configure.ac Fri Feb 4 08:20:42 2011
+++ /trunk/configure.ac Fri Feb 11 19:07:35 2011
@@ -852,6 +852,29 @@
AC_DEFINE(LIBPANEL_APPLET_HAVE_SET_BACKGROUND_WIDGET, 1 ,
[libpanel-applet have set_background api])
fi
+
+dnl ******************************
+dnl *** Check for Gtk3 Library ***
+dnl ******************************
+AC_ARG_WITH(gtk3,
+ AC_HELP_STRING([--with-gtk3],
+ [build gtk3 helper applications
+ @<:@default=no@:>@]),
+ [
+ case $with_gtk3 in
+ no)
+ use_gtk3="no"
+ ;;
+ yes|*)
+ PKG_CHECK_MODULES(GTK3, gtk+-3.0, use_gtk3="yes",use_gtk3="no")
+ ;;
+ esac
+ ],
+ [
+ PKG_CHECK_MODULES(GTK3, gtk+-3.0, use_gtk3="yes",use_gtk3="no")
+ ])
+
+
dnl ****************************
dnl *** Check for Qt Library ***
dnl ****************************
@@ -968,12 +991,15 @@
default_toolkit="gtk"
AC_ARG_ENABLE(default-toolkit,
AC_HELP_STRING([--enable-default-toolkit],
- [Determine default toolkit (gtk, qt, or qt4)
+ [Determine default toolkit (gtk, gtk3, qt, or qt4)
@<:@default=gtk@:>@]),
[
if test x"$enable_default_toolkit" = "xgtk" && test x"$use_gtk2"
= "xyes"; then
default_toolkit="gtk"
fi
+ if test x"$enable_default_toolkit" = "xgtk3" && test x"$use_gtk3"
= "xyes"; then
+ default_toolkit="gtk3"
+ fi
if test x"$enable_default_toolkit" = "xqt" && test x"$use_qt" = "xyes";
then
default_toolkit="qt"
fi
@@ -1179,7 +1205,9 @@
AM_CONDITIONAL(FFI, test x$use_ffi = xyes)
AM_CONDITIONAL(GTK2, test x$use_gtk2 = xyes)
AM_CONDITIONAL(GTK2_4, test x$use_gtk2_4 = xyes)
+AM_CONDITIONAL(GTK3, test x$use_gtk3 = xyes)
AM_CONDITIONAL(DEFAULT_TOOLKIT_GTK, test x$default_toolkit = xgtk)
+AM_CONDITIONAL(DEFAULT_TOOLKIT_GTK3, test x$default_toolkit = xgtk3)
AM_CONDITIONAL(DEFAULT_TOOLKIT_QT, test x$default_toolkit = xqt)
AM_CONDITIONAL(DEFAULT_TOOLKIT_QT4, test x$default_toolkit = xqt4)
AM_CONDITIONAL(APPLET_GNOME, test x$use_applet_gnome = xyes)
@@ -1210,10 +1238,19 @@
AC_SUBST(GTK_BINARY_VERSION)
AC_SUBST(GTK_LIBDIR)
+GTK3_BINARY_VERSION=`$PKG_CONFIG gtk+-3.0 --variable=gtk_binary_version`
+GTK3_LIBDIR=`$PKG_CONFIG gtk+-3.0 --variable=libdir`
+AC_SUBST(GTK3_BINARY_VERSION)
+AC_SUBST(GTK3_LIBDIR)
+
if test x$use_gtk2 = xyes ; then
AC_DEFINE(USE_GTK2, 1, [use gtk2])
fi
+if test x$use_gtk3 = xyes ; then
+ AC_DEFINE(USE_GTK3, 1, [use gtk3])
+fi
+
if test x$use_qt = xyes ; then
# minimum version
QT_VERSION=3.2.0
@@ -1487,6 +1524,9 @@
if test x"$default_toolkit" = "xgtk" && \
test x"$use_gtk2_4" = "xyes"; then
use_pref="yes"
+ elif test x"$default_toolkit" = "xgtk3" && \
+ test x"$use_gtk3" = "xyes"; then
+ use_pref="yes"
elif test x"$default_toolkit" = "xqt" && \
test x"$use_qt" = "xyes"; then
use_pref="yes"
@@ -1503,6 +1543,9 @@
if test x"$default_toolkit" = "xgtk" && \
test x"$use_gtk2_4" = "xyes"; then
use_pref="yes"
+ elif test x"$default_toolkit" = "xgtk3" && \
+ test x"$use_gtk3" = "xyes"; then
+ use_pref="yes"
elif test x"$default_toolkit" = "xqt" && \
test x"$use_qt" = "xyes"; then
use_pref="yes"
@@ -1817,6 +1860,10 @@
gtk/Makefile
gtk/test/Makefile
gtk/test/test.sh
+ gtk3/Makefile
+ gtk3/pad/Makefile
+ gtk3/switcher/Makefile
+ gtk3/toolbar/Makefile
qt/Makefile
qt/chardict/Makefile
qt/chardict/po/Makefile.in
@@ -1925,6 +1972,7 @@
SQLite3 : ${use_sqlite3}
ffi : ${use_ffi}
Gtk+ : ${use_gtk2}
+ Gtk+3 : ${use_gtk3}
Gnome Applet : ${use_applet_gnome}
Qt3 : ${use_qt}
Qt3 immodule : ${use_qtimmodule}
=======================================
--- /trunk/helper/im-switcher-gtk.c Thu Jan 6 18:09:56 2011
+++ /trunk/helper/im-switcher-gtk.c Fri Feb 11 19:07:35 2011
@@ -572,7 +572,6 @@
{
gint result;
setlocale(LC_ALL, "");
- gtk_set_locale();
bindtextdomain( PACKAGE, LOCALEDIR );
textdomain( PACKAGE );
bind_textdomain_codeset( PACKAGE, "UTF-8");
=======================================
--- /trunk/helper/input-pad-ja.c Thu Jan 6 18:09:56 2011
+++ /trunk/helper/input-pad-ja.c Fri Feb 11 19:07:35 2011
@@ -549,7 +549,6 @@
main(int argc, char *argv[])
{
setlocale(LC_ALL, "");
- gtk_set_locale();
bindtextdomain( PACKAGE, LOCALEDIR );
textdomain( PACKAGE );
bind_textdomain_codeset( PACKAGE, "UTF-8");
=======================================
--- /trunk/helper/toolbar-common-gtk.c Thu Jan 6 18:09:56 2011
+++ /trunk/helper/toolbar-common-gtk.c Fri Feb 11 19:07:35 2011
@@ -197,7 +197,11 @@
g_return_if_fail(GTK_IS_BUTTON(button));
gdk_window_get_origin(gtk_widget_get_window(button), x, y);
+#if GTK_CHECK_VERSION(2, 90, 0)
+ button_height = gdk_window_get_height(gtk_widget_get_window(button));
+#else
gdk_drawable_get_size(gtk_widget_get_window(button), NULL,
&button_height);
+#endif
#if GTK_CHECK_VERSION(2, 18, 0)
if (!gtk_widget_get_has_window(button)) {
=======================================
--- /trunk/helper/toolbar-standalone-gtk.c Thu Jan 6 18:09:56 2011
+++ /trunk/helper/toolbar-standalone-gtk.c Fri Feb 11 19:07:35 2011
@@ -119,7 +119,12 @@
sc_w = gdk_screen_width();
sc_h = gdk_screen_height();
+#if GTK_CHECK_VERSION(2, 90, 0)
+ w = gdk_window_get_width(gtk_widget_get_window(window));
+ h = gdk_window_get_height(gtk_widget_get_window(window));
+#else
gdk_drawable_get_size(gtk_widget_get_window(window), &w, &h);
+#endif
if (wx < 0)
wx = 0;
@@ -143,7 +148,12 @@
sc_w = gdk_screen_width();
sc_h = gdk_screen_height();
+#if GTK_CHECK_VERSION(2, 90, 0)
+ w = gdk_window_get_width(gtk_widget_get_window(widget));
+ h = gdk_window_get_height(gtk_widget_get_window(widget));
+#else
gdk_drawable_get_size(gtk_widget_get_window(widget), &w, &h);
+#endif
wx = window_drag_start_x + ((gint)event->x_root -
pointer_drag_start_x);
wy = window_drag_start_y + ((gint)event->y_root -
pointer_drag_start_y);
@@ -179,12 +189,19 @@
#if GTK_CHECK_VERSION(2, 18, 0)
GtkAllocation allocation;
gtk_widget_get_allocation(widget, &allocation);
+# if GTK_CHECK_VERSION(2, 90, 0)
+ gtk_render_handle(gtk_widget_get_style_context(widget),
+ gtk_widget_get_window(widget),
+ allocation.x, allocation.y,
+ allocation.width, allocation.height);
+# else
gtk_paint_handle(gtk_widget_get_style(widget),
gtk_widget_get_window(widget),
GTK_STATE_NORMAL, GTK_SHADOW_OUT,
rect, widget, "handlebox",
allocation.x, allocation.y,
allocation.width, allocation.height,
GTK_ORIENTATION_VERTICAL);
+# endif
#else
gtk_paint_handle(widget->style, widget->window,
GTK_STATE_NORMAL, GTK_SHADOW_OUT,
@@ -246,8 +263,6 @@
uim_init();
- gtk_set_locale();
-
gtk_init(&argc, &argv);
window = gtk_window_new(GTK_WINDOW_POPUP);
