Commit 4fc94797 authored by Franois Agrech's avatar Franois Agrech

Merge changes from Pietro Pilolli (Ardesia project)

Avoid usage of deprecated gtk calls.
Add man pages.
Upgrade autotools.
parent 292e0a06
This diff is collapsed.
......@@ -5,7 +5,7 @@ SUBDIRS = src data po
RUNTESTDEFAULTFLAGS = --tool style --srcdir $srcdir/testsuite
EXTRA_DIST = AUTHORS ChangeLog NEWS README COPYING COPYING-DOCS\
autogen.sh
autogen.sh src/florence.server.in.in
if WITH_DOCS
SUBDIRS += docs
......
#! /bin/sh
# Wrapper for compilers which do not understand `-c -o'.
scriptversion=2005-05-14.22
scriptversion=2009-10-06.20; # UTC
# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software
# Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
......@@ -17,8 +18,7 @@ scriptversion=2005-05-14.22
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
......@@ -103,13 +103,13 @@ if test -z "$ofile" || test -z "$cfile"; then
fi
# Name of file we expect compiler to create.
cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
# Create the lock directory.
# Note: use `[/.-]' here to ensure that we don't use the same name
# Note: use `[/\\:.-]' here to ensure that we don't use the same name
# that we are using for the .o file. Also, base the name on the expected
# object file name, since that is what matters with a parallel build.
lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
while true; do
if mkdir "$lockdir" >/dev/null 2>&1; then
break
......@@ -124,9 +124,9 @@ trap "rmdir '$lockdir'; exit 1" 1 2 15
ret=$?
if test -f "$cofile"; then
mv "$cofile" "$ofile"
test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
elif test -f "${cofile}bj"; then
mv "${cofile}bj" "$ofile"
test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
fi
rmdir "$lockdir"
......@@ -138,5 +138,6 @@ exit $ret
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-end: "$"
# time-stamp-time-zone: "UTC"
# time-stamp-end: "; # UTC"
# End:
......@@ -156,6 +156,8 @@ AC_CONFIG_FILES([Makefile
data/styles/hard/Makefile
data/svg11/Makefile
docs/Makefile
docs/florence.1
docs/florence_applet.1
src/Makefile
po/Makefile.in])
AC_OUTPUT
......
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
scriptversion=2007-03-29.01
scriptversion=2009-04-28.21; # UTC
# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
# Foundation, Inc.
# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
# Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......@@ -17,9 +17,7 @@ scriptversion=2007-03-29.01
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301, USA.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
......@@ -87,6 +85,15 @@ if test "$depmode" = dashXmstdout; then
depmode=dashmstdout
fi
cygpath_u="cygpath -u -f -"
if test "$depmode" = msvcmsys; then
# This is just like msvisualcpp but w/o cygpath translation.
# Just convert the backslash-escaped backslashes to single forward
# slashes to satisfy depend.m4
cygpath_u="sed s,\\\\\\\\,/,g"
depmode=msvisualcpp
fi
case "$depmode" in
gcc3)
## gcc 3 implements dependency tracking that does exactly what
......@@ -192,14 +199,14 @@ sgi)
' < "$tmpdepfile" \
| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
tr '
' ' ' >> $depfile
echo >> $depfile
' ' ' >> "$depfile"
echo >> "$depfile"
# The second pass generates a dummy entry for each header file.
tr ' ' '
' < "$tmpdepfile" \
| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
>> $depfile
>> "$depfile"
else
# The sourcefile does not contain any dependencies, so just
# store a dummy comment line, to avoid errors with the Makefile
......@@ -328,7 +335,12 @@ hp2)
if test -f "$tmpdepfile"; then
sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
# Add `dependent.h:' lines.
sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
sed -ne '2,${
s/^ *//
s/ \\*$//
s/$/:/
p
}' "$tmpdepfile" >> "$depfile"
else
echo "#dummy" > "$depfile"
fi
......@@ -404,7 +416,7 @@ dashmstdout)
# Remove the call to Libtool.
if test "$libtool" = yes; then
while test $1 != '--mode=compile'; do
while test "X$1" != 'X--mode=compile'; do
shift
done
shift
......@@ -455,32 +467,39 @@ makedepend)
"$@" || exit $?
# Remove any Libtool call
if test "$libtool" = yes; then
while test $1 != '--mode=compile'; do
while test "X$1" != 'X--mode=compile'; do
shift
done
shift
fi
# X makedepend
shift
cleared=no
for arg in "$@"; do
cleared=no eat=no
for arg
do
case $cleared in
no)
set ""; shift
cleared=yes ;;
esac
if test $eat = yes; then
eat=no
continue
fi
case "$arg" in
-D*|-I*)
set fnord "$@" "$arg"; shift ;;
# Strip any option that makedepend may not understand. Remove
# the object too, otherwise makedepend will parse it as a source file.
-arch)
eat=yes ;;
-*|$object)
;;
*)
set fnord "$@" "$arg"; shift ;;
esac
done
obj_suffix="`echo $object | sed 's/^.*\././'`"
obj_suffix=`echo "$object" | sed 's/^.*\././'`
touch "$tmpdepfile"
${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
rm -f "$depfile"
......@@ -500,7 +519,7 @@ cpp)
# Remove the call to Libtool.
if test "$libtool" = yes; then
while test $1 != '--mode=compile'; do
while test "X$1" != 'X--mode=compile'; do
shift
done
shift
......@@ -538,13 +557,27 @@ cpp)
msvisualcpp)
# Important note: in order to support this mode, a compiler *must*
# always write the preprocessed file to stdout, regardless of -o,
# because we must use -o when running libtool.
# always write the preprocessed file to stdout.
"$@" || exit $?
# Remove the call to Libtool.
if test "$libtool" = yes; then
while test "X$1" != 'X--mode=compile'; do
shift
done
shift
fi
IFS=" "
for arg
do
case "$arg" in
-o)
shift
;;
$object)
shift
;;
"-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
set fnord "$@"
shift
......@@ -557,16 +590,23 @@ msvisualcpp)
;;
esac
done
"$@" -E |
sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
"$@" -E 2>/dev/null |
sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
rm -f "$depfile"
echo "$object : \\" > "$depfile"
. "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
echo " " >> "$depfile"
. "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
rm -f "$tmpdepfile"
;;
msvcmsys)
# This case exists only to let depend.m4 do its work. It works by
# looking at the text of this script. This case will never be run,
# since it is checked for above.
exit 1
;;
none)
exec "$@"
;;
......@@ -585,5 +625,6 @@ exit 0
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-end: "$"
# time-stamp-time-zone: "UTC"
# time-stamp-end: "; # UTC"
# End:
florence-*.omf
florence*.1
......@@ -7,3 +7,30 @@ DOC_INCLUDES =
DOC_FIGURES = figures/behaviour.png figures/florence.png figures/layout.png figures/style.png figures/window.png
DOC_LINGUAS = fr ru
man_MANS = florence.1 florence_applet.1
EXTRA_DIST = $(man_MANS)
install-data-hook:
@list_install='$(man_MANS)'; \
for i in $$list_install; do \
s=`echo $$i | sed -e 's/.*\\(.\\)$$/\1/'`; \
n=`echo $$i | sed -e 's/-[^-]*$$//'`; \
f="$$n.$$s"; \
echo "cd $(DESTDIR)$(mandir)/man$$s"; \
cd $(DESTDIR)$(mandir)/man$$s; \
echo "rm -f $$f"; \
rm -f $$f; \
echo "ln -s $$i $$f"; \
ln -s $$i $$f; \
done
uninstall-local:
@list_uninst='$(man_MANS)'; \
for i in $$list_uninst; do \
s=`echo $$i | sed -e 's/.*\\(.\\)$$/\1/'`; \
n=`echo $$i | sed -e 's/-[^-]*$$//'`; \
f="$$n.$$s"; \
echo " rm -f $(DESTDIR)$(mandir)/man$$s/$$f"; \
rm -f $(DESTDIR)$(mandir)/man$$s/$$f; \
done
'\" t
.\" Title: florence
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 09/26/2011
.\" Manual: \ \&
.\" Source: Florence
.\" Language: English
.\"
.TH "FLORENCE" "1" "09/26/2011" "Florence" "\ \&"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.\" http://bugs.debian.org/507673
.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.ad l
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
.SH "NAME"
florence \- extensible and scalable virtual keyboard for GNOME
.SH "SYNOPSIS"
.sp
\fBflorence\fR [\fIOPTIONS\fR]
.SH "DESCRIPTION"
.sp
Florence is an extensible scalable virtual keyboard for GNOME\&. You need it if you can\(cqt use a real hardware keyboard, for example because of injury, handicap, your keyboard is broken or because you use a tablet PC, but you must be able to use a pointing device (as a mouse, a trackball, a touchscreen or opengazer); If you can\(cqt use a pointing device, there is gok, which can be used with just simple switches\&.
.sp
Florence stays out of your way when you don\(cqt need it: it appears on the screen only when you need it\&. A timer\-based auto\-click input method is available to help disabled people having difficulties to click\&. The ramble mode is another efficient input method that can help\&.
.sp
Florence is primarily intended to be used with the GNOME desktop, although it can be used on any desktop environment by using the \fB\-\-no\-gnome\fR option\&.
.SH "OPTIONS"
.PP
\fB\-h, \-\-help\fR
.RS 4
Print help message and exit\&.
.RE
.PP
\fB\-V, \-\-version\fR
.RS 4
Print Florence version and exit\&.
.RE
.PP
\fB\-c, \-\-config\fR
.RS 4
Open configuration dialog\&.
.RE
.PP
\fB\-d, \-\-debug\fR
.RS 4
Launch Florence in verbose mode\&.
.RE
.PP
\fB\-n, \-\-no\-gnome\fR
.RS 4
Use this option if you are not using the GNOME desktop environment\&. This will disable some GNOME specific features\&.
.RE
.PP
\fB\-f\fR \fB, \-\-focus\fR[\fB=\fR\fIWINDOW\fR]
.RS 4
With this option, any florence input will go to the selected window\&. The window argument is the name of the window (the one that most window managers put in the title bar)\&. if the window argument is not provided, florence will select the last focused window\&. This option is useful for window managers that don\(cqt support the "not focusable" hint and focus the keyboard window instead of the output one\&. It can also be useful if you want to input text to a window that is not focused\&. This option must be used for the keyboard to work in GDM\&.
.RE
.PP
\fB\-u\fR \fIFILE\fR, \fB\-\-use\-config=\fR\fIFILE\fR
.RS 4
Use the configuration file provided instead of gconf\&. The configuration file is a key\-value pair file with sections\&. An example of configuration file is provided at
\fI/usr/share/doc/florence/examples/florence\&.conf\fR\&.
.RE
.SH "SEE ALSO"
.sp
Florence documentation in the GNOME help system\&.
.sp
Florence website: http://florence\&.sourceforge\&.net/
.SH "AUTHOR"
.sp
François Agrech <f\&.agrech@gmail\&.com>
'\" t
.\" Title: florence_applet
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 09/26/2011
.\" Manual: \ \&
.\" Source: Florence
.\" Language: English
.\"
.TH "FLORENCE_APPLET" "1" "09/26/2011" "Florence" "\ \&"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.\" http://bugs.debian.org/507673
.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.ad l
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
.SH "NAME"
florence_applet \- virtual keyboard applet for the GNOME panel
.SH "SYNOPSIS"
.sp
florence_applet [\fIOPTIONS\fR]
.SH "DESCRIPTION"
.sp
Florence is an extensible scalable virtual keyboard for GNOME\&.
.sp
florence_applet is a panel applet which will display a virtual keyboard in a panel of the GNOME desktop\&.
.sp
This program is not intended to be run on a command\-line\&. To add this applet to a panel, right\-click on the panel, select "Add to Panel\&..." and choose Florence in the subsequent list\&.
.SH "SEE ALSO"
.sp
\fIflorence(1)\fR
.sp
Florence documentation in the GNOME help system\&.
.sp
Florence website: http://florence\&.sourceforge\&.net/
.SH "AUTHOR"
.sp
François Agrech <f\&.agrech@gmail\&.com>
......@@ -20,8 +20,8 @@
# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
kill -HUP $(ps -ef | grep gconfd | grep -v grep | tr -s ' ' ' ' | cut -d' ' -f 2) ||
echo "Unable to send HUP signal to gconf daemon.
kill -9 $(ps -ef | grep gconfd | grep -v grep | tr -s ' ' ' ' | cut -d' ' -f 2) ||
echo "Unable to send KILL signal to gconf daemon.
Configuration will not be updated until reboot.
Florence may not function correctly before reboot."
#!/bin/sh
# install - install a program, script, or datafile
scriptversion=2006-12-25.00
scriptversion=2009-04-28.21; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
......@@ -515,5 +515,6 @@ done
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-end: "$"
# time-stamp-time-zone: "UTC"
# time-stamp-end: "; # UTC"
# End:
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
scriptversion=2006-05-10.23
scriptversion=2009-04-28.21; # UTC
# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
......@@ -18,9 +18,7 @@ scriptversion=2006-05-10.23
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301, USA.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
......@@ -89,6 +87,9 @@ Supported PROGRAM values:
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
\`g' are ignored when checking the name.
Send bug reports to <bug-automake@gnu.org>."
exit $?
;;
......@@ -106,15 +107,22 @@ Send bug reports to <bug-automake@gnu.org>."
esac
# normalize program name to check for.
program=`echo "$1" | sed '
s/^gnu-//; t
s/^gnu//; t
s/^g//; t'`
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
# the program). This is about non-GNU programs, so use $1 not
# $program.
case $1 in
lex|yacc)
lex*|yacc*)
# Not GNU programs, they don't have --version.
;;
tar)
tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
......@@ -138,7 +146,7 @@ esac
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
case $1 in
case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
......@@ -148,7 +156,7 @@ WARNING: \`$1' is $msg. You should only need it if
touch aclocal.m4
;;
autoconf)
autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
......@@ -157,7 +165,7 @@ WARNING: \`$1' is $msg. You should only need it if
touch configure
;;
autoheader)
autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
......@@ -187,7 +195,7 @@ WARNING: \`$1' is $msg. You should only need it if
while read f; do touch "$f"; done
;;
autom4te)
autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
......@@ -210,7 +218,7 @@ WARNING: \`$1' is needed, but is $msg.
fi
;;
bison|yacc)
bison*|yacc*)
echo 1>&2 "\
WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
......@@ -240,7 +248,7 @@ WARNING: \`$1' $msg. You should only need it if
fi
;;
lex|flex)
lex*|flex*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
......@@ -263,7 +271,7 @@ WARNING: \`$1' is $msg. You should only need it if
fi
;;
help2man)
help2man*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
......@@ -277,11 +285,11 @@ WARNING: \`$1' is $msg. You should only need it if
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
exit 1
exit $?
fi
;;
makeinfo)
makeinfo*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
......@@ -310,7 +318,7 @@ WARNING: \`$1' is $msg. You should only need it if
touch $file
;;
tar)
tar*)
shift
# We have already tried tar in the generic part.
......@@ -363,5 +371,6 @@ exit 0
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-end: "$"
# time-stamp-time-zone: "UTC"
# time-stamp-end: "; # UTC"
# End:
......@@ -103,7 +103,7 @@ void flo_icon_expose (GtkWidget *window, GdkEventExpose* pExpose, void *userdata
gdouble w, h;
GdkBitmap *mask=NULL;
context=gdk_cairo_create(window->window);
context=gdk_cairo_create(gtk_widget_get_window(window));
cairo_set_operator(context, CAIRO_OPERATOR_SOURCE);
handle=rsvg_handle_new_from_file(ICONDIR "/florence.svg", &error);
......@@ -119,7 +119,7 @@ void flo_icon_expose (GtkWidget *window, GdkEventExpose* pExpose, void *userdata
cairo_paint(mask_context);
cairo_set_operator(mask_context, CAIRO_OPERATOR_OVER);
style_render_svg(mask_context, handle, w, h, TRUE, NULL);
gdk_window_shape_combine_mask(window->window, mask, 0, 0);
gdk_window_shape_combine_mask(gtk_widget_get_window(window), mask, 0, 0);
cairo_set_source_rgba(context, 0.0, 0.0, 0.0, 100.0);
cairo_set_operator(context, CAIRO_OPERATOR_DEST_OUT);
cairo_paint(context);
......@@ -144,7 +144,7 @@ void flo_check_show (struct florence *florence, Accessible *obj)
{
START_FUNC
if (flo_exit || (!florence->view)) return;
if (GTK_WIDGET_VISIBLE(florence->view->window)) view_hide(florence->view);
if (gtk_widget_get_visible(GTK_WIDGET(florence->view->window))) view_hide(florence->view);
if (settings_get_bool("behaviour/intermediate_icon")) {
#ifdef ENABLE_AT_SPI2
if (florence->obj) g_object_unref(florence->obj);
......@@ -419,7 +419,7 @@ gboolean flo_mouse_leave_event (GtkWidget *window, GdkEvent *event, gpointer use
status_press_latched(florence->status, NULL);
}
#ifdef ENABLE_RAMBLE
if (florence->ramble) ramble_reset(florence->ramble, GTK_WIDGET(florence->view->window)->window);
if (florence->ramble) ramble_reset(florence->ramble, gtk_widget_get_window(GTK_WIDGET(florence->view->window)));
#endif
END_FUNC
return FALSE;
......@@ -458,7 +458,10 @@ gboolean flo_button_press_event (GtkWidget *window, GdkEventButton *event, gpoin
(gint)((GdkEventButton*)event)->y);
#endif
/* we don't want double and triple click events */
if ((event->type==GDK_2BUTTON_PRESS) || (event->type==GDK_3BUTTON_PRESS)) return FALSE;
if ((event->type==GDK_2BUTTON_PRESS) || (event->type==GDK_3BUTTON_PRESS)) {
END_FUNC
return FALSE;
}
} else {
key=status_focus_get(florence->status);
}
......@@ -488,7 +491,7 @@ gboolean flo_button_release_event (GtkWidget *window, GdkEvent *event, gpointer
if (ramble_started(florence->ramble) &&
status_im_get(florence->status)==STATUS_IM_RAMBLE &&
settings_get_bool("behaviour/ramble_button")) {
ramble_reset(florence->ramble, GTK_WIDGET(florence->view->window)->window);
ramble_reset(florence->ramble, gtk_widget_get_window(GTK_WIDGET(florence->view->window)));
}
#endif
END_FUNC
......@@ -521,7 +524,7 @@ gboolean flo_to_top(gpointer data)
struct florence *florence=data;
GtkWindow *window=GTK_WINDOW(view_window_get(florence->view));
if (!settings_get_bool("window/keep_on_top")) return FALSE;
if (GTK_WIDGET_VISIBLE(GTK_WIDGET(window))) gtk_window_present(window);
if (gtk_widget_get_visible(GTK_WIDGET(window))) gtk_window_present(window);
END_FUNC
return TRUE;
}
......@@ -574,7 +577,7 @@ gboolean flo_mouse_move_event(GtkWidget *window, GdkEvent *event, gpointer user_
}
if (algo) g_free(algo);
if (ramble_started(florence->ramble) &&
ramble_add(florence->ramble, GTK_WIDGET(florence->view->window)->window,
ramble_add(florence->ramble, gtk_widget_get_window(GTK_WIDGET(florence->view->window)),
florence->xpos, florence->ypos, key)) {
if (status_focus_get(florence->status)!=key) {
status_focus_set(florence->status, key);
......@@ -717,7 +720,8 @@ struct florence *flo_new(gboolean gnome, const gchar *focus_back, PanelApplet *a
#else
if (SPI_init() && ((!gnome) || (!flo_check_at_spi()))) {
#endif
status_spi_disable(florence->status);
flo_warn(_("AT-SPI has been disabled at run time: auto-hide mode is disabled."));
status_spi_disable(florence->status);
}
#else
flo_warn(_("AT-SPI has been disabled at compile time: auto-hide mode is disabled."));
......
......@@ -344,7 +344,7 @@ gint settings_get_int(const gchar *name)
gint ret=0;
GConfValue *val=settings_value_get(name);;
if (!val) {
ret=settings_defaults[settings_default_idx(name)].default_value.vdouble;
ret=settings_defaults[settings_default_idx(name)].default_value.vinteger;
} else {
ret=gconf_value_get_int(val);
gconf_value_free(val);
......
......@@ -52,7 +52,7 @@ gint tools_dialog(const gchar *title, GtkWindow *parent,
accept, GTK_RESPONSE_ACCEPT, reject, GTK_RESPONSE_REJECT, NULL);
label=gtk_label_new(text);
tools_set_icon(GTK_WINDOW(dialog));
gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), label);
gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), label);
gtk_widget_show_all(dialog);
ret=gtk_dialog_run(GTK_DIALOG(dialog));
gtk_object_destroy(GTK_OBJECT(dialog));
......@@ -71,9 +71,9 @@ void tools_window_move(GtkWindow *window, Accessible *object)
START_FUNC
#ifdef ENABLE_AT_SPI2
AtspiRect *rect;
AtspiComponent *component;
AtspiComponent *component=NULL;
#else
AccessibleComponent *component;
AccessibleComponent *component=NULL;
#endif
long int x, y, w, h;
gint screen_width, screen_height;
......@@ -82,12 +82,13 @@ void tools_window_move(GtkWindow *window, Accessible *object)
if (!object) {
flo_error(_("NULL accessible object, unable to move window"));
END_FUNC
return;
}
#ifdef ENABLE_AT_SPI2
component=atspi_accessible_get_component(object);
#else
component=Accessible_getComponent(object);
if (Accessible_isComponent(object)) component=Accessible_getComponent(object);
#endif
if (component) {
screen_height=gdk_screen_get_height(gdk_screen_get_default());
......@@ -100,7 +101,7 @@ void tools_window_move(GtkWindow *window, Accessible *object)
AccessibleComponent_getExtents(component, &x, &y, &w, &h, SPI_COORD_TYPE_SCREEN);
#endif
if (gtk_window_get_decorated(window)) {
gdk_window_get_frame_extents(GTK_WIDGET(window)->window, &win_rect);
gdk_window_get_frame_extents(gtk_widget_get_window(GTK_WIDGET(window)), &win_rect);
win_width=win_rect.width;
win_height=win_rect.height;
} else gtk_window_get_size(window, &win_width, &win_height);
......
......@@ -95,7 +95,7 @@ void trayicon_on_click(GtkStatusIcon *status_icon, gpointer user_data)
{
START_FUNC
struct trayicon *trayicon=(struct trayicon *)(user_data);
if (GTK_WIDGET_VISIBLE(trayicon->view->window)) {