+++ /dev/null
-Linux Infrared Remote Control - use an easy to build home-brewn IR-receiver, an
-(almost) arbitrary remote control and control your Linux box with it! More
-about it at www.lirc.org. Be sure to read LIRC documentation before going ahead
-in this README.
-
-If you have installed the lirc-package, configure will autodetect it. If LIRC
-support is enabled and an error occurs Geeqie will tell you on startup. The
-application name for Geeqie is geeqie. Here is the list of supported commands:
-
-DOWN [int] - Move "camera" down by the specified amount. Default=1
-EXIT - Exit Geeqie
-FIRST - Jump to first image
-INFO - Show image information (full screen only)
-LAST - Jump to last image
-LEFT [int] - Move "camera" left by the specified amount. Default=1
-NEXT - Go to next image
-PAUSE - Pause/unpause slideshow
-PREV - Go to previous image
-RIGHT [int] - Move "camera" right by the specified amount. Default=1
-ROTATE_90 - Rotate image 90 degrees clockwise.
-ROTATE_90_CC - Rotate image 90 degrees counter-clockwise.
-SET_INV_ZOOM [int] - Zoom to 1/Nx. Default=1x
-SET_ZOOM [int] - Zoom to Nx. Default=1x
-UP [int] - Move "camera" up by the specified amount. Default=1
-ZOOM_IN [int] - Zoom in. Value specifies the amount of zoom.
-ZOOM_MAX - Zoom to fit image
-ZOOM_OUT [int] - Zoom out. Value specifies the amount of zoom.
-
-Don't forget to enable the repeat flag in .lircrc when it make sense
-(directional buttons, zoom in and out, ...)
-Here's an excerpt from my .lircrc:
-
-begin geeqie
- begin
- prog = geeqie
- button = vol_up
- config = ZOOM_IN 1
- repeat = 3
- end
- begin
- prog = geeqie
- button = vol_down
- config = ZOOM_OUT 1
- repeat = 3
- end
- begin
- prog = geeqie
- button = down
- config = DOWN 10
- repeat = 1
- end
- begin
- prog = geeqie
- button = up
- config = UP 10
- repeat = 1
- end
- begin
- prog = geeqie
- button = right
- config = RIGHT 10
- repeat = 1
- end
- begin
- prog = geeqie
- button = left
- config = LEFT 10
- repeat = 1
- end
- begin
- prog = geeqie
- button = back
- config = PREV
- end
- begin
- prog = geeqie
- button = forw
- config = NEXT
- end
- begin
- prog = geeqie
- button = skip_back
- config = FIRST
- end
- begin
- prog = geeqie
- button = skip_forw
- config = LAST
- end
- begin
- prog = geeqie
- button = pause
- config = PAUSE
- end
- begin
- prog = geeqie
- button = surround
- config = SET_ZOOM
- end
- begin
- prog = geeqie
- button = 1
- config = ROTATE_90
- end
- begin
- prog = geeqie
- button = 2
- config = ROTATE_90_CC
- end
- begin
- prog = geeqie
- button = 3
- config = INFO
- end
- begin
- prog = geeqie
- button = 4
- config = EXIT
- end
-end geeqie
-
-At the moment Geeqie uses the standard location for the lirc-config file
-(~/.lircrc).
-
-LIRC support and documentation by Matteo Beniamino
-<beniamino@tautologica.org>.
-
-(This file is 'inspired' by LIRC documentation from mplayer).
Generate the Geeqie executable:
```sh
-sudo make maintainer-clean
-./autogen.sh --prefix="/usr/"
-make -j
-make install DESTDIR=<full path to target dir>/AppDir
+meson setup appimage-build
+meson configure -Dprefix=/usr appimage-build
+DESTDIR=<full path to target dir>/AppDir ninja -C build-appimage install
```
## Generate the AppImage
#define HAVE_STRING_H 1
/* Define to 1 if you have the `strverscmp' function. */
-#define HAVE_STRVERSCMP 1 used
+#define HAVE_STRVERSCMP 1
/* Define to 1 if you have the <sys/stat.h> header file. */
#define HAVE_SYS_STAT_H 1
#define HAVE_GETTEXT 1
/* Define if you have gthread library */
-#define HAVE_GTHREAD 1 used
+#define HAVE_GTHREAD 1
/* Define to 1 if you have the <inttypes.h> header file. */
#define HAVE_INTTYPES_H 1
</para>
</listitem>
</varlistentry>
- <varlistentry>
- <term>
- <guilabel>Use GPU acceleration via Clutter library</guilabel>
- </term>
- <listitem>
- <para>Use alternate renderer. Geeqie must be compiled with the --enable-gpu-accel option.</para>
- </listitem>
- </varlistentry>
<varlistentry>
<term>
<guilabel>Two pass zooming</guilabel>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideReferenceLuaAPI.xml" />
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideReferenceConfig.xml" />
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideReferenceFileDates.xml" />
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideReferenceLIRC.xml" />
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideReferenceTags.xml" />
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideReferenceSupportedFormats.xml" />
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideReferencePixbufLoaders.xml" />
<programlisting xml:space="preserve">$XDG_DATA_HOME/geeqie/collections</programlisting>
<programlisting xml:space="preserve">($HOME/.local/share/geeqie/collections)</programlisting>
</para>
- <para>
- The lirc
- <link linkend="GuideReferenceLIRC" endterm="titleGuideReferenceLIRC" />
- configuration file must be located at:
- <programlisting xml:space="preserve">$HOME/.lircrc</programlisting>
- </para>
<para>
Thumbnails are stored in a location specified in
<link linkend="PreferencesThumbnails">Thumbnail Preferences</link>
+++ /dev/null
-<?xml version="1.0" encoding="utf-8"?>
-<section id="GuideReferenceLIRC">
- <title id="titleGuideReferenceLIRC">Infra-red controller</title>
- <para>Recent Linux kernels have in-built support for ir devices, making lirc support redundant.</para>
- <para>If you wish to use lirc with Geeqie, the lirc libraries must be installed. If you are compiling from sources, lirc functionality will be available if the library dependencies are met.</para>
- <para>If you are using a pre-compiled distribution, availability depends on the package maintainer.</para>
- <para>
- The website
- <ulink url="https://www.lirc.org">Linux Infrared Remote Control</ulink>
- has detailed information on this subject.
- </para>
- <para>
- You will need to create a configuration file for the controller you will use. This file must be installed at the location specified in
- <link linkend="GuideReferenceConfig" endterm="titleGuideReferenceConfig" />
- .
- </para>
- <para>
- Here is an excerpt from an .lircrc file:
- <programlisting>
- begin geeqie
- begin
- prog = geeqie
- button = vol_up
- config = ZOOM_IN 1
- repeat = 3
- end
- </programlisting>
- </para>
- <para>The commands Geeqie will respond to are:</para>
- <table frame="all">
- <tgroup cols="2" rowsep="1" colsep="1">
- <thead rowsep="1" colsep="1">
- <row>
- <entry>Command</entry>
- <entry>Mapped to</entry>
- </row>
- </thead>
- <tbody rowsep="1" colsep="1">
- <row>
- <entry>DOWN [int]</entry>
- <entry>Pan down by the specified amount. Default=1</entry>
- </row>
- <row>
- <entry>EXIT</entry>
- <entry>Exit Geeqie</entry>
- </row>
- <row>
- <entry>FIRST</entry>
- <entry>Jump to first image</entry>
- </row>
- <row>
- <entry>INFO</entry>
- <entry>Show image overlay (full screen only)</entry>
- </row>
- <row>
- <entry>LAST</entry>
- <entry>Jump to last image</entry>
- </row>
- <row>
- <entry>LEFT [int]</entry>
- <entry>Pan left by the specified amount. Default=1</entry>
- </row>
- <row>
- <entry>NEXT</entry>
- <entry>Go to next image</entry>
- </row>
- <row>
- <entry>PAUSE</entry>
- <entry>Pause/unpause slideshow</entry>
- </row>
- <row>
- <entry>PREV</entry>
- <entry>Go to previous image</entry>
- </row>
- <row>
- <entry>RIGHT [int]</entry>
- <entry>Pan right by the specified amount. Default=1</entry>
- </row>
- <row>
- <entry>ROTATE_90 ]</entry>
- <entry>Rotate image 90 degrees clockwise. .</entry>
- </row>
- <row>
- <entry>ROTATE_90_CC</entry>
- <entry>Rotate image 90 degrees counter-clockwise..</entry>
- </row>
- <row>
- <entry>SET_INV_ZOOM [int]</entry>
- <entry>Set Zoom level to 1:N. Default=1x</entry>
- </row>
- <row>
- <entry>SET_ZOOM [int]</entry>
- <entry>Set Zoom level to N:1. Default=1x</entry>
- </row>
- <row>
- <entry>UP [int]</entry>
- <entry>Pan up by the specified amount. Default=1</entry>
- </row>
- <row>
- <entry>ZOOM_IN [int]</entry>
- <entry>Zoom in. Value specifies the amount of zoom.</entry>
- </row>
- <row>
- <entry>ZOOM_MAX ]</entry>
- <entry>Zoom to fit image to window</entry>
- </row>
- <row>
- <entry>ZOOM_OUT [int]</entry>
- <entry>Zoom out. Value specifies the amount of zoom.</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- <para />
-</section>
HAVE_JPEG=1 \
HAVE_LIBCHAMPLAIN=1 \
HAVE_LIBCHAMPLAIN_GTK=1 \
- HAVE_LIRC=1 \
HAVE_LUA=1 \
HAVE_PDF=1 \
HAVE_RAW=1 \
## Dialogs allow the user to install additional features.
##
-version="2022-07-17"
+version="2022-07-21"
description='
Geeqie is an image viewer.
This script will download, compile, and install Geeqie on Debian-based systems.
help2man
doclifter"
-# Optional for both GTK2 and GTK3
+# Optional for GTK3
optional_array="LCMS (for color management)
liblcms2-dev
exiv2 (for exif handling)
libgexiv2-dev
+evince (for print preview)
+evince
lua (for --remote commands)
liblua5.1-0-dev
libffmpegthumbnailer (for mpeg thumbnails)
libarchive (for compressed files e.g. zip, including timezone)
libarchive-dev
libgspell (for spelling checks)
-libgspell-1-dev"
-
-# Optional for GTK3 only
-optional_gtk3_array="libchamplain gtk (for GPS maps)
+libgspell-1-dev
+libchamplain gtk (for GPS maps)
libchamplain-gtk-0.12-dev
libchamplain (for GPS maps)
libchamplain-0.12-dev
libpoppler (for pdf file preview)
-libpoppler-glib-dev
-libgspell (for spelling checks)
-libgspell-1-dev"
+libpoppler-glib-dev"
####################################################################
# Get System Info
printf '%b\n' "$file"
done
- printf '\n'
- printf '%b\n' "Optional for GTK3:"
- for file in $optional_gtk3_array
- do
- printf '%b\n' "$file"
- done
-
exit
fi
fi
# Use GTK3 as default
-gtk2_installed=FALSE
gtk3_installed=TRUE
if [ "$mode" = "install" ]
then
- message="This script is for use on Ubuntu and other\nDebian-based installations.\nIt will download, compile, and install Geeqie source\ncode and its dependencies.\n\nA sub-folder named \"geeqie\" will be created in the\nfolder this script is run from, and the source code\nwill be downloaded to that sub-folder.\n\nIn this dialog you must select whether to compile\nfor GTK2 or GTK3.\nIf you want to use GPS maps or pdf preview,\nyou must choose GTK3.\nThe GTK2 version has a slightly different\nlook-and-feel compared to the GTK3 version,\nbut otherwise has the same features.\nYou may easily switch between the two after\ninstallation.\n\nIn subsequent dialogs you may choose which\noptional features to install."
+ message="This script is for use on Ubuntu and other\nDebian-based installations.\nIt will download, compile, and install Geeqie source\ncode and its dependencies.\n\nA sub-folder named \"geeqie\" will be created in the\nfolder this script is run from, and the source code\nwill be downloaded to that sub-folder.\n\nIn subsequent dialogs you may choose which\noptional features to install."
title="Install Geeqie and dependencies"
install_option=TRUE
else
- message="This script is for use on Ubuntu and other\nDebian-based installations.\nIt will update the Geeqie source code and its\ndependencies, and will compile and install Geeqie.\n\nYou may also switch the installed version from\nGTK2 to GTK3 and vice versa.\n\nIn this dialog you must select whether to compile\nfor GTK2 or GTK3.\nIf you want to use GPS maps or pdf preview,\nyou must choose GTK3.\nThe GTK2 version has a slightly different\nlook-and-feel compared to the GTK3 version,\nbut otherwise has the same features.\n\nIn subsequent dialogs you may choose which\noptional features to install."
+ message="This script is for use on Ubuntu and other\nDebian-based installations.\nIt will update the Geeqie source code and its\ndependencies, and will compile and install Geeqie.\n\nIn subsequent dialogs you may choose which\noptional features to install."
title="Update Geeqie and re-install"
install_option=FALSE
-
- # When updating, use previous installation as default
- if [ -f config.log ]
- then
- if grep gtk-2.0 config.log > /dev/null
- then
- gtk2_installed=TRUE
- gtk3_installed=FALSE
- else
- gtk2_installed=FALSE
- gtk3_installed=TRUE
- fi
- fi
fi
-# Ask whether to install GTK2 or GTK3 or uninstall
+# Ask whether to install GTK3 or uninstall
-if ! gtk_version=$(zenity --title="$title" --width=370 --text="$message" --list --radiolist --column "" --column "" "$gtk3_installed" "GTK3 (required for GPS maps and pdf preview)" "$gtk2_installed" "GTK2" FALSE "Uninstall" --cancel-label="Cancel" --ok-label="OK" --hide-header 2> /dev/null)
+if ! gtk_version=$(zenity --title="$title" --width=370 --text="$message" --list --radiolist --column "" --column "" "$gtk3_installed" "Install" FALSE "Uninstall" --cancel-label="Cancel" --ok-label="OK" --hide-header 2> /dev/null)
then
exit
fi
i=$((i + 1))
done
-# If GTK3 required, get the GTK3 options not yet installed
-if [ -z "${gtk_version%%GTK3*}" ]
-then
- i=0
- for file in $optional_gtk3_array
- do
- if [ $((i % 2)) -eq 0 ]
- then
- package_title="$file"
- else
- if package_query "$file"
- then
- if [ -z "$option_string" ]
- then
- option_string="${install_option:+${install_option}}\n${file}\n${file}"
- else
- option_string="${option_string:+${option_string}}\n$install_option\n${package_title}\n${file}"
- fi
- fi
- fi
- i=$((i + 1))
- done
-fi
-
kill $zen_pid 2> /dev/null
# Ask the user which options to install
# norootforbuild
-BuildRequires: gtk2-devel gcc-c++ intltool gnome-doc-utils libjpeg-devel libtiff-devel
+BuildRequires: libgtk-3-dev gcc-c++ intltool gnome-doc-utils libjpeg-devel libtiff-devel
%if 0%{?suse_version}
BuildRequires: liblcms-devel update-desktop-files
%define docname %{name}
%suse_update_desktop_file -n geeqie
%endif
-%__install -m 644 AUTHORS COPYING ChangeLog NEWS README.md README.lirc "%{buildroot}/%{_docdir}/%{docname}/"
+%__install -m 644 AUTHORS COPYING ChangeLog NEWS README.md "%{buildroot}/%{_docdir}/%{docname}/"
%clean
%__rm -rf "%{buildroot}"
version : run_command('./version.sh', check : true).stdout().strip(),
license : ['GPL-2.0-or-later'],
meson_version : '>= 0.60.0',
- default_options : ['warning_level=0', 'buildtype=debugoptimized']
+ default_options : ['warning_level=3', 'buildtype=debugoptimized']
)
+# To inhibit warnings from the generated files icons_inline.h and ui_icons.h
+add_global_arguments('-Wno-overlength-strings', language : 'c')
+
# Project requirements
project_sources = []
gnome = import('gnome')
conf_data.set_quoted('VERSION', run_command('./version.sh', check : true).stdout())
conf_data.set('DEBUG', debug)
-if get_option('gtk3')
- gtk_dep = dependency('gtk+-3.0', version : '>=3.0', required: true)
-else
- gtk_dep = dependency('gtk+-2.0', version : '>=2.20', required: true)
-endif
-
+gtk_dep = dependency('gtk+-3.0', version : '>=3.22', required: true)
glib_dep = dependency('glib-2.0', version: '>=2.52', required: true)
libarchive_dep = []
conf_data.set('HAVE_ARCHIVE', 1)
endif
-clutter_dep = []
-clutter_gtk_dep = []
-if get_option('gtk3')
- clutter_dep = dependency('clutter-1.0', required : get_option('clutter'))
- clutter_gtk_dep = dependency('clutter-gtk-1.0', required : get_option('clutter'))
- if clutter_dep.found() and clutter_gtk_dep.found()
- conf_data.set('HAVE_CLUTTER', 1)
- endif
-endif
-
lcms_dep = []
lcms_dep = dependency('lcms2', version: '>=2.0', required : get_option('cms'))
if lcms_dep.found()
champlain_dep = []
champlain_gtk_dep = []
-if conf_data.has('HAVE_CLUTTER')
- champlain_dep = dependency('champlain-0.12', version: '>=0.12', required : get_option('gps-map'))
- champlain_gtk_dep = dependency('champlain-gtk-0.12', version: '>=0.12', required : get_option('gps-map'))
- if champlain_dep.found() and champlain_gtk_dep.found()
+champlain_dep = dependency('champlain-0.12', version: '>=0.12', required : get_option('gps-map'))
+champlain_gtk_dep = dependency('champlain-gtk-0.12', version: '>=0.12', required : get_option('gps-map'))
+if champlain_dep.found() and champlain_gtk_dep.found()
+ clutter_dep = []
+ clutter_gtk_dep = []
+ clutter_dep = dependency('clutter-1.0', required : true)
+ clutter_gtk_dep = dependency('clutter-gtk-1.0', required : true)
+ if clutter_dep.found() and clutter_gtk_dep.found()
+ conf_data.set('HAVE_CLUTTER', 1)
conf_data.set('HAVE_LIBCHAMPLAIN', 1)
conf_data.set('HAVE_LIBCHAMPLAIN_GTK', 1)
endif
conf_data.set('HAVE_RAW', 1)
endif
-lirc_dep = []
-lirc_dep = dependency('lirc', version: '>=0.6.1', required : get_option('lirc'))
-if lirc_dep.found()
- conf_data.set('HAVE_LIRC', 1)
-endif
-
lua_dep = []
lua_dep = dependency('lua5.1', required : get_option('lua'))
if lua_dep.found()
endif
poppler_glib_dep = []
-if get_option('gtk3')
- poppler_glib_dep = dependency('poppler-glib', version: '>=0.62', required : get_option('pdf'))
- if poppler_glib_dep.found()
- conf_data.set('HAVE_PDF', 1)
- endif
+poppler_glib_dep = dependency('poppler-glib', version: '>=0.62', required : get_option('pdf'))
+if poppler_glib_dep.found()
+ conf_data.set('HAVE_PDF', 1)
endif
gspell_dep = []
-if get_option('gtk3')
- gspell_dep = dependency('gspell-1', required: get_option('spell'))
- if gspell_dep.found()
- conf_data.set('HAVE_SPELL', 1)
- endif
+gspell_dep = dependency('gspell-1', required: get_option('spell'))
+if gspell_dep.found()
+ conf_data.set('HAVE_SPELL', 1)
endif
tiff_dep = []
pandoc = find_program('pandoc')
if pandoc.found()
- install_data('README.md', 'COPYING', join_paths(meson.project_build_root(), 'ChangeLog'), 'TODO', 'README.lirc', 'AUTHORS', join_paths(meson.project_build_root(), 'README.html'), join_paths(meson.project_build_root(), 'ChangeLog.html'), install_dir : helpdir, install_tag : 'help')
+ install_data('README.md', 'COPYING', join_paths(meson.project_build_root(), 'ChangeLog'), 'TODO', 'AUTHORS', join_paths(meson.project_build_root(), 'README.html'), join_paths(meson.project_build_root(), 'ChangeLog.html'), install_dir : helpdir, install_tag : 'help')
else
install_data('README.md', 'COPYING', join_paths(meson.project_build_root(), 'ChangeLog'), 'TODO', 'README.lirc', 'AUTHORS', install_dir : helpdir, install_tag : 'help')
endif
option('gq_htmldir', type : 'string', value : '', description : 'Location of html documentation')
option('gq_localedir', type : 'string', value : '', description : 'Location where the catalogs will be installed')
-option('gtk3', type : 'boolean', value : 'true', description : 'GTK3')
-
option('archive', type : 'feature', value : 'auto', description : 'archive files e.g. zip, gz')
-option('clutter', type : 'feature', value : 'auto', description : 'clutter (for GPS maps)')
option('cms', type : 'feature', value : 'auto', description : 'color management system')
option('djvu', type : 'feature', value : 'auto', description : 'djvu')
option('exiv2', type : 'feature', value : 'auto', description : 'exiv2')
option('jpeg', type : 'feature', value : 'auto', description : 'jpeg')
option('jpegxl', type : 'feature', value : 'auto', description : 'jpegxl')
option('libraw', type : 'feature', value : 'auto', description : 'libraw')
-option('lirc', type : 'feature', value : 'auto', description : 'lirc')
option('lua', type : 'feature', value : 'auto', description : 'lua')
option('markdown', type : 'feature', value : 'auto', description : 'markdown')
option('pdf', type : 'feature', value : 'auto', description : 'pdf')
#!/bin/sh
#/*
-# * Copyright (C) 2021 The Geeqie Team
+# * Copyright (C) 2022 The Geeqie Team
# *
# * Author: Colin Clark
# *
## @file
## @brief Check that Geeqie compiles with both gcc and clang,
-## for both GTK2 and GTK3, and with and without optional modules.
+## for GTK3, and with and without optional modules.
##
compile()
{
- compiler="$1"
+compiler="$1"
- # Cannot have --enable-debug-flags with --disable-gtk3
- set -- "$disable_list --disable-gtk3" "--disable-gtk3" "$disable_list --enable-debug-flags" "--enable-debug-flags" "$disable_list" ""
+printf '\e[32m%s\n' "$compiler all disabled"
+meson configure build -Darchive=disabled -Dcms=disabled -Ddjvu=disabled -Dexiv2=disabled -Dffmpegthumbnailer=disabled -Dgps-map=disabled -Dheif=disabled -Dj2k=disabled -Djpeg=disabled -Djpegxl=disabled -Dlibraw=disabled -Dlua=disabled -Dmarkdown=disabled -Dpdf=disabled -Dspell=disabled -Dtiff=disabled -Dwebp=disabled
+ninja -C build clean > /dev/null 2>&1
+ninja -C build > /dev/null 2>&1
- i=1
- while [ $i -le 6 ]
- do
- variant=""
- eval variant="\$${i}"
-
- if [ "$variant" != "${variant%gtk3*}" ]
- then
- gtk="GTK2"
- else
- gtk="GTK3"
- fi
- if [ "$variant" != "${variant%disable-threads*}" ]
- then
- disabled="all disabled"
- else
- disabled="none disabled"
- fi
- if [ "$variant" != "${variant%--enable-debug-flags*}" ]
- then
- debug_flags="enable-debug-flags"
- else
- debug_flags=""
- fi
-
- printf '\e[32m%s\n' "$compiler $gtk $debug_flags $disabled"
- sudo make maintainer-clean > /dev/null 2>&1
- ./autogen.sh "$variant" > /dev/null 2>&1
- make -j > /dev/null
-
- i=$((i+1))
- done
+printf '\e[32m%s\n' "$compiler none disabled"
+meson configure build -Darchive=auto -Dcms=auto -Ddjvu=auto -Dexiv2=auto -Dffmpegthumbnailer=auto -Dgps-map=auto -Dheif=auto -Dj2k=auto -Djpeg=auto -Djpegxl=auto -Dlibraw=auto -Dlua=auto -Dmarkdown=auto -Dpdf=auto -Dspell=auto -Dtiff=auto -Dwebp=auto
+ninja -C build clean > /dev/null 2>&1
+ninja -C build > /dev/null 2>&1
}
-disable_list=" "$(awk -F '[][]' '/AC_HELP_STRING\(\[--disable-/ {if ($2 != "gtk3") print $2}' configure.ac | tr '\n' ' ')
-
-printf '%s\n' "Disabled list: :$disable_list"
-
-export CFLAGS="-Wno-deprecated-declarations"
-
export CC=clang
export CXX=clang++
compile "clang"
git checkout stable/"$version"
fi
-sudo make maintainer-clean
-./autogen.sh
-make -j
./scripts/generate-man-page.sh
+./doc/create-shortcuts-xml.sh
git add NEWS
git add org.geeqie.Geeqie.appdata.xml.in
git push git@geeqie.org:geeqie "v$revision"
fi
-sudo make maintainer-clean
-./gen_changelog.sh
-
rm -rf /tmp/geeqie-"$revision".tar.xz
rm -rf /tmp/geeqie-"$revision".tar.xz.asc
exit 1
fi
-rm -rf doc/html
-tmpdir=$(mktemp -d "${TMPDIR:-/tmp}/geeqie.XXXXXXXXXX")
-
-make -j install DESTDIR="$tmpdir"
-rm -r "$tmpdir"
+ninja -C build
find ../geeqie.github.io/help/ -type f -exec rm "{}" \;
-cp -a doc/html/* ../geeqie.github.io/help
+cp -a build/doc/html/* ../geeqie.github.io/help
exit 0
static gint n_exif_drag_types = 1;
-static void advanced_exif_dnd_get(GtkWidget *listview, GdkDragContext *context,
- GtkSelectionData *selection_data, guint info,
- guint time, gpointer data)
+static void advanced_exif_dnd_get(GtkWidget *listview, GdkDragContext *UNUSED(context),
+ GtkSelectionData *selection_data, guint UNUSED(info),
+ guint UNUSED(time), gpointer UNUSED(data))
{
//ExifWin *ew = data;
GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(listview));
}
-static void advanced_exif_dnd_begin(GtkWidget *listview, GdkDragContext *context, gpointer data)
+static void advanced_exif_dnd_begin(GtkWidget *listview, GdkDragContext *context, gpointer UNUSED(data))
{
//ExifWin *ew = data;
GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(listview));
gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
}
-#if GTK_CHECK_VERSION(3,0,0)
gtk_tree_view_column_set_resizable(column, TRUE);
-#endif
gtk_tree_view_column_set_sort_column_id(column, n);
renderer = gtk_cell_renderer_text_new();
g_free(ew);
}
-static gboolean advanced_exif_delete_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
+static gboolean advanced_exif_delete_cb(GtkWidget *UNUSED(widget), GdkEvent *UNUSED(event), gpointer data)
{
ExifWin *ew = data;
return ret;
}
-static gboolean advanced_exif_mouseclick(GtkWidget *widget,
- GdkEventButton *bevent, gpointer data)
+static gboolean advanced_exif_mouseclick(GtkWidget *UNUSED(widget),
+ GdkEventButton *UNUSED(bevent), gpointer data)
{
ExifWin *ew = data;
GtkTreePath *path;
return TRUE;
}
-static gboolean advanced_exif_keypress(GtkWidget *widget, GdkEventKey *event, gpointer data)
+static gboolean advanced_exif_keypress(GtkWidget *UNUSED(widget), GdkEventKey *event, gpointer data)
{
ExifWin *ew = data;
gboolean stop_signal = FALSE;
return stop_signal;
} // static gboolean advanced_exif_...
-static gboolean search_function_cb(GtkTreeModel *model, gint column, const gchar *key, GtkTreeIter *iter, gpointer data)
+static gboolean search_function_cb(GtkTreeModel *model, gint column, const gchar *key, GtkTreeIter *iter, gpointer UNUSED(data))
{
gboolean ret = TRUE;
gchar *field_contents;
g_object_set_data(G_OBJECT(ew->window), "advanced_exif_data", ew);
g_signal_connect(G_OBJECT(ew->window), "delete_event", G_CALLBACK(advanced_exif_delete_cb), ew);
- ew->vbox = gtk_vbox_new(FALSE, PREF_PAD_GAP);
+ ew->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
gtk_container_add(GTK_CONTAINER(ew->window), ew->vbox);
gtk_widget_show(ew->vbox);
- box = gtk_hbox_new(FALSE, 0);
+ box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
ew->label_file_name = gtk_label_new("");
gtk_label_set_ellipsize(GTK_LABEL(ew->label_file_name), PANGO_ELLIPSIZE_START);
gtk_label_set_selectable(GTK_LABEL(ew->label_file_name), TRUE);
-#if GTK_CHECK_VERSION(3,16,0)
gtk_label_set_xalign(GTK_LABEL(ew->label_file_name), 0.5);
gtk_label_set_yalign(GTK_LABEL(ew->label_file_name), 0.5);
-#else
- gtk_misc_set_alignment(GTK_MISC(ew->label_file_name), 0.5, 0.5);
-#endif
+
gtk_box_pack_start(GTK_BOX(box), ew->label_file_name, TRUE, TRUE, 0);
gtk_widget_show(ew->label_file_name);
gint width;
};
-static void bar_expander_move(GtkWidget *widget, gpointer data, gboolean up, gboolean single_step)
+static void bar_expander_move(GtkWidget *UNUSED(widget), gpointer data, gboolean up, gboolean single_step)
{
GtkWidget *expander = data;
GtkWidget *box;
gtk_widget_set_size_request(GTK_WIDGET(data), -1, gtk_spin_button_get_value_as_int(spin));
}
-static gboolean height_spin_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
+static gboolean height_spin_key_press_cb(GtkWidget *UNUSED(widget), GdkEventKey *event, gpointer data)
{
if ((event->keyval == GDK_KEY_Return || event->keyval == GDK_KEY_Escape))
{
return TRUE;
}
-static void bar_expander_height_cb(GtkWidget *widget, gpointer data)
+static void bar_expander_height_cb(GtkWidget *UNUSED(widget), gpointer data)
{
GtkWidget *expander = data;
GtkWidget *spin;
GList *list;
gint x, y;
gint w, h;
-#if GTK_CHECK_VERSION(3,0,0)
GdkDisplay *display;
GdkDeviceManager *device_manager;
GdkDevice *device;
-#endif
-#if GTK_CHECK_VERSION(3,0,0)
display = gdk_display_get_default();
device_manager = gdk_display_get_device_manager(display);
device = gdk_device_manager_get_client_pointer(device_manager);
gdk_device_get_position(device, NULL, &x, &y);
-#else
- gdk_window_get_pointer(NULL, &x, &y, NULL);
-#endif
list = gtk_container_get_children(GTK_CONTAINER(expander));
data_box = list->data;
g_list_free(list);
}
-static void bar_expander_delete_cb(GtkWidget *widget, gpointer data)
+static void bar_expander_delete_cb(GtkWidget *UNUSED(widget), gpointer data)
{
GtkWidget *expander = data;
gtk_widget_destroy(expander);
}
-static void bar_expander_add_cb(GtkWidget *widget, gpointer data)
+static void bar_expander_add_cb(GtkWidget *widget, gpointer UNUSED(data))
{
//GtkWidget *bar = data;
const KnownPanes *pane = known_panes;
}
-static gboolean bar_menu_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+static gboolean bar_menu_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer UNUSED(data))
{
if (bevent->button == MOUSE_BUTTON_RIGHT)
{
return FALSE;
}
-static void bar_expander_cb(GObject *object, GParamSpec *param_spec, gpointer data)
+static void bar_expander_cb(GObject *object, GParamSpec *UNUSED(param_spec), gpointer UNUSED(data))
{
GtkExpander *expander;
GtkWidget *child;
}
}
-static gboolean bar_menu_add_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+static gboolean bar_menu_add_cb(GtkWidget *widget, GdkEventButton *UNUSED(bevent), gpointer UNUSED(data))
{
bar_menu_add_popup(widget);
return TRUE;
}
-void bar_populate_default(GtkWidget *bar)
+void bar_populate_default(GtkWidget *UNUSED(bar))
{
const gchar *populate_id[] = {"histogram", "title", "keywords", "comment", "rating", "exif", NULL};
const gchar **id = populate_id;
}
}
-static void bar_size_allocate(GtkWidget *widget, GtkAllocation *allocation, gpointer data)
+static void bar_size_allocate(GtkWidget *UNUSED(widget), GtkAllocation *UNUSED(allocation), gpointer data)
{
BarData *bd = data;
gtk_widget_destroy(bd->widget);
}
-static void bar_destroy(GtkWidget *widget, gpointer data)
+static void bar_destroy(GtkWidget *UNUSED(widget), gpointer data)
{
BarData *bd = data;
it should be removed as soon as a better solution exists
*/
-static void bar_unrealize_clutter_fix_cb(GtkWidget *widget, gpointer data)
+static void bar_unrealize_clutter_fix_cb(GtkWidget *widget, gpointer UNUSED(data))
{
GtkWidget *child = gtk_bin_get_child(GTK_BIN(widget));
if (child) gtk_widget_unrealize(child);
bd->lw = lw;
- bd->widget = gtk_vbox_new(FALSE, PREF_PAD_GAP);
+ bd->widget = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
DEBUG_NAME(bd->widget);
g_object_set_data(G_OBJECT(bd->widget), "bar_data", bd);
g_signal_connect(G_OBJECT(bd->widget), "destroy",
bd->width = SIDEBAR_DEFAULT_WIDTH;
- box = gtk_hbox_new(FALSE, 0);
+ box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
DEBUG_NAME(box);
bd->label_file_name = gtk_label_new("");
gtk_label_set_ellipsize(GTK_LABEL(bd->label_file_name), PANGO_ELLIPSIZE_END);
gtk_label_set_selectable(GTK_LABEL(bd->label_file_name), TRUE);
-#if GTK_CHECK_VERSION(3,16,0)
gtk_label_set_xalign(GTK_LABEL(bd->label_file_name), 0.5);
gtk_label_set_yalign(GTK_LABEL(bd->label_file_name), 0.5);
-#else
- gtk_misc_set_alignment(GTK_MISC(bd->label_file_name), 0.5, 0.5);
-#endif
+
gtk_box_pack_start(GTK_BOX(box), bd->label_file_name, TRUE, TRUE, 0);
gtk_widget_show(bd->label_file_name);
gtk_widget_show(scrolled);
- bd->vbox = gtk_vbox_new(FALSE, 0);
- gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled), bd->vbox);
+ bd->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+ gtk_container_add(GTK_CONTAINER(scrolled), bd->vbox);
gtk_viewport_set_shadow_type(GTK_VIEWPORT(gtk_bin_get_child(GTK_BIN(scrolled))), GTK_SHADOW_NONE);
- add_box = gtk_vbox_new(FALSE, 0);
+ add_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
DEBUG_NAME(add_box);
gtk_box_pack_end(GTK_BOX(bd->widget), add_box, FALSE, FALSE, 0);
tbar = pref_toolbar_new(add_box, GTK_TOOLBAR_ICONS);
if (strcmp(orig_comment, comment_not_null) != 0)
{
- g_signal_handlers_block_by_func(comment_buffer, bar_pane_comment_changed, pcd);
+ g_signal_handlers_block_by_func(comment_buffer, (gpointer)bar_pane_comment_changed, pcd);
gtk_text_buffer_set_text(comment_buffer, comment_not_null, -1);
- g_signal_handlers_unblock_by_func(comment_buffer, bar_pane_comment_changed, pcd);
+ g_signal_handlers_unblock_by_func(comment_buffer, (gpointer)bar_pane_comment_changed, pcd);
}
g_free(comment);
g_free(orig_comment);
g_free(comment);
}
-static void bar_pane_comment_sel_add_cb(GtkWidget *button, gpointer data)
+static void bar_pane_comment_sel_add_cb(GtkWidget *UNUSED(button), gpointer data)
{
PaneCommentData *pcd = data;
bar_pane_comment_set_selection(pcd, TRUE);
}
-static void bar_pane_comment_sel_replace_cb(GtkWidget *button, gpointer data)
+static void bar_pane_comment_sel_replace_cb(GtkWidget *UNUSED(button), gpointer data)
{
PaneCommentData *pcd = data;
}
}
-static void bar_pane_comment_changed(GtkTextBuffer *buffer, gpointer data)
+static void bar_pane_comment_changed(GtkTextBuffer *UNUSED(buffer), gpointer data)
{
PaneCommentData *pcd = data;
}
-static void bar_pane_comment_populate_popup(GtkTextView *textview, GtkMenu *menu, gpointer data)
+static void bar_pane_comment_populate_popup(GtkTextView *UNUSED(textview), GtkMenu *menu, gpointer data)
{
PaneCommentData *pcd = data;
menu_item_add_stock(GTK_WIDGET(menu), _("Replace existing text in selected files"), GTK_STOCK_CONVERT, G_CALLBACK(bar_pane_comment_sel_replace_cb), data);
}
-static void bar_pane_comment_destroy(GtkWidget *widget, gpointer data)
+static void bar_pane_comment_destroy(GtkWidget *UNUSED(widget), gpointer data)
{
PaneCommentData *pcd = data;
gtk_widget_show(pcd->comment_view);
#ifdef HAVE_SPELL
-#if GTK_CHECK_VERSION(3,20,0)
if (g_strcmp0(key, "Xmp.xmp.Rating") != 0)
{
if (options->metadata.check_spelling)
gspell_text_view_basic_setup(gspell_view);
}
}
-#endif
#endif
buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(pcd->comment_view));
static void bar_pane_exif_notify_cb(FileData *fd, NotifyType type, gpointer data);
static gboolean bar_pane_exif_copy_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data);
-static void bar_pane_exif_entry_changed(GtkEntry *text_entry, gpointer data)
+static void bar_pane_exif_entry_changed(GtkEntry *UNUSED(text_entry), gpointer data)
{
ExifEntry *ee = data;
gchar *text;
g_free(text);
}
-static void bar_pane_exif_entry_destroy(GtkWidget *widget, gpointer data)
+static void bar_pane_exif_entry_destroy(GtkWidget *UNUSED(widget), gpointer data)
{
ExifEntry *ee = data;
if (ee->box) gtk_widget_destroy(ee->box);
- ee->box = horizontal ? gtk_hbox_new(FALSE, 0) : gtk_vbox_new(FALSE, 0);
+ ee->box = horizontal ? gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0) : gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add(GTK_CONTAINER(ee->ebox), ee->box);
gtk_widget_show(ee->box);
ee->title_label = gtk_label_new(NULL);
-#if GTK_CHECK_VERSION(3,16,0)
gtk_label_set_xalign(GTK_LABEL(ee->title_label), horizontal ? 1.0 : 0.0);
gtk_label_set_yalign(GTK_LABEL(ee->title_label), 0.5);
-#else
- gtk_misc_set_alignment(GTK_MISC(ee->title_label), horizontal ? 1.0 : 0.0, 0.5);
-#endif
gtk_size_group_add_widget(ped->size_group, ee->title_label);
gtk_box_pack_start(GTK_BOX(ee->box), ee->title_label, FALSE, TRUE, 0);
gtk_widget_show(ee->title_label);
// gtk_label_set_width_chars(GTK_LABEL(ee->value_widget), 20);
gtk_label_set_ellipsize(GTK_LABEL(ee->value_widget), PANGO_ELLIPSIZE_END);
// gtk_widget_set_size_request(ee->value_widget, 100, -1);
-#if GTK_CHECK_VERSION(3,16,0)
gtk_label_set_xalign(GTK_LABEL(ee->value_widget), 0.0);
gtk_label_set_yalign(GTK_LABEL(ee->value_widget), 0.5);
-#else
- gtk_misc_set_alignment(GTK_MISC(ee->value_widget), 0.0, 0.5);
-#endif
}
gtk_box_pack_start(GTK_BOX(ee->box), ee->value_widget, TRUE, TRUE, 1);
{
if (ee->editable)
{
- g_signal_handlers_block_by_func(ee->value_widget, bar_pane_exif_entry_changed, ee);
+ g_signal_handlers_block_by_func(ee->value_widget, (gpointer *)bar_pane_exif_entry_changed, ee);
gtk_entry_set_text(GTK_ENTRY(ee->value_widget), text ? text : "");
- g_signal_handlers_unblock_by_func(ee->value_widget, bar_pane_exif_entry_changed, ee);
+ g_signal_handlers_unblock_by_func(ee->value_widget, (gpointer)bar_pane_exif_entry_changed, ee);
gtk_widget_set_tooltip_text(ee->box, NULL);
}
else
static gint n_exif_entry_drop_types = 2;
-static void bar_pane_exif_entry_dnd_get(GtkWidget *entry, GdkDragContext *context,
+static void bar_pane_exif_entry_dnd_get(GtkWidget *entry, GdkDragContext *UNUSED(context),
GtkSelectionData *selection_data, guint info,
- guint time, gpointer data)
+ guint UNUSED(time), gpointer UNUSED(data))
{
ExifEntry *ee = g_object_get_data(G_OBJECT(entry), "entry_data");
}
-static void bar_pane_exif_dnd_receive(GtkWidget *pane, GdkDragContext *context,
+static void bar_pane_exif_dnd_receive(GtkWidget *pane, GdkDragContext *UNUSED(context),
gint x, gint y,
GtkSelectionData *selection_data, guint info,
- guint time, gpointer data)
+ guint UNUSED(time), gpointer UNUSED(data))
{
PaneExifData *ped;
GList *work, *list;
gtk_box_reorder_child(GTK_BOX(ped->vbox), new_entry, pos);
}
-static void bar_pane_exif_entry_dnd_begin(GtkWidget *entry, GdkDragContext *context, gpointer data)
+static void bar_pane_exif_entry_dnd_begin(GtkWidget *entry, GdkDragContext *context, gpointer UNUSED(data))
{
ExifEntry *ee = g_object_get_data(G_OBJECT(entry), "entry_data");
dnd_set_drag_label(entry, context, ee->key);
}
-static void bar_pane_exif_entry_dnd_end(GtkWidget *widget, GdkDragContext *context, gpointer data)
+static void bar_pane_exif_entry_dnd_end(GtkWidget *UNUSED(widget), GdkDragContext *UNUSED(context), gpointer UNUSED(data))
{
}
G_CALLBACK(bar_pane_exif_dnd_receive), NULL);
}
-static void bar_pane_exif_edit_close_cb(GtkWidget *widget, gpointer data)
+static void bar_pane_exif_edit_close_cb(GtkWidget *UNUSED(widget), gpointer data)
{
GenericDialog *gd = data;
generic_dialog_close(gd);
}
-static void bar_pane_exif_edit_destroy_cb(GtkWidget *widget, gpointer data)
+static void bar_pane_exif_edit_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ConfDialogData *cdd = data;
- g_signal_handlers_disconnect_by_func(cdd->widget, G_CALLBACK(bar_pane_exif_edit_close_cb), cdd->gd);
+ g_signal_handlers_disconnect_by_func(cdd->widget, (gpointer)(bar_pane_exif_edit_close_cb), cdd->gd);
g_free(cdd);
}
-static void bar_pane_exif_edit_cancel_cb(GenericDialog *gd, gpointer data)
+static void bar_pane_exif_edit_cancel_cb(GenericDialog *UNUSED(gd), gpointer UNUSED(data))
{
}
-static void bar_pane_exif_edit_ok_cb(GenericDialog *gd, gpointer data)
+static void bar_pane_exif_edit_ok_cb(GenericDialog *UNUSED(gd), gpointer data)
{
ConfDialogData *cdd = data;
gtk_widget_show(gd->dialog);
}
-static void bar_pane_exif_conf_dialog_cb(GtkWidget *menu_widget, gpointer data)
+static void bar_pane_exif_conf_dialog_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
{
GtkWidget *widget = data;
bar_pane_exif_conf_dialog(widget);
}
-static void bar_pane_exif_delete_entry_cb(GtkWidget *menu_widget, gpointer data)
+static void bar_pane_exif_delete_entry_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
{
GtkWidget *entry = data;
gtk_widget_destroy(entry);
}
-static void bar_pane_exif_copy_entry_cb(GtkWidget *menu_widget, gpointer data)
+static void bar_pane_exif_copy_entry_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
{
GtkWidget *widget = data;
GtkClipboard *clipboard;
gtk_clipboard_set_text(clipboard, value, -1);
}
-static void bar_pane_exif_toggle_show_all_cb(GtkWidget *menu_widget, gpointer data)
+static void bar_pane_exif_toggle_show_all_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
{
PaneExifData *ped = data;
ped->show_all = !ped->show_all;
return FALSE;
}
-static gboolean bar_pane_exif_copy_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+static gboolean bar_pane_exif_copy_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer UNUSED(data))
{
const gchar *value;
GtkClipboard *clipboard;
gtk_widget_destroy(ped->vbox);
}
-static void bar_pane_exif_destroy(GtkWidget *widget, gpointer data)
+static void bar_pane_exif_destroy(GtkWidget *UNUSED(widget), gpointer data)
{
PaneExifData *ped = data;
g_free(ped);
}
-#if !GTK_CHECK_VERSION(3,0,0)
-static void bar_pane_exif_size_request(GtkWidget *pane, GtkRequisition *requisition, gpointer data)
-{
- PaneExifData *ped = data;
- if (requisition->height < ped->min_height)
- {
- requisition->height = ped->min_height;
- }
-}
-#endif
+//~ static void bar_pane_exif_size_request(GtkWidget *UNUSED(pane), GtkRequisition *requisition, gpointer data)
+//~ {
+ //~ PaneExifData *ped = data;
+ //~ if (requisition->height < ped->min_height)
+ //~ {
+ //~ requisition->height = ped->min_height;
+ //~ }
+//~ }
-static void bar_pane_exif_size_allocate(GtkWidget *pane, GtkAllocation *alloc, gpointer data)
+static void bar_pane_exif_size_allocate(GtkWidget *UNUSED(pane), GtkAllocation *alloc, gpointer data)
{
PaneExifData *ped = data;
ped->min_height = alloc->height;
-#if GTK_CHECK_VERSION(3,0,0)
gtk_widget_set_size_request(ped->widget, -1, ped->min_height);
-#endif
}
static GtkWidget *bar_pane_exif_new(const gchar *id, const gchar *title, gboolean expanded, gboolean show_all)
ped->size_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
ped->widget = gtk_event_box_new();
- ped->vbox = gtk_vbox_new(FALSE, PREF_PAD_GAP);
+ ped->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
gtk_container_add(GTK_CONTAINER(ped->widget), ped->vbox);
gtk_widget_show(ped->vbox);
g_object_set_data(G_OBJECT(ped->widget), "pane_data", ped);
g_signal_connect_after(G_OBJECT(ped->widget), "destroy",
G_CALLBACK(bar_pane_exif_destroy), ped);
-#if GTK_CHECK_VERSION(3,0,0)
gtk_widget_set_size_request(ped->widget, -1, ped->min_height);
-#else
- g_signal_connect(G_OBJECT(ped->widget), "size-request",
- G_CALLBACK(bar_pane_exif_size_request), ped);
-#endif
g_signal_connect(G_OBJECT(ped->widget), "size-allocate",
G_CALLBACK(bar_pane_exif_size_allocate), ped);
};
static gint n_gps_entry_drop_types = 2;
-static void bar_pane_gps_close_cancel_cb(GenericDialog *gd, gpointer data)
+static void bar_pane_gps_close_cancel_cb(GenericDialog *UNUSED(gd), gpointer data)
{
PaneGPSData *pgd = data;
g_list_free(pgd->geocode_list);
}
-static void bar_pane_gps_close_save_cb(GenericDialog *gd, gpointer data)
+static void bar_pane_gps_close_save_cb(GenericDialog *UNUSED(gd), gpointer data)
{
PaneGPSData *pgd = data;
FileData *fd;
g_list_free(pgd->geocode_list);
}
- static void bar_pane_gps_dnd_receive(GtkWidget *pane, GdkDragContext *context,
+ static void bar_pane_gps_dnd_receive(GtkWidget *pane, GdkDragContext *UNUSED(context),
gint x, gint y,
GtkSelectionData *selection_data, guint info,
- guint time, gpointer data)
+ guint UNUSED(time), gpointer UNUSED(data))
{
PaneGPSData *pgd;
GenericDialog *gd;
}
-static gboolean bar_gps_draw_direction (ClutterCanvas *canvas,
- cairo_t *cr, gpointer data)
+static gboolean bar_gps_draw_direction (ClutterCanvas *UNUSED(canvas),
+ cairo_t *cr, gpointer UNUSED(data))
{
cairo_set_source_rgb(cr, 255, 0, 0);
thumb_loader_free(tl);
}
-static void bar_pane_gps_thumb_error_cb(ThumbLoader *tl, gpointer data)
+static void bar_pane_gps_thumb_error_cb(ThumbLoader *tl, gpointer UNUSED(data))
{
thumb_loader_free(tl);
}
-static gboolean bar_pane_gps_marker_keypress_cb(GtkWidget *widget, ClutterButtonEvent *bevent, gpointer data)
+static gboolean bar_pane_gps_marker_keypress_cb(GtkWidget *widget, ClutterButtonEvent *bevent, gpointer UNUSED(data))
{
//PaneGPSData *pgd = data;
FileData *fd;
g_object_unref(map_factory);
}
-void bar_pane_gps_enable_markers_checked_toggle_cb(GtkWidget *menu_widget, gpointer data)
+void bar_pane_gps_enable_markers_checked_toggle_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
{
PaneGPSData *pgd = data;
}
}
-static void bar_pane_gps_centre_map_checked_toggle_cb(GtkWidget *menu_widget, gpointer data)
+static void bar_pane_gps_centre_map_checked_toggle_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
{
PaneGPSData *pgd = data;
}
static void bar_pane_gps_view_state_changed_cb(ChamplainView *view,
- GParamSpec *gobject,
+ GParamSpec *UNUSED(gobject),
gpointer data)
{
PaneGPSData *pgd = data;
g_string_free(message, TRUE);
}
-static gboolean bar_pane_gps_map_keypress_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+static gboolean bar_pane_gps_map_keypress_cb(GtkWidget *UNUSED(widget), GdkEventButton *bevent, gpointer data)
{
PaneGPSData *pgd = data;
GtkWidget *menu;
}
}
-static void bar_pane_gps_destroy(GtkWidget *widget, gpointer data)
+static void bar_pane_gps_destroy(GtkWidget *UNUSED(widget), gpointer data)
{
PaneGPSData *pgd = data;
gtk_scale_button_set_value(GTK_SCALE_BUTTON(slider), (gdouble)zoom);
progress = gtk_progress_bar_new();
-#if GTK_CHECK_VERSION(3,0,0)
gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress), "");
gtk_progress_bar_set_show_text(GTK_PROGRESS_BAR(progress), TRUE);
-#endif
+
state = gtk_label_new("");
gtk_label_set_justify(GTK_LABEL(state), GTK_JUSTIFY_LEFT);
gtk_label_set_ellipsize(GTK_LABEL(state), PANGO_ELLIPSIZE_START);
}
}
-#if GTK_CHECK_VERSION(3,0,0)
-static gboolean bar_pane_histogram_draw_cb(GtkWidget *widget, cairo_t *cr, gpointer data)
+static gboolean bar_pane_histogram_draw_cb(GtkWidget *UNUSED(widget), cairo_t *cr, gpointer data)
{
PaneHistogramData *phd = data;
if (!phd) return TRUE;
return TRUE;
}
-#else
-static gboolean bar_pane_histogram_expose_event_cb(GtkWidget *widget, GdkEventExpose *event, gpointer data)
-{
- PaneHistogramData *phd = data;
- if (!phd) return TRUE;
-
- if (phd->need_update)
- {
- bar_pane_histogram_update(phd);
- }
-
- if (!phd->pixbuf) return TRUE;
-
- cairo_t *cr = gdk_cairo_create(gtk_widget_get_window(widget));
- gdk_cairo_set_source_pixbuf (cr, phd->pixbuf, 0, 0);
- cairo_paint (cr);
- cairo_destroy (cr);
-
- return TRUE;
-}
-#endif
-
-static void bar_pane_histogram_size_cb(GtkWidget *widget, GtkAllocation *allocation, gpointer data)
+static void bar_pane_histogram_size_cb(GtkWidget *UNUSED(widget), GtkAllocation *allocation, gpointer data)
{
PaneHistogramData *phd = data;
bar_pane_histogram_update(phd);
}
-static void bar_pane_histogram_destroy(GtkWidget *widget, gpointer data)
+static void bar_pane_histogram_destroy(GtkWidget *UNUSED(widget), gpointer data)
{
PaneHistogramData *phd = data;
return menu;
}
-static gboolean bar_pane_histogram_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+static gboolean bar_pane_histogram_press_cb(GtkWidget *UNUSED(widget), GdkEventButton *bevent, gpointer data)
{
PaneHistogramData *phd = data;
g_signal_connect_after(G_OBJECT(phd->drawing_area), "size_allocate",
G_CALLBACK(bar_pane_histogram_size_cb), phd);
-#if GTK_CHECK_VERSION(3,0,0)
g_signal_connect(G_OBJECT(phd->drawing_area), "draw",
G_CALLBACK(bar_pane_histogram_draw_cb), phd);
-#else
- g_signal_connect(G_OBJECT(phd->drawing_area), "expose_event",
- G_CALLBACK(bar_pane_histogram_expose_event_cb), phd);
-#endif
gtk_box_pack_start(GTK_BOX(phd->widget), phd->drawing_area, TRUE, TRUE, 0);
gtk_widget_show(phd->drawing_area);
if (work1 || work2) /* lists differs */
{
- g_signal_handlers_block_by_func(keyword_buffer, bar_pane_keywords_changed, pkd);
+ g_signal_handlers_block_by_func(keyword_buffer, (gpointer)bar_pane_keywords_changed, pkd);
keyword_list_push(pkd->keyword_view, keywords);
bar_keyword_tree_sync(pkd);
- g_signal_handlers_unblock_by_func(keyword_buffer, bar_pane_keywords_changed, pkd);
+ g_signal_handlers_unblock_by_func(keyword_buffer, (gpointer)bar_pane_keywords_changed, pkd);
}
string_list_free(keywords);
string_list_free(orig_keywords);
return FALSE;
}
-static void bar_pane_keywords_keyword_toggle(GtkCellRendererToggle *toggle, const gchar *path, gpointer data)
+static void bar_pane_keywords_keyword_toggle(GtkCellRendererToggle *UNUSED(toggle), const gchar *path, gpointer data)
{
PaneKeywordsData *pkd = data;
GtkTreeModel *model;
else
keyword_tree_reset(keyword_tree, &child_iter, &list);
- g_signal_handlers_block_by_func(keyword_buffer, bar_pane_keywords_changed, pkd);
+ g_signal_handlers_block_by_func(keyword_buffer, (gpointer)bar_pane_keywords_changed, pkd);
keyword_list_push(pkd->keyword_view, list);
string_list_free(list);
- g_signal_handlers_unblock_by_func(keyword_buffer, bar_pane_keywords_changed, pkd);
+ g_signal_handlers_unblock_by_func(keyword_buffer, (gpointer)bar_pane_keywords_changed, pkd);
/* call this just once in the end */
bar_pane_keywords_changed(keyword_buffer, pkd);
string_list_free(keywords);
}
-static void bar_pane_keywords_sel_add_cb(GtkWidget *button, gpointer data)
+static void bar_pane_keywords_sel_add_cb(GtkWidget *UNUSED(button), gpointer data)
{
PaneKeywordsData *pkd = data;
bar_pane_keywords_set_selection(pkd, TRUE);
}
-static void bar_pane_keywords_sel_replace_cb(GtkWidget *button, gpointer data)
+static void bar_pane_keywords_sel_replace_cb(GtkWidget *UNUSED(button), gpointer data)
{
PaneKeywordsData *pkd = data;
bar_pane_keywords_set_selection(pkd, FALSE);
}
-static void bar_pane_keywords_populate_popup_cb(GtkTextView *textview, GtkMenu *menu, gpointer data)
+static void bar_pane_keywords_populate_popup_cb(GtkTextView *UNUSED(textview), GtkMenu *menu, gpointer data)
{
PaneKeywordsData *pkd = data;
return FALSE;
}
-static void bar_pane_keywords_changed(GtkTextBuffer *buffer, gpointer data)
+static void bar_pane_keywords_changed(GtkTextBuffer *UNUSED(buffer), gpointer data)
{
PaneKeywordsData *pkd = data;
static gint n_keywords_drop_types = 2;
-static void bar_pane_keywords_dnd_get(GtkWidget *tree_view, GdkDragContext *context,
+static void bar_pane_keywords_dnd_get(GtkWidget *tree_view, GdkDragContext *UNUSED(context),
GtkSelectionData *selection_data, guint info,
- guint time, gpointer data)
+ guint UNUSED(time), gpointer UNUSED(data))
{
GtkTreeIter iter;
GtkTreeModel *model;
}
}
-static void bar_pane_keywords_dnd_begin(GtkWidget *tree_view, GdkDragContext *context, gpointer data)
+static void bar_pane_keywords_dnd_begin(GtkWidget *tree_view, GdkDragContext *context, gpointer UNUSED(data))
{
GtkTreeIter iter;
GtkTreeModel *model;
}
-static void bar_pane_keywords_dnd_end(GtkWidget *widget, GdkDragContext *context, gpointer data)
+static void bar_pane_keywords_dnd_end(GtkWidget *UNUSED(widget), GdkDragContext *UNUSED(context), gpointer UNUSED(data))
{
}
return !!*keywords;
}
-static void bar_pane_keywords_dnd_receive(GtkWidget *tree_view, GdkDragContext *context,
+static void bar_pane_keywords_dnd_receive(GtkWidget *tree_view, GdkDragContext *UNUSED(context),
gint x, gint y,
GtkSelectionData *selection_data, guint info,
- guint time, gpointer data)
+ guint UNUSED(time), gpointer data)
{
PaneKeywordsData *pkd = data;
GtkTreePath *tpath = NULL;
}
static gint bar_pane_keywords_dnd_motion(GtkWidget *tree_view, GdkDragContext *context,
- gint x, gint y, guint time, gpointer data)
+ gint x, gint y, guint time, gpointer UNUSED(data))
{
GtkTreePath *tpath = NULL;
GtkTreeViewDropPosition pos;
*-------------------------------------------------------------------
*/
-static void bar_pane_keywords_edit_destroy_cb(GtkWidget *widget, gpointer data)
+static void bar_pane_keywords_edit_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ConfDialogData *cdd = data;
gtk_tree_path_free(cdd->click_tpath);
}
-static void bar_pane_keywords_edit_cancel_cb(GenericDialog *gd, gpointer data)
+static void bar_pane_keywords_edit_cancel_cb(GenericDialog *UNUSED(gd), gpointer UNUSED(data))
{
}
-static void bar_pane_keywords_edit_ok_cb(GenericDialog *gd, gpointer data)
+static void bar_pane_keywords_edit_ok_cb(GenericDialog *UNUSED(gd), gpointer data)
{
ConfDialogData *cdd = data;
PaneKeywordsData *pkd = cdd->pkd;
string_list_free(keywords);
}
-static void bar_pane_keywords_conf_set_helper(GtkWidget *widget, gpointer data)
+static void bar_pane_keywords_conf_set_helper(GtkWidget *UNUSED(widget), gpointer data)
{
ConfDialogData *cdd = data;
cdd->is_keyword = FALSE;
}
-static void bar_pane_keywords_conf_set_kw(GtkWidget *widget, gpointer data)
+static void bar_pane_keywords_conf_set_kw(GtkWidget *UNUSED(widget), gpointer data)
{
ConfDialogData *cdd = data;
cdd->is_keyword = TRUE;
*-------------------------------------------------------------------
*/
-static void bar_pane_keywords_edit_dialog_cb(GtkWidget *menu_widget, gpointer data)
+static void bar_pane_keywords_edit_dialog_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
{
PaneKeywordsData *pkd = data;
bar_pane_keywords_edit_dialog(pkd, TRUE);
}
-static void bar_pane_keywords_add_dialog_cb(GtkWidget *menu_widget, gpointer data)
+static void bar_pane_keywords_add_dialog_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
{
PaneKeywordsData *pkd = data;
bar_pane_keywords_edit_dialog(pkd, FALSE);
meta_data_connect_mark_with_keyword(keyword_tree, &kw_iter, mark);
}
-static void bar_pane_keywords_disconnect_marks_ok_cb(GenericDialog *gd, gpointer data)
+static void bar_pane_keywords_disconnect_marks_ok_cb(GenericDialog *UNUSED(gd), gpointer UNUSED(data))
{
keyword_tree_disconnect_marks();
}
-static void dummy_cancel_cb(GenericDialog *gd, gpointer data)
+static void dummy_cancel_cb(GenericDialog *UNUSED(gd), gpointer UNUSED(data))
{
/* no op, only so cancel button appears */
}
g_string_free(message, TRUE);
}
-static void bar_pane_keywords_delete_cb(GtkWidget *menu_widget, gpointer data)
+static void bar_pane_keywords_delete_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
{
PaneKeywordsData *pkd = data;
GtkTreeModel *model;
keyword_delete(GTK_TREE_STORE(keyword_tree), &kw_iter);
}
-static void bar_pane_keywords_hide_cb(GtkWidget *menu_widget, gpointer data)
+static void bar_pane_keywords_hide_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
{
PaneKeywordsData *pkd = data;
GtkTreeModel *model;
keyword_hide_in(GTK_TREE_STORE(keyword_tree), &kw_iter, model);
}
-static void bar_pane_keywords_show_all_cb(GtkWidget *menu_widget, gpointer data)
+static void bar_pane_keywords_show_all_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
{
PaneKeywordsData *pkd = data;
GtkTreeModel *model;
bar_keyword_tree_sync(pkd);
}
-static void bar_pane_keywords_revert_cb(GtkWidget *menu_widget, gpointer data)
+static void bar_pane_keywords_revert_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
{
PaneKeywordsData *pkd = data;
GList *work;
bar_keyword_tree_sync(pkd);
}
-static void bar_pane_keywords_expand_checked_cb(GtkWidget *menu_widget, gpointer data)
+static void bar_pane_keywords_expand_checked_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
{
PaneKeywordsData *pkd = data;
GtkTreeModel *model;
gtk_tree_model_foreach(model, bar_keyword_tree_expand_if_set_cb, pkd);
}
-static void bar_pane_keywords_collapse_all_cb(GtkWidget *menu_widget, gpointer data)
+static void bar_pane_keywords_collapse_all_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
{
PaneKeywordsData *pkd = data;
bar_keyword_tree_sync(pkd);
}
-static void bar_pane_keywords_revert_hidden_cb(GtkWidget *menu_widget, gpointer data)
+static void bar_pane_keywords_revert_hidden_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
{
PaneKeywordsData *pkd = data;
GtkTreeModel *model;
bar_keyword_tree_sync(pkd);
}
-static void bar_pane_keywords_collapse_unchecked_cb(GtkWidget *menu_widget, gpointer data)
+static void bar_pane_keywords_collapse_unchecked_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
{
PaneKeywordsData *pkd = data;
GtkTreeModel *model;
gtk_tree_model_foreach(model, bar_keyword_tree_collapse_if_unset_cb, pkd);
}
-static void bar_pane_keywords_hide_unchecked_cb(GtkWidget *menu_widget, gpointer data)
+static void bar_pane_keywords_hide_unchecked_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
{
PaneKeywordsData *pkd = data;
GtkTreeModel *model;
bar_keyword_tree_sync(pkd);
}
-static void bar_pane_keywords_expand_checked_toggle_cb(GtkWidget *menu_widget, gpointer data)
+static void bar_pane_keywords_expand_checked_toggle_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
{
PaneKeywordsData *pkd = data;
pkd->expand_checked = !pkd->expand_checked;
bar_keyword_tree_sync(pkd);
}
-static void bar_pane_keywords_collapse_unchecked_toggle_cb(GtkWidget *menu_widget, gpointer data)
+static void bar_pane_keywords_collapse_unchecked_toggle_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
{
PaneKeywordsData *pkd = data;
pkd->collapse_unchecked = !pkd->collapse_unchecked;
bar_keyword_tree_sync(pkd);
}
-static void bar_pane_keywords_hide_unchecked_toggle_cb(GtkWidget *menu_widget, gpointer data)
+static void bar_pane_keywords_hide_unchecked_toggle_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
{
PaneKeywordsData *pkd = data;
pkd->hide_unchecked = !pkd->hide_unchecked;
/**
* @brief Callback for adding selected keyword to all selected images.
*/
-static void bar_pane_keywords_add_to_selected_cb(GtkWidget *menu_widget, gpointer data)
+static void bar_pane_keywords_add_to_selected_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
{
PaneKeywordsData *pkd = data;
GtkTreeIter iter; /* This is the iter which initial holds the current keyword */
string_list_free(keywords);
}
-static void bar_pane_keywords_menu_popup(GtkWidget *widget, PaneKeywordsData *pkd, gint x, gint y)
+static void bar_pane_keywords_menu_popup(GtkWidget *UNUSED(widget), PaneKeywordsData *pkd, gint x, gint y)
{
GtkWidget *menu;
GtkWidget *item;
gtk_widget_destroy(pkd->widget);
}
-static void bar_pane_keywords_destroy(GtkWidget *widget, gpointer data)
+static void bar_pane_keywords_destroy(GtkWidget *UNUSED(widget), gpointer data)
{
PaneKeywordsData *pkd = data;
gchar *path;
pkd->expand_checked = TRUE;
pkd->expanded_rows = NULL;
- vbox = gtk_vbox_new(FALSE, PREF_PAD_GAP);
- hbox = gtk_hbox_new(FALSE, PREF_PAD_GAP);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP);
gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
pkd->widget = vbox;
*-----------------------------------------------------------------------------
*/
-static gboolean autocomplete_activate_cb(GtkWidget *widget, gpointer data)
+static gboolean autocomplete_activate_cb(GtkWidget *UNUSED(widget), gpointer data)
{
PaneKeywordsData *pkd = data;
gchar *entry_text;
gint autocomplete_sort_iter_compare_func (GtkTreeModel *model,
GtkTreeIter *a,
GtkTreeIter *b,
- gpointer userdata)
+ gpointer UNUSED(userdata))
{
gint ret = 0;
gchar *name1, *name2;
}
}
-static void bar_pane_rating_destroy(GtkWidget *widget, gpointer data)
+static void bar_pane_rating_destroy(GtkWidget *UNUSED(widget), gpointer data)
{
PaneRatingData *prd = data;
prd->pane.expanded = expanded;
- prd->widget = gtk_vbox_new(FALSE, PREF_PAD_GAP);
+ prd->widget = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
g_object_set_data(G_OBJECT(prd->widget), "pane_data", prd);
g_signal_connect(G_OBJECT(prd->widget), "destroy", G_CALLBACK(bar_pane_rating_destroy), prd);
- row_1 = gtk_hbox_new(FALSE, PREF_PAD_GAP);
+ row_1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP);
gtk_box_pack_start(GTK_BOX(prd->widget), row_1, FALSE, FALSE, 0);
radio_rejected = gtk_radio_button_new_with_label(NULL, _("Rejected"));
gtk_box_pack_start(GTK_BOX(row_1), radio_unrated, FALSE, FALSE, 0);
g_signal_connect(radio_unrated, "released", G_CALLBACK(bar_pane_rating_selected_cb), prd);
- row_2 = gtk_hbox_new(FALSE, PREF_PAD_GAP);
+ row_2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP);
gtk_box_pack_start(GTK_BOX(prd->widget), row_2, FALSE, FALSE, 0);
i = 1;
}
}
-static void bar_sort_bookmark_select_folder(SortData *sd, FileData *source, const gchar *path)
+static void bar_sort_bookmark_select_folder(SortData *sd, FileData *UNUSED(source), const gchar *path)
{
GList *orig_list;
GList *action_list;
bar_sort_set_action(sd, BAR_SORT_FILTER, key);
}
-static void bar_filter_help_cb(GenericDialog *gd, gpointer data)
+static void bar_filter_help_cb(GenericDialog *UNUSED(gd), gpointer UNUSED(data))
{
help_window_show("GuidePluginsConfig.html#Geeqieextensions");
}
-static gboolean bar_filter_message_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
+static gboolean bar_filter_message_cb(GtkWidget *UNUSED(widget), GdkEventButton *event, gpointer UNUSED(data))
{
GenericDialog *gd;
bar_sort_add_close(sd);
}
-static void bar_sort_add_cancel_cb(FileDialog *fd, gpointer data)
+static void bar_sort_add_cancel_cb(FileDialog *UNUSED(fd), gpointer data)
{
SortData *sd = data;
gtk_widget_destroy(sd->vbox);
}
-static void bar_sort_destroy(GtkWidget *widget, gpointer data)
+static void bar_sort_destroy(GtkWidget *UNUSED(widget), gpointer data)
{
SortData *sd = data;
return sd->vbox;
}
-GtkWidget *bar_sort_new_from_config(LayoutWindow *lw, const gchar **attribute_names, const gchar **attribute_values)
+GtkWidget *bar_sort_new_from_config(LayoutWindow *lw, const gchar **UNUSED(attribute_names), const gchar **UNUSED(attribute_values))
{
GtkWidget *bar;
static gboolean cache_loader_phase2_idle_cb(gpointer data);
-static void cache_loader_phase1_done_cb(ImageLoader *il, gpointer data)
+static void cache_loader_phase1_done_cb(ImageLoader *UNUSED(il), gpointer data)
{
CacheLoader *cl = data;
cl->idle_id = g_idle_add(cache_loader_phase2_idle_cb, cl);
}
-static void cache_loader_phase1_error_cb(ImageLoader *il, gpointer data)
+static void cache_loader_phase1_error_cb(ImageLoader *UNUSED(il), gpointer data)
{
CacheLoader *cl = data;
static gchar *cache_maintenance_path = NULL;
static GtkStatusIcon *status_icon;
-static void cache_maintenance_sim_stop_cb(gpointer data)
+static void cache_maintenance_sim_stop_cb(gpointer UNUSED(data))
{
exit(EXIT_SUCCESS);
}
-static void cache_maintenance_render_stop_cb(gpointer data)
+static void cache_maintenance_render_stop_cb(gpointer UNUSED(data))
{
gtk_status_icon_set_tooltip_text(status_icon, _("Geeqie: Creating sim data..."));
cache_manager_sim_remote(cache_maintenance_path, TRUE, (GDestroyNotify *)cache_maintenance_sim_stop_cb);
}
-static void cache_maintenance_clean_stop_cb(gpointer data)
+static void cache_maintenance_clean_stop_cb(gpointer UNUSED(data))
{
gtk_status_icon_set_tooltip_text(status_icon, _("Geeqie: Creating thumbs..."));
cache_manager_render_remote(cache_maintenance_path, TRUE, options->thumbnails.cache_into_dirs, (GDestroyNotify *)cache_maintenance_render_stop_cb);
exit(EXIT_FAILURE);
}
-static void cache_maintenance_status_icon_activate_cb(GtkStatusIcon *status, gpointer data)
+static void cache_maintenance_status_icon_activate_cb(GtkStatusIcon *UNUSED(status), gpointer UNUSED(data))
{
GtkWidget *menu;
GtkWidget *item;
return TRUE;
}
-static void cache_maintain_home_close_cb(GenericDialog *gd, gpointer data)
+static void cache_maintain_home_close_cb(GenericDialog *UNUSED(gd), gpointer data)
{
CMData *cm = data;
cache_maintain_home_close(cm);
}
-static void cache_maintain_home_stop_cb(GenericDialog *gd, gpointer data)
+static void cache_maintain_home_stop_cb(GenericDialog *UNUSED(gd), gpointer data)
{
CMData *cm = data;
generic_dialog_add_message(cm->gd, NULL, msg, NULL, FALSE);
gtk_window_set_default_size(GTK_WINDOW(cm->gd->dialog), PURGE_DIALOG_WIDTH, -1);
- hbox = gtk_hbox_new(FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(cm->gd->vbox), hbox, FALSE, FALSE, 5);
gtk_widget_show(hbox);
g_free(src_cache);
}
-void cache_notify_cb(FileData *fd, NotifyType type, gpointer data)
+void cache_notify_cb(FileData *fd, NotifyType type, gpointer UNUSED(data))
{
if (!(type & NOTIFY_CHANGE) || !fd->change) return;
cd->tl = NULL;
}
-static void cache_manager_render_close_cb(GenericDialog *fd, gpointer data)
+static void cache_manager_render_close_cb(GenericDialog *UNUSED(fd), gpointer data)
{
CacheOpsData *cd = data;
}
}
-static void cache_manager_render_stop_cb(GenericDialog *fd, gpointer data)
+static void cache_manager_render_stop_cb(GenericDialog *UNUSED(fd), gpointer data)
{
CacheOpsData *cd = data;
static gboolean cache_manager_render_file(CacheOpsData *cd);
-static void cache_manager_render_thumb_done_cb(ThumbLoader *tl, gpointer data)
+static void cache_manager_render_thumb_done_cb(ThumbLoader *UNUSED(tl), gpointer data)
{
CacheOpsData *cd = data;
return FALSE;
}
-static void cache_manager_render_start_cb(GenericDialog *fd, gpointer data)
+static void cache_manager_render_start_cb(GenericDialog *UNUSED(fd), gpointer data)
{
CacheOpsData *cd = data;
gchar *path;
cache_manager_render_start_render_remote(cd, path);
}
-static void cache_manager_standard_clean_close_cb(GenericDialog *gd, gpointer data)
+static void cache_manager_standard_clean_close_cb(GenericDialog *UNUSED(gd), gpointer data)
{
CacheOpsData *cd = data;
cd->list = NULL;
}
-static void cache_manager_standard_clean_stop_cb(GenericDialog *gd, gpointer data)
+static void cache_manager_standard_clean_stop_cb(GenericDialog *UNUSED(gd), gpointer data)
{
CacheOpsData *cd = data;
}
}
-static void cache_manager_standard_clean_start(GenericDialog *gd, gpointer data)
+static void cache_manager_standard_clean_start(GenericDialog *UNUSED(gd), gpointer data)
{
CacheOpsData *cd = data;
GList *list;
cd->progress = gtk_progress_bar_new();
gtk_progress_bar_set_text(GTK_PROGRESS_BAR(cd->progress), _("click start to begin"));
-#if GTK_CHECK_VERSION(3,0,0)
gtk_progress_bar_set_show_text(GTK_PROGRESS_BAR(cd->progress), TRUE);
-#endif
gtk_box_pack_start(GTK_BOX(cd->gd->vbox), cd->progress, FALSE, FALSE, 0);
gtk_widget_show(cd->progress);
cache_manager_standard_clean_start(NULL, cd);
}
-static void cache_manager_standard_clean_cb(GtkWidget *widget, gpointer data)
+static void cache_manager_standard_clean_cb(GtkWidget *widget, gpointer UNUSED(data))
{
cache_manager_standard_process(widget, FALSE);
}
-static void cache_manager_standard_clear_cb(GtkWidget *widget, gpointer data)
+static void cache_manager_standard_clear_cb(GtkWidget *widget, gpointer UNUSED(data))
{
cache_manager_standard_process(widget, TRUE);
}
-static void cache_manager_main_clean_cb(GtkWidget *widget, gpointer data)
+static void cache_manager_main_clean_cb(GtkWidget *widget, gpointer UNUSED(data))
{
cache_maintain_home(FALSE, FALSE, widget);
}
-static void dummy_cancel_cb(GenericDialog *gd, gpointer data)
+static void dummy_cancel_cb(GenericDialog *UNUSED(gd), gpointer UNUSED(data))
{
/* no op, only so cancel button appears */
}
-static void cache_manager_main_clear_ok_cb(GenericDialog *gd, gpointer data)
+static void cache_manager_main_clear_ok_cb(GenericDialog *UNUSED(gd), gpointer UNUSED(data))
{
cache_maintain_home(FALSE, TRUE, NULL);
}
gtk_widget_show(gd->dialog);
}
-static void cache_manager_main_clear_cb(GtkWidget *widget, gpointer data)
+static void cache_manager_main_clear_cb(GtkWidget *widget, gpointer UNUSED(data))
{
cache_manager_main_clear_confirm(widget);
}
-static void cache_manager_render_cb(GtkWidget *widget, gpointer data)
+static void cache_manager_render_cb(GtkWidget *widget, gpointer UNUSED(data))
{
const gchar *path = layout_get_path(NULL);
cache_manager_render_dialog(widget, path);
}
-static void cache_manager_metadata_clean_cb(GtkWidget *widget, gpointer data)
+static void cache_manager_metadata_clean_cb(GtkWidget *widget, gpointer UNUSED(data))
{
cache_maintain_home(TRUE, FALSE, widget);
}
static CacheManager *cache_manager = NULL;
-static void cache_manager_close_cb(GenericDialog *gd, gpointer data)
+static void cache_manager_close_cb(GenericDialog *gd, gpointer UNUSED(data))
{
generic_dialog_close(gd);
cache_manager = NULL;
}
-static void cache_manager_help_cb(GenericDialog *gd, gpointer data)
+static void cache_manager_help_cb(GenericDialog *UNUSED(gd), gpointer UNUSED(data))
{
help_window_show("GuideReferenceManagement.html");
}
buf = g_strdup_printf(_("Location: %s"), subdir);
label = pref_label_new(group, buf);
g_free(buf);
-#if GTK_CHECK_VERSION(3,16,0)
gtk_label_set_xalign(GTK_LABEL(label), 0.0);
gtk_label_set_yalign(GTK_LABEL(label), 0.5);
-#else
- gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-#endif
return label;
}
cd->cl = NULL;
}
-static void cache_manager_sim_close_cb(GenericDialog *fd, gpointer data)
+static void cache_manager_sim_close_cb(GenericDialog *UNUSED(fd), gpointer data)
{
CacheOpsData *cd = data;
}
}
-static void cache_manager_sim_stop_cb(GenericDialog *fd, gpointer data)
+static void cache_manager_sim_stop_cb(GenericDialog *UNUSED(fd), gpointer data)
{
CacheOpsData *cd = data;
cd->list_dir = g_list_concat(list_d, cd->list_dir);
}
-static void cache_manager_sim_file_done_cb(CacheLoader *cl, gint error, gpointer data)
+static void cache_manager_sim_file_done_cb(CacheLoader *UNUSED(cl), gint UNUSED(error), gpointer data)
{
CacheOpsData *cd = data;
return FALSE;
}
-static void cache_manager_sim_start_cb(GenericDialog *fd, gpointer data)
+static void cache_manager_sim_start_cb(GenericDialog *UNUSED(fd), gpointer data)
{
CacheOpsData *cd = data;
gchar *path;
gtk_widget_show(cd->gd->dialog);
}
-static void cache_manager_sim_load_cb(GtkWidget *widget, gpointer data)
+static void cache_manager_sim_load_cb(GtkWidget *widget, gpointer UNUSED(data))
{
const gchar *path = layout_get_path(NULL);
cache_manager_sim_load_dialog(widget, path);
}
-static void cache_manager_cache_maintenance_close_cb(GenericDialog *fd, gpointer data)
+static void cache_manager_cache_maintenance_close_cb(GenericDialog *UNUSED(fd), gpointer data)
{
CacheOpsData *cd = data;
g_free(cd);
}
-static void cache_manager_cache_maintenance_start_cb(GenericDialog *fd, gpointer data)
+static void cache_manager_cache_maintenance_start_cb(GenericDialog *UNUSED(fd), gpointer data)
{
CacheOpsData *cd = data;
gchar *path;
gtk_widget_show(cd->gd->dialog);
}
-static void cache_manager_cache_maintenance_load_cb(GtkWidget *widget, gpointer data)
+static void cache_manager_cache_maintenance_load_cb(GtkWidget *widget, gpointer UNUSED(data))
{
const gchar *path = layout_get_path(NULL);
table = pref_table_new(group, 2, 1, FALSE, FALSE);
- button = pref_table_button(table, 0, 1, GTK_STOCK_EXECUTE, _("Render"), FALSE,
+ button = pref_table_button(table, 0, 1, "system-run", _("Render"), FALSE,
G_CALLBACK(cache_manager_render_cb), cache_manager);
gtk_size_group_add_widget(sizegroup, button);
pref_table_label(table, 1, 1, _("Render thumbnails for a specific folder."), 0.0);
#include <stdlib.h>
#include <gtk/gtk.h> /* To define GTK_CHECK_VERSION */
+#include "main.h"
#include "cellrenderericon.h"
#include "intl.h"
static void gqv_cell_renderer_icon_class_init_wrapper(void *, void *);
static void gqv_cell_renderer_icon_class_init(GQvCellRendererIconClass *class);
static void gqv_cell_renderer_icon_finalize(GObject *object);
-#if GTK_CHECK_VERSION(3,0,0)
static void gqv_cell_renderer_icon_get_size(GtkCellRenderer *cell,
GtkWidget *widget,
const GdkRectangle *rectangle,
gint *y_offset,
gint *width,
gint *height);
-#else
-static void gqv_cell_renderer_icon_get_size(GtkCellRenderer *cell,
- GtkWidget *widget,
- GdkRectangle *rectangle,
- gint *x_offset,
- gint *y_offset,
- gint *width,
- gint *height);
-#endif
-#if GTK_CHECK_VERSION(3,0,0)
+
static void gqv_cell_renderer_icon_render(GtkCellRenderer *cell,
cairo_t *cr,
GtkWidget *widget,
const GdkRectangle *background_area,
const GdkRectangle *cell_area,
GtkCellRendererState flags);
-#else
-static void gqv_cell_renderer_icon_render(GtkCellRenderer *cell,
- GdkWindow *window,
- GtkWidget *widget,
- GdkRectangle *background_area,
- GdkRectangle *cell_area,
- GdkRectangle *expose_area,
- GtkCellRendererState flags);
-#endif
-
-
-#if GTK_CHECK_VERSION(3,0,0)
+
static gboolean gqv_cell_renderer_icon_activate(GtkCellRenderer *cell,
GdkEvent *event,
GtkWidget *widget,
const GdkRectangle *background_area,
const GdkRectangle *cell_area,
GtkCellRendererState flags);
-#else
-static gboolean gqv_cell_renderer_icon_activate(GtkCellRenderer *cell,
- GdkEvent *event,
- GtkWidget *widget,
- const gchar *path,
- GdkRectangle *background_area,
- GdkRectangle *cell_area,
- GtkCellRendererState flags);
-#endif
-
enum {
TOGGLED,
LAST_SIGNAL
}
static void
-gqv_cell_renderer_icon_init_wrapper(void *data, void *user_data)
+gqv_cell_renderer_icon_init_wrapper(void *data, void *UNUSED(user_data))
{
gqv_cell_renderer_icon_init(data);
}
}
static void
-gqv_cell_renderer_icon_class_init_wrapper(void *data, void *user_data)
+gqv_cell_renderer_icon_class_init_wrapper(void *data, void *UNUSED(user_data))
{
gqv_cell_renderer_icon_class_init(data);
}
return g_object_new(GQV_TYPE_CELL_RENDERER_ICON, NULL);
}
-#if GTK_CHECK_VERSION(3,0,0)
static void gqv_cell_renderer_icon_get_size(GtkCellRenderer *cell,
GtkWidget *widget,
const GdkRectangle *cell_area,
gint *y_offset,
gint *width,
gint *height)
-#else
-static void gqv_cell_renderer_icon_get_size(GtkCellRenderer *cell,
- GtkWidget *widget,
- GdkRectangle *cell_area,
- gint *x_offset,
- gint *y_offset,
- gint *width,
- gint *height)
-#endif
{
GQvCellRendererIcon *cellicon = (GQvCellRendererIcon *) cell;
gint calc_width;
if (height) *height = calc_height;
}
-#if GTK_CHECK_VERSION(3,0,0)
static void gqv_cell_renderer_icon_render(GtkCellRenderer *cell,
cairo_t *cr,
GtkWidget *widget,
- const GdkRectangle *background_area,
+ const GdkRectangle *UNUSED(background_area),
const GdkRectangle *cell_area,
GtkCellRendererState flags)
{
GtkStyleContext *context = gtk_widget_get_style_context(widget);
-#else
-static void
-gqv_cell_renderer_icon_render(GtkCellRenderer *cell,
- GdkWindow *window,
- GtkWidget *widget,
- GdkRectangle *background_area,
- GdkRectangle *cell_area,
- GdkRectangle *expose_area,
- GtkCellRendererState flags)
-
-{
- cairo_t *cr = gdk_cairo_create(window);
-#endif
GQvCellRendererIcon *cellicon = (GQvCellRendererIcon *) cell;
GdkPixbuf *pixbuf;
const gchar *text;
GdkRectangle cell_rect;
-#if GTK_CHECK_VERSION(3,0,0)
GtkStateFlags state;
-#else
- GtkStateType state;
-#endif
gint xpad, ypad;
pixbuf = cellicon->pixbuf;
text = cellicon->text;
- if (!pixbuf && !text)
- {
-#if !GTK_CHECK_VERSION(3,0,0)
- cairo_destroy(cr);
-#endif
- return;
- }
-
gtk_cell_renderer_get_padding(cell, &xpad, &ypad);
gqv_cell_renderer_icon_get_size(cell, widget, cell_area,
if ((flags & GTK_CELL_RENDERER_SELECTED) == GTK_CELL_RENDERER_SELECTED)
{
if (gtk_widget_has_focus(widget))
-#if GTK_CHECK_VERSION(3,0,0)
state = GTK_STATE_FLAG_SELECTED;
else
state = GTK_STATE_FLAG_ACTIVE;
-#else
- state = GTK_STATE_SELECTED;
- else
- state = GTK_STATE_ACTIVE;
-#endif
}
else
{
if (gtk_widget_get_state(widget) == GTK_STATE_INSENSITIVE)
-#if GTK_CHECK_VERSION(3,0,0)
state = GTK_STATE_FLAG_INSENSITIVE;
else
state = GTK_STATE_FLAG_NORMAL;
-#else
- state = GTK_STATE_INSENSITIVE;
- else
- state = GTK_STATE_NORMAL;
-#endif
}
-
-#if GTK_CHECK_VERSION(3,0,0)
gtk_style_context_set_state(context, state);
-#endif
if (pixbuf)
{
pix_rect.y = cell_area->y + cell_rect.y;
}
- if (gdk_rectangle_intersect(cell_area, &pix_rect, &draw_rect)
-#if !GTK_CHECK_VERSION(3,0,0)
- && gdk_rectangle_intersect(expose_area, &draw_rect, &draw_rect)
-#endif
- )
+ if (gdk_rectangle_intersect(cell_area, &pix_rect, &draw_rect))
{
gdk_cairo_set_source_pixbuf(cr, pixbuf, pix_rect.x, pix_rect.y);
cairo_rectangle (cr,
pix_rect.y -= TOGGLE_SPACING;
}
- if (gdk_rectangle_intersect(cell_area, &pix_rect, &draw_rect)
-#if !GTK_CHECK_VERSION(3,0,0)
- && gdk_rectangle_intersect(expose_area, &draw_rect, &draw_rect)
-#endif
- )
+ if (gdk_rectangle_intersect(cell_area, &pix_rect, &draw_rect))
{
-#if GTK_CHECK_VERSION(3,0,0)
gtk_render_layout(context, cr, pix_rect.x - text_rect.x, pix_rect.y, layout);
-#else
-
- gtk_paint_layout(gtk_widget_get_style(widget), window,
- state, TRUE,
- cell_area, widget,
- "cellrenderertext",
- pix_rect.x - text_rect.x, pix_rect.y,
- layout);
-#endif
}
g_object_unref(layout);
}
pix_rect.x = cell_area->x + xpad + (cell_rect.width - pix_rect.width + 1) / 2 + (TOGGLE_SPACING - TOGGLE_WIDTH) / 2;
pix_rect.y = cell_area->y + ypad + (cell_rect.height - pix_rect.height) + (TOGGLE_SPACING - TOGGLE_WIDTH) / 2;
- if (gdk_rectangle_intersect(cell_area, &pix_rect, &draw_rect)
-#if !GTK_CHECK_VERSION(3,0,0)
- && gdk_rectangle_intersect(expose_area, &draw_rect, &draw_rect)
-#endif
- )
+ if (gdk_rectangle_intersect(cell_area, &pix_rect, &draw_rect))
{
for (i = 0; i < cellicon->num_marks; i++)
{
-#if GTK_CHECK_VERSION(3,0,0)
-#if GTK_CHECK_VERSION(3,14,0)
state &= ~(GTK_STATE_FLAG_CHECKED);
if ((cellicon->marks & (1 << i)))
state |= GTK_STATE_FLAG_CHECKED;
-#else
- state &= ~(GTK_STATE_FLAG_ACTIVE);
-
- if ((cellicon->marks & (1 << i)))
- state |= GTK_STATE_FLAG_ACTIVE;
-#endif
cairo_save (cr);
cairo_rectangle(cr,
}
gtk_style_context_restore(context);
cairo_restore(cr);
-
-#else
- gtk_paint_check(gtk_widget_get_style(widget), window,
- state, (cellicon->marks & (1 << i)) ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
- cell_area, widget, "cellcheck",
- pix_rect.x + i * TOGGLE_SPACING + (TOGGLE_WIDTH - TOGGLE_SPACING) / 2,
- pix_rect.y,
- TOGGLE_WIDTH, TOGGLE_WIDTH);
-#endif
}
}
}
-
-#if !GTK_CHECK_VERSION(3,0,0)
- if (cellicon->focused && gtk_widget_has_focus(widget))
- {
- gtk_paint_focus(gtk_widget_get_style(widget), window,
- state,
- cell_area, widget,
- "cellrendererfocus",
- cell_area->x, cell_area->y,
- cell_area->width, cell_area->height);
- }
- cairo_destroy(cr);
-#endif
}
-#if GTK_CHECK_VERSION(3,0,0)
static gboolean gqv_cell_renderer_icon_activate(GtkCellRenderer *cell,
GdkEvent *event,
GtkWidget *widget,
const gchar *path,
- const GdkRectangle *background_area,
+ const GdkRectangle *UNUSED(background_area),
const GdkRectangle *cell_area,
- GtkCellRendererState flags)
-#else
-static gboolean gqv_cell_renderer_icon_activate(GtkCellRenderer *cell,
- GdkEvent *event,
- GtkWidget *widget,
- const gchar *path,
- GdkRectangle *background_area,
- GdkRectangle *cell_area,
- GtkCellRendererState flags)
-#endif
+ GtkCellRendererState UNUSED(flags))
{
GQvCellRendererIcon *cellicon = (GQvCellRendererIcon *) cell;
GdkEventButton *bevent = &event->button;
static gboolean collection_save_confirmed(FileDialog *fd, gboolean overwrite, CollectionData *cd);
-static void collection_confirm_ok_cb(GenericDialog *gd, gpointer data)
+static void collection_confirm_ok_cb(GenericDialog *UNUSED(gd), gpointer data)
{
FileDialog *fd = data;
CollectionData *cd = GENERIC_DIALOG(fd)->data;
}
}
-static void collection_confirm_cancel_cb(GenericDialog *gd, gpointer data)
+static void collection_confirm_cancel_cb(GenericDialog *UNUSED(gd), gpointer UNUSED(data))
{
/* this is a no-op, so the cancel button is added */
}
if (!cd) return;
title = _("Save collection");
btntext = NULL;
- btnfunc = collection_save_cb;
+ btnfunc = (gpointer)collection_save_cb;
stock_id = GTK_STOCK_SAVE;
}
else if (type == DIALOG_LOAD)
{
title = _("Open collection");
btntext = NULL;
- btnfunc = collection_load_cb;
+ btnfunc = (gpointer)collection_load_cb;
stock_id = GTK_STOCK_OPEN;
}
else
if (!cd) return;
title = _("Append collection");
btntext = _("_Append");
- btnfunc = collection_append_cb;
+ btnfunc = (gpointer)collection_append_cb;
stock_id = GTK_STOCK_ADD;
}
collection_save_or_load_dialog_close_cb, cd);
generic_dialog_add_message(GENERIC_DIALOG(fd), NULL, title, NULL, FALSE);
- file_dialog_add_button(fd, stock_id, btntext, btnfunc, TRUE);
+ file_dialog_add_button(fd, stock_id, btntext, (void (*)(FileDialog *, gpointer))btnfunc, TRUE);
file_dialog_add_path_widgets(fd, get_collections_dir(), path,
"collection_load_save", GQ_COLLECTION_EXT, _("Collection Files"));
if (cd->info_updated_func) cd->info_updated_func(cd, cd->thumb_info, cd->info_updated_data);
}
-static void collection_load_thumb_error_cb(ThumbLoader *tl, gpointer data)
+static void collection_load_thumb_error_cb(ThumbLoader *UNUSED(tl), gpointer data)
{
CollectionData *cd = data;
collection_load_thumb_step(cd);
}
-static void collection_load_thumb_done_cb(ThumbLoader *tl, gpointer data)
+static void collection_load_thumb_done_cb(ThumbLoader *UNUSED(tl), gpointer data)
{
CollectionData *cd = data;
-static gboolean collect_manager_process_cb(gpointer data)
+static gboolean collect_manager_process_cb(gpointer UNUSED(data))
{
if (collection_manager_action_list) collect_manager_refresh();
collect_manager_process_actions(COLLECT_MANAGER_ACTIONS_PER_IDLE);
return FALSE;
}
-static gboolean collect_manager_timer_cb(gpointer data)
+static gboolean collect_manager_timer_cb(gpointer UNUSED(data))
{
DEBUG_1("collection manager timer expired");
while (collect_manager_process_cb(NULL));
}
-void collect_manager_notify_cb(FileData *fd, NotifyType type, gpointer data)
+void collect_manager_notify_cb(FileData *fd, NotifyType type, gpointer UNUSED(data))
{
if (!(type & NOTIFY_CHANGE) || !fd->change) return;
{
GtkWidget *label;
gint x, y;
-#if GTK_CHECK_VERSION(3,0,0)
GdkDisplay *display;
GdkDeviceManager *device_manager;
GdkDevice *device;
-#endif
if (ct->tip_window) return;
-#if GTK_CHECK_VERSION(3,0,0)
device_manager = gdk_display_get_device_manager(gdk_window_get_display(
gtk_widget_get_window(ct->listview)));
device = gdk_device_manager_get_client_pointer(device_manager);
gdk_window_get_device_position(gtk_widget_get_window(ct->listview),
device, &x, &y, NULL);
-#else
- gdk_window_get_pointer(gtk_widget_get_window(ct->listview), &x, &y, NULL);
-#endif
ct->tip_info = collection_table_find_data_by_coord(ct, x, y, NULL);
if (!ct->tip_info) return;
gtk_container_add(GTK_CONTAINER(ct->tip_window), label);
gtk_widget_show(label);
-#if GTK_CHECK_VERSION(3,0,0)
display = gdk_display_get_default();
device_manager = gdk_display_get_device_manager(display);
device = gdk_device_manager_get_client_pointer(device_manager);
gdk_device_get_position(device, NULL, &x, &y);
-#else
- gdk_window_get_pointer(NULL, &x, &y, NULL);
-#endif
if (!gtk_widget_get_realized(ct->tip_window)) gtk_widget_realize(ct->tip_window);
gtk_window_move(GTK_WINDOW(ct->tip_window), x + 16, y + 16);
static void tip_update(CollectTable *ct, CollectInfo *info)
{
-#if GTK_CHECK_VERSION(3,0,0)
GdkDisplay *display = gdk_display_get_default();
GdkDeviceManager *device_manager = gdk_display_get_device_manager(display);
GdkDevice *device = gdk_device_manager_get_client_pointer(device_manager);
-#endif
tip_schedule(ct);
if (ct->tip_window)
{
gint x, y;
-#if GTK_CHECK_VERSION(3,0,0)
gdk_device_get_position(device, NULL, &x, &y);
-#else
- gdk_window_get_pointer(NULL, &x, &y, NULL);
-#endif
+
gtk_window_move(GTK_WINDOW(ct->tip_window), x + 16, y + 16);
if (info != ct->tip_info)
*-------------------------------------------------------------------
*/
-static void collection_table_popup_save_as_cb(GtkWidget *widget, gpointer data)
+static void collection_table_popup_save_as_cb(GtkWidget *UNUSED(widget), gpointer data)
{
CollectTable *ct = data;
file_util_start_editor_from_filelist(key, collection_table_popup_file_list(ct), NULL, ct->listview);
}
-static void collection_table_popup_copy_cb(GtkWidget *widget, gpointer data)
+static void collection_table_popup_copy_cb(GtkWidget *UNUSED(widget), gpointer data)
{
CollectTable *ct = data;
file_util_copy(NULL, collection_table_popup_file_list(ct), NULL, ct->listview);
}
-static void collection_table_popup_move_cb(GtkWidget *widget, gpointer data)
+static void collection_table_popup_move_cb(GtkWidget *UNUSED(widget), gpointer data)
{
CollectTable *ct = data;
file_util_move(NULL, collection_table_popup_file_list(ct), NULL, ct->listview);
}
-static void collection_table_popup_rename_cb(GtkWidget *widget, gpointer data)
+static void collection_table_popup_rename_cb(GtkWidget *UNUSED(widget), gpointer data)
{
CollectTable *ct = data;
file_util_rename(NULL, collection_table_popup_file_list(ct), ct->listview);
}
-static void collection_table_popup_delete_cb(GtkWidget *widget, gpointer data)
+static void collection_table_popup_delete_cb(GtkWidget *UNUSED(widget), gpointer data)
{
CollectTable *ct = data;
file_util_delete(NULL, collection_table_popup_file_list(ct), ct->listview);
}
-static void collection_table_popup_move_to_trash_cb(GtkWidget *widget, gpointer data)
+static void collection_table_popup_move_to_trash_cb(GtkWidget *UNUSED(widget), gpointer data)
{
CollectTable *ct = data;
file_util_delete(NULL, collection_table_popup_file_list(ct), ct->listview);
}
-static void collection_table_popup_copy_path_cb(GtkWidget *widget, gpointer data)
+static void collection_table_popup_copy_path_cb(GtkWidget *UNUSED(widget), gpointer data)
{
CollectTable *ct = data;
file_util_copy_path_list_to_clipboard(collection_table_popup_file_list(ct), TRUE);
}
-static void collection_table_popup_copy_path_unquoted_cb(GtkWidget *widget, gpointer data)
+static void collection_table_popup_copy_path_unquoted_cb(GtkWidget *UNUSED(widget), gpointer data)
{
CollectTable *ct = data;
collection_set_sort_method(ct->cd, type);
}
-static void collection_table_popup_randomize_cb(GtkWidget *widget, gpointer data)
+static void collection_table_popup_randomize_cb(GtkWidget *widget, gpointer UNUSED(data))
{
CollectTable *ct;
collection_randomize(ct->cd);
}
-static void collection_table_popup_view_new_cb(GtkWidget *widget, gpointer data)
+static void collection_table_popup_view_new_cb(GtkWidget *UNUSED(widget), gpointer data)
{
CollectTable *ct = data;
}
}
-static void collection_table_popup_view_cb(GtkWidget *widget, gpointer data)
+static void collection_table_popup_view_cb(GtkWidget *UNUSED(widget), gpointer data)
{
CollectTable *ct = data;
}
}
-static void collection_table_popup_selectall_cb(GtkWidget *widget, gpointer data)
+static void collection_table_popup_selectall_cb(GtkWidget *UNUSED(widget), gpointer data)
{
CollectTable *ct = data;
ct->prev_selection= ct->click_info;
}
-static void collection_table_popup_unselectall_cb(GtkWidget *widget, gpointer data)
+static void collection_table_popup_unselectall_cb(GtkWidget *UNUSED(widget), gpointer data)
{
CollectTable *ct = data;
ct->prev_selection= ct->click_info;
}
-static void collection_table_popup_select_invert_cb(GtkWidget *widget, gpointer data)
+static void collection_table_popup_select_invert_cb(GtkWidget *UNUSED(widget), gpointer data)
{
CollectTable *ct = data;
ct->prev_selection= ct->click_info;
}
-static void collection_table_popup_rectangular_selection_cb(GtkWidget *widget, gpointer data)
+static void collection_table_popup_rectangular_selection_cb(GtkWidget *UNUSED(widget), gpointer UNUSED(data))
{
options->collections.rectangular_selection = !(options->collections.rectangular_selection);
}
-static void collection_table_popup_remove_cb(GtkWidget *widget, gpointer data)
+static void collection_table_popup_remove_cb(GtkWidget *UNUSED(widget), gpointer data)
{
CollectTable *ct = data;
GList *list;
g_list_free(list);
}
-static void collection_table_popup_add_file_selection_cb(GtkWidget *widget, gpointer data)
+static void collection_table_popup_add_file_selection_cb(GtkWidget *UNUSED(widget), gpointer data)
{
CollectTable *ct = data;
GList *list;
}
}
-static void collection_table_popup_add_collection_cb(GtkWidget *widget, gpointer data)
+static void collection_table_popup_add_collection_cb(GtkWidget *UNUSED(widget), gpointer data)
{
CollectTable *ct = data;
collection_dialog_append(NULL, ct->cd);
}
-static void collection_table_popup_goto_original_cb(GtkWidget *widget, gpointer data)
+static void collection_table_popup_goto_original_cb(GtkWidget *UNUSED(widget), gpointer data)
{
CollectTable *ct = data;
GList *list;
g_list_free(list);
}
-static void collection_table_popup_find_dupes_cb(GtkWidget *widget, gpointer data)
+static void collection_table_popup_find_dupes_cb(GtkWidget *UNUSED(widget), gpointer data)
{
CollectTable *ct = data;
DupeWindow *dw;
dupe_window_add_collection(dw, ct->cd);
}
-static void collection_table_popup_print_cb(GtkWidget *widget, gpointer data)
+static void collection_table_popup_print_cb(GtkWidget *UNUSED(widget), gpointer data)
{
CollectTable *ct = data;
FileData *fd;
print_window_new(fd, collection_table_selection_get_list(ct), collection_table_get_list(ct), gtk_widget_get_toplevel(ct->listview));
}
-static void collection_table_popup_show_names_cb(GtkWidget *widget, gpointer data)
+static void collection_table_popup_show_names_cb(GtkWidget *UNUSED(widget), gpointer data)
{
CollectTable *ct = data;
collection_table_toggle_filenames(ct);
}
-static void collection_table_popup_show_stars_cb(GtkWidget *widget, gpointer data)
+static void collection_table_popup_show_stars_cb(GtkWidget *UNUSED(widget), gpointer data)
{
CollectTable *ct = data;
collection_table_toggle_stars(ct);
}
-static void collection_table_popup_destroy_cb(GtkWidget *widget, gpointer data)
+static void collection_table_popup_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
{
CollectTable *ct = data;
return ret;
}
-static void collection_table_menu_pos_cb(GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer data)
+static void collection_table_menu_pos_cb(GtkMenu *menu, gint *x, gint *y, gboolean *UNUSED(push_in), gpointer data)
{
CollectTable *ct = data;
GtkTreeModel *store;
popup_menu_position_clamp(menu, x, y, 0);
}
-static gboolean collection_table_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
+static gboolean collection_table_press_key_cb(GtkWidget *UNUSED(widget), GdkEventKey *event, gpointer data)
{
CollectTable *ct = data;
gint focus_row = 0;
GtkTreeIter iter;
GtkTreePath *tpath;
GtkTreeViewColumn *column;
-#if GTK_CHECK_VERSION(3,0,0)
GdkDeviceManager *device_manager;
GdkDevice *device;
-#endif
store = gtk_tree_view_get_model(GTK_TREE_VIEW(ct->listview));
-#if GTK_CHECK_VERSION(3,0,0)
if (!use_coord)
{
device_manager = gdk_display_get_device_manager(gdk_window_get_display(
gdk_window_get_device_position(gtk_widget_get_window(ct->listview),
device, &x, &y, NULL);
}
-#else
- if (!use_coord) gdk_window_get_pointer(gtk_widget_get_window(ct->listview), &x, &y, NULL);
-#endif
+
if (source)
{
gint col;
ct->marker_window = gdk_window_new(NULL, &attributes, attributes_mask);
-#if GTK_CHECK_VERSION(3,0,0)
cairo_region_t *mask;
cairo_pattern_t *pattern;
cairo_surface_t *img = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, w, h);
cairo_pattern_destroy(pattern);
cairo_destroy(cr);
cairo_surface_destroy(img);
-#else
- GdkPixmap *pixmap;
- GdkBitmap *mask;
- gdk_pixbuf_render_pixmap_and_mask(pb, &pixmap, &mask, 128);
-
- gdk_window_set_back_pixmap(ct->marker_window, pixmap, FALSE);
- gdk_window_shape_combine_mask(ct->marker_window, mask, 0, 0);
-
- g_object_unref(pixmap);
- if (mask) g_object_unref(mask);
-#endif
g_object_unref(pb);
}
y = y + y_parent;
gdk_window_move(ct->marker_window, x, y);
-#if !GTK_CHECK_VERSION(3,0,0)
- gdk_window_clear(ct->marker_window);
-#endif
+
if (!gdk_window_is_visible(ct->marker_window)) gdk_window_show(ct->marker_window);
}
else
GdkWindow *window;
gint x, y;
gint w, h;
-#if GTK_CHECK_VERSION(3,0,0)
GdkDeviceManager *device_manager;
GdkDevice *device;
-#endif
if (!ct->drop_idle_id) return FALSE;
window = gtk_widget_get_window(ct->listview);
-#if GTK_CHECK_VERSION(3,0,0)
device_manager = gdk_display_get_device_manager(gdk_window_get_display(window));
device = gdk_device_manager_get_client_pointer(device_manager);
gdk_window_get_device_position(window, device, &x, &y, NULL);
-#else
- gdk_window_get_pointer(window, &x, &y, NULL);
-#endif
+
w = gdk_window_get_width(window);
h = gdk_window_get_height(window);
if (x >= 0 && x < w && y >= 0 && y < h)
return FALSE;
}
-static gboolean collection_table_auto_scroll_notify_cb(GtkWidget *widget, gint x, gint y, gpointer data)
+static gboolean collection_table_auto_scroll_notify_cb(GtkWidget *UNUSED(widget), gint UNUSED(x), gint UNUSED(y), gpointer data)
{
CollectTable *ct = data;
*-------------------------------------------------------------------
*/
-static gboolean collection_table_motion_cb(GtkWidget *widget, GdkEventMotion *event, gpointer data)
+static gboolean collection_table_motion_cb(GtkWidget *UNUSED(widget), GdkEventMotion *event, gpointer data)
{
CollectTable *ct = data;
return FALSE;
}
-static gboolean collection_table_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+static gboolean collection_table_press_cb(GtkWidget *UNUSED(widget), GdkEventButton *bevent, gpointer data)
{
CollectTable *ct = data;
GtkTreeIter iter;
return TRUE;
}
-static gboolean collection_table_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+static gboolean collection_table_release_cb(GtkWidget *UNUSED(widget), GdkEventButton *bevent, gpointer data)
{
CollectTable *ct = data;
GtkTreeIter iter;
return TRUE;
}
-static gboolean collection_table_leave_cb(GtkWidget *widget, GdkEventCrossing *event, gpointer data)
+static gboolean collection_table_leave_cb(GtkWidget *UNUSED(widget), GdkEventCrossing *UNUSED(event), gpointer data)
{
CollectTable *ct = data;
*-------------------------------------------------------------------
*/
-static gboolean collection_table_destroy_node_cb(GtkTreeModel *store, GtkTreePath *tpath, GtkTreeIter *iter, gpointer data)
+static gboolean collection_table_destroy_node_cb(GtkTreeModel *store, GtkTreePath *UNUSED(tpath), GtkTreeIter *iter, gpointer UNUSED(data))
{
GList *list;
collection_table_update_status(ct);
}
-static void collection_table_populate_at_new_size(CollectTable *ct, gint w, gint h, gboolean force)
+static void collection_table_populate_at_new_size(CollectTable *ct, gint w, gint UNUSED(h), gboolean force)
{
gint new_cols;
gint thumb_width;
}
}
-void collection_table_file_add(CollectTable *ct, CollectInfo *info)
+void collection_table_file_add(CollectTable *ct, CollectInfo *UNUSED(info))
{
collection_table_sync_idle(ct);
}
-void collection_table_file_insert(CollectTable *ct, CollectInfo *ci)
+void collection_table_file_insert(CollectTable *ct, CollectInfo *UNUSED(ci))
{
collection_table_sync_idle(ct);
}
}
-static void confirm_dir_list_add(GtkWidget *widget, gpointer data)
+static void confirm_dir_list_add(GtkWidget *UNUSED(widget), gpointer data)
{
CollectTable *ct = data;
confirm_dir_list_do(ct, ct->drop_list, FALSE);
}
-static void confirm_dir_list_recurse(GtkWidget *widget, gpointer data)
+static void confirm_dir_list_recurse(GtkWidget *UNUSED(widget), gpointer data)
{
CollectTable *ct = data;
confirm_dir_list_do(ct, ct->drop_list, TRUE);
}
-static void confirm_dir_list_skip(GtkWidget *widget, gpointer data)
+static void confirm_dir_list_skip(GtkWidget *UNUSED(widget), gpointer data)
{
CollectTable *ct = data;
static gint n_collection_drop_types = 2;
-static void collection_table_dnd_get(GtkWidget *widget, GdkDragContext *context,
+static void collection_table_dnd_get(GtkWidget *UNUSED(widget), GdkDragContext *UNUSED(context),
GtkSelectionData *selection_data, guint info,
- guint time, gpointer data)
+ guint UNUSED(time), gpointer data)
{
CollectTable *ct = data;
gboolean selected;
}
-static void collection_table_dnd_receive(GtkWidget *widget, GdkDragContext *context,
+static void collection_table_dnd_receive(GtkWidget *UNUSED(widget), GdkDragContext *context,
gint x, gint y,
GtkSelectionData *selection_data, guint info,
guint time, gpointer data)
}
}
-static void collection_table_dnd_end(GtkWidget *widget, GdkDragContext *context, gpointer data)
+static void collection_table_dnd_end(GtkWidget *UNUSED(widget), GdkDragContext *UNUSED(context), gpointer data)
{
CollectTable *ct = data;
collection_table_scroll(ct, FALSE);
}
-static gint collection_table_dnd_motion(GtkWidget *widget, GdkDragContext *context,
- gint x, gint y, guint time, gpointer data)
+static gint collection_table_dnd_motion(GtkWidget *UNUSED(widget), GdkDragContext *UNUSED(context),
+ gint x, gint y, guint UNUSED(time), gpointer data)
{
CollectTable *ct = data;
return FALSE;
}
-static void collection_table_dnd_leave(GtkWidget *widget, GdkDragContext *context, guint time, gpointer data)
+static void collection_table_dnd_leave(GtkWidget *UNUSED(widget), GdkDragContext *UNUSED(context), guint UNUSED(time), gpointer data)
{
CollectTable *ct = data;
gint number;
};
-static void collection_table_cell_data_cb(GtkTreeViewColumn *tree_column, GtkCellRenderer *cell,
+static void collection_table_cell_data_cb(GtkTreeViewColumn *UNUSED(tree_column), GtkCellRenderer *cell,
GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
{
ColumnData *cd = data;
gtk_tree_model_get(tree_model, iter, CTABLE_COLUMN_POINTER, &list, -1);
-#if GTK_CHECK_VERSION(3,0,0)
/** @FIXME this is a primitive hack to stop a crash.
* When compiled with GTK3, if a Collection window containing
* say, 50 or so, images has its width changed, there is a segfault
* https://github.com/BestImageViewer/geeqie/issues/531
*/
if (cd->number == COLLECT_TABLE_MAX_COLUMNS) return;
-#endif
+
info = g_list_nth_data(list, cd->number);
style = gtk_widget_get_style(ct->listview);
*-------------------------------------------------------------------
*/
-static void collection_table_destroy(GtkWidget *widget, gpointer data)
+static void collection_table_destroy(GtkWidget *UNUSED(widget), gpointer data)
{
CollectTable *ct = data;
g_free(ct);
}
-static void collection_table_sized(GtkWidget *widget, GtkAllocation *allocation, gpointer data)
+static void collection_table_sized(GtkWidget *UNUSED(widget), GtkAllocation *allocation, gpointer data)
{
CollectTable *ct = data;
*-------------------------------------------------------------------
*/
-CollectInfo *collection_info_new(FileData *fd, struct stat *st, GdkPixbuf *pixbuf)
+CollectInfo *collection_info_new(FileData *fd, struct stat *UNUSED(st), GdkPixbuf *pixbuf)
{
CollectInfo *ci;
CollectionData *cd;
CollectInfo *ci;
GList *work;
- FileData *fd;
GList *list = NULL;
if (is_collection(name))
while (work)
{
ci = work->data;
- fd = ci->fd;
list = g_list_append(list, ci->fd);
work = work->next;
*-------------------------------------------------------------------
*/
-static gboolean collection_window_keypress(GtkWidget *widget, GdkEventKey *event, gpointer data)
+static gboolean collection_window_keypress(GtkWidget *UNUSED(widget), GdkEventKey *event, gpointer data)
{
CollectWindow *cw = data;
gboolean stop_signal = FALSE;
g_free(buf);
}
-static void collection_window_update_info(CollectionData *cd, CollectInfo *ci, gpointer data)
+static void collection_window_update_info(CollectionData *UNUSED(cd), CollectInfo *ci, gpointer data)
{
CollectWindow *cw = data;
return ret;
}
-static gboolean collection_window_delete(GtkWidget *widget, GdkEvent *event, gpointer data)
+static gboolean collection_window_delete(GtkWidget *UNUSED(widget), GdkEvent *UNUSED(event), gpointer data)
{
CollectWindow *cw = data;
collection_window_close(cw);
g_signal_connect(G_OBJECT(cw->window), "key_press_event",
G_CALLBACK(collection_window_keypress), cw);
- vbox = gtk_vbox_new(FALSE, 0);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add(GTK_CONTAINER(cw->window), vbox);
gtk_widget_show(vbox);
gtk_box_pack_start(GTK_BOX(vbox), cw->table->scrolled, TRUE, TRUE, 0);
gtk_widget_show(cw->table->scrolled);
- cw->status_box = gtk_hbox_new(TRUE, 0);
+ cw->status_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(vbox), cw->status_box, FALSE, FALSE, 0);
gtk_widget_show(cw->status_box);
extra_label = gtk_progress_bar_new();
gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(extra_label), 0.0);
-#if GTK_CHECK_VERSION(3,0,0)
gtk_progress_bar_set_text(GTK_PROGRESS_BAR(extra_label), "");
gtk_progress_bar_set_show_text(GTK_PROGRESS_BAR(extra_label), TRUE);
-#endif
+
gtk_box_pack_start(GTK_BOX(cw->status_box), extra_label, TRUE, TRUE, 0);
gtk_widget_show(extra_label);
rs = gdk_pixbuf_get_rowstride(pixbuf);
/** @FIXME: x,y expected to be = 0. Maybe this is not the right place for scaling */
- if (!options->image.use_clutter_renderer)
- {
- w = w * scale_factor();
- h = h * scale_factor();
- }
+ w = w * scale_factor();
+ h = h * scale_factor();
w = MIN(w, pixbuf_width - x);
h = MIN(h, pixbuf_height - y);
#include "main.h"
#include "compat.h"
-#if !GTK_CHECK_VERSION(2,24,0)
-gint compat_gdk_window_get_width(GdkWindow *window)
-{
- gint w, h;
- gdk_drawable_get_size(window, &w, &h);
- return w;
-}
-
-gint compat_gdk_window_get_height(GdkWindow *window)
-{
- gint w, h;
- gdk_drawable_get_size(window, &w, &h);
- return h;
-}
-#endif
-
-#if !GTK_CHECK_VERSION(2,22,0)
-cairo_surface_t *compat_gdk_window_create_similar_surface (GdkWindow *window, cairo_content_t content, gint width, gint height)
-{
- cairo_t *cr = gdk_cairo_create(window);
- cairo_surface_t *ws = cairo_get_target(cr);
- cairo_surface_t *ret = cairo_surface_create_similar(ws, content, width, height);
- cairo_destroy(cr);
- return ret;
-}
-#endif
/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
#define MAP_ANON MAP_ANONYMOUS
#endif
-#if !GTK_CHECK_VERSION(2,22,0)
-#define GDK_KEY_BackSpace GDK_BackSpace
-#define GDK_KEY_Delete GDK_Delete
-#define GDK_KEY_Down GDK_Down
-#define GDK_KEY_End GDK_End
-#define GDK_KEY_Escape GDK_Escape
-#define GDK_KEY_F10 GDK_F10
-#define GDK_KEY_F11 GDK_F11
-#define GDK_KEY_Home GDK_Home
-#define GDK_KEY_ISO_Left_Tab GDK_ISO_Left_Tab
-#define GDK_KEY_KP_Add GDK_KP_Add
-#define GDK_KEY_KP_Delete GDK_KP_Delete
-#define GDK_KEY_KP_Divide GDK_KP_Divide
-#define GDK_KEY_KP_Down GDK_KP_Down
-#define GDK_KEY_KP_End GDK_KP_End
-#define GDK_KEY_KP_Enter GDK_KP_Enter
-#define GDK_KEY_KP_Home GDK_KP_Home
-#define GDK_KEY_KP_Left GDK_KP_Left
-#define GDK_KEY_KP_Multiply GDK_KP_Multiply
-#define GDK_KEY_KP_Page_Down GDK_KP_Page_Down
-#define GDK_KEY_KP_Page_Up GDK_KP_Page_Up
-#define GDK_KEY_KP_Right GDK_KP_Right
-#define GDK_KEY_KP_Subtract GDK_KP_Subtract
-#define GDK_KEY_KP_Up GDK_KP_Up
-#define GDK_KEY_Left GDK_Left
-#define GDK_KEY_Menu GDK_Menu
-#define GDK_KEY_Page_Down GDK_Page_Down
-#define GDK_KEY_Page_Up GDK_Page_Up
-#define GDK_KEY_plus GDK_plus
-#define GDK_KEY_Return GDK_Return
-#define GDK_KEY_Right GDK_Right
-#define GDK_KEY_space GDK_space
-#define GDK_KEY_Tab GDK_Tab
-#define GDK_KEY_Up GDK_Up
-#endif
-
-#if !GTK_CHECK_VERSION(2,24,0)
-#define gtk_combo_box_text_new gtk_combo_box_new_text
-#define gtk_combo_box_text_append_text gtk_combo_box_append_text
-#define gtk_combo_box_text_new_with_entry gtk_combo_box_entry_new_text
-#define gtk_combo_box_new_with_model_and_entry(model) gtk_combo_box_entry_new_with_model(model, FILTER_COLUMN_FILTER)
-#define GTK_COMBO_BOX_TEXT(combo) GTK_COMBO_BOX(combo)
-#define gdk_window_get_width(window) compat_gdk_window_get_width(window)
-#define gdk_window_get_height(window) compat_gdk_window_get_height(window)
-
-gint compat_gdk_window_get_width(GdkWindow *window);
-gint compat_gdk_window_get_height(GdkWindow *window);
-
-#endif
-
-#if !GTK_CHECK_VERSION(2,22,0)
-#define gdk_window_create_similar_surface(window, content, width, height) compat_gdk_window_create_similar_surface(window, content, width, height)
-cairo_surface_t *compat_gdk_window_create_similar_surface (GdkWindow *window, cairo_content_t content, gint width, gint height);
-
-#define gdk_drag_context_get_selected_action(context) ((context)->action)
-#define gdk_drag_context_get_suggested_action(context) ((context)->suggested_action)
-#define gdk_drag_context_get_actions(context) ((context)->actions)
-#endif
-
-#if GTK_CHECK_VERSION(3,0,0)
-#define gtk_hbox_new(homogeneous, spacing) gtk_box_new(GTK_ORIENTATION_HORIZONTAL, spacing)
-#define gtk_vbox_new(homogeneous, spacing) gtk_box_new(GTK_ORIENTATION_VERTICAL, spacing)
-#define gdk_cursor_unref(cursor) g_object_unref(G_OBJECT(cursor))
-#endif
-
-#if GTK_CHECK_VERSION(3,2,0)
-#define gtk_hpaned_new() gtk_paned_new(GTK_ORIENTATION_HORIZONTAL)
-#define gtk_vpaned_new() gtk_paned_new(GTK_ORIENTATION_VERTICAL)
-#endif
-
-#if GTK_CHECK_VERSION(3,8,0)
-#define gtk_scrolled_window_add_with_viewport(viewport, child) gtk_container_add(GTK_CONTAINER(viewport), child)
-#endif
-
-#if GTK_CHECK_VERSION(3,20,0)
-#define gtk_hbutton_box_new() gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL)
-#endif
-
#endif /* COMPAT_H */
/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
return ret;
}
-static void editor_window_close_cb(GtkWidget *widget, gpointer data)
+static void editor_window_close_cb(GtkWidget *UNUSED(widget), gpointer data)
{
EditorWindow *ew = data;
g_free(ew);
}
-static gint editor_window_delete_cb(GtkWidget *w, GdkEventAny *event, gpointer data)
+static gint editor_window_delete_cb(GtkWidget *w, GdkEventAny *UNUSED(event), gpointer data)
{
editor_window_close_cb(w, data);
return TRUE;
}
-static void editor_window_save_cb(GtkWidget *widget, gpointer data)
+static void editor_window_save_cb(GtkWidget *UNUSED(widget), gpointer data)
{
EditorWindow *ew = data;
ew->modified = FALSE;
}
-static void editor_window_text_modified_cb(GtkWidget *widget, gpointer data)
+static void editor_window_text_modified_cb(GtkWidget *UNUSED(widget), gpointer data)
{
EditorWindow *ew = data;
}
}
-static void editor_window_entry_changed_cb(GtkWidget *widget, gpointer data)
+static void editor_window_entry_changed_cb(GtkWidget *UNUSED(widget), gpointer data)
{
EditorWindow *ew = data;
const gchar *content = gtk_entry_get_text(GTK_ENTRY(ew->entry));
gtk_window_set_resizable(GTK_WINDOW(ew->window), TRUE);
gtk_container_set_border_width(GTK_CONTAINER(ew->window), PREF_PAD_BORDER);
- win_vbox = gtk_vbox_new(FALSE, PREF_PAD_SPACE);
+ win_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_SPACE);
gtk_container_add(GTK_CONTAINER(ew->window), win_vbox);
gtk_widget_show(win_vbox);
- hbox = gtk_hbox_new(FALSE, PREF_PAD_SPACE);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
gtk_box_pack_end(GTK_BOX(win_vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show(hbox);
}
-static void editor_list_window_close_cb(GtkWidget *widget, gpointer data)
+static void editor_list_window_close_cb(GtkWidget *UNUSED(widget), gpointer UNUSED(data))
{
gtk_widget_destroy(editor_list_window->window);
g_free(editor_list_window);
editor_list_window = NULL;
}
-static gboolean editor_list_window_delete(GtkWidget *widget, GdkEventAny *event, gpointer data)
+static gboolean editor_list_window_delete(GtkWidget *UNUSED(widget), GdkEventAny *UNUSED(event), gpointer UNUSED(data))
{
editor_list_window_close_cb(NULL, NULL);
return TRUE;
static void editor_list_window_delete_dlg_cancel(GenericDialog *gd, gpointer data);
-static void editor_list_window_delete_dlg_cancel(GenericDialog *gd, gpointer data)
+static void editor_list_window_delete_dlg_cancel(GenericDialog *UNUSED(gd), gpointer data)
{
EditorWindowDel_Data *ewdl = data;
editor_list_window_delete_dlg_cancel(gd, data);
}
-static void editor_list_window_delete_cb(GtkWidget *widget, gpointer data)
+static void editor_list_window_delete_cb(GtkWidget *UNUSED(widget), gpointer data)
{
EditorListWindow *ewl = data;
GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(ewl->view));
}
}
-static void editor_list_window_edit_cb(GtkWidget *widget, gpointer data)
+static void editor_list_window_edit_cb(GtkWidget *UNUSED(widget), gpointer data)
{
EditorListWindow *ewl = data;
GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(ewl->view));
}
}
-static void editor_list_window_new_cb(GtkWidget *widget, gpointer data)
+static void editor_list_window_new_cb(GtkWidget *UNUSED(widget), gpointer UNUSED(data))
{
editor_window_new(desktop_file_template, _("new.desktop"));
}
-static void editor_list_window_help_cb(GtkWidget *widget, gpointer data)
+static void editor_list_window_help_cb(GtkWidget *UNUSED(widget), gpointer UNUSED(data))
{
help_window_show("GuidePluginsConfig.html");
}
-static void editor_list_window_selection_changed_cb(GtkWidget *widget, gpointer data)
+static void editor_list_window_selection_changed_cb(GtkWidget *UNUSED(widget), gpointer data)
{
EditorListWindow *ewl = data;
GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(ewl->view));
return ret;
}
-static void plugin_disable_cb(GtkCellRendererToggle *renderer, gchar *path_str, gpointer data)
+static void plugin_disable_cb(GtkCellRendererToggle *UNUSED(renderer), gchar *path_str, gpointer data)
{
EditorListWindow *ewl = data;
GtkTreePath *tpath;
layout_editors_reload_finish();
}
-static void plugin_disable_set_func(GtkTreeViewColumn *tree_column, GtkCellRenderer *cell,
- GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
+static void plugin_disable_set_func(GtkTreeViewColumn *UNUSED(tree_column), GtkCellRenderer *cell,
+ GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer UNUSED(data))
{
gboolean disabled;
gtk_window_set_resizable(GTK_WINDOW(ewl->window), TRUE);
gtk_container_set_border_width(GTK_CONTAINER(ewl->window), PREF_PAD_BORDER);
- win_vbox = gtk_vbox_new(FALSE, PREF_PAD_SPACE);
+ win_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_SPACE);
gtk_container_add(GTK_CONTAINER(ewl->window), win_vbox);
gtk_widget_show(win_vbox);
g_object_unref(dest);
}
-static void dnd_set_drag_label_end_cb(GtkWidget *widget, GdkDragContext *context, gpointer data)
+static void dnd_set_drag_label_end_cb(GtkWidget *widget, GdkDragContext *UNUSED(context), gpointer data)
{
GtkWidget *window = data;
- g_signal_handlers_disconnect_by_func(widget, dnd_set_drag_label_end_cb, data);
+ g_signal_handlers_disconnect_by_func(widget, (gpointer)dnd_set_drag_label_end_cb, data);
gtk_widget_destroy(window);
}
gdk_window_set_cursor(gtk_widget_get_window(widget), cursor);
- if (cursor) gdk_cursor_unref(cursor);
+ if (cursor) g_object_unref(G_OBJECT(cursor));
}
/*
}
-static GList *dupe_listview_get_filelist(DupeWindow *dw, GtkWidget *listview)
+static GList *dupe_listview_get_filelist(DupeWindow *UNUSED(dw), GtkWidget *listview)
{
GtkTreeModel *store;
GtkTreeIter iter;
}
-static GList *dupe_listview_get_selection(DupeWindow *dw, GtkWidget *listview)
+static GList *dupe_listview_get_selection(DupeWindow *UNUSED(dw), GtkWidget *listview)
{
GtkTreeModel *store;
GtkTreeSelection *selection;
return g_list_reverse(list);
}
-static gboolean dupe_listview_item_is_selected(DupeWindow *dw, DupeItem *di, GtkWidget *listview)
+static gboolean dupe_listview_item_is_selected(DupeWindow *UNUSED(dw), DupeItem *di, GtkWidget *listview)
{
GtkTreeModel *store;
GtkTreeSelection *selection;
dupe_listview_set_thumb(dw, di, NULL);
}
-static void dupe_thumb_error_cb(ThumbLoader *tl, gpointer data)
+static void dupe_thumb_error_cb(ThumbLoader *UNUSED(tl), gpointer data)
{
DupeWindow *dw = data;
dupe_thumb_step(dw);
}
-static void dupe_thumb_done_cb(ThumbLoader *tl, gpointer data)
+static void dupe_thumb_done_cb(ThumbLoader *UNUSED(tl), gpointer data)
{
DupeWindow *dw = data;
dw->img_loader = NULL;
}
-static void dupe_check_stop_cb(GtkWidget *widget, gpointer data)
+static void dupe_check_stop_cb(GtkWidget *UNUSED(widget), gpointer data)
{
DupeWindow *dw = data;
}
}
-static void dupe_files_add(DupeWindow *dw, CollectionData *collection, CollectInfo *info,
+static void dupe_files_add(DupeWindow *dw, CollectionData *UNUSED(collection), CollectInfo *info,
FileData *fd, gboolean recurse)
{
DupeItem *di = NULL;
GtkWidget *hbox;
GtkWidget *label;
- hbox = gtk_hbox_new(FALSE, 10);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
label = gtk_label_new(description);
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
*-------------------------------------------------------------------
*/
-static void dupe_menu_view_cb(GtkWidget *widget, gpointer data)
+static void dupe_menu_view_cb(GtkWidget *UNUSED(widget), gpointer data)
{
DupeWindow *dw = data;
if (dw->click_item) dupe_menu_view(dw, dw->click_item, dw->listview, FALSE);
}
-static void dupe_menu_viewnew_cb(GtkWidget *widget, gpointer data)
+static void dupe_menu_viewnew_cb(GtkWidget *UNUSED(widget), gpointer data)
{
DupeWindow *dw = data;
if (dw->click_item) dupe_menu_view(dw, dw->click_item, dw->listview, TRUE);
}
-static void dupe_menu_select_all_cb(GtkWidget *widget, gpointer data)
+static void dupe_menu_select_all_cb(GtkWidget *UNUSED(widget), gpointer data)
{
DupeWindow *dw = data;
GtkTreeSelection *selection;
gtk_tree_selection_select_all(selection);
}
-static void dupe_menu_select_none_cb(GtkWidget *widget, gpointer data)
+static void dupe_menu_select_none_cb(GtkWidget *UNUSED(widget), gpointer data)
{
DupeWindow *dw = data;
GtkTreeSelection *selection;
gtk_tree_selection_unselect_all(selection);
}
-static void dupe_menu_select_dupes_set1_cb(GtkWidget *widget, gpointer data)
+static void dupe_menu_select_dupes_set1_cb(GtkWidget *UNUSED(widget), gpointer data)
{
DupeWindow *dw = data;
dupe_listview_select_dupes(dw, DUPE_SELECT_GROUP1);
}
-static void dupe_menu_select_dupes_set2_cb(GtkWidget *widget, gpointer data)
+static void dupe_menu_select_dupes_set2_cb(GtkWidget *UNUSED(widget), gpointer data)
{
DupeWindow *dw = data;
dupe_window_edit_selected(dw, key);
}
-static void dupe_menu_print_cb(GtkWidget *widget, gpointer data)
+static void dupe_menu_print_cb(GtkWidget *UNUSED(widget), gpointer data)
{
DupeWindow *dw = data;
FileData *fd;
dupe_listview_get_filelist(dw, dw->listview), dw->window);
}
-static void dupe_menu_copy_cb(GtkWidget *widget, gpointer data)
+static void dupe_menu_copy_cb(GtkWidget *UNUSED(widget), gpointer data)
{
DupeWindow *dw = data;
file_util_copy(NULL, dupe_listview_get_selection(dw, dw->listview), NULL, dw->window);
}
-static void dupe_menu_move_cb(GtkWidget *widget, gpointer data)
+static void dupe_menu_move_cb(GtkWidget *UNUSED(widget), gpointer data)
{
DupeWindow *dw = data;
file_util_move(NULL, dupe_listview_get_selection(dw, dw->listview), NULL, dw->window);
}
-static void dupe_menu_rename_cb(GtkWidget *widget, gpointer data)
+static void dupe_menu_rename_cb(GtkWidget *UNUSED(widget), gpointer data)
{
DupeWindow *dw = data;
file_util_rename(NULL, dupe_listview_get_selection(dw, dw->listview), dw->window);
}
-static void dupe_menu_delete_cb(GtkWidget *widget, gpointer data)
+static void dupe_menu_delete_cb(GtkWidget *UNUSED(widget), gpointer data)
{
DupeWindow *dw = data;
file_util_delete_notify_done(NULL, dupe_listview_get_selection(dw, dw->listview), dw->window, delete_finished_cb, dw);
}
-static void dupe_menu_move_to_trash_cb(GtkWidget *widget, gpointer data)
+static void dupe_menu_move_to_trash_cb(GtkWidget *UNUSED(widget), gpointer data)
{
DupeWindow *dw = data;
file_util_delete_notify_done(NULL, dupe_listview_get_selection(dw, dw->listview), dw->window, delete_finished_cb, dw);
}
-static void dupe_menu_copy_path_cb(GtkWidget *widget, gpointer data)
+static void dupe_menu_copy_path_cb(GtkWidget *UNUSED(widget), gpointer data)
{
DupeWindow *dw = data;
file_util_copy_path_list_to_clipboard(dupe_listview_get_selection(dw, dw->listview), TRUE);
}
-static void dupe_menu_copy_path_unquoted_cb(GtkWidget *widget, gpointer data)
+static void dupe_menu_copy_path_unquoted_cb(GtkWidget *UNUSED(widget), gpointer data)
{
DupeWindow *dw = data;
file_util_copy_path_list_to_clipboard(dupe_listview_get_selection(dw, dw->listview), FALSE);
}
-static void dupe_menu_remove_cb(GtkWidget *widget, gpointer data)
+static void dupe_menu_remove_cb(GtkWidget *UNUSED(widget), gpointer data)
{
DupeWindow *dw = data;
dupe_window_remove_selection(dw, dw->listview);
}
-static void dupe_menu_clear_cb(GtkWidget *widget, gpointer data)
+static void dupe_menu_clear_cb(GtkWidget *UNUSED(widget), gpointer data)
{
DupeWindow *dw = data;
dupe_window_clear(dw);
}
-static void dupe_menu_close_cb(GtkWidget *widget, gpointer data)
+static void dupe_menu_close_cb(GtkWidget *UNUSED(widget), gpointer data)
{
DupeWindow *dw = data;
dupe_window_close(dw);
}
-static void dupe_menu_popup_destroy_cb(GtkWidget *widget, gpointer data)
+static void dupe_menu_popup_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
{
GList *editmenu_fd_list = data;
dupe_second_update_status(dw);
}
-static void dupe_second_menu_view_cb(GtkWidget *widget, gpointer data)
+static void dupe_second_menu_view_cb(GtkWidget *UNUSED(widget), gpointer data)
{
DupeWindow *dw = data;
if (dw->click_item) dupe_menu_view(dw, dw->click_item, dw->second_listview, FALSE);
}
-static void dupe_second_menu_viewnew_cb(GtkWidget *widget, gpointer data)
+static void dupe_second_menu_viewnew_cb(GtkWidget *UNUSED(widget), gpointer data)
{
DupeWindow *dw = data;
if (dw->click_item) dupe_menu_view(dw, dw->click_item, dw->second_listview, TRUE);
}
-static void dupe_second_menu_select_all_cb(GtkWidget *widget, gpointer data)
+static void dupe_second_menu_select_all_cb(GtkWidget *UNUSED(widget), gpointer data)
{
GtkTreeSelection *selection;
DupeWindow *dw = data;
gtk_tree_selection_select_all(selection);
}
-static void dupe_second_menu_select_none_cb(GtkWidget *widget, gpointer data)
+static void dupe_second_menu_select_none_cb(GtkWidget *UNUSED(widget), gpointer data)
{
GtkTreeSelection *selection;
DupeWindow *dw = data;
gtk_tree_selection_unselect_all(selection);
}
-static void dupe_second_menu_remove_cb(GtkWidget *widget, gpointer data)
+static void dupe_second_menu_remove_cb(GtkWidget *UNUSED(widget), gpointer data)
{
DupeWindow *dw = data;
dupe_window_remove_selection(dw, dw->second_listview);
}
-static void dupe_second_menu_clear_cb(GtkWidget *widget, gpointer data)
+static void dupe_second_menu_clear_cb(GtkWidget *UNUSED(widget), gpointer data)
{
DupeWindow *dw = data;
return &color;
}
-static void dupe_listview_color_cb(GtkTreeViewColumn *tree_column, GtkCellRenderer *cell,
+static void dupe_listview_color_cb(GtkTreeViewColumn *UNUSED(tree_column), GtkCellRenderer *cell,
GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
{
DupeWindow *dw = data;
dupe_window_recompare(dw);
}
-static void dupe_popup_menu_pos_cb(GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer data)
+static void dupe_popup_menu_pos_cb(GtkMenu *menu, gint *x, gint *y, gboolean *UNUSED(push_in), gpointer data)
{
GtkWidget *view = data;
GtkTreePath *tpath;
*y = cy;
}
-static gboolean dupe_window_keypress_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
+static gboolean dupe_window_keypress_cb(GtkWidget *UNUSED(widget), GdkEventKey *event, gpointer data)
{
DupeWindow *dw = data;
gboolean stop_signal = FALSE;
g_free(dw);
}
-static gint dupe_window_close_cb(GtkWidget *widget, gpointer data)
+static gint dupe_window_close_cb(GtkWidget *UNUSED(widget), gpointer data)
{
DupeWindow *dw = data;
return TRUE;
}
-static gint dupe_window_delete(GtkWidget *widget, GdkEvent *event, gpointer data)
+static gint dupe_window_delete(GtkWidget *UNUSED(widget), GdkEvent *UNUSED(event), gpointer data)
{
DupeWindow *dw = data;
dupe_window_close(dw);
return TRUE;
}
-static void dupe_help_cb(GtkAction *action, gpointer data)
+static void dupe_help_cb(GtkAction *UNUSED(action), gpointer UNUSED(data))
{
help_window_show("GuideImageSearchFindingDuplicates.html");
}
-static gint default_sort_cb(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer data)
+static gint default_sort_cb(GtkTreeModel *UNUSED(model), GtkTreeIter *UNUSED(a), GtkTreeIter *UNUSED(b), gpointer UNUSED(data))
{
return 0;
}
return ret;
}
-static void column_clicked_cb(GtkWidget *widget, gpointer data)
+static void column_clicked_cb(GtkWidget *UNUSED(widget), gpointer data)
{
DupeWindow *dw = data;
g_signal_connect(G_OBJECT(dw->window), "key_press_event",
G_CALLBACK(dupe_window_keypress_cb), dw);
- vbox = gtk_vbox_new(FALSE, 0);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add(GTK_CONTAINER(dw->window), vbox);
gtk_widget_show(vbox);
gtk_container_add(GTK_CONTAINER(scrolled), dw->listview);
gtk_widget_show(dw->listview);
- dw->second_vbox = gtk_vbox_new(FALSE, 0);
+ dw->second_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_table_attach_defaults(GTK_TABLE(dw->table), dw->second_vbox, 2, 3, 0, 1);
if (dw->second_set)
{
pref_line(dw->second_vbox, GTK_ORIENTATION_HORIZONTAL);
- status_box = gtk_hbox_new(FALSE, 0);
+ status_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(vbox), status_box, FALSE, FALSE, 0);
gtk_widget_show(status_box);
dw->extra_label = gtk_progress_bar_new();
gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(dw->extra_label), 0.0);
-#if GTK_CHECK_VERSION(3,0,0)
gtk_progress_bar_set_text(GTK_PROGRESS_BAR(dw->extra_label), "");
gtk_progress_bar_set_show_text(GTK_PROGRESS_BAR(dw->extra_label), TRUE);
-#endif
gtk_box_pack_start(GTK_BOX(status_box), dw->extra_label, FALSE, FALSE, PREF_PAD_SPACE);
gtk_widget_show(dw->extra_label);
gtk_box_pack_start(GTK_BOX(controls_box), button, FALSE, FALSE, PREF_PAD_SPACE);
gtk_widget_show(button);
- button_box = gtk_hbox_new(FALSE, 0);
+ button_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(vbox), button_box, FALSE, FALSE, 0);
gtk_widget_show(button_box);
GList *list;
} CDupeConfirmD;
-static void confirm_dir_list_cancel(GtkWidget *widget, gpointer data)
+static void confirm_dir_list_cancel(GtkWidget *UNUSED(widget), gpointer UNUSED(data))
{
/* do nothing */
}
-static void confirm_dir_list_add(GtkWidget *widget, gpointer data)
+static void confirm_dir_list_add(GtkWidget *UNUSED(widget), gpointer data)
{
CDupeConfirmD *d = data;
GList *work;
}
}
-static void confirm_dir_list_recurse(GtkWidget *widget, gpointer data)
+static void confirm_dir_list_recurse(GtkWidget *UNUSED(widget), gpointer data)
{
CDupeConfirmD *d = data;
dupe_window_add_files(d->dw, d->list, TRUE);
}
-static void confirm_dir_list_skip(GtkWidget *widget, gpointer data)
+static void confirm_dir_list_skip(GtkWidget *UNUSED(widget), gpointer data)
{
CDupeConfirmD *d = data;
dupe_window_add_files(d->dw, d->list, FALSE);
}
-static void confirm_dir_list_destroy(GtkWidget *widget, gpointer data)
+static void confirm_dir_list_destroy(GtkWidget *UNUSED(widget), gpointer data)
{
CDupeConfirmD *d = data;
filelist_free(d->list);
};
static gint n_dupe_drop_types = 2;
-static void dupe_dnd_data_set(GtkWidget *widget, GdkDragContext *context,
+static void dupe_dnd_data_set(GtkWidget *widget, GdkDragContext *UNUSED(context),
GtkSelectionData *selection_data, guint info,
- guint time, gpointer data)
+ guint UNUSED(time), gpointer data)
{
DupeWindow *dw = data;
GList *list;
}
static void dupe_dnd_data_get(GtkWidget *widget, GdkDragContext *context,
- gint x, gint y,
+ gint UNUSED(x), gint UNUSED(y),
GtkSelectionData *selection_data, guint info,
guint time, gpointer data)
{
}
}
-static void dupe_dnd_end(GtkWidget *widget, GdkDragContext *context, gpointer data)
+static void dupe_dnd_end(GtkWidget *UNUSED(widget), GdkDragContext *UNUSED(context), gpointer data)
{
DupeWindow *dw = data;
dupe_dest_set(dw->listview, TRUE);
* the UI slows to an unacceptable level. The #FileUtilDoneFunc is used
* to call this function once, when the entire delete operation is completed.
*/
-static void delete_finished_cb(gboolean success, const gchar *dest_path, gpointer data)
+static void delete_finished_cb(gboolean success, const gchar *UNUSED(dest_path), gpointer data)
{
DupeWindow *dw = data;
edd->dialog = NULL;
}
-static void export_duplicates_data_cancel_cb(FileDialog *fdlg, gpointer data)
+static void export_duplicates_data_cancel_cb(FileDialog *UNUSED(fdlg), gpointer data)
{
ExportDupesData *edd = data;
export_duplicates_close(edd);
}
-static void pop_menu_export(GList *selection_list, gpointer dupe_window, gpointer data)
+static void pop_menu_export(GList *UNUSED(selection_list), gpointer dupe_window, gpointer data)
{
const gint index = GPOINTER_TO_INT(data);
DupeWindow *dw = dupe_window;
return TRUE;
}
-static gboolean editor_remove_desktop_file_cb(gpointer key, gpointer value, gpointer user_data)
+static gboolean editor_remove_desktop_file_cb(gpointer UNUSED(key), gpointer value, gpointer UNUSED(user_data))
{
EditorDescription *editor = value;
return editor->hidden || editor->ignored;
return list;
}
-static void editor_list_add_cb(gpointer key, gpointer value, gpointer data)
+static void editor_list_add_cb(gpointer UNUSED(key), gpointer value, gpointer data)
{
GList **listp = data;
EditorDescription *editor = value;
if (ed->pid == -1) editor_data_free(ed); /* the process has already terminated */
}
-static void editor_verbose_window_stop(GenericDialog *gd, gpointer data)
+static void editor_verbose_window_stop(GenericDialog *UNUSED(gd), gpointer data)
{
EditorData *ed = data;
ed->stopping = TRUE;
buf = g_strdup_printf(_("Output of %s"), text);
generic_dialog_add_message(vd->gd, NULL, buf, NULL, FALSE);
g_free(buf);
- vd->button_stop = generic_dialog_add_button(vd->gd, GTK_STOCK_STOP, NULL,
+ //~ vd->button_stop = generic_dialog_add_button(vd->gd, GTK_STOCK_STOP, NULL,
+ //~ editor_verbose_window_stop, FALSE);
+ vd->button_stop = generic_dialog_add_button(vd->gd, "process-stop", NULL,
editor_verbose_window_stop, FALSE);
gtk_widget_set_sensitive(vd->button_stop, FALSE);
vd->button_close = generic_dialog_add_button(vd->gd, GTK_STOCK_CLOSE, NULL,
gtk_container_add(GTK_CONTAINER(scrolled), vd->text);
gtk_widget_show(vd->text);
- hbox = gtk_hbox_new(FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(vd->gd->vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show(hbox);
vd->progress = gtk_progress_bar_new();
gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(vd->progress), 0.0);
gtk_box_pack_start(GTK_BOX(hbox), vd->progress, TRUE, TRUE, 0);
-#if GTK_CHECK_VERSION(3,0,0)
gtk_progress_bar_set_text(GTK_PROGRESS_BAR(vd->progress), "");
gtk_progress_bar_set_show_text(GTK_PROGRESS_BAR(vd->progress), TRUE);
-#endif
gtk_widget_show(vd->progress);
vd->spinner = spinner_new(NULL, SPINNER_SPEED);
EDITOR_ERROR_STATUS = 0x00400000,
EDITOR_ERROR_SKIPPED = 0x00800000,
/**< mask to match errors only */
- EDITOR_ERROR_MASK = 0xffff0000,
+ EDITOR_ERROR_MASK = ~0xffff,
} EditorFlags;
struct _EditorDescription {
return g_strdup_printf("%s (%d%d%d%d)", pbuf, mb, mu, mg, mo);
}
-gchar *metadata_file_info(FileData *fd, const gchar *key, MetadataFormat format)
+gchar *metadata_file_info(FileData *fd, const gchar *key, MetadataFormat UNUSED(format))
{
gchar *page_n_of_m;
}
#ifdef HAVE_LUA
-gchar *metadata_lua_info(FileData *fd, const gchar *key, MetadataFormat format)
+gchar *metadata_lua_info(FileData *fd, const gchar *key, MetadataFormat UNUSED(format))
{
gchar *script_name;
gchar *script_name_utf8;
void exif_init(void)
{
}
-
+#else
+typedef int dummy_variable;
#endif
/* not HAVE_EXIV2 */
/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
{
}
- virtual void writeMetadata(gchar *path = NULL)
+ virtual void writeMetadata(gchar *UNUSED(path) = NULL)
{
g_critical("Unsupported method of writing metadata");
}
}
}
-const char *exif_item_get_format_name(ExifItem *item, gboolean brief)
+const char *exif_item_get_format_name(ExifItem *item, gboolean UNUSED(brief))
{
try {
if (!item) return NULL;
if (fce->fd == fd)
{
/* entry exists */
- DEBUG_2("cache hit: fc=%p %s", fc, fd->path);
+ DEBUG_2("cache hit: fc=%p %s", (void *)fc, fd->path);
if (work == fc->list) return TRUE; /* already at the beginning */
/* move it to the beginning */
- DEBUG_2("cache move to front: fc=%p %s", fc, fd->path);
+ DEBUG_2("cache move to front: fc=%p %s", (void *)fc, fd->path);
fc->list = g_list_remove_link(fc->list, work);
fc->list = g_list_concat(work, fc->list);
}
work = work->next;
}
- DEBUG_2("cache miss: fc=%p %s", fc, fd->path);
+ DEBUG_2("cache miss: fc=%p %s", (void *)fc, fd->path);
return FALSE;
}
fc->list = g_list_delete_link(fc->list, work);
work = prev;
- DEBUG_2("file changed - cache remove: fc=%p %s", fc, last_fe->fd->path);
+ DEBUG_2("file changed - cache remove: fc=%p %s", (void *)fc, last_fe->fd->path);
fc->size -= last_fe->size;
fc->release(last_fe->fd);
file_data_unref(last_fe->fd);
if (file_cache_get(fc, fd)) return;
- DEBUG_2("cache add: fc=%p %s", fc, fd->path);
+ DEBUG_2("cache add: fc=%p %s", (void *)fc, fd->path);
fe = g_new(FileCacheEntry, 1);
fe->fd = file_data_ref(fd);
fe->size = size;
{
fc->list = g_list_delete_link(fc->list, current);
- DEBUG_1("cache remove: fc=%p %s", fc, fe->fd->path);
+ DEBUG_1("cache remove: fc=%p %s", (void *)fc, fe->fd->path);
fc->size -= fe->size;
fc->release(fe->fd);
file_data_unref(fe->fd);
GList *work = fc->list;
gulong n = 0;
- DEBUG_1("cache dump: fc=%p max size:%ld size:%ld", fc, fc->max_size, fc->size);
+ DEBUG_1("cache dump: fc=%p max size:%ld size:%ld", (void *)fc, fc->max_size, fc->size);
while (work)
{
FileCacheEntry *fe = work->data;
work = work->next;
- DEBUG_1("cache entry: fc=%p [%lu] %s %ld", fc, ++n, fe->fd->path, fe->size);
+ DEBUG_1("cache entry: fc=%p [%lu] %s %ld", (void *)fc, ++n, fe->fd->path, fe->size);
}
}
g_free(fd->collate_key_name);
g_free(fd->collate_key_name_nocase);
-#if GTK_CHECK_VERSION(2, 8, 0)
if (options->file_sort.natural)
{
fd->collate_key_name = g_utf8_collate_key_for_filename(fd->name, -1);
fd->collate_key_name = g_utf8_collate_key(valid_name, -1);
fd->collate_key_name_nocase = g_utf8_collate_key(caseless_name, -1);
}
-#else
- fd->collate_key_name = g_utf8_collate_key(valid_name, -1);
- fd->collate_key_name_nocase = g_utf8_collate_key(caseless_name, -1);
-#endif
g_free(valid_name);
g_free(caseless_name);
if (file->exif)
{
gchar *tmp = exif_get_data_as_text(file->exif, "Exif.Photo.DateTimeOriginal");
- DEBUG_2("%s set_exif_time_data: reading %p %s", get_exec_time(), file, file->path);
+ DEBUG_2("%s set_exif_time_data: reading %p %s", get_exec_time(), (void *)file, file->path);
if (tmp)
{
if (file->exif)
{
gchar *tmp = exif_get_data_as_text(file->exif, "Exif.Photo.DateTimeDigitized");
- DEBUG_2("%s set_exif_time_digitized_data: reading %p %s", get_exec_time(), file, file->path);
+ DEBUG_2("%s set_exif_time_digitized_data: reading %p %s", get_exec_time(), (void *)file, file->path);
if (tmp)
{
if (fd == NULL) return NULL;
if (fd->magick != FD_MAGICK)
#ifdef DEBUG_FILEDATA
- log_printf("Error: fd magick mismatch @ %s:%d fd=%p", file, line, fd);
+ log_printf("Error: fd magick mismatch @ %s:%d fd=%p", file, line, (void *)fd);
#else
log_printf("Error: fd magick mismatch fd=%p", fd);
#endif
fd->ref++;
#ifdef DEBUG_FILEDATA
- DEBUG_2("file_data_ref fd=%p (%d): '%s' @ %s:%d", fd, fd->ref, fd->path, file, line);
+ DEBUG_2("file_data_ref fd=%p (%d): '%s' @ %s:%d", (void *)fd, fd->ref, fd->path, file, line);
#else
DEBUG_2("file_data_ref fd=%p (%d): '%s'", fd, fd->ref, fd->path);
#endif
if (fd == NULL) return;
if (fd->magick != FD_MAGICK)
#ifdef DEBUG_FILEDATA
- log_printf("Error: fd magick mismatch @ %s:%d fd=%p", file, line, fd);
+ log_printf("Error: fd magick mismatch @ %s:%d fd=%p", file, line, (void *)fd);
#else
log_printf("Error: fd magick mismatch fd=%p", fd);
#endif
fd->ref--;
#ifdef DEBUG_FILEDATA
- DEBUG_2("file_data_unref fd=%p (%d:%d): '%s' @ %s:%d", fd, fd->ref, fd->locked, fd->path,
+ DEBUG_2("file_data_unref fd=%p (%d:%d): '%s' @ %s:%d", (void *)fd, fd->ref, fd->locked, fd->path,
file, line);
#else
DEBUG_2("file_data_unref fd=%p (%d:%d): '%s'", fd, fd->ref, fd->locked, fd->path);
void file_data_lock(FileData *fd)
{
if (fd == NULL) return;
- if (fd->magick != FD_MAGICK) log_printf("Error: fd magick mismatch fd=%p", fd);
+ if (fd->magick != FD_MAGICK) log_printf("Error: fd magick mismatch fd=%p", (void *)fd);
g_assert(fd->magick == FD_MAGICK);
fd->locked = TRUE;
- DEBUG_2("file_data_ref fd=%p (%d): '%s'", fd, fd->ref, fd->path);
+ DEBUG_2("file_data_ref fd=%p (%d): '%s'", (void *)fd, fd->ref, fd->path);
}
/**
void file_data_unlock(FileData *fd)
{
if (fd == NULL) return;
- if (fd->magick != FD_MAGICK) log_printf("Error: fd magick mismatch fd=%p", fd);
+ if (fd->magick != FD_MAGICK) log_printf("Error: fd magick mismatch fd=%p", (void *)fd);
g_assert(fd->magick == FD_MAGICK);
fd->locked = FALSE;
FileData *fd = work->data;
work = work->next;
g_assert(fd->magick == FD_MAGICK);
- DEBUG_2("basename: %p %s", fd, fd->name);
+ DEBUG_2("basename: %p %s", (void *)fd, fd->name);
if (fd->parent)
{
g_assert(fd->parent->magick == FD_MAGICK);
- DEBUG_2(" parent: %p", fd->parent);
+ DEBUG_2(" parent: %p", (void *)fd->parent);
}
s_work = fd->sidecar_files;
while (s_work)
FileData *sfd = s_work->data;
s_work = s_work->next;
g_assert(sfd->magick == FD_MAGICK);
- DEBUG_2(" sidecar: %p %s", sfd, sfd->name);
+ DEBUG_2(" sidecar: %p %s", (void *)sfd, sfd->name);
}
g_assert(fd->parent == NULL || fd->sidecar_files == NULL);
file_data_basename_hash_insert((GHashTable *)basename_hash, (FileData *)fd);
}
-static void file_data_basename_hash_remove_list(gpointer key, gpointer value, gpointer data)
+static void file_data_basename_hash_remove_list(gpointer UNUSED(key), gpointer value, gpointer UNUSED(data))
{
filelist_free((GList *)value);
}
return flist_filtered;
}
-static void file_data_basename_hash_to_sidecars(gpointer key, gpointer value, gpointer data)
+static void file_data_basename_hash_to_sidecars(gpointer UNUSED(key), gpointer value, gpointer UNUSED(data))
{
GList *basename_list = (GList *)value;
file_data_check_sidecars(basename_list);
return list;
}
-static void file_data_notify_mark_func(gpointer key, gpointer value, gpointer user_data)
+static void file_data_notify_mark_func(gpointer UNUSED(key), gpointer value, gpointer UNUSED(user_data))
{
FileData *fd = value;
file_data_increment_version(fd);
nd->priority = priority;
notify_func_list = g_list_insert_sorted(notify_func_list, nd, file_data_notify_sort);
- DEBUG_2("Notify func registered: %p", nd);
+ DEBUG_2("Notify func registered: %p", (void *)nd);
return TRUE;
}
{
notify_func_list = g_list_delete_link(notify_func_list, work);
g_free(nd);
- DEBUG_2("Notify func unregistered: %p", nd);
+ DEBUG_2("Notify func unregistered: %p", (void *)nd);
return TRUE;
}
work = work->next;
static GHashTable *file_data_monitor_pool = NULL;
static guint realtime_monitor_id = 0; /* event source id */
-static void realtime_monitor_check_cb(gpointer key, gpointer value, gpointer data)
+static void realtime_monitor_check_cb(gpointer key, gpointer UNUSED(value), gpointer UNUSED(data))
{
FileData *fd = key;
DEBUG_1("monitor %s", fd->path);
}
-static gboolean realtime_monitor_cb(gpointer data)
+static gboolean realtime_monitor_cb(gpointer UNUSED(data))
{
if (!options->update_on_time_change) return TRUE;
g_hash_table_foreach(file_data_monitor_pool, realtime_monitor_check_cb, NULL);
return (secure_close(ssi) == 0);
}
-static void marks_clear(gpointer key, gpointer value, gpointer userdata)
+static void marks_clear(gpointer key, gpointer value, gpointer UNUSED(userdata))
{
gchar *file_name = key;
gint mark_no;
return TRUE;
}
-
+#else
+typedef int dummy_variable;
#endif
/* not HAVE_EXIV2 */
/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
return TRUE;
}
-
+#else
+typedef int dummy_variable;
#endif
/* not HAVE_EXIV2 */
/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
return TRUE;
}
+#else
+typedef int dummy_variable;
#endif
/* not HAVE_EXIV2 */
/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
return TRUE;
}
-
+#else
+typedef int dummy_variable;
#endif
/* not HAVE_EXIV2 */
/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
return FALSE;
}
#endif
-
+#else
+typedef int dummy_variable;
#endif
/* not HAVE_EXIV2 */
/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
cursor = gdk_cursor_new(GDK_WATCH);
gdk_window_set_cursor(window, cursor);
- gdk_cursor_unref(cursor);
+ g_object_unref(G_OBJECT(cursor));
}
else if (state & FULLSCREEN_CURSOR_NORMAL)
{
cursor = gdk_cursor_new(GDK_BLANK_CURSOR);
gdk_window_set_cursor(window, cursor);
- gdk_cursor_unref(cursor);
+ g_object_unref(G_OBJECT(cursor));
}
}
fs->hide_mouse_id = g_timeout_add(FULL_SCREEN_HIDE_MOUSE_DELAY, fullscreen_hide_mouse_cb, fs);
}
-static gboolean fullscreen_mouse_moved(GtkWidget *widget, GdkEventMotion *event, gpointer data)
+static gboolean fullscreen_mouse_moved(GtkWidget *UNUSED(widget), GdkEventMotion *UNUSED(event), gpointer data)
{
FullScreenData *fs = data;
}
}
-static void fullscreen_image_update_cb(ImageWindow *imd, gpointer data)
+static void fullscreen_image_update_cb(ImageWindow *UNUSED(imd), gpointer data)
{
FullScreenData *fs = data;
}
}
-static void fullscreen_image_complete_cb(ImageWindow *imd, gboolean preload, gpointer data)
+static void fullscreen_image_complete_cb(ImageWindow *UNUSED(imd), gboolean preload, gpointer data)
{
FullScreenData *fs = data;
}
}
-static gboolean fullscreen_saver_block_cb(gpointer data)
+static gboolean fullscreen_saver_block_cb(gpointer UNUSED(data))
{
if (options->fullscreen.disable_saver)
{
return TRUE;
}
-static gboolean fullscreen_delete_cb(GtkWidget *widget, GdkEventAny *event, gpointer data)
+static gboolean fullscreen_delete_cb(GtkWidget *UNUSED(widget), GdkEventAny *UNUSED(event), gpointer data)
{
FullScreenData *fs = data;
GDK_HINT_WIN_GRAVITY | GDK_HINT_USER_POS | GDK_HINT_USER_SIZE);
gtk_widget_realize(fs->window);
-#if GTK_CHECK_VERSION(3,8,0)
+
if ((options->fullscreen.screen % 100) == 0)
{
GdkWindow *gdkwin;
if (gdkwin != NULL)
gdk_window_set_fullscreen_mode(gdkwin, GDK_FULLSCREEN_ON_ALL_MONITORS);
}
-#endif
+
/* make window fullscreen -- let Gtk do it's job, don't screw it in any way */
gtk_window_fullscreen(GTK_WINDOW(fs->window));
FS_MENU_COLUMN_VALUE, value, -1);
}
-GtkWidget *fullscreen_prefs_selection_new(const gchar *text, gint *screen_value, gboolean *above_value)
+GtkWidget *fullscreen_prefs_selection_new(const gchar *text, gint *screen_value, gboolean *UNUSED(above_value))
{
GtkWidget *vbox;
GtkWidget *hbox;
return TRUE;
}
-void histogram_notify_cb(FileData *fd, NotifyType type, gpointer data)
+void histogram_notify_cb(FileData *fd, NotifyType type, gpointer UNUSED(data))
{
if ((type & NOTIFY_REREAD) && fd->histmap)
{
return type;
}
-static void image_loader_init(GTypeInstance *instance, gpointer g_class)
+static void image_loader_init(GTypeInstance *instance, gpointer UNUSED(g_class))
{
ImageLoader *il = (ImageLoader *)instance;
il->can_destroy_cond = g_cond_new();
#endif
#endif
- DEBUG_1("new image loader %p, bufsize=%" G_GSIZE_FORMAT " idle_loop=%u", il, il->read_buffer_size, il->idle_read_loop_count);
+ DEBUG_1("new image loader %p, bufsize=%" G_GSIZE_FORMAT " idle_loop=%u", (void *)il, il->read_buffer_size, il->idle_read_loop_count);
}
-static void image_loader_class_init_wrapper(void *data, void *user_data)
+static void image_loader_class_init_wrapper(void *data, void *UNUSED(user_data))
{
image_loader_class_init(data);
}
if (il->error) DEBUG_1("%s", image_loader_get_error(il));
- DEBUG_1("freeing image loader %p bytes_read=%" G_GSIZE_FORMAT, il, il->bytes_read);
+ DEBUG_1("freeing image loader %p bytes_read=%" G_GSIZE_FORMAT, (void *)il, il->bytes_read);
if (il->idle_done_id)
{
g_mutex_unlock(il->data_mutex);
}
-static void image_loader_area_updated_cb(gpointer loader,
+static void image_loader_area_updated_cb(gpointer UNUSED(loader),
guint x, guint y, guint w, guint h,
gpointer data)
{
}
-static void image_loader_thread_run(gpointer data, gpointer user_data)
+static void image_loader_thread_run(gpointer data, gpointer UNUSED(user_data))
{
ImageLoader *il = data;
gboolean cont;
}
}
-static void image_osd_state_cb(ImageWindow *imd, ImageState state, gpointer data)
+static void image_osd_state_cb(ImageWindow *UNUSED(imd), ImageState state, gpointer data)
{
OverlayStateData *osd = data;
g_free(osd);
}
-static void image_osd_destroy_cb(GtkWidget *widget, gpointer data)
+static void image_osd_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
{
OverlayStateData *osd = data;
*-------------------------------------------------------------------
*/
-static void image_click_cb(PixbufRenderer *pr, GdkEventButton *event, gpointer data)
+static void image_click_cb(PixbufRenderer *UNUSED(pr), GdkEventButton *event, gpointer data)
{
ImageWindow *imd = data;
if (!options->image_lm_click_nav && event->button == MOUSE_BUTTON_MIDDLE)
if (imd->func_complete) imd->func_complete(imd, preload, imd->data_complete);
}
-static void image_render_complete_cb(PixbufRenderer *pr, gpointer data)
+static void image_render_complete_cb(PixbufRenderer *UNUSED(pr), gpointer data)
{
ImageWindow *imd = data;
if (imd->func_state) imd->func_state(imd, state, imd->data_state);
}
-static void image_zoom_cb(PixbufRenderer *pr, gdouble zoom, gpointer data)
+static void image_zoom_cb(PixbufRenderer *UNUSED(pr), gdouble UNUSED(zoom), gpointer data)
{
ImageWindow *imd = data;
}
-static void image_post_process_tile_color_cb(PixbufRenderer *pr, GdkPixbuf **pixbuf, gint x, gint y, gint w, gint h, gpointer data)
+static void image_post_process_tile_color_cb(PixbufRenderer *UNUSED(pr), GdkPixbuf **pixbuf, gint x, gint y, gint w, gint h, gpointer data)
{
ImageWindow *imd = (ImageWindow *)data;
if (imd->cm) color_man_correct_region(imd->cm, *pixbuf, x, y, w, h);
imd->read_ahead_fd = NULL;
}
-static void image_read_ahead_done_cb(ImageLoader *il, gpointer data)
+static void image_read_ahead_done_cb(ImageLoader *UNUSED(il), gpointer data)
{
ImageWindow *imd = data;
return cache;
}
-static void image_cache_set(ImageWindow *imd, FileData *fd)
+static void image_cache_set(ImageWindow *UNUSED(imd), FileData *fd)
{
g_assert(fd->pixbuf);
pixbuf_renderer_area_changed(pr, x, y, w, h);
}
-static void image_load_done_cb(ImageLoader *il, gpointer data)
+static void image_load_done_cb(ImageLoader *UNUSED(il), gpointer data)
{
ImageWindow *imd = data;
image_read_ahead_start(imd);
}
-static void image_load_size_cb(ImageLoader *il, guint width, guint height, gpointer data)
+static void image_load_size_cb(ImageLoader *UNUSED(il), guint width, guint height, gpointer data)
{
ImageWindow *imd = data;
*-------------------------------------------------------------------
*/
-static gboolean image_focus_in_cb(GtkWidget *widget, GdkEventFocus *event, gpointer data)
+static gboolean image_focus_in_cb(GtkWidget *UNUSED(widget), GdkEventFocus *UNUSED(event), gpointer data)
{
ImageWindow *imd = data;
return TRUE;
}
-static gboolean image_scroll_cb(GtkWidget *widget, GdkEventScroll *event, gpointer data)
+static gboolean image_scroll_cb(GtkWidget *UNUSED(widget), GdkEventScroll *event, gpointer data)
{
ImageWindow *imd = data;
gboolean in_lw = FALSE;
static void image_loader_sync_read_ahead_data(ImageLoader *il, gpointer old_data, gpointer data)
{
- if (g_signal_handlers_disconnect_by_func(G_OBJECT(il), (GCallback)image_read_ahead_error_cb, old_data))
- g_signal_connect(G_OBJECT(il), "error", (GCallback)image_read_ahead_error_cb, data);
+ if (g_signal_handlers_disconnect_by_func(G_OBJECT(il), (gpointer)image_read_ahead_error_cb, old_data))
+ g_signal_connect(G_OBJECT(il), "error", G_CALLBACK(image_read_ahead_error_cb), data);
- if (g_signal_handlers_disconnect_by_func(G_OBJECT(il), (GCallback)image_read_ahead_done_cb, old_data))
- g_signal_connect(G_OBJECT(il), "done", (GCallback)image_read_ahead_done_cb, data);
+ if (g_signal_handlers_disconnect_by_func(G_OBJECT(il), (gpointer)image_read_ahead_done_cb, old_data))
+ g_signal_connect(G_OBJECT(il), "done", G_CALLBACK(image_read_ahead_done_cb), data);
}
static void image_loader_sync_data(ImageLoader *il, gpointer old_data, gpointer data)
{
- if (g_signal_handlers_disconnect_by_func(G_OBJECT(il), (GCallback)image_load_area_cb, old_data))
- g_signal_connect(G_OBJECT(il), "area_ready", (GCallback)image_load_area_cb, data);
+ if (g_signal_handlers_disconnect_by_func(G_OBJECT(il), (gpointer)image_load_area_cb, old_data))
+ g_signal_connect(G_OBJECT(il), "area_ready", G_CALLBACK(image_load_area_cb), data);
- if (g_signal_handlers_disconnect_by_func(G_OBJECT(il), (GCallback)image_load_error_cb, old_data))
- g_signal_connect(G_OBJECT(il), "error", (GCallback)image_load_error_cb, data);
+ if (g_signal_handlers_disconnect_by_func(G_OBJECT(il), (gpointer)image_load_error_cb, old_data))
+ g_signal_connect(G_OBJECT(il), "error", G_CALLBACK(image_load_error_cb), data);
- if (g_signal_handlers_disconnect_by_func(G_OBJECT(il), (GCallback)image_load_done_cb, old_data))
- g_signal_connect(G_OBJECT(il), "done", (GCallback)image_load_done_cb, data);
+ if (g_signal_handlers_disconnect_by_func(G_OBJECT(il), (gpointer)image_load_done_cb, old_data))
+ g_signal_connect(G_OBJECT(il), "done", G_CALLBACK(image_load_done_cb), data);
}
/* this is more like a move function
void image_stereo_set(ImageWindow *imd, gint stereo_mode)
{
- DEBUG_1("Setting stereo mode %04x for imd %p", stereo_mode, imd);
+ DEBUG_1("Setting stereo mode %04x for imd %p", stereo_mode, (void *)imd);
pixbuf_renderer_stereo_set((PixbufRenderer *)imd->pr, stereo_mode);
}
void image_background_set_color_from_options(ImageWindow *imd, gboolean fullscreen)
{
GdkColor *color = NULL;
-#if GTK_CHECK_VERSION(3,0,0)
GdkColor theme_color;
GdkRGBA bg_color;
GtkStyleContext *style_context;
LayoutWindow *lw = NULL;
-#endif
if ((options->image.use_custom_border_color && !fullscreen) ||
(options->image.use_custom_border_color_in_fullscreen && fullscreen))
color = &options->image.border_color;
}
-#if GTK_CHECK_VERSION(3,0,0)
else
{
if (!layout_valid(&lw)) return;
color = &theme_color;
}
-#endif
image_background_set_color(imd, color);
}
}
}
-void image_to_root_window(ImageWindow *imd, gboolean scaled)
+void image_to_root_window(ImageWindow *UNUSED(imd), gboolean UNUSED(scaled))
{
-#if !GTK_CHECK_VERSION(3,0,0)
- GdkScreen *screen;
- GdkWindow *rootwindow;
- GdkPixmap *pixmap;
- GdkPixbuf *pixbuf;
- GdkPixbuf *pb;
- gint width, height;
-
- if (!imd) return;
-
- pixbuf = image_get_pixbuf(imd);
- if (!pixbuf) return;
-
- screen = gtk_widget_get_screen(imd->widget);
- rootwindow = gdk_screen_get_root_window(screen);
- if (gdk_window_get_visual(rootwindow) != gdk_visual_get_system()) return;
-
- if (scaled)
- {
- width = gdk_screen_width();
- height = gdk_screen_height();
- }
- else
- {
- pixbuf_renderer_get_scaled_size((PixbufRenderer *)imd->pr, &width, &height);
- }
-
- pb = gdk_pixbuf_scale_simple(pixbuf, width, height, (GdkInterpType)options->image.zoom_quality);
-
- gdk_pixbuf_render_pixmap_and_mask(pb, &pixmap, NULL, 128);
- gdk_window_set_back_pixmap(rootwindow, pixmap, FALSE);
- gdk_window_clear(rootwindow);
- g_object_unref(pb);
- g_object_unref(pixmap);
-
- gdk_flush();
-#endif
}
void image_select(ImageWindow *imd, gboolean select)
g_free(imd);
}
-static void image_destroy_cb(GtkWidget *widget, gpointer data)
+static void image_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ImageWindow *imd = data;
image_free(imd);
}
-#if GTK_CHECK_VERSION(3,0,0)
-gboolean selectable_frame_draw_cb(GtkWidget *widget, cairo_t *cr, gpointer data)
+
+gboolean selectable_frame_draw_cb(GtkWidget *widget, cairo_t *cr, gpointer UNUSED(data))
{
GtkAllocation allocation;
gtk_widget_get_allocation(widget, &allocation);
return FALSE;
}
-#else
-gboolean selectable_frame_expose_cb(GtkWidget *widget, GdkEventExpose *event, gpointer data)
-{
- GtkAllocation allocation;
- gtk_widget_get_allocation(widget, &allocation);
- gtk_paint_flat_box(gtk_widget_get_style(widget),
- gtk_widget_get_window(widget),
- gtk_widget_get_state(widget),
- gtk_frame_get_shadow_type(GTK_FRAME(widget)),
- NULL,
- widget,
- NULL,
- allocation.x + 3, allocation.y + 3,
- allocation.width - 6, allocation.height - 6);
-
- if (gtk_widget_has_focus(widget))
- {
- gtk_paint_focus(gtk_widget_get_style(widget), gtk_widget_get_window(widget), GTK_STATE_ACTIVE,
- &event->area, widget, "image_window",
- allocation.x, allocation.y,
- allocation.width - 1, allocation.height - 1);
- }
- else
- {
- gtk_paint_shadow(gtk_widget_get_style(widget), gtk_widget_get_window(widget), GTK_STATE_NORMAL, GTK_SHADOW_IN,
- &event->area, widget, "image_window",
- allocation.x, allocation.y,
- allocation.width - 1, allocation.height - 1);
- }
- return FALSE;
-}
-#endif
-
-
void image_set_frame(ImageWindow *imd, gboolean frame)
{
frame = !!frame;
gtk_widget_set_can_focus(imd->frame, TRUE);
gtk_widget_set_app_paintable(imd->frame, TRUE);
-#if GTK_CHECK_VERSION(3,0,0)
g_signal_connect(G_OBJECT(imd->frame), "draw",
G_CALLBACK(selectable_frame_draw_cb), NULL);
-#else
- g_signal_connect(G_OBJECT(imd->frame), "expose_event",
- G_CALLBACK(selectable_frame_expose_cb), NULL);
-#endif
g_signal_connect(G_OBJECT(imd->frame), "focus_in_event",
G_CALLBACK(image_focus_in_cb), imd);
gboolean abort;
};
-static gboolean image_loader_collection_load(gpointer loader, const guchar *buf, gsize count, GError **error)
+static gboolean image_loader_collection_load(gpointer loader, const guchar *UNUSED(buf), gsize UNUSED(count), GError **UNUSED(error))
{
ImageLoaderCOLLECTION *ld = (ImageLoaderCOLLECTION *) loader;
ImageLoader *il = ld->data;
return ld->pixbuf;
}
-static gchar* image_loader_collection_get_format_name(gpointer loader)
+static gchar* image_loader_collection_get_format_name(gpointer UNUSED(loader))
{
return g_strdup("collection");
}
-static gchar** image_loader_collection_get_format_mime_types(gpointer loader)
+static gchar** image_loader_collection_get_format_mime_types(gpointer UNUSED(loader))
{
static gchar *mime[] = {"image/png", NULL};
return g_strdupv(mime);
}
-static gboolean image_loader_collection_close(gpointer loader, GError **error)
+static gboolean image_loader_collection_close(gpointer UNUSED(loader), GError **UNUSED(error))
{
return TRUE;
}
}
static void
-output_message_handler (j_common_ptr cinfo)
+output_message_handler (j_common_ptr UNUSED(cinfo))
{
/* This method keeps libjpeg from dumping crap to stderr */
}
-static void init_source (j_decompress_ptr cinfo) {}
+static void init_source (j_decompress_ptr UNUSED(cinfo)) {}
static boolean fill_input_buffer (j_decompress_ptr cinfo)
{
ERREXIT(cinfo, JERR_INPUT_EMPTY);
src->bytes_in_buffer -= (size_t) num_bytes;
}
}
-static void term_source (j_decompress_ptr cinfo) {}
+static void term_source (j_decompress_ptr UNUSED(cinfo)) {}
static void set_mem_src (j_decompress_ptr cinfo, void* buffer, long nbytes)
{
struct jpeg_source_mgr* src;
return lj->pixbuf;
}
-static gchar* image_loader_cr3_get_format_name(gpointer loader)
+static gchar* image_loader_cr3_get_format_name(gpointer UNUSED(loader))
{
return g_strdup("cr3");
}
-static gchar** image_loader_cr3_get_format_mime_types(gpointer loader)
+static gchar** image_loader_cr3_get_format_mime_types(gpointer UNUSED(loader))
{
static gchar *mime[] = {"image/x-canon-cr3", NULL};
return g_strdupv(mime);
}
-static gboolean image_loader_cr3_close(gpointer loader, GError **error)
+static gboolean image_loader_cr3_close(gpointer UNUSED(loader), GError **UNUSED(error))
{
return TRUE;
}
gboolean abort;
};
-static void free_buffer(guchar *pixels, gpointer data)
+static void free_buffer(guchar *pixels, gpointer UNUSED(data))
{
g_free(pixels);
}
return (guchar *) pixels;
}
-static gboolean image_loader_dds_load (gpointer loader, const guchar *buf, gsize count, GError **error)
+static gboolean image_loader_dds_load (gpointer loader, const guchar *buf, gsize UNUSED(count), GError **UNUSED(error))
{
ImageLoaderDDS *ld = (ImageLoaderDDS *) loader;
int width = ddsGetWidth(buf);
return ld->pixbuf;
}
-static gchar* image_loader_dds_get_format_name(gpointer loader)
+static gchar* image_loader_dds_get_format_name(gpointer UNUSED(loader))
{
return g_strdup("dds");
}
-static gchar** image_loader_dds_get_format_mime_types(gpointer loader)
+static gchar** image_loader_dds_get_format_mime_types(gpointer UNUSED(loader))
{
static gchar *mime[] = {"image/vnd-ms.dds", NULL};
return g_strdupv(mime);
}
-static gboolean image_loader_dds_close(gpointer loader, GError **error)
+static gboolean image_loader_dds_close(gpointer UNUSED(loader), GError **UNUSED(error))
{
return TRUE;
}
gint page_total;
};
-static void free_buffer(guchar *pixels, gpointer data)
+static void free_buffer(guchar *pixels, gpointer UNUSED(data))
{
g_free (pixels);;
}
-static gboolean image_loader_djvu_load(gpointer loader, const guchar *buf, gsize count, GError **error)
+static gboolean image_loader_djvu_load(gpointer loader, const guchar *buf, gsize count, GError **UNUSED(error))
{
ImageLoaderDJVU *ld = (ImageLoaderDJVU *) loader;
ddjvu_context_t *ctx;
return ld->pixbuf;
}
-static gchar* image_loader_djvu_get_format_name(gpointer loader)
+static gchar* image_loader_djvu_get_format_name(gpointer UNUSED(loader))
{
return g_strdup("djvu");
}
-static gchar** image_loader_djvu_get_format_mime_types(gpointer loader)
+static gchar** image_loader_djvu_get_format_mime_types(gpointer UNUSED(loader))
{
static gchar *mime[] = {"image/vnd.djvu", NULL};
return g_strdupv(mime);
return ld->page_total;
}
-static gboolean image_loader_djvu_close(gpointer loader, GError **error)
+static gboolean image_loader_djvu_close(gpointer UNUSED(loader), GError **UNUSED(error))
{
return TRUE;
}
gboolean abort;
};
-static gboolean image_loader_external_load(gpointer loader, const guchar *buf, gsize count, GError **error)
+static gboolean image_loader_external_load(gpointer loader, const guchar *UNUSED(buf), gsize UNUSED(count), GError **UNUSED(error))
{
ImageLoaderExternal *ld = (ImageLoaderExternal *) loader;
ImageLoader *il = ld->data;
return ld->pixbuf;
}
-static gchar* image_loader_external_get_format_name(gpointer loader)
+static gchar* image_loader_external_get_format_name(gpointer UNUSED(loader))
{
return g_strdup("external");
}
-static gchar** image_loader_external_get_format_mime_types(gpointer loader)
+static gchar** image_loader_external_get_format_mime_types(gpointer UNUSED(loader))
{
static gchar *mime[] = {"application/octet-stream", NULL};
return g_strdupv(mime);
}
-static gboolean image_loader_external_close(gpointer loader, GError **error)
+static gboolean image_loader_external_close(gpointer UNUSED(loader), GError **UNUSED(error))
{
return TRUE;
}
}
#endif
-void image_loader_ft_destroy_image_data(guchar *pixels, gpointer data)
+void image_loader_ft_destroy_image_data(guchar *UNUSED(pixels), gpointer data)
{
image_data *image = (image_data *) data;
video_thumbnailer_destroy_image_data (image);
}
-static gchar* image_loader_ft_get_format_name(gpointer loader)
+static gchar* image_loader_ft_get_format_name(gpointer UNUSED(loader))
{
return g_strdup("ffmpeg");
}
-static gchar** image_loader_ft_get_format_mime_types(gpointer loader)
+static gchar** image_loader_ft_get_format_mime_types(gpointer UNUSED(loader))
{
static gchar *mime[] = {"video/mp4", NULL};
return g_strdupv(mime);}
}
// static gboolean image_loader_ft_loadfromdisk(gpointer loader, const gchar *path, GError **error)
-static gboolean image_loader_ft_load (gpointer loader, const guchar *buf, gsize count, GError **error)
+static gboolean image_loader_ft_load (gpointer loader, const guchar *UNUSED(buf), gsize UNUSED(count), GError **UNUSED(error))
{
ImageLoaderFT *lft = (ImageLoaderFT *) loader;
ImageLoader *il = lft->data;
return lft->pixbuf;
}
-static void image_loader_ft_abort(gpointer loader)
+static void image_loader_ft_abort(gpointer UNUSED(loader))
{
}
-static gboolean image_loader_ft_close(gpointer loader, GError **error)
+static gboolean image_loader_ft_close(gpointer UNUSED(loader), GError **UNUSED(error))
{
return TRUE;
}
return (gpointer) loader;
}
-static void image_loader_gdk_abort(gpointer loader)
+static void image_loader_gdk_abort(gpointer UNUSED(loader))
{
}
gint page_total;
};
-static void free_buffer(guchar *pixels, gpointer data)
+static void free_buffer(guchar *UNUSED(pixels), gpointer data)
{
heif_image_release((const struct heif_image*)data);
}
-static gboolean image_loader_heif_load(gpointer loader, const guchar *buf, gsize count, GError **error)
+static gboolean image_loader_heif_load(gpointer loader, const guchar *buf, gsize count, GError **UNUSED(error))
{
ImageLoaderHEIF *ld = (ImageLoaderHEIF *) loader;
struct heif_context* ctx;
return ld->pixbuf;
}
-static gchar* image_loader_heif_get_format_name(gpointer loader)
+static gchar* image_loader_heif_get_format_name(gpointer UNUSED(loader))
{
return g_strdup("heif");
}
-static gchar** image_loader_heif_get_format_mime_types(gpointer loader)
+static gchar** image_loader_heif_get_format_mime_types(gpointer UNUSED(loader))
{
static gchar *mime[] = {"image/heic", NULL};
return g_strdupv(mime);
return ld->page_total;
}
-static gboolean image_loader_heif_close(gpointer loader, GError **error)
+static gboolean image_loader_heif_close(gpointer UNUSED(loader), GError **UNUSED(error))
{
return TRUE;
}
gboolean abort;
};
-static void free_buffer(guchar *pixels, gpointer data)
+static void free_buffer(guchar *pixels, gpointer UNUSED(data))
{
g_free (pixels);
}
if (0 == len)
len = 1;
- OPJ_SIZE_T dist = pcur - pbuf, n = len - dist;
+ OPJ_SIZE_T dist = (guchar *)pcur - (guchar *)pbuf, n = len - dist;
g_assert (dist <= len);
while (n < p_nb_bytes) {
}
p_source_buffer->buf = pbuf;
- p_source_buffer->cur = pbuf + dist;
+ p_source_buffer->cur = (guchar *)pbuf + dist;
p_source_buffer->len = len;
}
return ps;
}
-static gboolean image_loader_j2k_load(gpointer loader, const guchar *buf, gsize count, GError **error)
+static gboolean image_loader_j2k_load(gpointer loader, const guchar *buf, gsize count, GError **UNUSED(error))
{
ImageLoaderJ2K *ld = (ImageLoaderJ2K *) loader;
opj_stream_t *stream;
return ld->pixbuf;
}
-static gchar* image_loader_j2k_get_format_name(gpointer loader)
+static gchar* image_loader_j2k_get_format_name(gpointer UNUSED(loader))
{
return g_strdup("j2k");
}
-static gchar** image_loader_j2k_get_format_mime_types(gpointer loader)
+static gchar** image_loader_j2k_get_format_mime_types(gpointer UNUSED(loader))
{
static gchar *mime[] = {"image/jp2", NULL};
return g_strdupv(mime);
}
-static gboolean image_loader_j2k_close(gpointer loader, GError **error)
+static gboolean image_loader_j2k_close(gpointer UNUSED(loader), GError **UNUSED(error))
{
return TRUE;
}
}
static void
-output_message_handler (j_common_ptr cinfo)
+output_message_handler (j_common_ptr UNUSED(cinfo))
{
/* This method keeps libjpeg from dumping crap to stderr */
}
-static void init_source (j_decompress_ptr cinfo) {}
+static void init_source (j_decompress_ptr UNUSED(cinfo)) {}
static boolean fill_input_buffer (j_decompress_ptr cinfo)
{
ERREXIT(cinfo, JERR_INPUT_EMPTY);
src->bytes_in_buffer -= (size_t) num_bytes;
}
}
-static void term_source (j_decompress_ptr cinfo) {}
+static void term_source (j_decompress_ptr UNUSED(cinfo)) {}
static void set_mem_src (j_decompress_ptr cinfo, void* buffer, long nbytes)
{
struct jpeg_source_mgr* src;
return lj->pixbuf;
}
-static gchar* image_loader_jpeg_get_format_name(gpointer loader)
+static gchar* image_loader_jpeg_get_format_name(gpointer UNUSED(loader))
{
return g_strdup("jpeg");
}
-static gchar** image_loader_jpeg_get_format_mime_types(gpointer loader)
+static gchar** image_loader_jpeg_get_format_mime_types(gpointer UNUSED(loader))
{
static gchar *mime[] = {"image/jpeg", NULL};
return g_strdupv(mime);
}
-static gboolean image_loader_jpeg_close(gpointer loader, GError **error)
+static gboolean image_loader_jpeg_close(gpointer UNUSED(loader), GError **UNUSED(error))
{
return TRUE;
}
gint page_total;
};
-static gboolean image_loader_pdf_load(gpointer loader, const guchar *buf, gsize count, GError **error)
+static gboolean image_loader_pdf_load(gpointer loader, const guchar *buf, gsize count, GError **UNUSED(error))
{
ImageLoaderPDF *ld = (ImageLoaderPDF *) loader;
GError *poppler_error = NULL;
return ld->pixbuf;
}
-static gchar* image_loader_pdf_get_format_name(gpointer loader)
+static gchar* image_loader_pdf_get_format_name(gpointer UNUSED(loader))
{
return g_strdup("pdf");
}
-static gchar** image_loader_pdf_get_format_mime_types(gpointer loader)
+static gchar** image_loader_pdf_get_format_mime_types(gpointer UNUSED(loader))
{
static gchar *mime[] = {"application/pdf", NULL};
return g_strdupv(mime);
return ld->page_total;
}
-static gboolean image_loader_pdf_close(gpointer loader, GError **error)
+static gboolean image_loader_pdf_close(gpointer UNUSED(loader), GError **UNUSED(error))
{
return TRUE;
}
static gboolean
skip_block (PsdContext* context, const guchar** data, guint* size)
{
- static guint counter;
-
if (!context->bytes_to_skip_known) {
context->bytes_read = 0;
if (feed_buffer(context->buffer, &context->bytes_read, data, size, 4)) {
context->bytes_to_skip = read_uint32(context->buffer);
context->bytes_to_skip_known = TRUE;
- counter = 0;
} else {
return FALSE;
}
if (*size < context->bytes_to_skip) {
*data += *size;
context->bytes_to_skip -= *size;
- counter += *size;
*size = 0;
return FALSE;
} else {
- counter += context->bytes_to_skip;
*size -= context->bytes_to_skip;
*data += context->bytes_to_skip;
return TRUE;
g_free(ctx);
}
-static gboolean image_loader_psd_load(gpointer loader, const guchar *buf, gsize count, GError **error)
+static gboolean image_loader_psd_load(gpointer loader, const guchar *buf, gsize count, GError **UNUSED(error))
{
ImageLoaderPSD *ld = (ImageLoaderPSD *) loader;
PsdContext* ctx = g_new0(PsdContext, 1);
return ld->pixbuf;
}
-static gchar* image_loader_psd_get_format_name(gpointer loader)
+static gchar* image_loader_psd_get_format_name(gpointer UNUSED(loader))
{
return g_strdup("psd");
}
-static gchar** image_loader_psd_get_format_mime_types(gpointer loader)
+static gchar** image_loader_psd_get_format_mime_types(gpointer UNUSED(loader))
{
static gchar *mime[] = {"application/psd", NULL};
return g_strdupv(mime);
}
-static gboolean image_loader_psd_close(gpointer loader, GError **error)
+static gboolean image_loader_psd_close(gpointer UNUSED(loader), GError **UNUSED(error))
{
return TRUE;
}
#include "image_load_svgz.h"
-static gchar* image_loader_svgz_get_format_name(gpointer loader)
+static gchar* image_loader_svgz_get_format_name(gpointer UNUSED(loader))
{
return g_strdup("svg");
}
-static gchar** image_loader_svgz_get_format_mime_types(gpointer loader)
+static gchar** image_loader_svgz_get_format_mime_types(gpointer UNUSED(loader))
{
static gchar *mime[] = {"image/svg", NULL};
return g_strdupv(mime);
return (gpointer) loader;
}
-static void image_loader_svgz_abort(gpointer loader)
+static void image_loader_svgz_abort(gpointer UNUSED(loader))
{
}
gint page_total;
};
-static void free_buffer (guchar *pixels, gpointer data)
+static void free_buffer (guchar *pixels, gpointer UNUSED(data))
{
g_free (pixels);
}
}
static tsize_t
-tiff_load_write (thandle_t handle, tdata_t buf, tsize_t size)
+tiff_load_write (thandle_t UNUSED(handle), tdata_t UNUSED(buf), tsize_t UNUSED(size))
{
return -1;
}
}
static int
-tiff_load_close (thandle_t context)
+tiff_load_close (thandle_t UNUSED(context))
{
return 0;
}
}
static void
-tiff_load_unmap_file (thandle_t handle, tdata_t data, toff_t offset)
+tiff_load_unmap_file (thandle_t UNUSED(handle), tdata_t UNUSED(data), toff_t UNUSED(offset))
{
}
-static gboolean image_loader_tiff_load (gpointer loader, const guchar *buf, gsize count, GError **error)
+static gboolean image_loader_tiff_load (gpointer loader, const guchar *buf, gsize count, GError **UNUSED(error))
{
ImageLoaderTiff *lt = (ImageLoaderTiff *) loader;
return lt->pixbuf;
}
-static gchar* image_loader_tiff_get_format_name(gpointer loader)
+static gchar* image_loader_tiff_get_format_name(gpointer UNUSED(loader))
{
return g_strdup("tiff");
}
-static gchar** image_loader_tiff_get_format_mime_types(gpointer loader)
+static gchar** image_loader_tiff_get_format_mime_types(gpointer UNUSED(loader))
{
static gchar *mime[] = {"image/tiff", NULL};
return g_strdupv(mime);
}
-static gboolean image_loader_tiff_close(gpointer loader, GError **error)
+static gboolean image_loader_tiff_close(gpointer UNUSED(loader), GError **UNUSED(error))
{
return TRUE;
}
gboolean abort;
};
-static void free_buffer(guchar *pixels, gpointer data)
+static void free_buffer(guchar *pixels, gpointer UNUSED(data))
{
g_free(pixels);
}
-static gboolean image_loader_webp_load(gpointer loader, const guchar *buf, gsize count, GError **error)
+static gboolean image_loader_webp_load(gpointer loader, const guchar *buf, gsize count, GError **UNUSED(error))
{
ImageLoaderWEBP *ld = (ImageLoaderWEBP *) loader;
guint8* data;
return ld->pixbuf;
}
-static gchar* image_loader_webp_get_format_name(gpointer loader)
+static gchar* image_loader_webp_get_format_name(gpointer UNUSED(loader))
{
return g_strdup("webp");
}
-static gchar** image_loader_webp_get_format_mime_types(gpointer loader)
+static gchar** image_loader_webp_get_format_mime_types(gpointer UNUSED(loader))
{
static gchar *mime[] = {"image/webp", NULL};
return g_strdupv(mime);
}
-static gboolean image_loader_webp_close(gpointer loader, GError **error)
+static gboolean image_loader_webp_close(gpointer UNUSED(loader), GError **UNUSED(error))
{
return TRUE;
}
}
};
-static void free_buffer(guchar *pixels, gpointer data)
+static void free_buffer(guchar *pixels, gpointer UNUSED(data))
{
g_free(pixels);
}
-static gboolean image_loader_zxscr_load(gpointer loader, const guchar *buf, gsize count, GError **error)
+static gboolean image_loader_zxscr_load(gpointer loader, const guchar *buf, gsize count, GError **UNUSED(error))
{
ImageLoaderZXSCR *ld = (ImageLoaderZXSCR *) loader;
guint8 *pixels;
return ld->pixbuf;
}
-static gchar *image_loader_zxscr_get_format_name(gpointer loader)
+static gchar *image_loader_zxscr_get_format_name(gpointer UNUSED(loader))
{
return g_strdup("zxscr");
}
-static gchar **image_loader_zxscr_get_format_mime_types(gpointer loader)
+static gchar **image_loader_zxscr_get_format_mime_types(gpointer UNUSED(loader))
{
static gchar *mime[] = {"application/octet-stream", NULL};
return g_strdupv(mime);
}
-static gboolean image_loader_zxscr_close(gpointer loader, GError **error)
+static gboolean image_loader_zxscr_close(gpointer UNUSED(loader), GError **UNUSED(error))
{
return TRUE;
}
*-----------------------------------------------------------------------------
*/
-static void view_window_menu_pos_cb(GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer data)
+static void view_window_menu_pos_cb(GtkMenu *menu, gint *x, gint *y, gboolean *UNUSED(push_in), gpointer data)
{
ViewWindow *vw = data;
ImageWindow *imd;
popup_menu_position_clamp(menu, x, y, 0);
}
-static gboolean view_window_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
+static gboolean view_window_key_press_cb(GtkWidget *UNUSED(widget), GdkEventKey *event, gpointer data)
{
ViewWindow *vw = data;
ImageWindow *imd;
image_set_scroll_func(imd, scroll_cb, vw);
}
-static void view_fullscreen_stop_func(FullScreenData *fs, gpointer data)
+static void view_fullscreen_stop_func(FullScreenData *UNUSED(fs), gpointer data)
{
ViewWindow *vw = data;
if (vw->ss) slideshow_prev(vw->ss);
}
-static void view_slideshow_stop_func(SlideShowData *fs, gpointer data)
+static void view_slideshow_stop_func(SlideShowData *UNUSED(fs), gpointer data)
{
ViewWindow *vw = data;
GList *work;
if (vw->ss) slideshow_free(vw->ss);
}
-static void view_window_destroy_cb(GtkWidget *widget, gpointer data)
+static void view_window_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewWindow *vw = data;
gtk_widget_destroy(vw->window);
}
-static gboolean view_window_delete_cb(GtkWidget *w, GdkEventAny *event, gpointer data)
+static gboolean view_window_delete_cb(GtkWidget *UNUSED(w), GdkEventAny *UNUSED(event), gpointer data)
{
ViewWindow *vw = data;
req_size.height = h;
gtk_widget_size_allocate(GTK_WIDGET(vw->window), &req_size);
-#if !GTK_CHECK_VERSION(3,0,0)
- gtk_widget_set_size_request(vw->imd->pr, w, h);
-#endif
-
gtk_window_set_focus_on_map(GTK_WINDOW(vw->window), FALSE);
gtk_widget_show(vw->window);
return vw;
}
-static void view_window_collection_unref_cb(GtkWidget *widget, gpointer data)
+static void view_window_collection_unref_cb(GtkWidget *UNUSED(widget), gpointer data)
{
CollectionData *cd = data;
*-----------------------------------------------------------------------------
*/
-static void view_new_window_cb(GtkWidget *widget, gpointer data)
+static void view_new_window_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewWindow *vw = data;
CollectionData *cd;
image_alter_orientation(vw->imd, vw->imd->image_fd, type);
}
-#if !GTK_CHECK_VERSION(3,0,0)
-static void view_wallpaper_cb(GtkWidget *widget, gpointer data)
-{
- ViewWindow *vw = data;
- ImageWindow *imd;
-
- imd = view_window_active_image(vw);
- image_to_root_window(imd, (image_zoom_get(imd) == 0.0));
-}
-#endif
-
-static void view_zoom_in_cb(GtkWidget *widget, gpointer data)
+static void view_zoom_in_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewWindow *vw = data;
image_zoom_adjust(view_window_active_image(vw), get_zoom_increment());
}
-static void view_zoom_out_cb(GtkWidget *widget, gpointer data)
+static void view_zoom_out_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewWindow *vw = data;
image_zoom_adjust(view_window_active_image(vw), -get_zoom_increment());
}
-static void view_zoom_1_1_cb(GtkWidget *widget, gpointer data)
+static void view_zoom_1_1_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewWindow *vw = data;
image_zoom_set(view_window_active_image(vw), 1.0);
}
-static void view_zoom_fit_cb(GtkWidget *widget, gpointer data)
+static void view_zoom_fit_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewWindow *vw = data;
image_zoom_set(view_window_active_image(vw), 0.0);
}
-static void view_copy_cb(GtkWidget *widget, gpointer data)
+static void view_copy_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewWindow *vw = data;
ImageWindow *imd;
file_util_copy(image_get_fd(imd), NULL, NULL, imd->widget);
}
-static void view_move_cb(GtkWidget *widget, gpointer data)
+static void view_move_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewWindow *vw = data;
ImageWindow *imd;
file_util_move(image_get_fd(imd), NULL, NULL, imd->widget);
}
-static void view_rename_cb(GtkWidget *widget, gpointer data)
+static void view_rename_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewWindow *vw = data;
ImageWindow *imd;
file_util_rename(image_get_fd(imd), NULL, imd->widget);
}
-static void view_delete_cb(GtkWidget *widget, gpointer data)
+static void view_delete_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewWindow *vw = data;
ImageWindow *imd;
file_util_delete(image_get_fd(imd), NULL, imd->widget);
}
-static void view_move_to_trash_cb(GtkWidget *widget, gpointer data)
+static void view_move_to_trash_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewWindow *vw = data;
ImageWindow *imd;
file_util_delete(image_get_fd(imd), NULL, imd->widget);
}
-static void view_copy_path_cb(GtkWidget *widget, gpointer data)
+static void view_copy_path_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewWindow *vw = data;
ImageWindow *imd;
file_util_copy_path_to_clipboard(image_get_fd(imd), TRUE);
}
-static void view_copy_path_unquoted_cb(GtkWidget *widget, gpointer data)
+static void view_copy_path_unquoted_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewWindow *vw = data;
ImageWindow *imd;
file_util_copy_path_to_clipboard(image_get_fd(imd), FALSE);
}
-static void view_fullscreen_cb(GtkWidget *widget, gpointer data)
+static void view_fullscreen_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewWindow *vw = data;
view_fullscreen_toggle(vw, FALSE);
}
-static void view_slideshow_start_cb(GtkWidget *widget, gpointer data)
+static void view_slideshow_start_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewWindow *vw = data;
view_slideshow_start(vw);
}
-static void view_slideshow_stop_cb(GtkWidget *widget, gpointer data)
+static void view_slideshow_stop_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewWindow *vw = data;
view_slideshow_stop(vw);
}
-static void view_slideshow_pause_cb(GtkWidget *widget, gpointer data)
+static void view_slideshow_pause_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewWindow *vw = data;
slideshow_pause_toggle(vw->ss);
}
-static void view_close_cb(GtkWidget *widget, gpointer data)
+static void view_close_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewWindow *vw = data;
}
-static void view_set_layout_path_cb(GtkWidget *widget, gpointer data)
+static void view_set_layout_path_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewWindow *vw = data;
LayoutWindow *lw;
view_window_close(vw);
}
-static void view_popup_menu_destroy_cb(GtkWidget *widget, gpointer data)
+static void view_popup_menu_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
{
GList *editmenu_fd_list = data;
G_CALLBACK(view_popup_menu_destroy_cb), editmenu_fd_list);
item = submenu_add_edit(menu, NULL, G_CALLBACK(view_edit_cb), vw, editmenu_fd_list);
menu_item_add_divider(item);
-#if !GTK_CHECK_VERSION(3,0,0)
- menu_item_add(item, _("Set as _wallpaper"), G_CALLBACK(view_wallpaper_cb), vw);
-#endif
+
submenu_add_alter(menu, G_CALLBACK(view_alter_cb), vw);
menu_item_add_stock(menu, _("View in _new window"), GTK_STOCK_NEW, G_CALLBACK(view_new_window_cb), vw);
GList *list;
} CViewConfirmD;
-static void view_dir_list_cancel(GtkWidget *widget, gpointer data)
+static void view_dir_list_cancel(GtkWidget *UNUSED(widget), gpointer UNUSED(data))
{
/* do nothing */
}
}
}
-static void view_dir_list_add(GtkWidget *widget, gpointer data)
+static void view_dir_list_add(GtkWidget *UNUSED(widget), gpointer data)
{
CViewConfirmD *d = data;
view_dir_list_do(d->vw, d->list, FALSE, FALSE);
}
-static void view_dir_list_recurse(GtkWidget *widget, gpointer data)
+static void view_dir_list_recurse(GtkWidget *UNUSED(widget), gpointer data)
{
CViewConfirmD *d = data;
view_dir_list_do(d->vw, d->list, FALSE, TRUE);
}
-static void view_dir_list_skip(GtkWidget *widget, gpointer data)
+static void view_dir_list_skip(GtkWidget *UNUSED(widget), gpointer data)
{
CViewConfirmD *d = data;
view_dir_list_do(d->vw, d->list, TRUE, FALSE);
}
-static void view_dir_list_destroy(GtkWidget *widget, gpointer data)
+static void view_dir_list_destroy(GtkWidget *UNUSED(widget), gpointer data)
{
CViewConfirmD *d = data;
filelist_free(d->list);
*-----------------------------------------------------------------------------
*/
-static void view_window_get_dnd_data(GtkWidget *widget, GdkDragContext *context,
- gint x, gint y,
+static void view_window_get_dnd_data(GtkWidget *UNUSED(widget), GdkDragContext *context,
+ gint UNUSED(x), gint UNUSED(y),
GtkSelectionData *selection_data, guint info,
guint time, gpointer data)
{
}
}
-static void view_window_set_dnd_data(GtkWidget *widget, GdkDragContext *context,
- GtkSelectionData *selection_data, guint info,
- guint time, gpointer data)
+static void view_window_set_dnd_data(GtkWidget *UNUSED(widget), GdkDragContext *UNUSED(context),
+ GtkSelectionData *selection_data, guint UNUSED(info),
+ guint UNUSED(time), gpointer data)
{
ViewWindow *vw = data;
FileData *fd;
}
static gint mpo_parse_Attributes_IFD_entry(const guchar *tiff, guint offset,
- guint size, TiffByteOrder bo,
+ guint UNUSED(size), TiffByteOrder bo,
gpointer data)
{
guint tag;
#include "bar_sort.h"
#include "preferences.h"
#include "shortcuts.h"
-#ifdef HAVE_LIRC
-#include "lirc.h"
-#endif
#ifdef GDK_WINDOWING_X11
-#if GTK_CHECK_VERSION(3,10,0)
#include <gdk/gdkx.h>
#endif
-#endif
#define MAINWINDOW_DEF_WIDTH 700
#define MAINWINDOW_DEF_HEIGHT 500
}
}
-static gboolean layout_set_current_cb(GtkWidget *widget, GdkEventFocus *event, gpointer data)
+static gboolean layout_set_current_cb(GtkWidget *UNUSED(widget), GdkEventFocus *UNUSED(event), gpointer data)
{
LayoutWindow *lw = data;
current_lw = lw;
return FALSE;
}
-static void layout_box_folders_changed_cb(GtkWidget *widget, gpointer data)
+static void layout_box_folders_changed_cb(GtkWidget *widget, gpointer UNUSED(data))
{
LayoutWindow *lw;
GList *work;
g_free(buf);
}
-static void layout_vd_select_cb(ViewDir *vd, FileData *fd, gpointer data)
+static void layout_vd_select_cb(ViewDir *UNUSED(vd), FileData *fd, gpointer data)
{
LayoutWindow *lw = data;
layout_set_fd(lw, fd);
}
-static void layout_path_entry_tab_append_cb(const gchar *path, gpointer data, gint n)
+static void layout_path_entry_tab_append_cb(const gchar *UNUSED(path), gpointer data, gint n)
{
LayoutWindow *lw = data;
gtk_widget_set_sensitive(lw->back_button, (n > 1));
}
-static gboolean path_entry_tooltip_cb(GtkWidget *widget, gpointer data)
+static gboolean path_entry_tooltip_cb(GtkWidget *widget, gpointer UNUSED(data))
{
GList *box_child_list;
GtkComboBox *path_entry;
GtkWidget *toolbar;
GtkWidget *scroll_window;
- box = gtk_vbox_new(FALSE, 0);
+ box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
if (!options->expand_menu_toolbar)
{
toolbar = layout_actions_toolbar(lw, TOOLBAR_MAIN);
scroll_window = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll_window), GTK_POLICY_AUTOMATIC,GTK_POLICY_NEVER);
- gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scroll_window), menu_bar);
+ gtk_container_add(GTK_CONTAINER(scroll_window), menu_bar);
gtk_widget_show(scroll_window);
gtk_widget_show(menu_bar);
gtk_widget_set_has_tooltip(GTK_WIDGET(tabcomp), TRUE);
g_signal_connect(G_OBJECT(tabcomp), "query_tooltip", G_CALLBACK(path_entry_tooltip_cb), lw);
-#if GTK_CHECK_VERSION(3,20,0)
g_signal_connect(G_OBJECT(gtk_widget_get_parent(gtk_widget_get_parent(lw->path_entry))), "changed",
G_CALLBACK(layout_path_entry_changed_cb), lw);
-#else
- g_signal_connect(G_OBJECT(gtk_widget_get_parent(lw->path_entry)), "changed",
- G_CALLBACK(layout_path_entry_changed_cb), lw);
-#endif
box_folders = GTK_WIDGET(gtk_hpaned_new());
DEBUG_NAME(box_folders);
layout_sort_set(lw, type, lw->sort_ascend);
}
-static void layout_sort_menu_ascend_cb(GtkWidget *widget, gpointer data)
+static void layout_sort_menu_ascend_cb(GtkWidget *UNUSED(widget), gpointer data)
{
LayoutWindow *lw = data;
layout_sort_set(lw, lw->sort_method, !lw->sort_ascend);
}
-static void layout_sort_menu_hide_cb(GtkWidget *widget, gpointer data)
+static void layout_sort_menu_hide_cb(GtkWidget *widget, gpointer UNUSED(data))
{
/* destroy the menu */
g_object_unref(widget);
}
-static void layout_sort_button_press_cb(GtkWidget *widget, gpointer data)
+static void layout_sort_button_press_cb(GtkWidget *UNUSED(widget), gpointer data)
{
LayoutWindow *lw = data;
GtkWidget *menu;
image_options_sync();
}
-static void layout_zoom_menu_hide_cb(GtkWidget *widget, gpointer data)
+static void layout_zoom_menu_hide_cb(GtkWidget *widget, gpointer UNUSED(data))
{
/* destroy the menu */
g_object_unref(widget);
}
-static void layout_zoom_button_press_cb(GtkWidget *widget, gpointer data)
+static void layout_zoom_button_press_cb(GtkWidget *UNUSED(widget), gpointer data)
{
LayoutWindow *lw = data;
GtkWidget *menu;
gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 0, etime);
}
-static GtkWidget *layout_zoom_button(LayoutWindow *lw, GtkWidget *box, gint size, gboolean expand)
+static GtkWidget *layout_zoom_button(LayoutWindow *lw, GtkWidget *box, gint size, gboolean UNUSED(expand))
{
GtkWidget *button;
GtkWidget *frame;
if (small_format)
{
- lw->info_box = gtk_vbox_new(FALSE, 0);
+ lw->info_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
DEBUG_NAME(lw->info_box);
}
else
{
- lw->info_box = gtk_hbox_new(FALSE, 0);
+ lw->info_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
DEBUG_NAME(lw->info_box);
}
gtk_box_pack_end(GTK_BOX(box), lw->info_box, FALSE, FALSE, 0);
if (small_format)
{
- hbox = gtk_hbox_new(FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
DEBUG_NAME(hbox);
gtk_box_pack_start(GTK_BOX(lw->info_box), hbox, FALSE, FALSE, 0);
gtk_widget_show(hbox);
lw->info_progress_bar = gtk_progress_bar_new();
DEBUG_NAME(lw->info_progress_bar);
gtk_widget_set_size_request(lw->info_progress_bar, PROGRESS_WIDTH, -1);
-#if GTK_CHECK_VERSION(3,0,0)
+
gtk_progress_bar_set_text(GTK_PROGRESS_BAR(lw->info_progress_bar), "");
gtk_progress_bar_set_show_text(GTK_PROGRESS_BAR(lw->info_progress_bar), TRUE);
-#endif
+
gtk_box_pack_start(GTK_BOX(hbox), lw->info_progress_bar, FALSE, FALSE, 0);
gtk_widget_show(lw->info_progress_bar);
if (small_format)
{
- hbox = gtk_hbox_new(FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
DEBUG_NAME(hbox);
gtk_box_pack_start(GTK_BOX(lw->info_box), hbox, FALSE, FALSE, 0);
gtk_widget_show(hbox);
if (small_format)
{
- hbox = gtk_hbox_new(FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
DEBUG_NAME(hbox);
gtk_box_pack_start(GTK_BOX(lw->info_box), hbox, FALSE, FALSE, 0);
gtk_widget_show(hbox);
return lw->dir_view;
}
-static void layout_list_status_cb(ViewFile *vf, gpointer data)
+static void layout_list_status_cb(ViewFile *UNUSED(vf), gpointer data)
{
LayoutWindow *lw = data;
layout_status_update_info(lw, NULL);
}
-static void layout_list_thumb_cb(ViewFile *vf, gdouble val, const gchar *text, gpointer data)
+static void layout_list_thumb_cb(ViewFile *UNUSED(vf), gdouble val, const gchar *text, gpointer data)
{
LayoutWindow *lw = data;
if (lw->vf) vf_marks_set(lw->vf, lw->options.show_marks);
}
-static void layout_list_scroll_to_subpart(LayoutWindow *lw, const gchar *needle)
+static void layout_list_scroll_to_subpart(LayoutWindow *lw, const gchar *UNUSED(needle))
{
if (!lw) return;
}
lw->options.tools_hidden = hide;
}
-static gboolean layout_tools_delete_cb(GtkWidget *widget, GdkEventAny *event, gpointer data)
+static gboolean layout_tools_delete_cb(GtkWidget *UNUSED(widget), GdkEventAny *UNUSED(event), gpointer data)
{
LayoutWindow *lw = data;
layout_actions_add_window(lw, lw->tools);
- vbox = gtk_vbox_new(FALSE, 0);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
DEBUG_NAME(vbox);
gtk_container_add(GTK_CONTAINER(lw->tools), vbox);
if (options->expand_menu_toolbar) gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(lw->menu_tool_bar), FALSE, FALSE, 0);
layout_actions_setup(lw);
- lw->group_box = gtk_vbox_new(FALSE, 0);
+ lw->group_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
DEBUG_NAME(lw->group_box);
if (options->expand_menu_toolbar)
{
static gint layout_config_delete_cb(GtkWidget *w, GdkEventAny *event, gpointer data);
-static void layout_config_close_cb(GtkWidget *widget, gpointer data)
+static void layout_config_close_cb(GtkWidget *UNUSED(widget), gpointer data)
{
LayoutConfig *lc = data;
g_free(lc);
}
-static gint layout_config_delete_cb(GtkWidget *w, GdkEventAny *event, gpointer data)
+static gint layout_config_delete_cb(GtkWidget *w, GdkEventAny *UNUSED(event), gpointer data)
{
layout_config_close_cb(w, data);
return TRUE;
}
-static void layout_config_apply_cb(GtkWidget *widget, gpointer data)
+static void layout_config_apply_cb(GtkWidget *UNUSED(widget), gpointer data)
{
LayoutConfig *lc = data;
layout_apply_options(lc->lw, &lc->options);
}
-static void layout_config_help_cb(GtkWidget *widget, gpointer data)
+static void layout_config_help_cb(GtkWidget *UNUSED(widget), gpointer UNUSED(data))
{
help_window_show("GuideOptionsLayout.html");
}
layout_config_close_cb(widget, lc);
}
-static void home_path_set_current_cb(GtkWidget *widget, gpointer data)
+static void home_path_set_current_cb(GtkWidget *UNUSED(widget), gpointer data)
{
LayoutConfig *lc = data;
gtk_entry_set_text(GTK_ENTRY(lc->home_path_entry), layout_get_path(lc->lw));
gtk_window_set_resizable(GTK_WINDOW(lc->configwindow), TRUE);
gtk_container_set_border_width(GTK_CONTAINER(lc->configwindow), PREF_PAD_BORDER);
- win_vbox = gtk_vbox_new(FALSE, PREF_PAD_SPACE);
+ win_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_SPACE);
DEBUG_NAME(win_vbox);
gtk_container_add(GTK_CONTAINER(lc->configwindow), win_vbox);
gtk_widget_show(win_vbox);
frame = pref_frame_new(win_vbox, TRUE, NULL, GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
DEBUG_NAME(frame);
- vbox = gtk_vbox_new(FALSE, PREF_PAD_SPACE);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_SPACE);
DEBUG_NAME(vbox);
gtk_container_add(GTK_CONTAINER(frame), vbox);
gtk_widget_show(vbox);
{
Histogram *histogram;
#ifdef GDK_WINDOWING_X11
-#if GTK_CHECK_VERSION(3,10,0)
GdkWindow *window;
-#endif
#endif
if (!layout_valid(&lw)) return;
&lw->options.log_window.w, &lw->options.log_window.h);
#ifdef GDK_WINDOWING_X11
-#if GTK_CHECK_VERSION(3,10,0)
GdkDisplay *display;
if (options->save_window_workspace)
lw->options.workspace = gdk_x11_window_get_desktop(window);
}
}
-#endif
#endif
return;
}
g_free(lw);
}
-static gboolean layout_delete_cb(GtkWidget *widget, GdkEventAny *event, gpointer data)
+static gboolean layout_delete_cb(GtkWidget *UNUSED(widget), GdkEventAny *UNUSED(event), gpointer data)
{
LayoutWindow *lw = data;
static gboolean move_window_to_workspace_cb(gpointer data)
{
#ifdef GDK_WINDOWING_X11
-#if GTK_CHECK_VERSION(3,10,0)
LayoutWindow *lw = data;
GdkWindow *window;
GdkDisplay *display;
}
}
}
-#endif
#endif
return FALSE;
}
layout_keyboard_init(lw, lw->window);
-#ifdef HAVE_LIRC
- layout_image_lirc_init(lw);
-#endif
-
- lw->main_box = gtk_vbox_new(FALSE, 0);
+ lw->main_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
DEBUG_NAME(lw->main_box);
gtk_container_add(GTK_CONTAINER(lw->window), lw->main_box);
gtk_widget_show(lw->main_box);
static gchar *layout_titles[] = { N_("Tools"), N_("Files"), N_("Image") };
-static void layout_config_destroy(GtkWidget *widget, gpointer data)
+static void layout_config_destroy(GtkWidget *UNUSED(widget), gpointer data)
{
LayoutConfig * lc = data;
return group;
}
-static void layout_config_number_cb(GtkTreeViewColumn *tree_column, GtkCellRenderer *cell,
- GtkTreeModel *store, GtkTreeIter *iter, gpointer data)
+static void layout_config_number_cb(GtkTreeViewColumn *UNUSED(tree_column), GtkCellRenderer *cell,
+ GtkTreeModel *store, GtkTreeIter *iter, gpointer UNUSED(data))
{
GtkTreePath *tpath;
gint *indices;
lc = g_new0(LayoutConfig, 1);
- lc->box = gtk_vbox_new(FALSE, PREF_PAD_GAP);
+ lc->box = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
g_object_set_data(G_OBJECT(lc->box), "layout_config", lc);
g_signal_connect(G_OBJECT(lc->box), "destroy",
G_CALLBACK(layout_config_destroy), lc);
- hbox = gtk_hbox_new(TRUE, PREF_PAD_SPACE);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
gtk_box_pack_start(GTK_BOX(lc->box), hbox, FALSE, FALSE, 0);
for (i = 0; i < layout_config_style_count; i++)
{
if (lw->slideshow) slideshow_prev(lw->slideshow);
}
-static void layout_image_slideshow_stop_func(SlideShowData *ss, gpointer data)
+static void layout_image_slideshow_stop_func(SlideShowData *UNUSED(ss), gpointer data)
{
LayoutWindow *lw = data;
}
-static void animation_async_ready_cb(GObject *source_object, GAsyncResult *res, gpointer data)
+static void animation_async_ready_cb(GObject *UNUSED(source_object), GAsyncResult *res, gpointer data)
{
GError *error = NULL;
AnimationData *animation = data;
*----------------------------------------------------------------------------
*/
-static void li_pop_menu_zoom_in_cb(GtkWidget *widget, gpointer data)
+static void li_pop_menu_zoom_in_cb(GtkWidget *UNUSED(widget), gpointer data)
{
LayoutWindow *lw = data;
layout_image_zoom_adjust(lw, get_zoom_increment(), FALSE);
}
-static void li_pop_menu_zoom_out_cb(GtkWidget *widget, gpointer data)
+static void li_pop_menu_zoom_out_cb(GtkWidget *UNUSED(widget), gpointer data)
{
LayoutWindow *lw = data;
layout_image_zoom_adjust(lw, -get_zoom_increment(), FALSE);
}
-static void li_pop_menu_zoom_1_1_cb(GtkWidget *widget, gpointer data)
+static void li_pop_menu_zoom_1_1_cb(GtkWidget *UNUSED(widget), gpointer data)
{
LayoutWindow *lw = data;
layout_image_zoom_set(lw, 1.0, FALSE);
}
-static void li_pop_menu_zoom_fit_cb(GtkWidget *widget, gpointer data)
+static void li_pop_menu_zoom_fit_cb(GtkWidget *UNUSED(widget), gpointer data)
{
LayoutWindow *lw = data;
file_util_start_editor_from_file(key, layout_image_get_fd(lw), lw->window);
}
-#if !GTK_CHECK_VERSION(3,0,0)
-static void li_pop_menu_wallpaper_cb(GtkWidget *widget, gpointer data)
-{
- LayoutWindow *lw = data;
-
- layout_image_to_root(lw);
-}
-#endif
-
static void li_pop_menu_alter_cb(GtkWidget *widget, gpointer data)
{
LayoutWindow *lw = data;
image_alter_orientation(lw->image, lw->image->image_fd, type);
}
-static void li_pop_menu_new_cb(GtkWidget *widget, gpointer data)
+static void li_pop_menu_new_cb(GtkWidget *UNUSED(widget), gpointer data)
{
LayoutWindow *lw = data;
li_pop_menu_click_parent(widget, lw));
}
-static void li_pop_menu_copy_path_cb(GtkWidget *widget, gpointer data)
+static void li_pop_menu_copy_path_cb(GtkWidget *UNUSED(widget), gpointer data)
{
LayoutWindow *lw = data;
file_util_copy_path_to_clipboard(layout_image_get_fd(lw), TRUE);
}
-static void li_pop_menu_copy_path_unquoted_cb(GtkWidget *widget, gpointer data)
+static void li_pop_menu_copy_path_unquoted_cb(GtkWidget *UNUSED(widget), gpointer data)
{
LayoutWindow *lw = data;
file_util_copy_path_to_clipboard(layout_image_get_fd(lw), FALSE);
}
-static void li_pop_menu_copy_image_cb(GtkWidget *widget, gpointer data)
+static void li_pop_menu_copy_image_cb(GtkWidget *UNUSED(widget), gpointer data)
{
LayoutWindow *lw = data;
ImageWindow *imd = lw->image;
li_pop_menu_click_parent(widget, lw));
}
-static void li_pop_menu_slide_start_cb(GtkWidget *widget, gpointer data)
+static void li_pop_menu_slide_start_cb(GtkWidget *UNUSED(widget), gpointer data)
{
LayoutWindow *lw = data;
layout_image_slideshow_start(lw);
}
-static void li_pop_menu_slide_stop_cb(GtkWidget *widget, gpointer data)
+static void li_pop_menu_slide_stop_cb(GtkWidget *UNUSED(widget), gpointer data)
{
LayoutWindow *lw = data;
layout_image_slideshow_stop(lw);
}
-static void li_pop_menu_slide_pause_cb(GtkWidget *widget, gpointer data)
+static void li_pop_menu_slide_pause_cb(GtkWidget *UNUSED(widget), gpointer data)
{
LayoutWindow *lw = data;
layout_image_slideshow_pause_toggle(lw);
}
-static void li_pop_menu_full_screen_cb(GtkWidget *widget, gpointer data)
+static void li_pop_menu_full_screen_cb(GtkWidget *UNUSED(widget), gpointer data)
{
LayoutWindow *lw = data;
layout_image_full_screen_toggle(lw);
}
-static void li_pop_menu_animate_cb(GtkWidget *widget, gpointer data)
+static void li_pop_menu_animate_cb(GtkWidget *UNUSED(widget), gpointer data)
{
LayoutWindow *lw = data;
layout_image_animate_toggle(lw);
}
-static void li_pop_menu_hide_cb(GtkWidget *widget, gpointer data)
+static void li_pop_menu_hide_cb(GtkWidget *UNUSED(widget), gpointer data)
{
LayoutWindow *lw = data;
layout_tools_hide_toggle(lw);
}
-static void li_set_layout_path_cb(GtkWidget *widget, gpointer data)
+static void li_set_layout_path_cb(GtkWidget *UNUSED(widget), gpointer data)
{
LayoutWindow *lw = data;
FileData *fd;
if (fd) layout_set_fd(lw, fd);
}
-static void li_open_archive_cb(GtkWidget *widget, gpointer data)
+static void li_open_archive_cb(GtkWidget *UNUSED(widget), gpointer data)
{
LayoutWindow *lw = data;
LayoutWindow *lw_new;
return ret;
}
-static void layout_image_popup_menu_destroy_cb(GtkWidget *widget, gpointer data)
+static void layout_image_popup_menu_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
{
GList *editmenu_fd_list = data;
submenu = submenu_add_edit(menu, &item, G_CALLBACK(li_pop_menu_edit_cb), lw, editmenu_fd_list);
if (!path) gtk_widget_set_sensitive(item, FALSE);
menu_item_add_divider(submenu);
-#if !GTK_CHECK_VERSION(3,0,0)
- menu_item_add(submenu, _("Set as _wallpaper"), G_CALLBACK(li_pop_menu_wallpaper_cb), lw);
-#endif
item = submenu_add_alter(menu, G_CALLBACK(li_pop_menu_alter_cb), lw);
item = menu_item_add_stock(menu, _("View in _new window"), GTK_STOCK_NEW, G_CALLBACK(li_pop_menu_new_cb), lw);
if (!path) gtk_widget_set_sensitive(item, FALSE);
item = menu_item_add_stock(menu,
options->file_ops.confirm_delete ? _("_Delete...") :
- _("_Delete"), GTK_STOCK_DELETE,
+ _("_Delete"), "edit-delete",
G_CALLBACK(li_pop_menu_delete_cb), lw);
if (!path) gtk_widget_set_sensitive(item, FALSE);
menu_item_add_divider(menu);
return menu;
}
-static void layout_image_menu_pos_cb(GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer data)
+static void layout_image_menu_pos_cb(GtkMenu *menu, gint *x, gint *y, gboolean *UNUSED(push_in), gpointer data)
{
LayoutWindow *lw = data;
*----------------------------------------------------------------------------
*/
-static void layout_image_dnd_receive(GtkWidget *widget, GdkDragContext *context,
- gint x, gint y,
+static void layout_image_dnd_receive(GtkWidget *widget, GdkDragContext *UNUSED(context),
+ gint UNUSED(x), gint UNUSED(y),
GtkSelectionData *selection_data, guint info,
- guint time, gpointer data)
+ guint UNUSED(time), gpointer data)
{
LayoutWindow *lw = data;
gint i;
}
}
-static void layout_image_dnd_get(GtkWidget *widget, GdkDragContext *context,
- GtkSelectionData *selection_data, guint info,
- guint time, gpointer data)
+static void layout_image_dnd_get(GtkWidget *widget, GdkDragContext *UNUSED(context),
+ GtkSelectionData *selection_data, guint UNUSED(info),
+ guint UNUSED(time), gpointer data)
{
LayoutWindow *lw = data;
FileData *fd;
}
}
-static void layout_image_dnd_end(GtkWidget *widget, GdkDragContext *context, gpointer data)
+static void layout_image_dnd_end(GtkWidget *UNUSED(widget), GdkDragContext *context, gpointer data)
{
LayoutWindow *lw = data;
if (gdk_drag_context_get_selected_action(context) == GDK_ACTION_MOVE)
*----------------------------------------------------------------------------
*/
-static void layout_image_update_cb(ImageWindow *imd, gpointer data)
+static void layout_image_update_cb(ImageWindow *UNUSED(imd), gpointer data)
{
LayoutWindow *lw = data;
layout_status_update_image(lw);
layout_image_full_screen_stop(lw);
}
-static void clear_marks_cancel_cb(GenericDialog *gd, gpointer data)
+static void clear_marks_cancel_cb(GenericDialog *gd, gpointer UNUSED(data))
{
generic_dialog_close(gd);
}
-static void clear_marks_help_cb(GenericDialog *gd, gpointer data)
+static void clear_marks_help_cb(GenericDialog *UNUSED(gd), gpointer UNUSED(data))
{
help_window_show("GuideMainWindowMenus.html");
}
-void layout_menu_clear_marks_ok_cb(GenericDialog *gd, gpointer data)
+void layout_menu_clear_marks_ok_cb(GenericDialog *gd, gpointer UNUSED(data))
{
marks_clear_all();
generic_dialog_close(gd);
}
-static void layout_menu_clear_marks_cb(GtkAction *action, gpointer data)
+static void layout_menu_clear_marks_cb(GtkAction *UNUSED(action), gpointer UNUSED(data))
{
GenericDialog *gd;
gtk_widget_show(gd->dialog);
}
-static void layout_menu_new_cb(GtkAction *action, gpointer data)
+static void layout_menu_new_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
collection_window_new(NULL);
}
-static void layout_menu_open_cb(GtkAction *action, gpointer data)
+static void layout_menu_open_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
collection_dialog_load(NULL);
}
-static void layout_menu_search_cb(GtkAction *action, gpointer data)
+static void layout_menu_search_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
search_new(lw->dir_fd, layout_image_get_fd(lw));
}
-static void layout_menu_dupes_cb(GtkAction *action, gpointer data)
+static void layout_menu_dupes_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
dupe_window_new();
}
-static void layout_menu_pan_cb(GtkAction *action, gpointer data)
+static void layout_menu_pan_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
pan_window_new(lw->dir_fd);
}
-static void layout_menu_print_cb(GtkAction *action, gpointer data)
+static void layout_menu_print_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
print_window_new(layout_image_get_fd(lw), layout_selection_list(lw), layout_list(lw), layout_window(lw));
}
-static void layout_menu_dir_cb(GtkAction *action, gpointer data)
+static void layout_menu_dir_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
if (lw->vd) vd_new_folder(lw->vd, lw->dir_fd);
}
-static void layout_menu_copy_cb(GtkAction *action, gpointer data)
+static void layout_menu_copy_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
file_util_copy(NULL, layout_selection_list(lw), NULL, layout_window(lw));
}
-static void layout_menu_copy_path_cb(GtkAction *action, gpointer data)
+static void layout_menu_copy_path_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
file_util_copy_path_list_to_clipboard(layout_selection_list(lw), TRUE);
}
-static void layout_menu_copy_path_unquoted_cb(GtkAction *action, gpointer data)
+static void layout_menu_copy_path_unquoted_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
file_util_copy_path_list_to_clipboard(layout_selection_list(lw), FALSE);
}
-static void layout_menu_move_cb(GtkAction *action, gpointer data)
+static void layout_menu_move_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
file_util_move(NULL, layout_selection_list(lw), NULL, layout_window(lw));
}
-static void layout_menu_rename_cb(GtkAction *action, gpointer data)
+static void layout_menu_rename_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
file_util_rename(NULL, layout_selection_list(lw), layout_window(lw));
}
-static void layout_menu_delete_cb(GtkAction *action, gpointer data)
+static void layout_menu_delete_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
file_util_delete(NULL, layout_selection_list(lw), layout_window(lw));
}
-static void layout_menu_move_to_trash_cb(GtkAction *action, gpointer data)
+static void layout_menu_move_to_trash_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
file_util_delete(NULL, layout_selection_list(lw), layout_window(lw));
}
-static void layout_menu_move_to_trash_key_cb(GtkAction *action, gpointer data)
+static void layout_menu_move_to_trash_key_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
}
}
-static void layout_menu_disable_grouping_cb(GtkAction *action, gpointer data)
+static void layout_menu_disable_grouping_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
file_data_disable_grouping_list(layout_selection_list(lw), TRUE);
}
-static void layout_menu_enable_grouping_cb(GtkAction *action, gpointer data)
+static void layout_menu_enable_grouping_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
file_data_disable_grouping_list(layout_selection_list(lw), FALSE);
}
-void layout_menu_close_cb(GtkAction *action, gpointer data)
+void layout_menu_close_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_close(lw);
}
-static void layout_menu_exit_cb(GtkAction *action, gpointer data)
+static void layout_menu_exit_cb(GtkAction *UNUSED(action), gpointer UNUSED(data))
{
exit_program();
}
-static void layout_menu_alter_90_cb(GtkAction *action, gpointer data)
+static void layout_menu_alter_90_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_image_alter_orientation(lw, ALTER_ROTATE_90);
}
-static void layout_menu_rating_0_cb(GtkAction *action, gpointer data)
+static void layout_menu_rating_0_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_image_rating(lw, "0");
}
-static void layout_menu_rating_1_cb(GtkAction *action, gpointer data)
+static void layout_menu_rating_1_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_image_rating(lw, "1");
}
-static void layout_menu_rating_2_cb(GtkAction *action, gpointer data)
+static void layout_menu_rating_2_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_image_rating(lw, "2");
}
-static void layout_menu_rating_3_cb(GtkAction *action, gpointer data)
+static void layout_menu_rating_3_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_image_rating(lw, "3");
}
-static void layout_menu_rating_4_cb(GtkAction *action, gpointer data)
+static void layout_menu_rating_4_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_image_rating(lw, "4");
}
-static void layout_menu_rating_5_cb(GtkAction *action, gpointer data)
+static void layout_menu_rating_5_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_image_rating(lw, "5");
}
-static void layout_menu_rating_m1_cb(GtkAction *action, gpointer data)
+static void layout_menu_rating_m1_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_image_rating(lw, "-1");
}
-static void layout_menu_alter_90cc_cb(GtkAction *action, gpointer data)
+static void layout_menu_alter_90cc_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_image_alter_orientation(lw, ALTER_ROTATE_90_CC);
}
-static void layout_menu_alter_180_cb(GtkAction *action, gpointer data)
+static void layout_menu_alter_180_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_image_alter_orientation(lw, ALTER_ROTATE_180);
}
-static void layout_menu_alter_mirror_cb(GtkAction *action, gpointer data)
+static void layout_menu_alter_mirror_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_image_alter_orientation(lw, ALTER_MIRROR);
}
-static void layout_menu_alter_flip_cb(GtkAction *action, gpointer data)
+static void layout_menu_alter_flip_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_image_set_ignore_alpha(lw, gtk_toggle_action_get_active(action));
}
-static void layout_menu_alter_none_cb(GtkAction *action, gpointer data)
+static void layout_menu_alter_none_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_image_reset_orientation(lw);
}
-static void layout_menu_select_rectangle_cb(GtkToggleAction *action, gpointer data)
+static void layout_menu_select_rectangle_cb(GtkToggleAction *action, gpointer UNUSED(data))
{
options->draw_rectangle = gtk_toggle_action_get_active(action);
}
layout_image_set_overunderexposed(lw, gtk_toggle_action_get_active(action));
}
-static void layout_menu_write_rotate(GtkToggleAction *action, gpointer data, gboolean keep_date)
+static void layout_menu_write_rotate(GtkToggleAction *UNUSED(action), gpointer data, gboolean keep_date)
{
LayoutWindow *lw = data;
GtkTreeModel *store;
layout_menu_write_rotate(action, data, FALSE);
}
-static void layout_menu_config_cb(GtkAction *action, gpointer data)
+static void layout_menu_config_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
show_config_window(lw);
}
-static void layout_menu_editors_cb(GtkAction *action, gpointer data)
+static void layout_menu_editors_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
show_editor_list_window();
}
-static void layout_menu_layout_config_cb(GtkAction *action, gpointer data)
+static void layout_menu_layout_config_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_show_config_window(lw);
}
-static void layout_menu_remove_thumb_cb(GtkAction *action, gpointer data)
+static void layout_menu_remove_thumb_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
cache_manager_show();
}
-static void layout_menu_wallpaper_cb(GtkAction *action, gpointer data)
+static void layout_menu_wallpaper_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
}
/* single window zoom */
-static void layout_menu_zoom_in_cb(GtkAction *action, gpointer data)
+static void layout_menu_zoom_in_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_image_zoom_adjust(lw, get_zoom_increment(), FALSE);
}
-static void layout_menu_zoom_out_cb(GtkAction *action, gpointer data)
+static void layout_menu_zoom_out_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_image_zoom_adjust(lw, -get_zoom_increment(), FALSE);
}
-static void layout_menu_zoom_1_1_cb(GtkAction *action, gpointer data)
+static void layout_menu_zoom_1_1_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_image_zoom_set(lw, 1.0, FALSE);
}
-static void layout_menu_zoom_fit_cb(GtkAction *action, gpointer data)
+static void layout_menu_zoom_fit_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_image_zoom_set(lw, 0.0, FALSE);
}
-static void layout_menu_zoom_fit_hor_cb(GtkAction *action, gpointer data)
+static void layout_menu_zoom_fit_hor_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_image_zoom_set_fill_geometry(lw, FALSE, FALSE);
}
-static void layout_menu_zoom_fit_vert_cb(GtkAction *action, gpointer data)
+static void layout_menu_zoom_fit_vert_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_image_zoom_set_fill_geometry(lw, TRUE, FALSE);
}
-static void layout_menu_zoom_2_1_cb(GtkAction *action, gpointer data)
+static void layout_menu_zoom_2_1_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_image_zoom_set(lw, 2.0, FALSE);
}
-static void layout_menu_zoom_3_1_cb(GtkAction *action, gpointer data)
+static void layout_menu_zoom_3_1_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_image_zoom_set(lw, 3.0, FALSE);
}
-static void layout_menu_zoom_4_1_cb(GtkAction *action, gpointer data)
+static void layout_menu_zoom_4_1_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_image_zoom_set(lw, 4.0, FALSE);
}
-static void layout_menu_zoom_1_2_cb(GtkAction *action, gpointer data)
+static void layout_menu_zoom_1_2_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_image_zoom_set(lw, -2.0, FALSE);
}
-static void layout_menu_zoom_1_3_cb(GtkAction *action, gpointer data)
+static void layout_menu_zoom_1_3_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_image_zoom_set(lw, -3.0, FALSE);
}
-static void layout_menu_zoom_1_4_cb(GtkAction *action, gpointer data)
+static void layout_menu_zoom_1_4_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
}
/* connected zoom */
-static void layout_menu_connect_zoom_in_cb(GtkAction *action, gpointer data)
+static void layout_menu_connect_zoom_in_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_image_zoom_adjust(lw, get_zoom_increment(), TRUE);
}
-static void layout_menu_connect_zoom_out_cb(GtkAction *action, gpointer data)
+static void layout_menu_connect_zoom_out_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_image_zoom_adjust(lw, -get_zoom_increment(), TRUE);
}
-static void layout_menu_connect_zoom_1_1_cb(GtkAction *action, gpointer data)
+static void layout_menu_connect_zoom_1_1_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_image_zoom_set(lw, 1.0, TRUE);
}
-static void layout_menu_connect_zoom_fit_cb(GtkAction *action, gpointer data)
+static void layout_menu_connect_zoom_fit_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_image_zoom_set(lw, 0.0, TRUE);
}
-static void layout_menu_connect_zoom_fit_hor_cb(GtkAction *action, gpointer data)
+static void layout_menu_connect_zoom_fit_hor_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_image_zoom_set_fill_geometry(lw, FALSE, TRUE);
}
-static void layout_menu_connect_zoom_fit_vert_cb(GtkAction *action, gpointer data)
+static void layout_menu_connect_zoom_fit_vert_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_image_zoom_set_fill_geometry(lw, TRUE, TRUE);
}
-static void layout_menu_connect_zoom_2_1_cb(GtkAction *action, gpointer data)
+static void layout_menu_connect_zoom_2_1_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_image_zoom_set(lw, 2.0, TRUE);
}
-static void layout_menu_connect_zoom_3_1_cb(GtkAction *action, gpointer data)
+static void layout_menu_connect_zoom_3_1_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_image_zoom_set(lw, 3.0, TRUE);
}
-static void layout_menu_connect_zoom_4_1_cb(GtkAction *action, gpointer data)
+static void layout_menu_connect_zoom_4_1_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_image_zoom_set(lw, 4.0, TRUE);
}
-static void layout_menu_connect_zoom_1_2_cb(GtkAction *action, gpointer data)
+static void layout_menu_connect_zoom_1_2_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_image_zoom_set(lw, -2.0, TRUE);
}
-static void layout_menu_connect_zoom_1_3_cb(GtkAction *action, gpointer data)
+static void layout_menu_connect_zoom_1_3_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_image_zoom_set(lw, -3.0, TRUE);
}
-static void layout_menu_connect_zoom_1_4_cb(GtkAction *action, gpointer data)
+static void layout_menu_connect_zoom_1_4_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
}
-static void layout_menu_split_cb(GtkRadioAction *action, GtkRadioAction *current, gpointer data)
+static void layout_menu_split_cb(GtkRadioAction *action, GtkRadioAction *UNUSED(current), gpointer data)
{
LayoutWindow *lw = data;
ImageSplitMode mode;
}
-static void layout_menu_list_cb(GtkRadioAction *action, GtkRadioAction *current, gpointer data)
+static void layout_menu_list_cb(GtkRadioAction *action, GtkRadioAction *UNUSED(current), gpointer data)
{
LayoutWindow *lw = data;
}
}
-static void layout_menu_view_in_new_window_cb(GtkAction *action, gpointer data)
+static void layout_menu_view_in_new_window_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
view_window_new(layout_image_get_fd(lw));
}
-static void layout_menu_open_archive_cb(GtkAction *action, gpointer data)
+static void layout_menu_open_archive_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
LayoutWindow *lw_new;
}
}
-static void layout_menu_fullscreen_cb(GtkAction *action, gpointer data)
+static void layout_menu_fullscreen_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_image_full_screen_toggle(lw);
}
-static void layout_menu_escape_cb(GtkAction *action, gpointer data)
+static void layout_menu_escape_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_exit_fullscreen(lw);
}
-static void layout_menu_overlay_toggle_cb(GtkAction *action, gpointer data)
+static void layout_menu_overlay_toggle_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_image_animate_toggle(lw);
}
-static void layout_menu_rectangular_selection_cb(GtkToggleAction *action, gpointer data)
+static void layout_menu_rectangular_selection_cb(GtkToggleAction *action, gpointer UNUSED(data))
{
options->collections.rectangular_selection = gtk_toggle_action_get_active(action);
}
-static void layout_menu_histogram_toggle_channel_cb(GtkAction *action, gpointer data)
+static void layout_menu_histogram_toggle_channel_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_util_sync_views(lw);
}
-static void layout_menu_histogram_toggle_mode_cb(GtkAction *action, gpointer data)
+static void layout_menu_histogram_toggle_mode_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_util_sync_views(lw);
}
-static void layout_menu_histogram_channel_cb(GtkRadioAction *action, GtkRadioAction *current, gpointer data)
+static void layout_menu_histogram_channel_cb(GtkRadioAction *action, GtkRadioAction *UNUSED(current), gpointer data)
{
LayoutWindow *lw = data;
gint channel = gtk_radio_action_get_current_value(action);
image_osd_histogram_set_channel(lw->image, channel);
}
-static void layout_menu_histogram_mode_cb(GtkRadioAction *action, GtkRadioAction *current, gpointer data)
+static void layout_menu_histogram_mode_cb(GtkRadioAction *action, GtkRadioAction *UNUSED(current), gpointer data)
{
LayoutWindow *lw = data;
gint mode = gtk_radio_action_get_current_value(action);
image_osd_histogram_set_mode(lw->image, mode);
}
-static void layout_menu_refresh_cb(GtkAction *action, gpointer data)
+static void layout_menu_refresh_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_refresh(lw);
}
-static void layout_menu_bar_exif_cb(GtkAction *action, gpointer data)
+static void layout_menu_bar_exif_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_exif_window_new(lw);
}
-static void layout_menu_search_and_run_cb(GtkAction *action, gpointer data)
+static void layout_menu_search_and_run_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_tools_float_toggle(lw);
}
-static void layout_menu_hide_cb(GtkAction *action, gpointer data)
+static void layout_menu_hide_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_image_slideshow_toggle(lw);
}
-static void layout_menu_slideshow_pause_cb(GtkAction *action, gpointer data)
+static void layout_menu_slideshow_pause_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_image_slideshow_pause_toggle(lw);
}
-static void layout_menu_slideshow_slower_cb(GtkAction *action, gpointer data)
+static void layout_menu_slideshow_slower_cb(GtkAction *UNUSED(action), gpointer UNUSED(data))
{
options->slideshow.delay = options->slideshow.delay + 5;
if (options->slideshow.delay > SLIDESHOW_MAX_SECONDS)
options->slideshow.delay = SLIDESHOW_MAX_SECONDS;
}
-static void layout_menu_slideshow_faster_cb(GtkAction *action, gpointer data)
+static void layout_menu_slideshow_faster_cb(GtkAction *UNUSED(action), gpointer UNUSED(data))
{
options->slideshow.delay = options->slideshow.delay - 5;
if (options->slideshow.delay < SLIDESHOW_MIN_SECONDS * 10)
}
-static void layout_menu_stereo_mode_next_cb(GtkAction *action, gpointer data)
+static void layout_menu_stereo_mode_next_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
gint mode = layout_image_stereo_pixbuf_get(lw);
}
-static void layout_menu_stereo_mode_cb(GtkRadioAction *action, GtkRadioAction *current, gpointer data)
+static void layout_menu_stereo_mode_cb(GtkRadioAction *action, GtkRadioAction *UNUSED(current), gpointer data)
{
LayoutWindow *lw = data;
gint mode = gtk_radio_action_get_current_value(action);
layout_image_stereo_pixbuf_set(lw, mode);
}
-static void layout_menu_help_cb(GtkAction *action, gpointer data)
+static void layout_menu_help_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
help_window_show("index.html");
}
-static void layout_menu_help_search_cb(GtkAction *action, gpointer data)
+static void layout_menu_help_search_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
help_search_window_show();
}
-static void layout_menu_help_keys_cb(GtkAction *action, gpointer data)
+static void layout_menu_help_keys_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
help_window_show("GuideReferenceKeyboardShortcuts.html");
}
-static void layout_menu_notes_cb(GtkAction *action, gpointer data)
+static void layout_menu_notes_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
help_window_show("release_notes");
}
-static void layout_menu_changelog_cb(GtkAction *action, gpointer data)
+static void layout_menu_changelog_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
const gchar *accel_path,
guint accel_key,
GdkModifierType accel_mods,
- gboolean changed)
+ gboolean UNUSED(changed))
{
gchar *path, *name;
gchar *key_name, *menu_name;
g_free(path);
}
-static void layout_menu_kbd_map_cb(GtkAction *action, gpointer data)
+static void layout_menu_kbd_map_cb(GtkAction *UNUSED(action), gpointer UNUSED(data))
{
gint fd = -1;
GPtrArray *array;
}
}
-static void layout_menu_about_cb(GtkAction *action, gpointer data)
+static void layout_menu_about_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
show_about_window(lw);
}
-static void layout_menu_log_window_cb(GtkAction *action, gpointer data)
+static void layout_menu_log_window_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
*-----------------------------------------------------------------------------
*/
-static void layout_menu_select_all_cb(GtkAction *action, gpointer data)
+static void layout_menu_select_all_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_select_all(lw);
}
-static void layout_menu_unselect_all_cb(GtkAction *action, gpointer data)
+static void layout_menu_unselect_all_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_select_none(lw);
}
-static void layout_menu_invert_selection_cb(GtkAction *action, gpointer data)
+static void layout_menu_invert_selection_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
*-----------------------------------------------------------------------------
*/
-static void layout_menu_image_first_cb(GtkAction *action, gpointer data)
+static void layout_menu_image_first_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_image_first(lw);
}
-static void layout_menu_image_prev_cb(GtkAction *action, gpointer data)
+static void layout_menu_image_prev_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
gint i;
}
}
-static void layout_menu_image_next_cb(GtkAction *action, gpointer data)
+static void layout_menu_image_next_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
gint i;
}
}
-static void layout_menu_page_first_cb(GtkAction *action, gpointer data)
+static void layout_menu_page_first_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
FileData *fd = layout_image_get_fd(lw);
}
}
-static void layout_menu_page_last_cb(GtkAction *action, gpointer data)
+static void layout_menu_page_last_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
FileData *fd = layout_image_get_fd(lw);
}
}
-static void layout_menu_page_next_cb(GtkAction *action, gpointer data)
+static void layout_menu_page_next_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
FileData *fd = layout_image_get_fd(lw);
}
}
-static void layout_menu_page_previous_cb(GtkAction *action, gpointer data)
+static void layout_menu_page_previous_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
FileData *fd = layout_image_get_fd(lw);
}
}
-static void layout_menu_image_forward_cb(GtkAction *action, gpointer data)
+static void layout_menu_image_forward_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_set_path(lw, image_chain_forward());
}
-static void layout_menu_image_back_cb(GtkAction *action, gpointer data)
+static void layout_menu_image_back_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_set_path(lw, image_chain_back());
}
-static void layout_menu_split_pane_next_cb(GtkAction *action, gpointer data)
+static void layout_menu_split_pane_next_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
gint active_frame;
layout_image_activate(lw, active_frame, FALSE);
}
-static void layout_menu_split_pane_prev_cb(GtkAction *action, gpointer data)
+static void layout_menu_split_pane_prev_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
gint active_frame;
layout_image_activate(lw, active_frame, FALSE);
}
-static void layout_menu_split_pane_updown_cb(GtkAction *action, gpointer data)
+static void layout_menu_split_pane_updown_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
gint active_frame;
layout_image_activate(lw, active_frame, FALSE);
}
-static void layout_menu_image_last_cb(GtkAction *action, gpointer data)
+static void layout_menu_image_last_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
layout_image_last(lw);
}
-static void layout_menu_back_cb(GtkAction *action, gpointer data)
+static void layout_menu_back_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
FileData *dir_fd;
file_data_unref(dir_fd);
}
-static void layout_menu_forward_cb(GtkAction *action, gpointer data)
+static void layout_menu_forward_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
FileData *dir_fd;
file_data_unref(dir_fd);
}
-static void layout_menu_home_cb(GtkAction *action, gpointer data)
+static void layout_menu_home_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
const gchar *path;
}
}
-static void layout_menu_up_cb(GtkAction *action, gpointer data)
+static void layout_menu_up_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
ViewDir *vd = lw->vd;
}
-static void layout_menu_metadata_write_cb(GtkAction *action, gpointer data)
+static void layout_menu_metadata_write_cb(GtkAction *UNUSED(action), gpointer UNUSED(data))
{
metadata_write_queue_confirm(TRUE, NULL, NULL);
}
static GtkWidget *last_focussed = NULL;
-static void layout_menu_keyword_autocomplete_cb(GtkAction *action, gpointer data)
+static void layout_menu_keyword_autocomplete_cb(GtkAction *UNUSED(action), gpointer data)
{
LayoutWindow *lw = data;
GtkWidget *tmp;
#endif
}
-static void layout_color_menu_input_cb(GtkRadioAction *action, GtkRadioAction *current, gpointer data)
+static void layout_color_menu_input_cb(GtkRadioAction *action, GtkRadioAction *UNUSED(current), gpointer data)
{
#ifdef HAVE_LCMS
LayoutWindow *lw = data;
*-----------------------------------------------------------------------------
*/
-static void layout_menu_recent_cb(GtkWidget *widget, gpointer data)
+static void layout_menu_recent_cb(GtkWidget *widget, gpointer UNUSED(data))
{
gint n;
gchar *path;
return g_list_sort(listin, layout_window_menu_list_sort_cb);
}
-static void layout_menu_new_window_cb(GtkWidget *widget, gpointer data)
+static void layout_menu_new_window_cb(GtkWidget *UNUSED(widget), gpointer data)
{
gint n;
}
}
-static void window_rename_cancel_cb(GenericDialog *gd, gpointer data)
+static void window_rename_cancel_cb(GenericDialog *UNUSED(gd), gpointer data)
{
RenameWindow *rw = data;
g_free(rw);
}
-static void window_rename_ok(GenericDialog *gd, gpointer data)
+static void window_rename_ok(GenericDialog *UNUSED(gd), gpointer data)
{
RenameWindow *rw = data;
gchar *path;
window_rename_ok(gd, rw);
}
-static void window_delete_cancel_cb(GenericDialog *gd, gpointer data)
+static void window_delete_cancel_cb(GenericDialog *UNUSED(gd), gpointer data)
{
DeleteWindow *dw = data;
g_free(dw);
}
-static void window_delete_ok_cb(GenericDialog *gd, gpointer data)
+static void window_delete_ok_cb(GenericDialog *UNUSED(gd), gpointer data)
{
DeleteWindow *dw = data;
gchar *path;
g_free(path);
}
-static void layout_menu_window_default_cb(GtkWidget *widget, gpointer data)
+static void layout_menu_window_default_cb(GtkWidget *UNUSED(widget), gpointer UNUSED(data))
{
layout_new_from_default();
}
-static void layout_menu_windows_menu_cb(GtkWidget *widget, gpointer data)
+static void layout_menu_windows_menu_cb(GtkWidget *UNUSED(widget), gpointer data)
{
LayoutWindow *lw = data;
GtkWidget *menu;
}
}
-static void layout_menu_view_menu_cb(GtkWidget *widget, gpointer data)
+static void layout_menu_view_menu_cb(GtkWidget *UNUSED(widget), gpointer data)
{
LayoutWindow *lw = data;
GtkWidget *menu;
g_object_unref(in_file);
}
-static void layout_menu_window_from_current_cb(GtkWidget *widget, gpointer data)
+static void layout_menu_window_from_current_cb(GtkWidget *UNUSED(widget), gpointer data)
{
LayoutWindow *lw = data;
gint fd_in = -1;
g_free(tmp_file_out);
}
-static void layout_menu_window_cb(GtkWidget *widget, gpointer data)
+static void layout_menu_window_cb(GtkWidget *UNUSED(widget), gpointer data)
{
LayoutWindow *lw = data;
layout_menu_new_window_update(lw);
}
-static void layout_menu_window_rename_cb(GtkWidget *widget, gpointer data)
+static void layout_menu_window_rename_cb(GtkWidget *UNUSED(widget), gpointer data)
{
LayoutWindow *lw = data;
RenameWindow *rw;
gtk_widget_show(rw->gd->dialog);
}
-static void layout_menu_window_delete_cb(GtkWidget *widget, gpointer data)
+static void layout_menu_window_delete_cb(GtkWidget *UNUSED(widget), gpointer data)
{
LayoutWindow *lw = data;
DeleteWindow *dw;
" <menuitem action='Maintenance'/>"
" <placeholder name='PreferencesSection'/>"
" <separator/>"
-#if !GTK_CHECK_VERSION(3,0,0)
-" <menuitem action='Wallpaper'/>"
-#endif
" <separator/>"
" </menu>"
" <menu action='PluginsMenu'>"
"<accelerator action='ConnectZoomFitAlt1'/>"
"</ui>";
-static gchar *menu_translate(const gchar *path, gpointer data)
+static gchar *menu_translate(const gchar *path, gpointer UNUSED(data))
{
return (gchar *)(_(path));
}
static gint layout_editors_reload_idle_id = -1;
static GList *layout_editors_desktop_files = NULL;
-static gboolean layout_editors_reload_idle_cb(gpointer data)
+static gboolean layout_editors_reload_idle_cb(gpointer UNUSED(data))
{
if (!layout_editors_desktop_files)
{
DEBUG_NAME(menu_bar);
toolbar = layout_actions_toolbar(lw, TOOLBAR_MAIN);
DEBUG_NAME(toolbar);
- lw->menu_tool_bar = gtk_vbox_new(FALSE, 0);
+ lw->menu_tool_bar = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_box_pack_start(GTK_BOX(lw->menu_tool_bar), menu_bar, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(lw->menu_tool_bar), toolbar, FALSE, FALSE, 0);
return lw->bar && gtk_widget_get_visible(lw->bar);
}
-static void layout_bar_destroyed(GtkWidget *widget, gpointer data)
+static void layout_bar_destroyed(GtkWidget *UNUSED(widget), gpointer data)
{
LayoutWindow *lw = data;
}
-static void layout_bar_sort_destroyed(GtkWidget *widget, gpointer data)
+static void layout_bar_sort_destroyed(GtkWidget *UNUSED(widget), gpointer data)
{
LayoutWindow *lw = data;
GtkWidget *layout_bars_prepare(LayoutWindow *lw, GtkWidget *image)
{
if (lw->utility_box) return lw->utility_box;
- lw->utility_box = gtk_hbox_new(FALSE, PREF_PAD_GAP);
+ lw->utility_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP);
lw->utility_paned = gtk_hpaned_new();
DEBUG_NAME(lw->utility_paned);
gtk_box_pack_start(GTK_BOX(lw->utility_box), lw->utility_paned, TRUE, TRUE, 0);
layout_bar_close(lw);
}
-static gboolean layout_exif_window_destroy(GtkWidget *widget, gpointer data)
+static gboolean layout_exif_window_destroy(GtkWidget *UNUSED(widget), gpointer data)
{
LayoutWindow *lw = data;
lw->exif_window = NULL;
+++ /dev/null
-/*
- * Copyright (C) 2008 - 2016 The Geeqie Team
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * 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.
- */
-
-#include <glib/gprintf.h>
-
-#include "lirc.h"
-
-#include "misc.h"
-
-#ifdef HAVE_LIRC
-#include <lirc/lirc_client.h>
-#include "layout_image.h"
-
-gint lirc_fd = -1;
-struct lirc_config *config = NULL;
-guint input_tag = 0; /* event source id */
-GIOChannel *gio_chan;
-
-/*
- *-----------------------------------------------------------------------------
- * LIRC callback
- *-----------------------------------------------------------------------------
- */
-
-static void lirc_cleanup(void)
-{
- if (config)
- {
- g_source_remove(input_tag);
- lirc_freeconfig(config);
- config = NULL;
- }
- if (lirc_fd != -1)
- {
- lirc_deinit();
- lirc_fd = -1;
- }
- if (gio_chan)
- {
- g_io_channel_shutdown(gio_chan, TRUE, NULL);
- g_io_channel_unref(gio_chan);
- }
-}
-
-static gboolean lirc_input_callback(GIOChannel *source, GIOCondition condition,
- gpointer data)
-{
- LayoutWindow *lw = data;
- gchar *ptr;
- gint ret;
- gint x = 0;
- gint y = 0;
-
- /* LIRC code and corresponding geeqie command (and parameters)*/
- gchar *code;
- gchar *cmd;
-
- /* parameters for geeqie command */
- gint i_parm;
- gfloat fl_parm;
-
- while ((ret = lirc_nextcode(&code)) == 0 && code)
- {
- while ((ret = lirc_code2char(config, code, &cmd)) == 0 && cmd)
- {
- if (g_ascii_strncasecmp("LEFT", cmd, 4) == 0)
- {
- ptr = cmd + 4;
- while (g_ascii_isspace(*ptr)) ptr++;
- i_parm = atoi(ptr);
-
- if (i_parm <= 0) i_parm = 1;
- x -= i_parm;
- }
- else if (g_ascii_strncasecmp("RIGHT", cmd, 5) == 0)
- {
- ptr = cmd + 5;
- while (g_ascii_isspace(*ptr)) ptr++;
- i_parm = atoi(ptr);
-
- if (i_parm <= 0) i_parm = 1;
- x += i_parm;
- }
- else if (g_ascii_strncasecmp("UP", cmd, 2) == 0)
- {
- ptr = cmd + 2;
- while (g_ascii_isspace(*ptr)) ptr++;
- i_parm = atoi(ptr);
-
- if (i_parm <= 0) i_parm = 1;
- y -= i_parm;
- }
- else if (g_ascii_strncasecmp("DOWN", cmd, 4) == 0)
- {
- ptr = cmd + 4;
- while (g_ascii_isspace(*ptr)) ptr++;
- i_parm = atoi(ptr);
-
- if (i_parm <= 0) i_parm = 1;
- y += i_parm;
- }
- else if (g_ascii_strcasecmp("PREV", cmd) == 0)
- {
- layout_image_prev(lw);
- }
- else if (g_ascii_strcasecmp("NEXT", cmd) == 0)
- {
- layout_image_next(lw);
- }
- else if (g_ascii_strncasecmp("ZOOM_IN", cmd, 7) == 0)
- {
- ptr = cmd + 7;
- while (g_ascii_isspace(*ptr)) ptr++;
- fl_parm = atoi(ptr) / 10.0;
-
- if (fl_parm <= 0.01) fl_parm = get_zoom_increment();
- layout_image_zoom_adjust(lw, fl_parm, FALSE);
- }
- else if (g_ascii_strncasecmp("ZOOM_OUT", cmd, 8) == 0)
- {
- ptr = cmd + 8;
- while (g_ascii_isspace(*ptr)) ptr++;
- fl_parm = atoi(ptr) / 10.0;
-
- if (fl_parm <= 0.01) fl_parm = get_zoom_increment();
- layout_image_zoom_adjust(lw, -fl_parm, FALSE);
- }
- else if (g_ascii_strcasecmp("ZOOM_MAX", cmd) == 0)
- {
- layout_image_zoom_set(lw, 0.0, FALSE);
- }
- else if (g_ascii_strcasecmp("FULL_SCREEN", cmd) == 0)
- {
- layout_image_full_screen_toggle(lw);
- }
- else if (g_ascii_strncasecmp("SET_ZOOM", cmd, 8) == 0)
- {
- ptr = cmd + 8;
- while (g_ascii_isspace(*ptr)) ptr++;
- i_parm = atoi(ptr);
-
- if (i_parm <= 0) i_parm = 1;
- layout_image_zoom_set(lw, 1.0, FALSE);
- }
- else if (g_ascii_strncasecmp("SET_INV_ZOOM", cmd, 12) == 0)
- {
- ptr = cmd + 12;
- while (g_ascii_isspace(*ptr)) ptr++;
- i_parm = atoi(ptr);
-
- if (i_parm <= 0) i_parm = 1;
- layout_image_zoom_set(lw, -i_parm, FALSE);
- }
- else if (g_ascii_strcasecmp("FIRST", cmd) == 0)
- {
- layout_image_first(lw);
- }
- else if (g_ascii_strcasecmp("LAST", cmd) == 0)
- {
- layout_image_last(lw);
- }
- else if (g_ascii_strcasecmp("PAUSE", cmd) == 0)
- {
- layout_image_slideshow_pause_toggle(lw);
- }
- else if (g_ascii_strcasecmp("ROTATE_90", cmd) == 0)
- {
- layout_image_alter_orientation(lw, ALTER_ROTATE_90);
- }
- else if (g_ascii_strcasecmp("ROTATE_90_CC", cmd) == 0)
- {
- layout_image_alter_orientation(lw, ALTER_ROTATE_90_CC);
- }
- else if (g_ascii_strcasecmp("INFO", cmd) == 0)
- {
- layout_image_overlay_toggle(lw);
- }
- else if (g_ascii_strcasecmp("EXIT", cmd) == 0)
- {
- exit_program();
- }
- }
- free(code);
- if (ret == -1) break;
- }
- if (x != 0 || y != 0)
- {
- layout_image_scroll(lw, x, y, FALSE);
- }
-
- if (ret == -1)
- {
- /* something went badly wrong */
- g_fprintf(stderr, _("disconnected from LIRC\n"));
- lirc_cleanup();
- return (gboolean)FALSE;
- }
- return (gboolean)TRUE;
-}
-
-void layout_image_lirc_init(LayoutWindow *lw)
-{
- gint flags;
- gboolean lirc_verbose = (get_debug_level() >= 2);
-
- lirc_fd = lirc_init(GQ_APPNAME_LC, lirc_verbose);
- if (lirc_fd == -1)
- {
- DEBUG_1("Initializing LIRC... failed");
- return;
- }
-
- DEBUG_1("Initializing LIRC... OK");
- if (lirc_readconfig(NULL, &config, NULL) == -1)
- {
- lirc_deinit();
-
- g_fprintf(stderr,
- _("could not read LIRC config file\n"
- "please read the documentation of LIRC to \n"
- "know how to create a proper config file\n"));
- fflush(stderr);
-
- DEBUG_1("Failed to read LIRC config file");
- return;
- }
- if (lirc_verbose) fflush(stderr);
-
- gio_chan = g_io_channel_unix_new(lirc_fd);
- input_tag = g_io_add_watch(gio_chan, G_IO_IN,
- lirc_input_callback, lw);
- fcntl(lirc_fd, F_SETOWN, getpid());
- flags = fcntl(lirc_fd, F_GETFL, 0);
- if (flags != -1) fcntl(lirc_fd, F_SETFL, flags|O_NONBLOCK);
-}
-
-#endif /* HAVE_LIRC */
-/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
+++ /dev/null
-/*
- * Copyright (C) 2008 - 2016 The Geeqie Team
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * 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.
- */
-
-#ifndef LIRC_H
-#define LIRC_H
-
-#include "main.h"
-
-#ifdef HAVE_LIRC
-void layout_image_lirc_init(LayoutWindow *lw);
-#endif
-
-#endif
-/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
GtkWidget *window;
GtkWidget *scrolledwin;
GtkWidget *text;
-
-#if !GTK_CHECK_VERSION(3,0,0)
- GdkColor colors[LOG_COUNT];
-#else
GtkTextTag *color_tags[LOG_COUNT];
-#endif
-
gint lines;
GtkWidget *regexp_box;
GtkWidget *bar;
gboolean highlight_all;
};
-#if !GTK_CHECK_VERSION(3,0,0)
-typedef struct _LogDef LogDef;
-struct _LogDef
-{
- LogType type;
- const gchar *tag;
- const gchar *color;
-};
-
-/* Keep LogType order !! */
-static LogDef logdefs[LOG_COUNT] = {
- { LOG_NORMAL, "normal", "black" },
- { LOG_MSG, "message", "blue" },
- { LOG_WARN, "warning", "orange" },
- { LOG_ERROR, "error", "red" },
-};
-#endif
-
typedef enum {
LOGWINDOW_SEARCH_BACKWARDS,
LOGWINDOW_SEARCH_FORWARDS
static LogWindow *logwindow = NULL;
-static void hide_cb(GtkWidget *widget, LogWindow *logwin)
+static void hide_cb(GtkWidget *UNUSED(widget), LogWindow *UNUSED(logwin))
{
}
-static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
+static gboolean key_pressed(GtkWidget *UNUSED(widget), GdkEventKey *event,
LogWindow *logwin)
{
if (event && event->keyval == GDK_KEY_Escape)
}
-static void log_window_pause_cb(GtkWidget *widget, gpointer data)
+static void log_window_pause_cb(GtkWidget *UNUSED(widget), gpointer UNUSED(data))
{
options->log_window.paused = !options->log_window.paused;
}
-static void log_window_line_wrap_cb(GtkWidget *widget, gpointer data)
+static void log_window_line_wrap_cb(GtkWidget *UNUSED(widget), gpointer data)
{
LogWindow *logwin = data;
}
}
-static void log_window_timer_data_cb(GtkWidget *widget, gpointer data)
+static void log_window_timer_data_cb(GtkWidget *UNUSED(widget), gpointer UNUSED(data))
{
options->log_window.timer_data = !options->log_window.timer_data;
}
-static void log_window_regexp_cb(GtkWidget *text_entry, gpointer data)
+static void log_window_regexp_cb(GtkWidget *text_entry, gpointer UNUSED(data))
{
gchar *new_regexp;
}
}
-static void search_activate_event(GtkEntry *widget, LogWindow *logwin)
+static void search_activate_event(GtkEntry *UNUSED(widget), LogWindow *logwin)
{
GtkTextIter start_find;
GtkTextIter start_match;
}
}
-static gboolean search_keypress_event(GtkWidget *widget, GdkEventKey *event, LogWindow *logwin, LogWindowSearchDirection direction)
+static gboolean search_keypress_event(GtkWidget *UNUSED(widget), GdkEventKey *UNUSED(event), LogWindow *logwin, LogWindowSearchDirection direction)
{
GtkTextIter start_find;
GtkTextIter start_match;
return FALSE;
}
-static gboolean debug_changed_cb(GtkSpinButton *widget, LogWindow *logwin)
+static gboolean debug_changed_cb(GtkSpinButton *widget, LogWindow *UNUSED(logwin))
{
set_debug_level((gtk_spin_button_get_value(widget)));
return FALSE;
}
-static void search_entry_icon_cb(GtkEntry *entry, GtkEntryIconPosition pos, GdkEvent *event, gpointer userdata)
+static void search_entry_icon_cb(GtkEntry *UNUSED(entry), GtkEntryIconPosition pos, GdkEvent *UNUSED(event), gpointer userdata)
{
LogWindow *logwin = userdata;
GtkTextIter start_find;
}
}
-static void filter_entry_icon_cb(GtkEntry *entry, GtkEntryIconPosition pos, GdkEvent *event, gpointer userdata)
+static void filter_entry_icon_cb(GtkEntry *entry, GtkEntryIconPosition UNUSED(pos), GdkEvent *UNUSED(event), gpointer UNUSED(userdata))
{
gtk_entry_set_text(entry, "");
set_regexp("");
window = window_new(GTK_WINDOW_TOPLEVEL, "log", NULL, NULL, _("Log"));
DEBUG_NAME(window);
- win_vbox = gtk_vbox_new(FALSE, PREF_PAD_SPACE);
+ win_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_SPACE);
gtk_container_add(GTK_CONTAINER(window), win_vbox);
gtk_widget_show(win_vbox);
g_signal_connect(logwin->timer_data, "toggled", G_CALLBACK(log_window_timer_data_cb), logwin);
gtk_widget_show_all(logwin->timer_data);
- search_box = gtk_hbox_new(FALSE, 0);
+ search_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_container_add(GTK_CONTAINER(hbox), search_box);
gtk_widget_show(search_box);
static void log_window_init(LogWindow *logwin)
{
GtkTextBuffer *buffer;
-#if !GTK_CHECK_VERSION(3,0,0)
- GdkColormap *colormap;
- gboolean success[LOG_COUNT];
- gint i;
- g_assert(logwin != NULL);
- g_assert(logwin->colors != NULL);
- for (i = LOG_NORMAL; i < LOG_COUNT; i++)
- {
- gboolean ok = gdk_color_parse(logdefs[i].color, &logwin->colors[i]);
- if (ok == TRUE) continue;
-
- if (i == LOG_NORMAL) return;
- memcpy(&logwin->colors[i], &logwin->colors[LOG_NORMAL], sizeof(GdkColor));
- }
-
- colormap = gdk_drawable_get_colormap(gtk_widget_get_window(logwin->window));
- gdk_colormap_alloc_colors(colormap, logwin->colors, LOG_COUNT, FALSE, TRUE, success);
-
- for (i = LOG_NORMAL; i < LOG_COUNT; i++)
- {
- if (success[i] == FALSE)
- {
- GtkStyle *style;
- gint j;
-
- g_warning("LogWindow: color allocation failed\n");
- style = gtk_widget_get_style(logwin->window);
- for (j = LOG_NORMAL; j < LOG_COUNT; j++)
- logwin->colors[j] = style->black;
- break;
- }
- }
-
- buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(logwin->text));
- for (i = LOG_NORMAL; i < LOG_COUNT; i++)
- gtk_text_buffer_create_tag(buffer, logdefs[i].tag,
- "foreground-gdk", &logwin->colors[i],
- "family", "MonoSpace",
- NULL);
-#else
g_assert(logwin != NULL);
buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(logwin->text));
logwin->color_tags[LOG_ERROR] = gtk_text_buffer_create_tag (buffer,
"red_foreground", "foreground", "red",
"family", "MonoSpace", NULL);
-#endif
}
static void log_window_show(LogWindow *logwin)
LogType type;
};
-#if !GTK_CHECK_VERSION(3,0,0)
-static void log_window_insert_text(GtkTextBuffer *buffer, GtkTextIter *iter,
- const gchar *text, const gchar *tag)
-{
- gchar *str_utf8;
-
- if (!text || !*text) return;
-
- str_utf8 = utf8_validate_or_convert(text);
- gtk_text_buffer_insert_with_tags_by_name(buffer, iter, str_utf8, -1, tag, NULL);
- g_free(str_utf8);
-}
-#else
static void log_window_insert_text(GtkTextBuffer *buffer, GtkTextIter *iter,
const gchar *text, GtkTextTag *tag)
{
gtk_text_buffer_insert_with_tags(buffer, iter, str_utf8, -1, tag, NULL);
g_free(str_utf8);
}
-#endif
void log_window_append(const gchar *str, LogType type)
{
GList *prev;
LogMsg *oldest_msg = work->data;
-#if !GTK_CHECK_VERSION(3,0,0)
- log_window_insert_text(buffer, &iter, oldest_msg->text, logdefs[oldest_msg->type].tag);
-#else
log_window_insert_text(buffer, &iter, oldest_msg->text,
logwindow->color_tags[oldest_msg->type]);
-#endif
prev = work->prev;
memory = g_list_delete_link(memory, work);
}
}
-#if !GTK_CHECK_VERSION(3,0,0)
- log_window_insert_text(buffer, &iter, str, logdefs[type].tag);
-#else
log_window_insert_text(buffer, &iter, str, logwindow->color_tags[type]);
-#endif
if (!options->log_window.paused)
{
}
}
-static void parse_command_line_add_dir(const gchar *dir, gchar **path, gchar **file,
- GList **list)
+static void parse_command_line_add_dir(const gchar *dir, gchar **UNUSED(path), gchar **UNUSED(file),
+ GList **UNUSED(list))
{
#if 0
/* This is broken because file filter is not initialized yet.
static GenericDialog *exit_dialog = NULL;
-static void exit_confirm_cancel_cb(GenericDialog *gd, gpointer data)
+static void exit_confirm_cancel_cb(GenericDialog *gd, gpointer UNUSED(data))
{
exit_dialog = NULL;
generic_dialog_close(gd);
}
-static void exit_confirm_exit_cb(GenericDialog *gd, gpointer data)
+static void exit_confirm_exit_cb(GenericDialog *gd, gpointer UNUSED(data))
{
exit_dialog = NULL;
generic_dialog_close(gd);
return TRUE;
}
-static void exit_program_write_metadata_cb(gint success, const gchar *dest_path, gpointer data)
+static void exit_program_write_metadata_cb(gint success, const gchar *UNUSED(dest_path), gpointer UNUSED(data))
{
if (success) exit_program();
}
/** @FIXME this probably needs some better ifdefs. Please report any compilation problems */
#if defined(SIGBUS) && defined(SA_SIGINFO)
-static void sigbus_handler_cb(int signum, siginfo_t *info, void *context)
+static void sigbus_handler_cb(int UNUSED(signum), siginfo_t *info, void *UNUSED(context))
{
unsigned long pagesize = sysconf(_SC_PAGE_SIZE);
DEBUG_1("SIGBUS %p", info->si_addr);
static void set_theme_bg_color()
{
-#if GTK_CHECK_VERSION(3,0,0)
GdkRGBA bg_color;
GdkColor theme_color;
GtkStyleContext *style_context;
}
view_window_colors_update();
-#endif
}
-static gboolean theme_change_cb(GObject *gobject, GParamSpec *pspec, gpointer data)
+static gboolean theme_change_cb(GObject *UNUSED(gobject), GParamSpec *UNUSED(pspec), gpointer UNUSED(data))
{
set_theme_bg_color();
* They are now variables, all defined relative to one level above the
* directory that the executable is run from.
*/
-static void create_application_paths(gchar *argv[])
+static void create_application_paths()
{
gchar *dirname;
- gchar *tmp;
gint length;
gchar *path;
g_free(path);
}
-gboolean stderr_channel_cb(GIOChannel *source, GIOCondition condition, gpointer data)
+gboolean stderr_channel_cb(GIOChannel *source, GIOCondition UNUSED(condition), gpointer UNUSED(data))
{
static GString *message_str = NULL;
gchar buf[10] = {0};
gint fd_stderr[2];
GIOChannel *stderr_channel;
-#if GTK_CHECK_VERSION(3,10,0)
gdk_set_allowed_backends("x11,*");
-#endif
#ifdef HAVE_GTHREAD
-#if !GLIB_CHECK_VERSION(2,32,0)
- g_thread_init(NULL);
-#endif
gdk_threads_init();
gdk_threads_enter();
-
#endif
/* init execution time counter (debug only) */
init_exec_time();
- create_application_paths(argv);
+ create_application_paths();
/* setup locale, i18n */
setlocale(LC_ALL, "");
#define STAR_RATING_REJECTED 0x274C //Unicode Character 'Cross Mark'
#define STAR_RATING_STAR 0x2738 //Unicode Character 'Heavy Eight Pointed Rectilinear Black Star'
+/* From http://stackoverflow.com/questions/3417837/ */
+#ifdef UNUSED
+#elif defined(__GNUC__)
+# define UNUSED(x) UNUSED_ ## x __attribute__((unused))
+#elif defined(__LCLINT__)
+# define UNUSED(x) /*@unused@*/ x
+#else
+# define UNUSED(x) x
+#endif
+
/*
*----------------------------------------------------------------------------
* main.c
* edit menu
*-----------------------------------------------------------------------------
*/
-static void edit_item_destroy_cb(GtkWidget *widget, gpointer data)
+static void edit_item_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
{
g_free(data);
}
}
GtkWidget *submenu_add_zoom(GtkWidget *menu, GCallback func, gpointer data,
- gboolean include_none, gboolean include_path,
+ gboolean UNUSED(include_none), gboolean UNUSED(include_path),
gboolean show_current, ZoomMode mode)
{
GtkWidget *submenu;
* Used by all image windows
*/
static void add_collection_list(GtkWidget *menu, GCallback func,
- GList *collection_list, gpointer data)
+ GList *collection_list, gpointer UNUSED(data))
{
GList *work;
gint index = 0; /* index to existing collection list menu item selected */
'layout_image.h',
'layout_util.c',
'layout_util.h',
-'lirc.c',
-'lirc.h',
'logwindow.c',
'logwindow.h',
'lua.c',
'rcfile.h',
'remote.c',
'remote.h',
-'renderer-clutter.c',
-'renderer-clutter.h',
'renderer-tiles.c',
'renderer-tiles.h',
'search_and_run.c',
libopenjp2_dep,
libraw_dep,
libwebp_dep,
-lirc_dep,
lua_dep,
poppler_glib_dep,
thread_dep,
return ret;
}
-void metadata_notify_cb(FileData *fd, NotifyType type, gpointer data)
+void metadata_notify_cb(FileData *fd, NotifyType type, gpointer UNUSED(data))
{
if (type & (NOTIFY_REREAD | NOTIFY_CHANGE))
{
return (metadata_write_queue != NULL);
}
-static gboolean metadata_write_queue_idle_cb(gpointer data)
+static gboolean metadata_write_queue_idle_cb(gpointer UNUSED(data))
{
metadata_write_queue_confirm(FALSE, NULL, NULL);
metadata_write_idle_id = 0;
*/
-gboolean meta_data_get_keyword_mark(FileData *fd, gint n, gpointer data)
+gboolean meta_data_get_keyword_mark(FileData *fd, gint UNUSED(n), gpointer data)
{
/** @FIXME do not use global keyword_tree */
GList *path = data;
return found;
}
-gboolean meta_data_set_keyword_mark(FileData *fd, gint n, gboolean value, gpointer data)
+gboolean meta_data_set_keyword_mark(FileData *fd, gint UNUSED(n), gboolean value, gpointer data)
{
GList *path = data;
GList *keywords = NULL;
return !!g_list_find(list, id);
}
-static gboolean keyword_show_all_in_cb(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
+static gboolean keyword_show_all_in_cb(GtkTreeModel *model, GtkTreePath *UNUSED(path), GtkTreeIter *iter, gpointer data)
{
keyword_show_in(GTK_TREE_STORE(model), iter, data);
return FALSE;
gtk_tree_model_foreach(GTK_TREE_MODEL(keyword_tree), keyword_show_all_in_cb, id);
}
-static gboolean keyword_revert_hidden_in_cb(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
+static gboolean keyword_revert_hidden_in_cb(GtkTreeModel *model, GtkTreePath *UNUSED(path), GtkTreeIter *iter, gpointer data)
{
if (keyword_is_hidden_in(GTK_TREE_MODEL(keyword_tree), iter, data))
{
keyword_hide_unset_in_recursive(keyword_tree, &iter, id, keywords);
}
-static gboolean keyword_show_set_in_cb(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter_ptr, gpointer data)
+static gboolean keyword_show_set_in_cb(GtkTreeModel *model, GtkTreePath *UNUSED(path), GtkTreeIter *iter_ptr, gpointer data)
{
GtkTreeIter iter = *iter_ptr;
GList *keywords = data;
return sysconf(_SC_NPROCESSORS_ONLN);
}
-void tree_path_free_wrapper(void *data, void *useradata)
+void tree_path_free_wrapper(void *data, void *UNUSED(useradata))
{
gtk_tree_path_free(data);
}
g_free(rc_path);
}
-gboolean load_options(ConfOptions *options)
+gboolean load_options(ConfOptions *UNUSED(options))
{
gboolean success;
gchar *rc_path;
/* Stereo */
struct {
- gint mode;;
+ gint mode;
gint fsmode;
gboolean enable_fsmode;
gint fixed_w, fixed_h;
gtk_widget_grab_focus(GTK_WIDGET(image_overlay_template_view));
}
-static void osd_dnd_get_cb(GtkWidget *btn, GdkDragContext *context,
- GtkSelectionData *selection_data, guint info,
- guint time, gpointer data)
+static void osd_dnd_get_cb(GtkWidget *btn, GdkDragContext *UNUSED(context),
+ GtkSelectionData *selection_data, guint UNUSED(info),
+ guint UNUSED(time), gpointer data)
{
TagData *td;
GtkTextView *image_overlay_template_view = data;
gtk_widget_grab_focus(GTK_WIDGET(image_overlay_template_view));
}
-static void osd_btn_destroy_cb(GtkWidget *btn, GdkDragContext *context,
- GtkSelectionData *selection_data, guint info,
- guint time, gpointer data)
+static void osd_btn_destroy_cb(GtkWidget *btn, GdkDragContext *UNUSED(context),
+ GtkSelectionData *UNUSED(selection_data), guint UNUSED(info),
+ guint UNUSED(time), gpointer UNUSED(data))
{
TagData *td;
pi->data = shadow;
}
-gint pan_item_box_draw(PanWindow *pw, PanItem *pi, GdkPixbuf *pixbuf, PixbufRenderer *pr,
+gint pan_item_box_draw(PanWindow *UNUSED(pw), PanItem *pi, GdkPixbuf *pixbuf, PixbufRenderer *UNUSED(pr),
gint x, gint y, gint width, gint height)
{
gint bw, bh;
*-----------------------------------------------------------------------------
*/
-PanItem *pan_item_tri_new(PanWindow *pw, FileData *fd, gint x, gint y, gint width, gint height,
+PanItem *pan_item_tri_new(PanWindow *pw, FileData *UNUSED(fd), gint x, gint y, gint width, gint height,
gint x1, gint y1, gint x2, gint y2, gint x3, gint y3,
guint8 r, guint8 g, guint8 b, guint8 a)
{
pi->color2_a = a;
}
-gint pan_item_tri_draw(PanWindow *pw, PanItem *pi, GdkPixbuf *pixbuf, PixbufRenderer *pr,
+gint pan_item_tri_draw(PanWindow *UNUSED(pw), PanItem *pi, GdkPixbuf *pixbuf, PixbufRenderer *UNUSED(pr),
gint x, gint y, gint width, gint height)
{
gint rx, ry, rw, rh;
return pi;
}
-gint pan_item_text_draw(PanWindow *pw, PanItem *pi, GdkPixbuf *pixbuf, PixbufRenderer *pr,
- gint x, gint y, gint width, gint height)
+gint pan_item_text_draw(PanWindow *UNUSED(pw), PanItem *pi, GdkPixbuf *pixbuf, PixbufRenderer *pr,
+ gint x, gint y, gint UNUSED(width), gint UNUSED(height))
{
PangoLayout *layout;
return pi;
}
-gint pan_item_thumb_draw(PanWindow *pw, PanItem *pi, GdkPixbuf *pixbuf, PixbufRenderer *pr,
+gint pan_item_thumb_draw(PanWindow *pw, PanItem *pi, GdkPixbuf *pixbuf, PixbufRenderer *UNUSED(pr),
gint x, gint y, gint width, gint height)
{
gint tx, ty, tw, th;
return pi;
}
-gint pan_item_image_draw(PanWindow *pw, PanItem *pi, GdkPixbuf *pixbuf, PixbufRenderer *pr,
+gint pan_item_image_draw(PanWindow *UNUSED(pw), PanItem *pi, GdkPixbuf *pixbuf, PixbufRenderer *UNUSED(pr),
gint x, gint y, gint width, gint height)
{
gint rx, ry, rw, rh;
}
}
-void pan_filter_toggle_button_cb(GtkWidget *button, gpointer data)
+void pan_filter_toggle_button_cb(GtkWidget *UNUSED(button), gpointer data)
{
PanWindow *pw = data;
PanViewFilterUi *ui = pw->filter_ui;
GtkWidget *hbox;
// Build the actual search UI.
- ui->search_box = gtk_hbox_new(FALSE, PREF_PAD_SPACE);
+ ui->search_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
pref_spacer(ui->search_box, 0);
pref_label_new(ui->search_box, _("Find:"));
- hbox = gtk_hbox_new(TRUE, PREF_PAD_SPACE);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
gtk_box_pack_start(GTK_BOX(ui->search_box), hbox, TRUE, TRUE, 0);
gtk_widget_show(hbox);
ui->search_button = gtk_toggle_button_new();
gtk_button_set_relief(GTK_BUTTON(ui->search_button), GTK_RELIEF_NONE);
gtk_button_set_focus_on_click(GTK_BUTTON(ui->search_button), FALSE);
- hbox = gtk_hbox_new(FALSE, PREF_PAD_GAP);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP);
gtk_container_add(GTK_CONTAINER(ui->search_button), hbox);
gtk_widget_show(hbox);
ui->search_button_arrow = gtk_arrow_new(GTK_ARROW_UP, GTK_SHADOW_NONE);
#include "pan-view.h"
+#include "main.h"
#include "bar_exif.h"
#include "dnd.h"
#include "editors.h"
return TRUE;
}
-static void pan_window_dispose_tile_cb(PixbufRenderer *pr, gint x, gint y,
- gint width, gint height, GdkPixbuf *pixbuf, gpointer data)
+static void pan_window_dispose_tile_cb(PixbufRenderer *UNUSED(pr), gint x, gint y,
+ gint width, gint height, GdkPixbuf *UNUSED(pixbuf), gpointer data)
{
PanWindow *pw = data;
GList *list;
pw->cache_total = g_list_length(pw->cache_todo);
}
-static void pan_cache_step_done_cb(CacheLoader *cl, gint error, gpointer data)
+static void pan_cache_step_done_cb(CacheLoader *cl, gint UNUSED(error), gpointer data)
{
PanWindow *pw = data;
return NULL;
}
-static void pan_window_menu_pos_cb(GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer data)
+static void pan_window_menu_pos_cb(GtkMenu *menu, gint *x, gint *y, gboolean *UNUSED(push_in), gpointer data)
{
PanWindow *pw = data;
popup_menu_position_clamp(menu, x, y, 0);
}
-static gboolean pan_window_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
+static gboolean pan_window_key_press_cb(GtkWidget *UNUSED(widget), GdkEventKey *event, gpointer data)
{
PanWindow *pw = data;
PixbufRenderer *pr;
}
}
-static void scroll_cb(PixbufRenderer *pr, GdkEventScroll *event, gpointer data)
+static void scroll_cb(PixbufRenderer *pr, GdkEventScroll *event, gpointer UNUSED(data))
{
gint w, h;
G_CALLBACK(scroll_cb), pw);
}
-static void pan_fullscreen_stop_func(FullScreenData *fs, gpointer data)
+static void pan_fullscreen_stop_func(FullScreenData *UNUSED(fs), gpointer data)
{
PanWindow *pw = data;
}
}
-static void pan_window_image_zoom_cb(PixbufRenderer *pr, gdouble zoom, gpointer data)
+static void pan_window_image_zoom_cb(PixbufRenderer *UNUSED(pr), gdouble UNUSED(zoom), gpointer data)
{
PanWindow *pw = data;
gchar *text;
g_free(pw);
}
-static gboolean pan_window_delete_cb(GtkWidget *w, GdkEventAny *event, gpointer data)
+static gboolean pan_window_delete_cb(GtkWidget *UNUSED(w), GdkEventAny *UNUSED(event), gpointer data)
{
PanWindow *pw = data;
file_data_unref(dir_fd);
}
-static void pan_warning_hide_cb(GtkWidget *button, gpointer data)
+static void pan_warning_hide_cb(GtkWidget *button, gpointer UNUSED(data))
{
gboolean hide_dlg;
#define INFO_IMAGE_SIZE_KEY "image_size_data"
-static void pan_new_window_cb(GtkWidget *widget, gpointer data)
+static void pan_new_window_cb(GtkWidget *UNUSED(widget), gpointer data)
{
PanWindow *pw = data;
FileData *fd;
}
}
-static void pan_go_to_original_cb(GtkWidget *widget, gpointer data)
+static void pan_go_to_original_cb(GtkWidget *UNUSED(widget), gpointer data)
{
LayoutWindow *lw = NULL;
PanWindow *pw = data;
}
}
-static void pan_zoom_in_cb(GtkWidget *widget, gpointer data)
+static void pan_zoom_in_cb(GtkWidget *UNUSED(widget), gpointer data)
{
PanWindow *pw = data;
image_zoom_adjust(pw->imd, ZOOM_INCREMENT);
}
-static void pan_zoom_out_cb(GtkWidget *widget, gpointer data)
+static void pan_zoom_out_cb(GtkWidget *UNUSED(widget), gpointer data)
{
PanWindow *pw = data;
image_zoom_adjust(pw->imd, -ZOOM_INCREMENT);
}
-static void pan_zoom_1_1_cb(GtkWidget *widget, gpointer data)
+static void pan_zoom_1_1_cb(GtkWidget *UNUSED(widget), gpointer data)
{
PanWindow *pw = data;
image_zoom_set(pw->imd, 1.0);
}
-static void pan_copy_cb(GtkWidget *widget, gpointer data)
+static void pan_copy_cb(GtkWidget *UNUSED(widget), gpointer data)
{
PanWindow *pw = data;
FileData *fd;
if (fd) file_util_copy(fd, NULL, NULL, pw->imd->widget);
}
-static void pan_move_cb(GtkWidget *widget, gpointer data)
+static void pan_move_cb(GtkWidget *UNUSED(widget), gpointer data)
{
PanWindow *pw = data;
FileData *fd;
if (fd) file_util_move(fd, NULL, NULL, pw->imd->widget);
}
-static void pan_rename_cb(GtkWidget *widget, gpointer data)
+static void pan_rename_cb(GtkWidget *UNUSED(widget), gpointer data)
{
PanWindow *pw = data;
FileData *fd;
if (fd) file_util_rename(fd, NULL, pw->imd->widget);
}
-static void pan_delete_cb(GtkWidget *widget, gpointer data)
+static void pan_delete_cb(GtkWidget *UNUSED(widget), gpointer data)
{
PanWindow *pw = data;
FileData *fd;
}
}
-static void pan_move_to_trash_cb(GtkWidget *widget, gpointer data)
+static void pan_move_to_trash_cb(GtkWidget *UNUSED(widget), gpointer data)
{
PanWindow *pw = data;
FileData *fd;
}
}
-static void pan_copy_path_cb(GtkWidget *widget, gpointer data)
+static void pan_copy_path_cb(GtkWidget *UNUSED(widget), gpointer data)
{
PanWindow *pw = data;
FileData *fd;
if (fd) file_util_copy_path_to_clipboard(fd, TRUE);
}
-static void pan_copy_path_unquoted_cb(GtkWidget *widget, gpointer data)
+static void pan_copy_path_unquoted_cb(GtkWidget *UNUSED(widget), gpointer data)
{
PanWindow *pw = data;
FileData *fd;
/** @FIXME sync info now */
}
-static void pan_fullscreen_cb(GtkWidget *widget, gpointer data)
+static void pan_fullscreen_cb(GtkWidget *UNUSED(widget), gpointer data)
{
PanWindow *pw = data;
pan_fullscreen_toggle(pw, FALSE);
}
-static void pan_close_cb(GtkWidget *widget, gpointer data)
+static void pan_close_cb(GtkWidget *UNUSED(widget), gpointer data)
{
PanWindow *pw = data;
pan_window_close(pw);
}
-static void pan_popup_menu_destroy_cb(GtkWidget *widget, gpointer data)
+static void pan_popup_menu_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
{
GList *editmenu_fd_list = data;
filelist_free(editmenu_fd_list);
}
-static void pan_play_cb(GtkWidget *widget, gpointer data)
+static void pan_play_cb(GtkWidget *UNUSED(widget), gpointer data)
{
PanWindow *pw = data;
*-----------------------------------------------------------------------------
*/
-static void pan_window_get_dnd_data(GtkWidget *widget, GdkDragContext *context,
- gint x, gint y,
+static void pan_window_get_dnd_data(GtkWidget *UNUSED(widget), GdkDragContext *context,
+ gint UNUSED(x), gint UNUSED(y),
GtkSelectionData *selection_data, guint info,
- guint time, gpointer data)
+ guint UNUSED(time), gpointer data)
{
PanWindow *pw = data;
}
}
-static void pan_window_set_dnd_data(GtkWidget *widget, GdkDragContext *context,
- GtkSelectionData *selection_data, guint info,
- guint time, gpointer data)
+static void pan_window_set_dnd_data(GtkWidget *UNUSED(widget), GdkDragContext *UNUSED(context),
+ GtkSelectionData *selection_data, guint UNUSED(info),
+ guint UNUSED(time), gpointer data)
{
PanWindow *pw = data;
FileData *fd;
#include "main.h"
#include "pixbuf-renderer.h"
#include "renderer-tiles.h"
-#include "renderer-clutter.h"
#include "intl.h"
#include "layout.h"
*-------------------------------------------------------------------
*/
-static void pixbuf_renderer_class_init_wrapper(void *g_class, void *class_data)
+static void pixbuf_renderer_class_init_wrapper(void *g_class, void *UNUSED(class_data))
{
pixbuf_renderer_class_init(g_class);
}
-static void pixbuf_renderer_init_wrapper(PixbufRenderer *pr, void *class_data)
+static void pixbuf_renderer_init_wrapper(PixbufRenderer *pr, void *UNUSED(class_data))
{
pixbuf_renderer_init(pr);
}
static RendererFuncs *pr_backend_renderer_new(PixbufRenderer *pr)
{
- if (options->image.use_clutter_renderer && !options->disable_gpu)
- {
-#ifdef HAVE_CLUTTER
- return renderer_clutter_new(pr);
-#else
- log_printf("Warning: Geeqie is built without clutter renderer support");
-#endif
- }
+ //~ if (options->image.use_clutter_renderer && !options->disable_gpu)
+ //~ {
+//~ #ifdef HAVE_CLUTTER
+ //~ return renderer_clutter_new(pr);
+//~ #else
+ //~ log_printf("Warning: Geeqie is built without clutter renderer support");
+//~ #endif
+ //~ }
return renderer_tiles_new(pr);
}
gdk_window_set_cursor(gtk_widget_get_window(widget), cursor);
- if (cursor) gdk_cursor_unref(cursor);
+ if (cursor) g_object_unref(G_OBJECT(cursor));
}
gboolean pr_clip_region(gint x, gint y, gint w, gint h,
static void pr_update_signal(PixbufRenderer *pr)
{
- DEBUG_1("%s pixbuf renderer updated - started drawing %p, img: %dx%d", get_exec_time(), pr, pr->image_width, pr->image_height);
+ DEBUG_1("%s pixbuf renderer updated - started drawing %p, img: %dx%d", get_exec_time(), (void *)pr, pr->image_width, pr->image_height);
pr->debug_updated = TRUE;
}
}
if (pr->debug_updated)
{
- DEBUG_1("%s pixbuf renderer done %p", get_exec_time(), pr);
+ DEBUG_1("%s pixbuf renderer done %p", get_exec_time(), (void *)pr);
pr->debug_updated = FALSE;
}
}
pr_update_signal(pr);
}
-static void pr_size_cb(GtkWidget *widget, GtkAllocation *allocation, gpointer data)
+static void pr_size_cb(GtkWidget *UNUSED(widget), GtkAllocation *allocation, gpointer data)
{
PixbufRenderer *pr = data;
*-------------------------------------------------------------------
*/
-static gboolean pr_mouse_motion_cb(GtkWidget *widget, GdkEventMotion *event, gpointer data)
+static gboolean pr_mouse_motion_cb(GtkWidget *widget, GdkEventMotion *event, gpointer UNUSED(data))
{
PixbufRenderer *pr;
gint accel;
-#if GTK_CHECK_VERSION(3,0,0)
GdkDeviceManager *device_manager;
GdkDevice *device;
-#endif
/* This is a hack, but work far the best, at least for single pointer systems.
* See https://bugzilla.gnome.org/show_bug.cgi?id=587714 for more. */
gint x, y;
-#if GTK_CHECK_VERSION(3,0,0)
device_manager = gdk_display_get_device_manager(gdk_window_get_display(event->window));
device = gdk_device_manager_get_client_pointer(device_manager);
gdk_window_get_device_position(event->window, device, &x, &y, NULL);
-#else
- gdk_window_get_pointer (event->window, &x, &y, NULL);
-#endif
+
event->x = x;
event->y = y;
return FALSE;
}
-static gboolean pr_leave_notify_cb(GtkWidget *widget, GdkEventCrossing *cevent, gpointer data)
+static gboolean pr_leave_notify_cb(GtkWidget *widget, GdkEventCrossing *UNUSED(cevent), gpointer UNUSED(data))
{
PixbufRenderer *pr;
return FALSE;
}
-static gboolean pr_mouse_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+static gboolean pr_mouse_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer UNUSED(data))
{
PixbufRenderer *pr;
GtkWidget *parent;
return FALSE;
}
-static gboolean pr_mouse_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+static gboolean pr_mouse_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer UNUSED(data))
{
PixbufRenderer *pr;
return FALSE;
}
-static gboolean pr_mouse_leave_cb(GtkWidget *widget, GdkEventCrossing *event, gpointer data)
+static gboolean pr_mouse_leave_cb(GtkWidget *widget, GdkEventCrossing *UNUSED(event), gpointer UNUSED(data))
{
PixbufRenderer *pr;
return FALSE;
}
-static void pr_mouse_drag_cb(GtkWidget *widget, GdkDragContext *context, gpointer data)
+static void pr_mouse_drag_cb(GtkWidget *widget, GdkDragContext *UNUSED(context), gpointer UNUSED(data))
{
PixbufRenderer *pr;
return TRUE;
}
-void pixbuf_renderer_set_size_early(PixbufRenderer *pr, guint width, guint height)
+void pixbuf_renderer_set_size_early(PixbufRenderer *UNUSED(pr), guint UNUSED(width), guint UNUSED(height))
{
#if 0
/** @FIXME this function does not consider the image orientation,
}
}
-void pixbuf_draw_layout(GdkPixbuf *pixbuf, PangoLayout *layout, GtkWidget *widget,
+void pixbuf_draw_layout(GdkPixbuf *pixbuf, PangoLayout *layout, GtkWidget *UNUSED(widget),
gint x, gint y,
guint8 r, guint8 g, guint8 b, guint8 a)
{
static void pixbuf_draw_fade_radius(guchar *p_pix, gint prs, gboolean has_alpha,
gint sx, gint sy, gint border,
gint x1, gint y1, gint x2, gint y2,
- guint8 r, guint8 g, guint8 b, guint8 a)
+ guint8 UNUSED(r), guint8 g, guint8 b, guint8 a)
{
guchar *pp;
gint p_step;
*-----------------------------------------------------------------------------
*/
-static void zoom_increment_cb(GtkWidget *spin, gpointer data)
+static void zoom_increment_cb(GtkWidget *spin, gpointer UNUSED(data))
{
c_options->image.zoom_increment = (gint)(gtk_spin_button_get_value(GTK_SPIN_BUTTON(spin)) * 100.0 + 0.01);
}
-static void slideshow_delay_hours_cb(GtkWidget *spin, gpointer data)
+static void slideshow_delay_hours_cb(GtkWidget *spin, gpointer UNUSED(data))
{
gint mins_secs_tenths, delay;
SLIDESHOW_SUBSECOND_PRECISION;
}
-static void slideshow_delay_minutes_cb(GtkWidget *spin, gpointer data)
+static void slideshow_delay_minutes_cb(GtkWidget *spin, gpointer UNUSED(data))
{
gint hours, secs_tenths, delay;
SLIDESHOW_SUBSECOND_PRECISION;
}
-static void slideshow_delay_seconds_cb(GtkWidget *spin, gpointer data)
+static void slideshow_delay_seconds_cb(GtkWidget *spin, gpointer UNUSED(data))
{
gint hours_mins, delay;
}
-static gboolean accel_apply_cb(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
+static gboolean accel_apply_cb(GtkTreeModel *model, GtkTreePath *UNUSED(path), GtkTreeIter *iter, gpointer UNUSED(data))
{
gchar *accel_path, *accel;
options->image.limit_autofit_size = c_options->image.limit_autofit_size;
options->image.max_autofit_size = c_options->image.max_autofit_size;
options->image.max_enlargement_size = c_options->image.max_enlargement_size;
- options->image.use_clutter_renderer = c_options->image.use_clutter_renderer;
+ //~ options->image.use_clutter_renderer = c_options->image.use_clutter_renderer;
options->image.tile_size = c_options->image.tile_size;
options->progressive_key_scrolling = c_options->progressive_key_scrolling;
options->keyboard_scroll_step = c_options->keyboard_scroll_step;
*-----------------------------------------------------------------------------
*/
-static void config_window_close_cb(GtkWidget *widget, gpointer data)
+static void config_window_close_cb(GtkWidget *UNUSED(widget), gpointer UNUSED(data))
{
gtk_widget_destroy(configwindow);
configwindow = NULL;
filter_store = NULL;
}
-static void config_window_help_cb(GtkWidget *widget, gpointer data)
+static void config_window_help_cb(GtkWidget *UNUSED(widget), gpointer data)
{
GtkWidget *notebook = data;
gint i;
help_window_show(html_section[i]);
}
-static gboolean config_window_delete(GtkWidget *widget, GdkEventAny *event, gpointer data)
+static gboolean config_window_delete(GtkWidget *UNUSED(widget), GdkEventAny *UNUSED(event), gpointer UNUSED(data))
{
config_window_close_cb(NULL, NULL);
return TRUE;
gtk_widget_show(combo);
}
-static void thumb_size_menu_cb(GtkWidget *combo, gpointer data)
+static void thumb_size_menu_cb(GtkWidget *combo, gpointer UNUSED(data))
{
gint n;
}
}
-static void filter_store_ext_edit_cb(GtkCellRendererText *cell, gchar *path_str,
+static void filter_store_ext_edit_cb(GtkCellRendererText *UNUSED(cell), gchar *path_str,
gchar *new_text, gpointer data)
{
GtkWidget *model = data;
filter_rebuild();
}
-static void filter_store_class_edit_cb(GtkCellRendererText *cell, gchar *path_str,
+static void filter_store_class_edit_cb(GtkCellRendererText *UNUSED(cell), gchar *path_str,
gchar *new_text, gpointer data)
{
GtkWidget *model = data;
filter_rebuild();
}
-static void filter_store_desc_edit_cb(GtkCellRendererText *cell, gchar *path_str,
+static void filter_store_desc_edit_cb(GtkCellRendererText *UNUSED(cell), gchar *path_str,
gchar *new_text, gpointer data)
{
GtkWidget *model = data;
gtk_tree_path_free(tpath);
}
-static void filter_store_enable_cb(GtkCellRendererToggle *renderer,
+static void filter_store_enable_cb(GtkCellRendererToggle *UNUSED(renderer),
gchar *path_str, gpointer data)
{
GtkWidget *model = data;
filter_rebuild();
}
-static void filter_store_writable_cb(GtkCellRendererToggle *renderer,
+static void filter_store_writable_cb(GtkCellRendererToggle *UNUSED(renderer),
gchar *path_str, gpointer data)
{
GtkWidget *model = data;
filter_rebuild();
}
-static void filter_store_sidecar_cb(GtkCellRendererToggle *renderer,
+static void filter_store_sidecar_cb(GtkCellRendererToggle *UNUSED(renderer),
gchar *path_str, gpointer data)
{
GtkWidget *model = data;
filter_rebuild();
}
-static void filter_set_func(GtkTreeViewColumn *tree_column, GtkCellRenderer *cell,
+static void filter_set_func(GtkTreeViewColumn *UNUSED(tree_column), GtkCellRenderer *cell,
GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
{
FilterEntry *fe;
return(FALSE);
}
-static void filter_add_cb(GtkWidget *widget, gpointer data)
+static void filter_add_cb(GtkWidget *UNUSED(widget), gpointer data)
{
filter_add_unique("description", ".new", FORMAT_CLASS_IMAGE, TRUE, FALSE, TRUE);
filter_store_populate();
g_idle_add((GSourceFunc)filter_add_scroll, data);
}
-static void filter_remove_cb(GtkWidget *widget, gpointer data)
+static void filter_remove_cb(GtkWidget *UNUSED(widget), gpointer data)
{
GtkWidget *filter_view = data;
GtkTreeSelection *selection;
return(FALSE);
}
-static void filter_default_ok_cb(GenericDialog *gd, gpointer data)
+static void filter_default_ok_cb(GenericDialog *gd, gpointer UNUSED(data))
{
filter_reset();
filter_add_defaults();
g_idle_add((GSourceFunc)filter_default_ok_scroll, gd->data);
}
-static void dummy_cancel_cb(GenericDialog *gd, gpointer data)
+static void dummy_cancel_cb(GenericDialog *UNUSED(gd), gpointer UNUSED(data))
{
/* no op, only so cancel button appears */
}
!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)));
}
-static void safe_delete_view_cb(GtkWidget *widget, gpointer data)
+static void safe_delete_view_cb(GtkWidget *UNUSED(widget), gpointer UNUSED(data))
{
layout_set_path(NULL, gtk_entry_get_text(GTK_ENTRY(safe_delete_path_entry)));
}
-static void safe_delete_clear_ok_cb(GenericDialog *gd, gpointer data)
+static void safe_delete_clear_ok_cb(GenericDialog *UNUSED(gd), gpointer UNUSED(data))
{
file_util_trash_clear();
}
-static void safe_delete_clear_cb(GtkWidget *widget, gpointer data)
+static void safe_delete_clear_cb(GtkWidget *widget, gpointer UNUSED(data))
{
GenericDialog *gd;
GtkWidget *entry;
gtk_widget_show(gd->dialog);
}
-static void image_overlay_template_view_changed_cb(GtkWidget *widget, gpointer data)
+static void image_overlay_template_view_changed_cb(GtkWidget *UNUSED(widget), gpointer data)
{
GtkWidget *pTextView;
GtkTextBuffer *pTextBuffer;
gtk_text_buffer_get_text(pTextBuffer, &iStart, &iEnd, TRUE));
}
-static void image_overlay_default_template_ok_cb(GenericDialog *gd, gpointer data)
+static void image_overlay_default_template_ok_cb(GenericDialog *UNUSED(gd), gpointer data)
{
GtkTextView *text_view = data;
GtkTextBuffer *buffer;
gtk_widget_show(gd->dialog);
}
-static void image_overlay_help_cb(GtkWidget *widget, gpointer data)
+static void image_overlay_help_cb(GtkWidget *UNUSED(widget), gpointer UNUSED(data))
{
help_window_show("GuideOptionsOSD.html");
}
-static void image_overlay_set_font_cb(GtkWidget *widget, gpointer data)
+static void image_overlay_set_font_cb(GtkWidget *widget, gpointer UNUSED(data))
{
-#if GTK_CHECK_VERSION(3,4,0)
GtkWidget *dialog;
char *font;
PangoFontDescription *font_desc;
}
gtk_widget_destroy(dialog);
-#else
- const char *font;
-
- font = gtk_font_button_get_font_name(GTK_FONT_BUTTON(widget));
- c_options->image_overlay.font = g_strdup(font);
-#endif
}
-static void image_overlay_set_text_colour_cb(GtkWidget *widget, gpointer data)
+static void image_overlay_set_text_colour_cb(GtkWidget *widget, gpointer UNUSED(data))
{
GtkWidget *dialog;
-#if GTK_CHECK_VERSION(3,4,0)
GdkRGBA colour;
dialog = gtk_color_chooser_dialog_new("Image Overlay Text Colour", GTK_WINDOW(gtk_widget_get_toplevel(widget)));
c_options->image_overlay.text_alpha = colour.alpha*255;
}
gtk_widget_destroy(dialog);
-#else
- GdkColor colour;
- GtkColorSelection *colorsel;
-
- dialog = gtk_color_selection_dialog_new("Image Overlay Text Colour");
- gtk_window_set_keep_above(GTK_WINDOW(dialog),TRUE);
- colour.red = options->image_overlay.text_red*257;
- colour.green = options->image_overlay.text_green*257;
- colour.blue = options->image_overlay.text_blue*257;
- colorsel = GTK_COLOR_SELECTION(gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG(dialog)));
- gtk_color_selection_set_has_opacity_control(colorsel, TRUE);
- gtk_color_selection_set_current_color(colorsel, &colour);
- gtk_color_selection_set_current_alpha(colorsel, options->image_overlay.text_alpha*257);
-
- if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK)
- {
- gtk_color_selection_get_current_color(colorsel, &colour);
- c_options->image_overlay.text_red = colour.red/257;
- c_options->image_overlay.text_green = colour.green/257;
- c_options->image_overlay.text_blue = colour.blue/257;
- c_options->image_overlay.text_alpha = gtk_color_selection_get_current_alpha(colorsel)/257;
- }
- gtk_widget_destroy (dialog);
-#endif
}
-static void image_overlay_set_background_colour_cb(GtkWidget *widget, gpointer data)
+static void image_overlay_set_background_colour_cb(GtkWidget *widget, gpointer UNUSED(data))
{
GtkWidget *dialog;
-#if GTK_CHECK_VERSION(3,4,0)
GdkRGBA colour;
dialog = gtk_color_chooser_dialog_new("Image Overlay Background Colour", GTK_WINDOW(gtk_widget_get_toplevel(widget)));
c_options->image_overlay.background_alpha = colour.alpha*255;
}
gtk_widget_destroy(dialog);
-#else
- GdkColor colour;
- GtkColorSelection *colorsel;
-
- dialog = gtk_color_selection_dialog_new("Image Overlay Background Colour");
- gtk_window_set_keep_above(GTK_WINDOW(dialog),TRUE);
- colour.red = options->image_overlay.background_red*257;
- colour.green = options->image_overlay.background_green*257;
- colour.blue = options->image_overlay.background_blue*257;
- colorsel = GTK_COLOR_SELECTION(gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG(dialog)));
- gtk_color_selection_set_has_opacity_control(colorsel, TRUE);
- gtk_color_selection_set_current_color(colorsel, &colour);
- gtk_color_selection_set_current_alpha(colorsel, options->image_overlay.background_alpha*257);
-
- if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK)
- {
- gtk_color_selection_get_current_color(colorsel, &colour);
- c_options->image_overlay.background_red = colour.red/257;
- c_options->image_overlay.background_green = colour.green/257;
- c_options->image_overlay.background_blue = colour.blue/257;
- c_options->image_overlay.background_alpha = gtk_color_selection_get_current_alpha(colorsel)/257;
- }
- gtk_widget_destroy(dialog);
-#endif
}
static void accel_store_populate(void)
}
}
-static void accel_store_cleared_cb(GtkCellRendererAccel *accel, gchar *path_string, gpointer user_data)
+static void accel_store_cleared_cb(GtkCellRendererAccel *UNUSED(accel), gchar *UNUSED(path_string), gpointer UNUSED(user_data))
{
}
-static gboolean accel_remove_key_cb(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
+static gboolean accel_remove_key_cb(GtkTreeModel *model, GtkTreePath *UNUSED(path), GtkTreeIter *iter, gpointer data)
{
gchar *accel1 = data;
gchar *accel2;
}
-static void accel_store_edited_cb(GtkCellRendererAccel *accel, gchar *path_string, guint accel_key, GdkModifierType accel_mods, guint hardware_keycode, gpointer user_data)
+static void accel_store_edited_cb(GtkCellRendererAccel *UNUSED(accel), gchar *path_string, guint accel_key, GdkModifierType accel_mods, guint UNUSED(hardware_keycode), gpointer UNUSED(user_data))
{
GtkTreeModel *model = (GtkTreeModel *)accel_store;
GtkTreeIter iter;
return(FALSE);
}
-static void accel_default_cb(GtkWidget *widget, gpointer data)
+static void accel_default_cb(GtkWidget *UNUSED(widget), gpointer data)
{
accel_store_populate();
g_idle_add((GSourceFunc)accel_default_scroll, data);
}
-void accel_remove_selection(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
+void accel_remove_selection(GtkTreeModel *UNUSED(model), GtkTreePath *UNUSED(path), GtkTreeIter *iter, gpointer UNUSED(data))
{
gtk_tree_store_set(accel_store, iter, AE_KEY, "", -1);
}
-void accel_reset_selection(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
+void accel_reset_selection(GtkTreeModel *model, GtkTreePath *UNUSED(path), GtkTreeIter *iter, gpointer UNUSED(data))
{
GtkAccelKey key;
gchar *accel_path, *accel;
g_free(accel);
}
-static void accel_reset_cb(GtkWidget *widget, gpointer data)
+static void accel_reset_cb(GtkWidget *UNUSED(widget), gpointer data)
{
GtkTreeSelection *selection;
gtk_container_add(GTK_CONTAINER(scrolled), viewport);
gtk_widget_show(viewport);
- vbox = gtk_vbox_new(FALSE, 0);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add(GTK_CONTAINER(viewport), vbox);
gtk_widget_show(vbox);
return vbox;
}
-static void cache_standard_cb(GtkWidget *widget, gpointer data)
+static void cache_standard_cb(GtkWidget *widget, gpointer UNUSED(data))
{
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
{
}
}
-static void cache_geeqie_cb(GtkWidget *widget, gpointer data)
+static void cache_geeqie_cb(GtkWidget *widget, gpointer UNUSED(data))
{
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
{
}
}
-static void cache_local_cb(GtkWidget *widget, gpointer data)
+static void cache_local_cb(GtkWidget *widget, gpointer UNUSED(data))
{
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
{
}
}
-static void help_search_engine_entry_icon_cb(GtkEntry *entry, GtkEntryIconPosition pos,
- GdkEvent *event, gpointer userdata)
+static void help_search_engine_entry_icon_cb(GtkEntry *UNUSED(entry), GtkEntryIconPosition pos,
+ GdkEvent *UNUSED(event), gpointer userdata)
{
if (pos == GTK_ENTRY_ICON_PRIMARY)
{
}
}
-static void star_rating_star_icon_cb(GtkEntry *entry, GtkEntryIconPosition pos,
- GdkEvent *event, gpointer userdata)
+static void star_rating_star_icon_cb(GtkEntry *UNUSED(entry), GtkEntryIconPosition pos,
+ GdkEvent *UNUSED(event), gpointer userdata)
{
gchar *rating_symbol;
}
}
-static void star_rating_rejected_icon_cb(GtkEntry *entry, GtkEntryIconPosition pos,
- GdkEvent *event, gpointer userdata)
+static void star_rating_rejected_icon_cb(GtkEntry *UNUSED(entry), GtkEntryIconPosition pos,
+ GdkEvent *UNUSED(event), gpointer userdata)
{
gchar *rating_symbol;
}
}
-static guint star_rating_symbol_test(GtkWidget *widget, gpointer data)
+static guint star_rating_symbol_test(GtkWidget *UNUSED(widget), gpointer data)
{
GtkContainer *hbox = data;
GString *str = g_string_new(NULL);
GtkWidget *enlargement_button;
GtkWidget *table;
GtkWidget *spin;
- GtkWidget *two_pass;
-#ifdef HAVE_CLUTTER
- GtkWidget *gpu_accel;
-#endif
+//~ #ifdef HAVE_CLUTTER
+ //~ GtkWidget *gpu_accel;
+//~ #endif
vbox = scrolled_notebook_page(notebook, _("Image"));
table = pref_table_new(group, 2, 1, FALSE, FALSE);
add_quality_menu(table, 0, 0, _("Quality:"), options->image.zoom_quality, &c_options->image.zoom_quality);
- if (options->image.use_clutter_renderer && !options->disable_gpu)
- {
- gtk_widget_set_sensitive(table, FALSE);
- }
-
-#ifdef HAVE_CLUTTER
- gpu_accel = pref_checkbox_new_int(group, _("Use GPU acceleration via Clutter library (Requires restart)"),
- options->image.use_clutter_renderer, &c_options->image.use_clutter_renderer);
- if (options->disable_gpu && !options->override_disable_gpu)
- {
- gtk_widget_set_sensitive(gpu_accel, FALSE);
- }
-#endif
-
- two_pass = pref_checkbox_new_int(group, _("Two pass rendering (apply HQ zoom and color correction in second pass)"),
+ //~ if (options->image.use_clutter_renderer && !options->disable_gpu)
+ //~ {
+ //~ gtk_widget_set_sensitive(table, FALSE);
+ //~ }
+
+//~ #ifdef HAVE_CLUTTER
+ //~ gpu_accel = pref_checkbox_new_int(group, _("Use GPU acceleration via Clutter library (Requires restart)"),
+ //~ options->image.use_clutter_renderer, &c_options->image.use_clutter_renderer);
+ //~ if (options->disable_gpu && !options->override_disable_gpu)
+ //~ {
+ //~ gtk_widget_set_sensitive(gpu_accel, FALSE);
+ //~ }
+//~ #endif
+
+ pref_checkbox_new_int(group, _("Two pass rendering (apply HQ zoom and color correction in second pass)"),
options->image.zoom_2pass, &c_options->image.zoom_2pass);
- if (options->image.use_clutter_renderer && !options->disable_gpu)
- {
- gtk_widget_set_sensitive(two_pass, FALSE);
- }
+ //~ if (options->image.use_clutter_renderer && !options->disable_gpu)
+ //~ {
+ //~ gtk_widget_set_sensitive(two_pass, FALSE);
+ //~ }
c_options->image.zoom_increment = options->image.zoom_increment;
spin = pref_spin_new(group, _("Zoom increment:"), NULL,
gtk_widget_set_tooltip_text(GTK_WIDGET(hbox), _("This value will set the virtual size of the window when \"Fit image to window\" is set. Instead of using the actual size of the window, the specified percentage of the window will be used. It allows one to keep a border around the image (values lower than 100%) or to auto zoom the image (values greater than 100%). It affects fullscreen mode too."));
group = pref_group_new(vbox, FALSE, _("Tile size"), GTK_ORIENTATION_VERTICAL);
- gtk_widget_set_sensitive(group, !options->image.use_clutter_renderer);
+ //~ gtk_widget_set_sensitive(group, !options->image.use_clutter_renderer);
hbox = pref_box_new(group, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
spin = pref_spin_new_int(hbox, _("Pixels"), _("(Requires restart)"),
/* windows tab */
-static void save_default_window_layout_cb(GtkWidget *widget, gpointer data)
+static void save_default_window_layout_cb(GtkWidget *UNUSED(widget), gpointer UNUSED(data))
{
LayoutWindow *lw = NULL;
gchar *default_path;
g_free(default_path);
}
-#if GTK_CHECK_VERSION(3,22,0)
static gboolean popover_cb(gpointer data)
{
GtkPopover *popover = data;
return FALSE;
}
-static void default_layout_changed_cb(GtkWidget *button, GtkPopover *popover)
+static void default_layout_changed_cb(GtkWidget *UNUSED(button), GtkPopover *popover)
{
gtk_popover_popup(popover);
return popover;
}
-#endif
static void config_tab_windows(GtkWidget *notebook)
{
pref_label_new(subgroup, _("Use current layout for default: "));
button = pref_button_new(subgroup, NULL, _("Set"), FALSE, G_CALLBACK(save_default_window_layout_cb), NULL);
-#if GTK_CHECK_VERSION(3,22,0)
GtkWidget *popover;
popover = create_popover(button, gtk_label_new(_("Current window layout\nhas been set as default")), GTK_POS_TOP);
gtk_popover_set_modal(GTK_POPOVER (popover), FALSE);
g_signal_connect(button, "clicked", G_CALLBACK(default_layout_changed_cb), popover);
-#endif
group = pref_group_new(vbox, FALSE, _("Size"), GTK_ORIENTATION_VERTICAL);
hbox = pref_box_new(group, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_BUTTON_GAP);
-#if GTK_CHECK_VERSION(3,4,0)
button = pref_button_new(NULL, GTK_STOCK_SELECT_FONT, _("Font"), FALSE,
G_CALLBACK(image_overlay_set_font_cb), notebook);
-#else
- button = gtk_font_button_new();
- gtk_font_button_set_title(GTK_FONT_BUTTON(button), "Image Overlay Font");
- gtk_font_button_set_font_name(GTK_FONT_BUTTON(button), options->image_overlay.font);
- g_signal_connect(G_OBJECT(button), "font-set",
- G_CALLBACK(image_overlay_set_font_cb),NULL);
-#endif
+
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
gtk_widget_show(button);
pref_line(group, PREF_PAD_GAP);
group = pref_group_new(vbox, FALSE, _("Exif, XMP or IPTC tags"), GTK_ORIENTATION_VERTICAL);
- hbox = gtk_hbox_new(FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(group), hbox, FALSE, FALSE, 0);
gtk_widget_show(hbox);
label = gtk_label_new(_("%Exif.Image.Orientation%"));
pref_spacer(group,TRUE);
group = pref_group_new(vbox, FALSE, _("Field separators"), GTK_ORIENTATION_VERTICAL);
- hbox = gtk_hbox_new(FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(group), hbox, FALSE, FALSE, 0);
gtk_widget_show(hbox);
label = gtk_label_new(_("Separator shown only if both fields are non-null:\n%formatted.ShutterSpeed%|%formatted.ISOSpeedRating%"));
pref_spacer(group,TRUE);
group = pref_group_new(vbox, FALSE, _("Field maximum length"), GTK_ORIENTATION_VERTICAL);
- hbox = gtk_hbox_new(FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(group), hbox, FALSE, FALSE, 0);
gtk_widget_show(hbox);
label = gtk_label_new(_("%path:39%"));
pref_spacer(group,TRUE);
group = pref_group_new(vbox, FALSE, _("Pre- and post- text"), GTK_ORIENTATION_VERTICAL);
- hbox = gtk_hbox_new(FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(group), hbox, FALSE, FALSE, 0);
gtk_widget_show(hbox);
label = gtk_label_new(_("Text shown only if the field is non-null:\n%formatted.Aperture:F no. * setting%\n %formatted.Aperture:10:F no. * setting%"));
pref_spacer(group,TRUE);
group = pref_group_new(vbox, FALSE, _("Pango markup"), GTK_ORIENTATION_VERTICAL);
- hbox = gtk_hbox_new(FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(group), hbox, FALSE, FALSE, 0);
gtk_widget_show(hbox);
label = gtk_label_new(_("<b>bold</b>\n<u>underline</u>\n<i>italic</i>\n<s>strikethrough</s>"));
return ret;
}
-static gboolean search_function_cb(GtkTreeModel *model, gint column, const gchar *key, GtkTreeIter *iter, gpointer search_data)
+static gboolean search_function_cb(GtkTreeModel *model, gint UNUSED(column), const gchar *key, GtkTreeIter *iter, gpointer UNUSED(search_data))
{
FilterEntry *fe;
gboolean ret = TRUE;
label = pref_label_new(group, _("Warning: Geeqie is built without Exiv2. Some options are disabled."));
#endif
label = pref_label_new(group, _("When writing metadata, Geeqie will follow these steps, if selected. This process will stop when the first successful write occurs."));
-#if GTK_CHECK_VERSION(3,16,0)
gtk_label_set_xalign(GTK_LABEL(label), 0.0);
gtk_label_set_yalign(GTK_LABEL(label), 0.5);
-#else
- gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-#endif
+
gtk_widget_set_tooltip_text(label, _("A flowchart of the sequence is shown in the Help file"));
ct_button = pref_checkbox_new_int(group, "", options->metadata.save_in_image_file, &c_options->metadata.save_in_image_file);
gtk_label_set_markup (GTK_LABEL(label), markup);
g_free(markup);
-#if GTK_CHECK_VERSION(3,16,0)
gtk_label_set_xalign(GTK_LABEL(label), 0.0);
gtk_label_set_yalign(GTK_LABEL(label), 0.5);
-#else
- gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-#endif
gtk_misc_set_padding(GTK_MISC(label), 22, 0);
pref_spacer(group, PREF_PAD_GROUP);
pref_spacer(group, PREF_PAD_GROUP);
#ifdef HAVE_SPELL
-#if GTK_CHECK_VERSION(3,20,0)
group = pref_group_new(vbox, FALSE, _("Spelling checks"), GTK_ORIENTATION_VERTICAL);
ct_button = pref_checkbox_new_int(group, _("Check spelling - Requires restart"), options->metadata.check_spelling, &c_options->metadata.check_spelling);
gtk_widget_set_tooltip_text(ct_button, _("Spelling checks are performed on info sidebar panes Comment, Headline and Title"));
-#endif
#endif
pref_spacer(group, PREF_PAD_GROUP);
kfd->list_dir = NULL;
}
-static void keywords_find_close_cb(GenericDialog *fd, gpointer data)
+static void keywords_find_close_cb(GenericDialog *UNUSED(fd), gpointer data)
{
KeywordFindData *kfd = data;
gtk_widget_set_sensitive(kfd->button_close, TRUE);
}
-static void keywords_find_stop_cb(GenericDialog *fd, gpointer data)
+static void keywords_find_stop_cb(GenericDialog *UNUSED(fd), gpointer data)
{
KeywordFindData *kfd = data;
return FALSE;
}
-static void keywords_find_start_cb(GenericDialog *fd, gpointer data)
+static void keywords_find_start_cb(GenericDialog *UNUSED(fd), gpointer data)
{
KeywordFindData *kfd = data;
gchar *path;
gtk_widget_show(kfd->gd->dialog);
}
-static void keywords_find_cb(GtkWidget *widget, gpointer data)
+static void keywords_find_cb(GtkWidget *widget, gpointer UNUSED(data))
{
const gchar *path = layout_get_path(NULL);
gtk_widget_show(scrolled);
#ifdef HAVE_SPELL
-#if GTK_CHECK_VERSION(3,20,0)
if (options->metadata.check_spelling)
{
gspell_view = gspell_text_view_get_from_gtk_text_view(GTK_TEXT_VIEW(keyword_text));
gspell_text_view_basic_setup(gspell_view);
}
-#endif
#endif
gtk_container_add(GTK_CONTAINER(scrolled), keyword_text);
}
/* advanced entry tab */
-static void use_geeqie_trash_cb(GtkWidget *widget, gpointer data)
+static void use_geeqie_trash_cb(GtkWidget *widget, gpointer UNUSED(data))
{
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
{
}
}
-static void use_system_trash_cb(GtkWidget *widget, gpointer data)
+static void use_system_trash_cb(GtkWidget *widget, gpointer UNUSED(data))
{
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
{
}
}
-static void use_no_cache_cb(GtkWidget *widget, gpointer data)
+static void use_no_cache_cb(GtkWidget *widget, gpointer UNUSED(data))
{
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
{
gtk_window_set_resizable(GTK_WINDOW(configwindow), TRUE);
gtk_container_set_border_width(GTK_CONTAINER(configwindow), PREF_PAD_BORDER);
- win_vbox = gtk_vbox_new(FALSE, PREF_PAD_SPACE);
+ win_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_SPACE);
gtk_container_add(GTK_CONTAINER(configwindow), win_vbox);
gtk_widget_show(win_vbox);
}
}
-static void timezone_cancel_button_cb(GenericDialog *gd, gpointer data)
+static void timezone_cancel_button_cb(GenericDialog *UNUSED(gd), gpointer data)
{
TZData *tz = data;
option = options->printer.page_font;
}
-#if GTK_CHECK_VERSION(3,4,0)
GtkWidget *dialog;
char *font;
PangoFontDescription *font_desc;
}
gtk_widget_destroy(dialog);
-#else
- const char *font;
-
- font = gtk_font_button_get_font_name(GTK_FONT_BUTTON(widget));
- option = g_strdup(font);
-#endif
}
static gint set_toggle(GSList *list, TextPosition pos)
*template_string = g_strdup(value);
}
-static void image_text_template_view_changed_cb(GtkWidget *widget, gpointer data)
+static void image_text_template_view_changed_cb(GtkWidget *UNUSED(widget), gpointer data)
{
GtkWidget *pTextView;
GtkTextBuffer *pTextBuffer;
pref_checkbox_link_sensitivity(image_text_button, subgroup);
- hbox = gtk_hbox_new(FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(subgroup), hbox, FALSE, FALSE, 0);
/* order is important */
hbox = pref_box_new(subgroup, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_BUTTON_GAP);
-#if GTK_CHECK_VERSION(3,4,0)
button = pref_button_new(NULL, GTK_STOCK_SELECT_FONT, _("Font"), FALSE,
G_CALLBACK(print_set_font_cb), "Image text font");
-#else
- button = gtk_font_button_new();
- gtk_font_button_set_title(GTK_FONT_BUTTON(button), "Image text Font");
- gtk_font_button_set_font_name(GTK_FONT_BUTTON(button), options->printer.image_font);
- g_signal_connect(G_OBJECT(button), "font-set",
- G_CALLBACK(print_set_font_cb), "Image text font");
-#endif
+
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
gtk_widget_show(button);
subgroup = pref_box_new(group, FALSE, GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
pref_checkbox_link_sensitivity(page_text_button, subgroup);
- hbox = gtk_hbox_new(FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(subgroup), hbox, FALSE, FALSE, 0);
/* order is important */
hbox = pref_box_new(subgroup, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_BUTTON_GAP);
-#if GTK_CHECK_VERSION(3,4,0)
button = pref_button_new(NULL, GTK_STOCK_SELECT_FONT, _("Font"), FALSE,
G_CALLBACK(print_set_font_cb), "Page text font");
-#else
- button = gtk_font_button_new();
- gtk_font_button_set_title(GTK_FONT_BUTTON(button), "Page text Font");
- gtk_font_button_set_font_name(GTK_FONT_BUTTON(button), options->printer.page_font);
- g_signal_connect(G_OBJECT(button), "font-set",
- G_CALLBACK(print_set_font_cb), "Page text font");
-#endif
+
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
gtk_widget_show(button);
}
-static gboolean paginate_cb(GtkPrintOperation *operation,
- GtkPrintContext *context,
+static gboolean paginate_cb(GtkPrintOperation *UNUSED(operation),
+ GtkPrintContext *UNUSED(context),
gpointer data)
{
PrintWindow *pw = data;
return text;
}
-static void draw_page(GtkPrintOperation *operation, GtkPrintContext *context,
+static void draw_page(GtkPrintOperation *UNUSED(operation), GtkPrintContext *context,
gint page_nr, gpointer data)
{
PrintWindow *pw = data;
}
static void begin_print(GtkPrintOperation *operation,
- GtkPrintContext *context,
+ GtkPrintContext *UNUSED(context),
gpointer user_data)
{
PrintWindow *pw = user_data;
}
-GObject *option_tab_cb(GtkPrintOperation *operation, gpointer user_data)
+GObject *option_tab_cb(GtkPrintOperation *UNUSED(operation), gpointer user_data)
{
PrintWindow *pw = user_data;
}
static void end_print_cb(GtkPrintOperation *operation,
- GtkPrintContext *context, gpointer data)
+ GtkPrintContext *UNUSED(context), gpointer data)
{
PrintWindow *pw = data;
GList *work;
g_free(pw);
}
-void print_window_new(FileData *fd, GList *selection, GList *list, GtkWidget *parent)
+void print_window_new(FileData *UNUSED(fd), GList *selection, GList *UNUSED(list), GtkWidget *parent)
{
PrintWindow *pw;
GtkWidget *vbox;
pw->parent = parent;
- vbox = gtk_vbox_new(FALSE, 0);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_container_set_border_width(GTK_CONTAINER(vbox), PREF_PAD_BORDER);
gtk_widget_show(vbox);
g_string_append_printf(str, "\n%*s", indent * 4, "");
}
-void write_char_option(GString *str, gint indent, const gchar *label, const gchar *text)
+void write_char_option(GString *str, gint UNUSED(indent), const gchar *label, const gchar *text)
{
/* this is needed for overlay string, because g_markup_escape_text does not handle \n and such,
ideas for improvement are welcome
return TRUE;
}
-void write_int_option(GString *str, gint indent, const gchar *label, gint n)
+void write_int_option(GString *str, gint UNUSED(indent), const gchar *label, gint n)
{
g_string_append_printf(str, "%s = \"%d\" ", label, n);
}
return TRUE;
}
-void write_ushort_option(GString *str, gint indent, const gchar *label, guint16 n)
+void write_ushort_option(GString *str, gint UNUSED(indent), const gchar *label, guint16 n)
{
g_string_append_printf(str, "%s = \"%uh\" ", label, n);
}
return TRUE;
}
-void write_uint_option(GString *str, gint indent, const gchar *label, guint n)
+void write_uint_option(GString *str, gint UNUSED(indent), const gchar *label, guint n)
{
g_string_append_printf(str, "%s = \"%u\" ", label, n);
}
return ret;
}
-void write_int_unit_option(GString *str, gint indent, gchar *label, gint n, gint subunits)
+void write_int_unit_option(GString *str, gint UNUSED(indent), gchar *label, gint n, gint subunits)
{
gint l, r;
return TRUE;
}
-void write_bool_option(GString *str, gint indent, gchar *label, gint n)
+void write_bool_option(GString *str, gint UNUSED(indent), gchar *label, gint n)
{
g_string_append_printf(str, "%s = \"%s\" ", label, n ? "true" : "false");
}
WRITE_NL(); WRITE_COLOR(*options, image.border_color);
WRITE_NL(); WRITE_COLOR(*options, image.alpha_color_1);
WRITE_NL(); WRITE_COLOR(*options, image.alpha_color_2);
- WRITE_NL(); WRITE_BOOL(*options, image.use_clutter_renderer);
+ //~ WRITE_NL(); WRITE_BOOL(*options, image.use_clutter_renderer);
WRITE_NL(); WRITE_INT(*options, image.tile_size);
/* Thumbnails Options */
return TRUE;
}
-gboolean save_default_layout_options_to_file(const gchar *utf8_path, ConfOptions *options, LayoutWindow *lw)
+gboolean save_default_layout_options_to_file(const gchar *utf8_path, ConfOptions *UNUSED(options), LayoutWindow *lw)
{
SecureSaveInfo *ssi;
gchar *rc_pathl;
if (READ_COLOR(*options, image.border_color)) continue;
if (READ_COLOR(*options, image.alpha_color_1)) continue;
if (READ_COLOR(*options, image.alpha_color_2)) continue;
- if (READ_BOOL(*options, image.use_clutter_renderer)) continue;
+ //~ if (READ_BOOL(*options, image.use_clutter_renderer)) continue;
if (READ_INT(*options, image.tile_size)) continue;
/* Thumbnails options */
return TRUE;
}
-static void options_load_color_profiles(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **error)
+static void options_load_color_profiles(GQParserData *UNUSED(parser_data), GMarkupParseContext *UNUSED(context), const gchar *UNUSED(element_name), const gchar **attribute_names, const gchar **attribute_values, gpointer UNUSED(data), GError **UNUSED(error))
{
while (*attribute_names)
{
}
-static void options_load_profile(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **error)
+static void options_load_profile(GQParserData *parser_data, GMarkupParseContext *UNUSED(context), const gchar *UNUSED(element_name), const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **UNUSED(error))
{
gint i = GPOINTER_TO_INT(data);
if (i < 0 || i >= COLOR_PROFILE_INPUTS) return;
}
-static void options_load_marks_tooltips(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **error)
+static void options_load_marks_tooltips(GQParserData *parser_data, GMarkupParseContext *UNUSED(context), const gchar *UNUSED(element_name), const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **UNUSED(error))
{
gint i = GPOINTER_TO_INT(data);
if (i < 0 || i >= FILEDATA_MARKS_SIZE) return;
}
-static void options_load_disabled_plugins(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **error)
+static void options_load_disabled_plugins(GQParserData *parser_data, GMarkupParseContext *UNUSED(context), const gchar *UNUSED(element_name), const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **UNUSED(error))
{
gint i = GPOINTER_TO_INT(data);
struct {
}
-void options_parse_leaf(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **error)
+void options_parse_leaf(GQParserData *parser_data, GMarkupParseContext *UNUSED(context), const gchar *element_name, const gchar **UNUSED(attribute_names), const gchar **UNUSED(attribute_values), gpointer UNUSED(data), GError **UNUSED(error))
{
log_printf("unexpected: %s\n", element_name);
options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
}
}
-static void options_parse_class_filter(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **error)
+static void options_parse_class_filter(GQParserData *parser_data, GMarkupParseContext *UNUSED(context), const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer UNUSED(data), GError **UNUSED(error))
{
if (g_ascii_strcasecmp(element_name, "filter_type") == 0)
{
}
}
-static void options_parse_filter(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **error)
+static void options_parse_filter(GQParserData *parser_data, GMarkupParseContext *UNUSED(context), const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer UNUSED(data), GError **UNUSED(error))
{
if (g_ascii_strcasecmp(element_name, "file_type") == 0)
{
}
}
-static void options_parse_filter_end(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, gpointer data, GError **error)
+static void options_parse_filter_end(GQParserData *parser_data, GMarkupParseContext *UNUSED(context), const gchar *UNUSED(element_name), gpointer UNUSED(data), GError **UNUSED(error))
{
if (parser_data->startup) filter_add_defaults();
filter_rebuild();
}
-static void options_parse_keyword_end(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, gpointer data, GError **error)
+static void options_parse_keyword_end(GQParserData *UNUSED(parser_data), GMarkupParseContext *UNUSED(context), const gchar *UNUSED(element_name), gpointer data, GError **UNUSED(error))
{
GtkTreeIter *iter_ptr = data;
gtk_tree_iter_free(iter_ptr);
}
-static void options_parse_keyword(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **error)
+static void options_parse_keyword(GQParserData *parser_data, GMarkupParseContext *UNUSED(context), const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **UNUSED(error))
{
GtkTreeIter *iter_ptr = data;
if (g_ascii_strcasecmp(element_name, "keyword") == 0)
-static void options_parse_keyword_tree(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **error)
+static void options_parse_keyword_tree(GQParserData *parser_data, GMarkupParseContext *UNUSED(context), const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer UNUSED(data), GError **UNUSED(error))
{
if (g_ascii_strcasecmp(element_name, "keyword") == 0)
{
}
}
-static void options_parse_global_end(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, gpointer data, GError **error)
+static void options_parse_global_end(GQParserData *UNUSED(parser_data), GMarkupParseContext *UNUSED(context), const gchar *UNUSED(element_name), gpointer UNUSED(data), GError **UNUSED(error))
{
#ifndef HAVE_EXIV2
/* some options do not work without exiv2 */
#endif
}
-static void options_parse_pane_exif(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **error)
+static void options_parse_pane_exif(GQParserData *parser_data, GMarkupParseContext *UNUSED(context), const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **UNUSED(error))
{
GtkWidget *pane = data;
if (g_ascii_strcasecmp(element_name, "entry") == 0)
}
}
-static void options_parse_pane_keywords(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **error)
+static void options_parse_pane_keywords(GQParserData *parser_data, GMarkupParseContext *UNUSED(context), const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **UNUSED(error))
{
GtkWidget *pane = data;
}
}
-static void options_parse_bar(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **error)
+static void options_parse_bar(GQParserData *parser_data, GMarkupParseContext *UNUSED(context), const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **UNUSED(error))
{
GtkWidget *bar = data;
if (g_ascii_strcasecmp(element_name, "pane_comment") == 0)
}
}
-static void options_parse_toolbar(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **error)
+static void options_parse_toolbar(GQParserData *parser_data, GMarkupParseContext *UNUSED(context), const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **UNUSED(error))
{
LayoutWindow *lw = data;
if (g_ascii_strcasecmp(element_name, "toolitem") == 0)
}
}
-static void options_parse_statusbar(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **error)
+static void options_parse_statusbar(GQParserData *parser_data, GMarkupParseContext *UNUSED(context), const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **UNUSED(error))
{
LayoutWindow *lw = data;
if (g_ascii_strcasecmp(element_name, "toolitem") == 0)
}
}
-static void options_parse_dialogs(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **error)
+static void options_parse_dialogs(GQParserData *parser_data, GMarkupParseContext *UNUSED(context), const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer UNUSED(data), GError **UNUSED(error))
{
if (g_ascii_strcasecmp(element_name, "window") == 0)
{
}
}
-static void options_parse_layout(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **error)
+static void options_parse_layout(GQParserData *parser_data, GMarkupParseContext *UNUSED(context), const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **UNUSED(error))
{
LayoutWindow *lw = data;
if (g_ascii_strcasecmp(element_name, "bar") == 0)
}
}
-static void options_parse_layout_end(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, gpointer data, GError **error)
+static void options_parse_layout_end(GQParserData *UNUSED(parser_data), GMarkupParseContext *UNUSED(context), const gchar *UNUSED(element_name), gpointer data, GError **UNUSED(error))
{
LayoutWindow *lw = data;
layout_util_sync(lw);
}
-static void options_parse_toplevel(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **error)
+static void options_parse_toplevel(GQParserData *parser_data, GMarkupParseContext *UNUSED(context), const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer UNUSED(data), GError **UNUSED(error))
{
if (g_ascii_strcasecmp(element_name, "gq") == 0)
{
}
}
-static gboolean remote_server_read_cb(GIOChannel *source, GIOCondition condition, gpointer data)
+static gboolean remote_server_read_cb(GIOChannel *UNUSED(source), GIOCondition UNUSED(condition), gpointer data)
{
RemoteConnection *rc = data;
gint fd;
static sig_atomic_t sigpipe_occurred = FALSE;
-static void sighandler_sigpipe(gint sig)
+static void sighandler_sigpipe(gint UNUSED(sig))
{
sigpipe_occurred = TRUE;
}
*-----------------------------------------------------------------------------
*/
-static void gr_image_next(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_image_next(const gchar *UNUSED(text), GIOChannel *UNUSED(channel), gpointer UNUSED(data))
{
layout_image_next(lw_id);
}
-static void gr_new_window(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_new_window(const gchar *UNUSED(text), GIOChannel *UNUSED(channel), gpointer UNUSED(data))
{
LayoutWindow *lw = NULL;
return FALSE;
}
-static void gr_close_window(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_close_window(const gchar *UNUSED(text), GIOChannel *UNUSED(channel), gpointer UNUSED(data))
{
g_idle_add(gr_close_window_cb, NULL);
}
-static void gr_image_prev(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_image_prev(const gchar *UNUSED(text), GIOChannel *UNUSED(channel), gpointer UNUSED(data))
{
layout_image_prev(lw_id);
}
-static void gr_image_first(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_image_first(const gchar *UNUSED(text), GIOChannel *UNUSED(channel), gpointer UNUSED(data))
{
layout_image_first(lw_id);
}
-static void gr_image_last(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_image_last(const gchar *UNUSED(text), GIOChannel *UNUSED(channel), gpointer UNUSED(data))
{
layout_image_last(lw_id);
}
-static void gr_fullscreen_toggle(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_fullscreen_toggle(const gchar *UNUSED(text), GIOChannel *UNUSED(channel), gpointer UNUSED(data))
{
layout_image_full_screen_toggle(lw_id);
}
-static void gr_fullscreen_start(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_fullscreen_start(const gchar *UNUSED(text), GIOChannel *UNUSED(channel), gpointer UNUSED(data))
{
layout_image_full_screen_start(lw_id);
}
-static void gr_fullscreen_stop(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_fullscreen_stop(const gchar *UNUSED(text), GIOChannel *UNUSED(channel), gpointer UNUSED(data))
{
layout_image_full_screen_stop(lw_id);
}
-static void gr_lw_id(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_lw_id(const gchar *text, GIOChannel *UNUSED(channel), gpointer UNUSED(data))
{
lw_id = layout_find_by_layout_id(text);
if (!lw_id)
layout_valid(&lw_id);
}
-static void gr_slideshow_start_rec(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_slideshow_start_rec(const gchar *text, GIOChannel *UNUSED(channel), gpointer UNUSED(data))
{
GList *list;
gchar *tilde_filename;
layout_image_slideshow_start_from_list(lw_id, list);
}
-static void gr_cache_thumb(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_cache_thumb(const gchar *text, GIOChannel *UNUSED(channel), gpointer UNUSED(data))
{
if (!g_strcmp0(text, "clear"))
{
}
}
-static void gr_cache_shared(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_cache_shared(const gchar *text, GIOChannel *UNUSED(channel), gpointer UNUSED(data))
{
if (!g_strcmp0(text, "clear"))
cache_manager_standard_process_remote(TRUE);
cache_manager_standard_process_remote(FALSE);
}
-static void gr_cache_metadata(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_cache_metadata(const gchar *UNUSED(text), GIOChannel *UNUSED(channel), gpointer UNUSED(data))
{
cache_maintain_home_remote(TRUE, FALSE, NULL);
}
-static void gr_cache_render(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_cache_render(const gchar *text, GIOChannel *UNUSED(channel), gpointer UNUSED(data))
{
cache_manager_render_remote(text, FALSE, FALSE, NULL);
}
-static void gr_cache_render_recurse(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_cache_render_recurse(const gchar *text, GIOChannel *UNUSED(channel), gpointer UNUSED(data))
{
cache_manager_render_remote(text, TRUE, FALSE, NULL);
}
-static void gr_cache_render_standard(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_cache_render_standard(const gchar *text, GIOChannel *UNUSED(channel), gpointer UNUSED(data))
{
if(options->thumbnails.spec_standard)
{
}
}
-static void gr_cache_render_standard_recurse(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_cache_render_standard_recurse(const gchar *text, GIOChannel *UNUSED(channel), gpointer UNUSED(data))
{
if(options->thumbnails.spec_standard)
{
}
}
-static void gr_slideshow_toggle(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_slideshow_toggle(const gchar *UNUSED(text), GIOChannel *UNUSED(channel), gpointer UNUSED(data))
{
layout_image_slideshow_toggle(lw_id);
}
-static void gr_slideshow_start(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_slideshow_start(const gchar *UNUSED(text), GIOChannel *UNUSED(channel), gpointer UNUSED(data))
{
layout_image_slideshow_start(lw_id);
}
-static void gr_slideshow_stop(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_slideshow_stop(const gchar *UNUSED(text), GIOChannel *UNUSED(channel), gpointer UNUSED(data))
{
layout_image_slideshow_stop(lw_id);
}
-static void gr_slideshow_delay(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_slideshow_delay(const gchar *text, GIOChannel *UNUSED(channel), gpointer UNUSED(data))
{
gdouble t1, t2, t3, n;
gint res;
options->slideshow.delay = (gint)(n * 10.0 + 0.01);
}
-static void gr_tools_show(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_tools_show(const gchar *UNUSED(text), GIOChannel *UNUSED(channel), gpointer UNUSED(data))
{
gboolean popped;
gboolean hidden;
}
}
-static void gr_tools_hide(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_tools_hide(const gchar *UNUSED(text), GIOChannel *UNUSED(channel), gpointer UNUSED(data))
{
gboolean popped;
gboolean hidden;
}
}
-static gboolean gr_quit_idle_cb(gpointer data)
+static gboolean gr_quit_idle_cb(gpointer UNUSED(data))
{
exit_program();
return FALSE;
}
-static void gr_quit(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_quit(const gchar *UNUSED(text), GIOChannel *UNUSED(channel), gpointer UNUSED(data))
{
/* schedule exit when idle, if done from within a
* remote handler remote_close will crash
g_idle_add(gr_quit_idle_cb, NULL);
}
-static void gr_file_load_no_raise(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_file_load_no_raise(const gchar *text, GIOChannel *UNUSED(channel), gpointer UNUSED(data))
{
gchar *filename;
gchar *tilde_filename;
gr_raise(text, channel, data);
}
-static void gr_pixel_info(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_pixel_info(const gchar *UNUSED(text), GIOChannel *channel, gpointer UNUSED(data))
{
gchar *pixel_info;
gint x_pixel, y_pixel;
}
}
-static void gr_rectangle(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_rectangle(const gchar *UNUSED(text), GIOChannel *channel, gpointer UNUSED(data))
{
gchar *rectangle_info;
PixbufRenderer *pr;
}
}
-static void gr_render_intent(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_render_intent(const gchar *UNUSED(text), GIOChannel *channel, gpointer UNUSED(data))
{
gchar *render_intent;
file_data_unref(dir_fd);
}
-static void gr_collection(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_collection(const gchar *text, GIOChannel *channel, gpointer UNUSED(data))
{
GString *contents = g_string_new(NULL);
g_string_free(contents, TRUE);
}
-static void gr_collection_list(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_collection_list(const gchar *UNUSED(text), GIOChannel *channel, gpointer UNUSED(data))
{
GList *collection_list = NULL;
return FALSE;
}
-static void gr_geometry(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_geometry(const gchar *text, GIOChannel *UNUSED(channel), gpointer UNUSED(data))
{
gchar **geometry;
g_strfreev(geometry);
}
-static void gr_filelist(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_filelist(const gchar *text, GIOChannel *channel, gpointer UNUSED(data))
{
get_filelist(text, channel, FALSE);
}
-static void gr_filelist_recurse(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_filelist_recurse(const gchar *text, GIOChannel *channel, gpointer UNUSED(data))
{
get_filelist(text, channel, TRUE);
}
-static void gr_file_tell(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_file_tell(const gchar *UNUSED(text), GIOChannel *channel, gpointer UNUSED(data))
{
gchar *out_string;
gchar *collection_name = NULL;
g_free(out_string);
}
-static void gr_file_info(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_file_info(const gchar *UNUSED(text), GIOChannel *channel, gpointer UNUSED(data))
{
gchar *filename;
FileData *fd;
return FALSE;
}
-static void gr_config_load(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_config_load(const gchar *text, GIOChannel *UNUSED(channel), gpointer UNUSED(data))
{
gchar *filename = expand_tilde(text);
g_free(filename);
}
-static void gr_get_sidecars(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_get_sidecars(const gchar *text, GIOChannel *channel, gpointer UNUSED(data))
{
gchar *filename = expand_tilde(text);
FileData *fd = file_data_new_group(filename);
g_free(filename);
}
-static void gr_get_destination(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_get_destination(const gchar *text, GIOChannel *channel, gpointer UNUSED(data))
{
gchar *filename = expand_tilde(text);
FileData *fd = file_data_new_group(filename);
g_free(filename);
}
-static void gr_file_view(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_file_view(const gchar *text, GIOChannel *UNUSED(channel), gpointer UNUSED(data))
{
gchar *filename;
gchar *tilde_filename = expand_tilde(text);
g_free(tilde_filename);
}
-static void gr_list_clear(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_list_clear(const gchar *UNUSED(text), GIOChannel *UNUSED(channel), gpointer data)
{
RemoteData *remote_data = data;
remote_data->single_dir = TRUE;
}
-static void gr_list_add(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_list_add(const gchar *text, GIOChannel *UNUSED(channel), gpointer data)
{
RemoteData *remote_data = data;
gboolean new = TRUE;
}
}
-static void gr_raise(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_raise(const gchar *UNUSED(text), GIOChannel *UNUSED(channel), gpointer UNUSED(data))
{
if (layout_valid(&lw_id))
{
}
}
-static void gr_pwd(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_pwd(const gchar *text, GIOChannel *UNUSED(channel), gpointer UNUSED(data))
{
LayoutWindow *lw = NULL;
lw_id = lw;
}
-static void gr_print0(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_print0(const gchar *UNUSED(text), GIOChannel *channel, gpointer UNUSED(data))
{
g_io_channel_write_chars(channel, "print0", -1, NULL, NULL);
g_io_channel_write_chars(channel, "<gq_end_of_command>", -1, NULL, NULL);
}
#ifdef HAVE_LUA
-static void gr_lua(const gchar *text, GIOChannel *channel, gpointer data)
+static void gr_lua(const gchar *text, GIOChannel *channel, gpointer UNUSED(data))
{
gchar *result = NULL;
gchar **lua_command;
return NULL;
}
-static void remote_cb(RemoteConnection *rc, const gchar *text, GIOChannel *channel, gpointer data)
+static void remote_cb(RemoteConnection *UNUSED(rc), const gchar *text, GIOChannel *channel, gpointer data)
{
RemoteCommandEntry *entry;
const gchar *offset;
+++ /dev/null
-/*
- * Copyright (C) 2006 John Ellis
- * Copyright (C) 2008 - 2016 The Geeqie Team
- *
- * Author: John Ellis
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * 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.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-
-#include "main.h"
-#include "pixbuf-renderer.h"
-#include "renderer-clutter.h"
-
-#include "intl.h"
-#include "layout.h"
-
-#include <gtk/gtk.h>
-
-#ifdef HAVE_CLUTTER
-
-/* for 3d texture */
-#define COGL_ENABLE_EXPERIMENTAL_API
-#define CLUTTER_ENABLE_EXPERIMENTAL_API
-
-#include <clutter/clutter.h>
-
-#include <clutter-gtk/clutter-gtk.h>
-
-
-
-#define GQ_BUILD 1
-
-#ifdef GQ_BUILD
-#include "main.h"
-#include "pixbuf_util.h"
-#include "exif.h"
-#else
-typedef enum {
- EXIF_ORIENTATION_UNKNOWN = 0,
- EXIF_ORIENTATION_TOP_LEFT = 1,
- EXIF_ORIENTATION_TOP_RIGHT = 2,
- EXIF_ORIENTATION_BOTTOM_RIGHT = 3,
- EXIF_ORIENTATION_BOTTOM_LEFT = 4,
- EXIF_ORIENTATION_LEFT_TOP = 5,
- EXIF_ORIENTATION_RIGHT_TOP = 6,
- EXIF_ORIENTATION_RIGHT_BOTTOM = 7,
- EXIF_ORIENTATION_LEFT_BOTTOM = 8
-} ExifOrientationType;
-#endif
-
-#define GET_RIGHT_PIXBUF_OFFSET(rc) \
- (( (rc->stereo_mode & PR_STEREO_RIGHT) && !(rc->stereo_mode & PR_STEREO_SWAP)) || \
- (!(rc->stereo_mode & PR_STEREO_RIGHT) && (rc->stereo_mode & PR_STEREO_SWAP)) ? \
- rc->pr->stereo_pixbuf_offset_right : rc->pr->stereo_pixbuf_offset_left )
-
-#define GET_LEFT_PIXBUF_OFFSET(rc) \
- ((!(rc->stereo_mode & PR_STEREO_RIGHT) && !(rc->stereo_mode & PR_STEREO_SWAP)) || \
- ( (rc->stereo_mode & PR_STEREO_RIGHT) && (rc->stereo_mode & PR_STEREO_SWAP)) ? \
- rc->pr->stereo_pixbuf_offset_right : rc->pr->stereo_pixbuf_offset_left )
-
-
-typedef struct _OverlayData OverlayData;
-struct _OverlayData
-{
- gint id;
-
- GdkPixbuf *pixbuf;
- ClutterActor *actor;
-
- gint x;
- gint y;
-
- OverlayRendererFlags flags;
-};
-
-typedef struct _RendererClutter RendererClutter;
-
-struct _RendererClutter
-{
- RendererFuncs f;
- PixbufRenderer *pr;
-
-
- gint stereo_mode;
- gint stereo_off_x;
- gint stereo_off_y;
-
-
- GList *pending_updates;
- gint idle_update;
-
- GList *overlay_list;
-
- GtkWidget *widget; /* widget and stage may be shared with other renderers */
- ClutterActor *stage;
- ClutterActor *texture;
- ClutterActor *group;
-
- gboolean clut_updated;
- gint64 last_pixbuf_change;
-
- GdkPixbuf *display_pixbuf;
-};
-
-typedef struct _RendererClutterAreaParam RendererClutterAreaParam;
-struct _RendererClutterAreaParam {
- RendererClutter *rc;
- gint x;
- gint y;
- gint w;
- gint h;
-};
-
-static void rc_sync_actor(RendererClutter *rc)
-{
- PixbufRenderer *pr = rc->pr;
- gint anchor_x = 0;
- gint anchor_y = 0;
- gint rot_z = 0;
- gint rot_y = 0;
-
- clutter_actor_set_anchor_point(CLUTTER_ACTOR(rc->texture), 0, 0);
-
- DEBUG_3("scale %d %d", rc->pr->width, rc->pr->height);
- DEBUG_3("pos %d %d", rc->pr->x_offset, rc->pr->y_offset);
-
- clutter_actor_set_scale(CLUTTER_ACTOR(rc->texture),
- (gfloat)pr->width / pr->image_width,
- (gfloat)pr->height / pr->image_height);
-
- switch (pr->orientation)
- {
- case EXIF_ORIENTATION_TOP_LEFT:
- /* 1 - Horizontal (normal) */
- break;
- case EXIF_ORIENTATION_TOP_RIGHT:
- /* 2 - Mirror horizontal */
- rot_y = 180;
- anchor_x = pr->width;
- break;
- case EXIF_ORIENTATION_BOTTOM_RIGHT:
- /* 3 - Rotate 180 */
- rot_z = 180;
- anchor_x = pr->width;
- anchor_y = pr->height;
- break;
- case EXIF_ORIENTATION_BOTTOM_LEFT:
- /* 4 - Mirror vertical */
- rot_z = 180;
- rot_y = 180;
- anchor_y = pr->height;
- break;
- case EXIF_ORIENTATION_LEFT_TOP:
- /* 5 - Mirror horizontal and rotate 270 CW */
- rot_z = 270;
- rot_y = 180;
- break;
- case EXIF_ORIENTATION_RIGHT_TOP:
- /* 6 - Rotate 90 CW */
- rot_z = 90;
- anchor_x = pr->width;
- break;
- case EXIF_ORIENTATION_RIGHT_BOTTOM:
- /* 7 - Mirror horizontal and rotate 90 CW */
- rot_z = 90;
- rot_y = 180;
- anchor_x = pr->width;
- anchor_y = pr->height;
- break;
- case EXIF_ORIENTATION_LEFT_BOTTOM:
- /* 8 - Rotate 270 CW */
- rot_z = 270;
- anchor_y = pr->height;
- break;
- default:
- /* The other values are out of range */
- break;
- }
-
- clutter_actor_set_rotation( CLUTTER_ACTOR(rc->texture),
- CLUTTER_Z_AXIS,
- rot_z, 0, 0, 0);
- clutter_actor_set_rotation( CLUTTER_ACTOR(rc->texture),
- CLUTTER_Y_AXIS,
- rot_y, 0, 0, 0);
-
- clutter_actor_set_position(CLUTTER_ACTOR(rc->texture),
- pr->x_offset - pr->x_scroll + anchor_x,
- pr->y_offset - pr->y_scroll + anchor_y);
-
-}
-
-
-static void rc_area_clip_add(RendererClutter *rc, gfloat x, gfloat y, gfloat w, gfloat h)
-{
- gfloat x2, y2;
- gfloat clip_x, clip_y, clip_w, clip_h, clip_x2, clip_y2;
-
- x2 = x + w;
- y2 = y + h;
-
- clutter_actor_get_clip(rc->texture, &clip_x, &clip_y, &clip_w, &clip_h);
-
- clip_x2 = clip_x + clip_w;
- clip_y2 = clip_y + clip_h;
-
- if (clip_x > x) clip_x = x;
- if (clip_x2 < x2) clip_x2 = x2;
- if (clip_y > y) clip_y = y;
- if (clip_y2 < y2) clip_y2 = y2;
-
- clip_w = clip_x2 - clip_x;
- clip_h = clip_y2 - clip_y;
-
- clutter_actor_set_clip(rc->texture, clip_x, clip_y, clip_w, clip_h);
-}
-
-#define MAX_REGION_AREA (32768 * 1024)
-
-static gboolean rc_area_changed_cb(gpointer data);
-
-static void rc_schedule_texture_upload(RendererClutter *rc)
-{
- if (g_get_monotonic_time() - rc->last_pixbuf_change < 50000)
- {
- /* delay clutter redraw until the texture has some data
- set priority between gtk redraw and clutter redraw */
- DEBUG_3("%s tex upload high prio", get_exec_time());
- rc->idle_update = g_idle_add_full(CLUTTER_PRIORITY_REDRAW - 10, rc_area_changed_cb, rc, NULL);
- }
- else
- {
- /* higher prio than histogram */
- DEBUG_3("%s tex upload low prio", get_exec_time());
-
- rc->idle_update = g_idle_add_full(G_PRIORITY_DEFAULT_IDLE - 5, rc_area_changed_cb, rc, NULL);
- }
-}
-
-static void update_display_pixbuf(RendererClutter *rc);
-
-static gboolean rc_area_changed_cb(gpointer data)
-{
- RendererClutter *rc = (RendererClutter *)data;
- PixbufRenderer *pr = rc->pr;
-
- RendererClutterAreaParam *par = rc->pending_updates->data;
-
- gint h = MAX_REGION_AREA / par->w;
- if (h == 0) h = 1;
- if (h > par->h) h = par->h;
-
- if (pr->pixbuf)
- {
- CoglHandle texture = clutter_texture_get_cogl_texture(CLUTTER_TEXTURE(rc->texture));
-
- cogl_texture_set_region(texture,
- par->x + GET_RIGHT_PIXBUF_OFFSET(rc),
- par->y,
- par->x,
- par->y,
- par->w,
- h,
- par->w,
- h,
- gdk_pixbuf_get_has_alpha(pr->pixbuf) ? COGL_PIXEL_FORMAT_RGBA_8888 : COGL_PIXEL_FORMAT_RGB_888,
- gdk_pixbuf_get_rowstride(pr->pixbuf),
- gdk_pixbuf_get_pixels(pr->pixbuf));
- }
- rc_area_clip_add(rc, par->x, par->y, par->w, h);
-
-
- par->y += h;
- par->h -= h;
-
- if (par->h == 0)
- {
- rc->pending_updates = g_list_remove(rc->pending_updates, par);
- g_free(par);
- }
- if (!rc->pending_updates)
- {
- clutter_actor_queue_redraw(CLUTTER_ACTOR(rc->texture));
- rc->idle_update = 0;
-
- update_display_pixbuf(rc);
-
- if (pr->func_post_process && pr->pixbuf)
- {
- pr->func_post_process(pr, &rc->display_pixbuf, 0, 0, gdk_pixbuf_get_width(pr->pixbuf), gdk_pixbuf_get_height(pr->pixbuf), pr->post_process_user_data);
- }
-
- if (pr->pixbuf)
- {
- CoglHandle texture = clutter_texture_get_cogl_texture(CLUTTER_TEXTURE(rc->texture));
-
- cogl_texture_set_region(texture,
- 0 + GET_RIGHT_PIXBUF_OFFSET(rc),
- 0,
- 0,
- 0,
- gdk_pixbuf_get_width(pr->pixbuf),
- gdk_pixbuf_get_height(pr->pixbuf),
- gdk_pixbuf_get_width(pr->pixbuf),
- gdk_pixbuf_get_height(pr->pixbuf),
- gdk_pixbuf_get_has_alpha(pr->pixbuf) ? COGL_PIXEL_FORMAT_RGBA_8888 : COGL_PIXEL_FORMAT_RGB_888,
- gdk_pixbuf_get_rowstride(pr->pixbuf),
- gdk_pixbuf_get_pixels(rc->display_pixbuf));
- DEBUG_3("%s upload end", get_exec_time());
- }
-
- return FALSE;
- }
-
- rc_schedule_texture_upload(rc);
-
- return FALSE; /* it was rescheduled, possibly with different prio */
-}
-
-
-static void rc_area_changed(void *renderer, gint src_x, gint src_y, gint src_w, gint src_h)
-{
- RendererClutter *rc = (RendererClutter *)renderer;
- PixbufRenderer *pr = rc->pr;
- RendererClutterAreaParam *par;
-
- gint width = gdk_pixbuf_get_width(pr->pixbuf);
- gint height = gdk_pixbuf_get_height(pr->pixbuf);
-
- if (pr->stereo_data == STEREO_PIXBUF_SBS || pr->stereo_data == STEREO_PIXBUF_CROSS)
- {
- width /= 2;
- }
-
- if (!pr_clip_region(src_x, src_y, src_w, src_h,
- GET_RIGHT_PIXBUF_OFFSET(rc), 0, width, height,
- &src_x, &src_y, &src_w, &src_h)) return;
-
- par = g_new0(RendererClutterAreaParam, 1);
- par->rc = rc;
- par->x = src_x - GET_RIGHT_PIXBUF_OFFSET(rc);
- par->y = src_y;
- par->w = src_w;
- par->h = src_h;
- rc->pending_updates = g_list_append(rc->pending_updates, par);
- if (!rc->idle_update)
- {
- rc_schedule_texture_upload(rc);
- }
-}
-
-static void rc_remove_pending_updates(RendererClutter *rc)
-{
- if (rc->idle_update) g_idle_remove_by_data(rc);
- rc->idle_update = 0;
- while (rc->pending_updates)
- {
- RendererClutterAreaParam *par = rc->pending_updates->data;
- rc->pending_updates = g_list_remove(rc->pending_updates, par);
- g_free(par);
- }
-}
-
-static void update_display_pixbuf(RendererClutter *rc)
-{
- PixbufRenderer *pr = rc->pr;
- GdkPixbuf* tmppixbuf = NULL;
-
- if (pr->pixbuf)
- {
- if (rc->display_pixbuf)
- {
- g_object_unref(rc->display_pixbuf);
- }
-
- if (!gdk_pixbuf_get_has_alpha(pr->pixbuf))
- {
- rc->display_pixbuf = gdk_pixbuf_copy(pr->pixbuf);
- }
- else
- {
- if (pr->ignore_alpha)
- {
- tmppixbuf = gdk_pixbuf_add_alpha(pr->pixbuf, FALSE, 0, 0, 0);
-
- pixbuf_ignore_alpha_rect(tmppixbuf, 0, 0, gdk_pixbuf_get_width(pr->pixbuf), gdk_pixbuf_get_height(pr->pixbuf));
-
- rc->display_pixbuf = gdk_pixbuf_composite_color_simple (tmppixbuf,
- gdk_pixbuf_get_width(pr->pixbuf),
- gdk_pixbuf_get_height(pr->pixbuf),
- GDK_INTERP_BILINEAR,
- 255,
- PR_ALPHA_CHECK_SIZE,
- ((options->image.alpha_color_1.red << 8 & 0x00FF0000) +
- (options->image.alpha_color_1.green & 0x00FF00) +
- (options->image.alpha_color_1.blue >> 8 & 0x00FF)),
- ((options->image.alpha_color_2.red << 8 & 0x00FF0000) +
- (options->image.alpha_color_2.green & 0x00FF00) +
- (options->image.alpha_color_2.blue >> 8 & 0x00FF)));
- g_object_unref(tmppixbuf);
- }
- else
- {
- rc->display_pixbuf = gdk_pixbuf_composite_color_simple (pr->pixbuf,
- gdk_pixbuf_get_width(pr->pixbuf),
- gdk_pixbuf_get_height(pr->pixbuf),
- GDK_INTERP_BILINEAR,
- 255,
- PR_ALPHA_CHECK_SIZE,
- ((options->image.alpha_color_1.red << 8 & 0x00FF0000) +
- (options->image.alpha_color_1.green & 0x00FF00) +
- (options->image.alpha_color_1.blue >> 8 & 0x00FF)),
- ((options->image.alpha_color_2.red << 8 & 0x00FF0000) +
- (options->image.alpha_color_2.green & 0x00FF00) +
- (options->image.alpha_color_2.blue >> 8 & 0x00FF)));
- }
- }
- }
-}
-
-static void rc_update_pixbuf(void *renderer, gboolean lazy)
-{
- RendererClutter *rc = (RendererClutter *)renderer;
- PixbufRenderer *pr = rc->pr;
-
- DEBUG_3("rc_update_pixbuf");
-
- rc_remove_pending_updates(rc);
-
- rc->last_pixbuf_change = g_get_monotonic_time();
- DEBUG_3("%s change time reset", get_exec_time());
-
- if (pr->pixbuf)
- {
- gint width = gdk_pixbuf_get_width(pr->pixbuf);
- gint height = gdk_pixbuf_get_height(pr->pixbuf);
-
- DEBUG_3("pixbuf size %d x %d (%d)", width, height, gdk_pixbuf_get_has_alpha(pr->pixbuf) ? 32 : 24);
-
- gint prev_width, prev_height;
-
- if (pr->stereo_data == STEREO_PIXBUF_SBS || pr->stereo_data == STEREO_PIXBUF_CROSS)
- {
- width /= 2;
- }
-
-
- clutter_texture_get_base_size(CLUTTER_TEXTURE(rc->texture), &prev_width, &prev_height);
-
- if (width != prev_width || height != prev_height)
- {
- /** @FIXME use CoglMaterial with multiple textures for background, color management, anaglyph, ... */
- CoglHandle texture = cogl_texture_new_with_size(width,
- height,
- COGL_TEXTURE_NO_AUTO_MIPMAP,
- gdk_pixbuf_get_has_alpha(pr->pixbuf) ? COGL_PIXEL_FORMAT_RGBA_8888 : COGL_PIXEL_FORMAT_RGB_888);
-
- if (texture != COGL_INVALID_HANDLE)
- {
- clutter_texture_set_cogl_texture(CLUTTER_TEXTURE(rc->texture), texture);
- cogl_handle_unref(texture);
- }
- }
- clutter_actor_set_clip(rc->texture, 0, 0, 0, 0); /* visible area is extended as area_changed events arrive */
- if (!lazy)
- {
- rc_area_changed(renderer, GET_RIGHT_PIXBUF_OFFSET(rc), 0, width, height);
- }
-
- rc->clut_updated = FALSE;
- }
-}
-
-
-
-static void rc_update_zoom(void *renderer, gboolean lazy)
-{
- RendererClutter *rc = (RendererClutter *)renderer;
-
- DEBUG_3("rc_update_zoom");
- rc_sync_actor(rc);
-}
-
-static void rc_invalidate_region(void *renderer, gint x, gint y, gint w, gint h)
-{
-}
-
-static OverlayData *rc_overlay_find(RendererClutter *rc, gint id)
-{
- GList *work;
-
- work = rc->overlay_list;
- while (work)
- {
- OverlayData *od = work->data;
- work = work->next;
-
- if (od->id == id) return od;
- }
-
- return NULL;
-}
-
-static void rc_overlay_actor_destroy_cb(ClutterActor *actor, gpointer user_data)
-{
- OverlayData *od = user_data;
- od->actor = NULL;
-}
-
-static void rc_overlay_free(RendererClutter *rc, OverlayData *od)
-{
- rc->overlay_list = g_list_remove(rc->overlay_list, od);
-
- if (od->pixbuf) g_object_unref(G_OBJECT(od->pixbuf));
- if (od->actor) clutter_actor_destroy(od->actor);
- g_free(od);
-}
-
-static void rc_overlay_update_position(RendererClutter *rc, OverlayData *od)
-{
- gint px, py, pw, ph;
-
- pw = gdk_pixbuf_get_width(od->pixbuf);
- ph = gdk_pixbuf_get_height(od->pixbuf);
- px = od->x;
- py = od->y;
-
- if (od->flags & OVL_RELATIVE)
- {
- if (px < 0) px = rc->pr->viewport_width - pw + px;
- if (py < 0) py = rc->pr->viewport_height - ph + py;
- }
- if (od->actor) clutter_actor_set_position(od->actor, px, py);
-}
-
-static void rc_overlay_update_positions(RendererClutter *rc)
-{
- GList *work;
-
- work = rc->overlay_list;
- while (work)
- {
- OverlayData *od = work->data;
- work = work->next;
-
- rc_overlay_update_position(rc, od);
- }
-}
-
-static void rc_overlay_free_all(RendererClutter *rc)
-{
- GList *work;
-
- work = rc->overlay_list;
- while (work)
- {
- OverlayData *od = work->data;
- work = work->next;
-
- rc_overlay_free(rc, od);
- }
-}
-
-static gint rc_overlay_add(void *renderer, GdkPixbuf *pixbuf, gint x, gint y, OverlayRendererFlags flags)
-{
- RendererClutter *rc = (RendererClutter *)renderer;
- PixbufRenderer *pr = rc->pr;
- OverlayData *od;
- gint id;
-
- g_return_val_if_fail(IS_PIXBUF_RENDERER(pr), -1);
- g_return_val_if_fail(pixbuf != NULL, -1);
-
- id = 1;
- while (rc_overlay_find(rc, id)) id++;
-
- od = g_new0(OverlayData, 1);
- od->id = id;
- od->pixbuf = pixbuf;
- g_object_ref(G_OBJECT(od->pixbuf));
- od->x = x;
- od->y = y;
- od->flags = flags;
-
- od->actor = gtk_clutter_texture_new();
- g_signal_connect (od->actor, "destroy", G_CALLBACK(rc_overlay_actor_destroy_cb), od);
-
- gtk_clutter_texture_set_from_pixbuf(GTK_CLUTTER_TEXTURE (od->actor), pixbuf, NULL);
- clutter_container_add_actor(CLUTTER_CONTAINER(rc->group), od->actor);
-
- rc->overlay_list = g_list_append(rc->overlay_list, od);
- rc_overlay_update_position(rc, od);
-
- return od->id;
-}
-
-static void rc_overlay_set(void *renderer, gint id, GdkPixbuf *pixbuf, gint x, gint y)
-{
- RendererClutter *rc = (RendererClutter *)renderer;
- PixbufRenderer *pr = rc->pr;
- OverlayData *od;
-
- g_return_if_fail(IS_PIXBUF_RENDERER(pr));
-
- od = rc_overlay_find(rc, id);
- if (!od) return;
-
- if (pixbuf)
- {
- g_object_ref(G_OBJECT(pixbuf));
- g_object_unref(G_OBJECT(od->pixbuf));
- od->pixbuf = pixbuf;
-
- od->x = x;
- od->y = y;
-
- if (od->actor) gtk_clutter_texture_set_from_pixbuf(GTK_CLUTTER_TEXTURE(od->actor), pixbuf, NULL);
- rc_overlay_update_position(rc, od);
- }
- else
- {
- rc_overlay_free(rc, od);
- }
-}
-
-static gboolean rc_overlay_get(void *renderer, gint id, GdkPixbuf **pixbuf, gint *x, gint *y)
-{
- RendererClutter *rc = (RendererClutter *)renderer;
-
- PixbufRenderer *pr = rc->pr;
- OverlayData *od;
-
- g_return_val_if_fail(IS_PIXBUF_RENDERER(pr), FALSE);
-
- od = rc_overlay_find(rc, id);
- if (!od) return FALSE;
-
- if (pixbuf) *pixbuf = od->pixbuf;
- if (x) *x = od->x;
- if (y) *y = od->y;
-
- return TRUE;
-}
-
-
-static void rc_update_viewport(void *renderer)
-{
- RendererClutter *rc = (RendererClutter *)renderer;
- ClutterColor stage_color = { rc->pr->color.red / 256, rc->pr->color.green / 256, rc->pr->color.blue / 256, 0xff };
-
- rc->stereo_off_x = 0;
- rc->stereo_off_y = 0;
-
- if (rc->stereo_mode & PR_STEREO_RIGHT)
- {
- if (rc->stereo_mode & PR_STEREO_HORIZ)
- {
- rc->stereo_off_x = rc->pr->viewport_width;
- }
- else if (rc->stereo_mode & PR_STEREO_VERT)
- {
- rc->stereo_off_y = rc->pr->viewport_height;
- }
- else if (rc->stereo_mode & PR_STEREO_FIXED)
- {
- rc->stereo_off_x = rc->pr->stereo_fixed_x_right;
- rc->stereo_off_y = rc->pr->stereo_fixed_y_right;
- }
- }
- else
- {
- if (rc->stereo_mode & PR_STEREO_FIXED)
- {
- rc->stereo_off_x = rc->pr->stereo_fixed_x_left;
- rc->stereo_off_y = rc->pr->stereo_fixed_y_left;
- }
- }
- DEBUG_3("rc_update_viewport scale %d %d", rc->pr->width, rc->pr->height);
-
- clutter_stage_set_color(CLUTTER_STAGE(rc->stage), &stage_color);
-
-
- clutter_actor_set_size(rc->group, rc->pr->viewport_width, rc->pr->viewport_height);
- clutter_actor_set_position(rc->group, rc->stereo_off_x, rc->stereo_off_y);
-
- clutter_actor_set_rotation(CLUTTER_ACTOR(rc->group),
- CLUTTER_Y_AXIS,
- (rc->stereo_mode & PR_STEREO_MIRROR) ? 180 : 0,
- rc->pr->viewport_width / 2.0, 0, 0);
-
- clutter_actor_set_rotation(CLUTTER_ACTOR(rc->group),
- CLUTTER_X_AXIS,
- (rc->stereo_mode & PR_STEREO_FLIP) ? 180 : 0,
- 0, rc->pr->viewport_height / 2.0, 0);
-
- rc_sync_actor(rc);
- rc_overlay_update_positions(rc);
-}
-
-static void rc_scroll(void *renderer, gint x_off, gint y_off)
-{
- DEBUG_3("rc_scroll");
- RendererClutter *rc = (RendererClutter *)renderer;
-
- rc_sync_actor(rc);
-}
-
-static void rc_stereo_set(void *renderer, gint stereo_mode)
-{
- RendererClutter *rc = (RendererClutter *)renderer;
-
- rc->stereo_mode = stereo_mode;
-}
-
-static void rc_free(void *renderer)
-{
- RendererClutter *rc = (RendererClutter *)renderer;
- GtkWidget *widget = gtk_bin_get_child(GTK_BIN(rc->pr));
-
- if (rc->display_pixbuf)
- {
- g_object_unref(rc->display_pixbuf);
- }
-
- rc_remove_pending_updates(rc);
-
- rc_overlay_free_all(rc);
-
- if (widget)
- {
- /* widget still exists */
- clutter_actor_destroy(rc->group);
- if (clutter_group_get_n_children(CLUTTER_GROUP(rc->stage)) == 0)
- {
- DEBUG_1("destroy %p", rc->widget);
- /* this was the last user */
- gtk_widget_destroy(rc->widget);
- }
- else
- {
- DEBUG_1("keep %p", rc->widget);
- g_object_unref(G_OBJECT(rc->widget));
- }
- }
- g_free(rc);
-}
-
-RendererFuncs *renderer_clutter_new(PixbufRenderer *pr)
-{
- RendererClutter *rc = g_new0(RendererClutter, 1);
-
- rc->pr = pr;
-
- rc->f.area_changed = rc_area_changed;
- rc->f.update_pixbuf = rc_update_pixbuf;
- rc->f.free = rc_free;
- rc->f.update_zoom = rc_update_zoom;
- rc->f.invalidate_region = rc_invalidate_region;
- rc->f.scroll = rc_scroll;
- rc->f.update_viewport = rc_update_viewport;
-
-
- rc->f.overlay_add = rc_overlay_add;
- rc->f.overlay_set = rc_overlay_set;
- rc->f.overlay_get = rc_overlay_get;
-
- rc->f.stereo_set = rc_stereo_set;
-
-
- rc->stereo_mode = 0;
- rc->stereo_off_x = 0;
- rc->stereo_off_y = 0;
-
- rc->idle_update = 0;
- rc->pending_updates = NULL;
-
- rc->display_pixbuf = NULL;
-
- rc->widget = gtk_bin_get_child(GTK_BIN(rc->pr));
-
- if (rc->widget)
- {
- if (!GTK_CLUTTER_IS_EMBED(rc->widget))
- {
- g_free(rc);
- DEBUG_3("pixbuf renderer has a child of other type than gtk_clutter_embed");
- return NULL;
- }
- }
- else
- {
- rc->widget = gtk_clutter_embed_new();
- gtk_container_add(GTK_CONTAINER(rc->pr), rc->widget);
- }
-
- gtk_event_box_set_above_child (GTK_EVENT_BOX(rc->pr), TRUE);
- rc->stage = gtk_clutter_embed_get_stage (GTK_CLUTTER_EMBED (rc->widget));
-
- rc->group = clutter_group_new();
- clutter_container_add_actor(CLUTTER_CONTAINER(rc->stage), rc->group);
- clutter_actor_set_clip_to_allocation(CLUTTER_ACTOR(rc->group), TRUE);
-
- rc->texture = clutter_texture_new ();
- clutter_container_add_actor(CLUTTER_CONTAINER(rc->group), rc->texture);
-
- clutter_actor_set_content_scaling_filters(rc->texture, CLUTTER_SCALING_FILTER_TRILINEAR, CLUTTER_SCALING_FILTER_NEAREST);
-
- g_object_ref(G_OBJECT(rc->widget));
-
- gtk_widget_show(rc->widget);
- return (RendererFuncs *) rc;
-}
-
-#endif
-/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
+++ /dev/null
-/*
- * Copyright (C) 2006 John Ellis
- * Copyright (C) 2008 - 2016 The Geeqie Team
- *
- * Author: John Ellis
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * 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.
- */
-
-#ifndef RENDERER_CLUTTER_H
-#define RENDERER_CLUTTER_H
-
-#ifdef HAVE_CLUTTER
-#include <pixbuf-renderer.h>
-
-
-RendererFuncs *renderer_clutter_new(PixbufRenderer *pr);
-
-#endif
-#endif
-/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
if (!window) return;
-#if GTK_CHECK_VERSION(3,0,0)
cr = cairo_create(rt->surface);
-#else
- cr = gdk_cairo_create(window);
-#endif
if (!pr->pixbuf && !pr->source_tiles_enabled)
{
return rt_tile_add(rt, x, y);
}
-static gint pixmap_calc_size(cairo_surface_t *surface)
+static gint pixmap_calc_size(cairo_surface_t *UNUSED(surface))
{
// gint w, h, d;
double x,
double y)
{
-#if GTK_CHECK_VERSION(3, 10, 0)
cairo_surface_t *surface;
surface = gdk_cairo_surface_create_from_pixbuf(pixbuf, rt->hidpi_scale, NULL);
cairo_set_source_surface(cr, surface, x, y);
cairo_fill(cr);
cairo_surface_destroy(surface);
-#else
- gdk_cairo_set_source_pixbuf(cr, pixbuf, x, y);
- cairo_fill(cr);
-#endif
}
static void rt_tile_prepare(RendererTiles *rt, ImageTile *it)
od->window = gdk_window_new(gtk_widget_get_window(GTK_WIDGET(pr)), &attributes, attributes_mask);
gdk_window_set_user_data(od->window, pr);
gdk_window_move(od->window, px + rt->stereo_off_x, py + rt->stereo_off_y);
-#if !GTK_CHECK_VERSION(3,0,0)
gdk_window_show(od->window);
-#endif
}
static void rt_overlay_draw(RendererTiles *rt, gint x, gint y, gint w, gint h,
rt->overlay_list = g_list_append(rt->overlay_list, od);
-#if GTK_CHECK_VERSION(3,0,0)
gtk_widget_queue_draw(GTK_WIDGET(rt->pr));
-#else
- rt_overlay_queue_draw(rt, od, 0, 0, 0, 0);
-#endif
return od->id;
}
}
}
-#if GTK_CHECK_VERSION(3,0,0)
-void renderer_tiles_overlay_set(void *renderer, gint id, GdkPixbuf *pixbuf, gint x, gint y)
+void renderer_tiles_overlay_set(void *renderer, gint id, GdkPixbuf *pixbuf, gint UNUSED(x), gint UNUSED(y))
{
RendererTiles *rc = (RendererTiles *)renderer;
PixbufRenderer *pr = rc->pr;
gtk_widget_queue_draw(GTK_WIDGET(rc->pr));
}
-#else
-void renderer_tiles_overlay_set(void *renderer, gint id, GdkPixbuf *pixbuf, gint x, gint y)
-{
- RendererTiles *rt = (RendererTiles *) renderer;
- PixbufRenderer *pr = rt->pr;
- OverlayData *od;
-
- g_return_if_fail(IS_PIXBUF_RENDERER(pr));
-
- od = rt_overlay_find(rt, id);
- if (!od) return;
-
- if (pixbuf)
- {
- gint px, py, pw, ph;
-
- g_object_ref(G_OBJECT(pixbuf));
- g_object_unref(G_OBJECT(od->pixbuf));
- od->pixbuf = pixbuf;
-
- od->x = x;
- od->y = y;
-
- if (!od->window) rt_overlay_init_window(rt, od);
-
- rt_overlay_queue_draw(rt, od, 0, 0, 0, 0);
- rt_overlay_get_position(rt, od, &px, &py, &pw, &ph);
- gdk_window_move_resize(od->window, px + rt->stereo_off_x, py + rt->stereo_off_y, pw, ph);
- }
- else
- {
- rt_overlay_queue_draw(rt, od, 0, 0, 0, 0);
- rt_overlay_free(rt, od);
- }
-}
-#endif
gboolean renderer_tiles_overlay_get(void *renderer, gint id, GdkPixbuf **pixbuf, gint *x, gint *y)
{
return TRUE;
}
-static void rt_hierarchy_changed_cb(GtkWidget *widget, GtkWidget *previous_toplevel, gpointer data)
+static void rt_hierarchy_changed_cb(GtkWidget *UNUSED(widget), GtkWidget *UNUSED(previous_toplevel), gpointer data)
{
RendererTiles *rt = data;
rt_overlay_list_reset_window(rt);
static gboolean rt_source_tile_render(RendererTiles *rt, ImageTile *it,
gint x, gint y, gint w, gint h,
- gboolean new_data, gboolean fast)
+ gboolean UNUSED(new_data), gboolean fast)
{
PixbufRenderer *pr = rt->pr;
GList *list;
gboolean new_data, gboolean fast)
{
PixbufRenderer *pr = rt->pr;
- GtkWidget *box;
- GdkWindow *window;
+ //~ GtkWidget *box;
+ //~ GdkWindow *window;
cairo_t *cr;
/* clamp to visible */
rt_tile_render(rt, it, x, y, w, h, new_data, fast);
- box = GTK_WIDGET(pr);
- window = gtk_widget_get_window(box);
+ //~ box = GTK_WIDGET(pr);
+ //~ window = gtk_widget_get_window(box);
-#if GTK_CHECK_VERSION(3,0,0)
cr = cairo_create(rt->surface);
-#else
- cr = gdk_cairo_create(window);
-#endif
cairo_set_source_surface(cr, it->surface, pr->x_offset + (it->x - rt->x_scroll) + rt->stereo_off_x, pr->y_offset + (it->y - rt->y_scroll) + rt->stereo_off_y);
cairo_rectangle (cr, pr->x_offset + (it->x - rt->x_scroll) + x + rt->stereo_off_x, pr->y_offset + (it->y - rt->y_scroll) + y + rt->stereo_off_y, w, h);
cairo_fill (cr);
it);
}
-#if GTK_CHECK_VERSION(3,0,0)
gtk_widget_queue_draw(GTK_WIDGET(rt->pr));
-#endif
}
y2 = abs(y_off);
}
-#if GTK_CHECK_VERSION(3,0,0)
cr = cairo_create(rt->surface);
surface = rt->surface;
-#else
- GtkWidget *box;
- GdkWindow *window;
-
- box = GTK_WIDGET(pr);
- window = gtk_widget_get_window(box);
- cr = gdk_cairo_create(window);
- surface = cairo_get_target(cr);
-#endif
/* clipping restricts the intermediate surface's size, so it's a good idea
* to use it. */
cairo_rectangle(cr, x1 + pr->x_offset + rt->stereo_off_x, y1 + pr->y_offset + rt->stereo_off_y, w, h);
clamp, render, new_data, only_existing);
}
-static void renderer_update_pixbuf(void *renderer, gboolean lazy)
+static void renderer_update_pixbuf(void *renderer, gboolean UNUSED(lazy))
{
rt_queue_clear((RendererTiles *)renderer);
}
rt->stereo_off_y = rt->pr->stereo_fixed_y_left;
}
}
- DEBUG_1("update size: %p %d %d %d %d", rt, rt->stereo_off_x, rt->stereo_off_y, rt->pr->viewport_width, rt->pr->viewport_height);
+ DEBUG_1("update size: %p %d %d %d %d", (void *)rt, rt->stereo_off_x, rt->stereo_off_y, rt->pr->viewport_width, rt->pr->viewport_height);
rt_sync_scroll(rt);
rt_overlay_update_sizes(rt);
rt_border_clear(rt);
g_free(rt);
}
-#if GTK_CHECK_VERSION(3,0,0)
static gboolean rt_realize_cb(GtkWidget *widget, gpointer data)
{
RendererTiles *rt = (RendererTiles *)data;
return FALSE;
}
-static gboolean rt_draw_cb(GtkWidget *widget, cairo_t *cr, gpointer data)
+static gboolean rt_draw_cb(GtkWidget *UNUSED(widget), cairo_t *cr, gpointer data)
{
RendererTiles *rt = (RendererTiles *)data;
GList *work;
return FALSE;
}
-#else
-static gboolean rt_expose_cb(GtkWidget *widget, GdkEventExpose *event, gpointer data)
-{
- RendererTiles *rt = (RendererTiles *)data;
- if (gtk_widget_is_drawable(widget))
- {
- if (gtk_widget_get_has_window(widget))
- {
- if (event->window != gtk_widget_get_window(widget))
- {
- GdkRectangle area;
-
- gdk_window_get_position(event->window, &area.x, &area.y);
- area.x += event->area.x;
- area.y += event->area.y;
- area.width = event->area.width;
- area.height = event->area.height;
- renderer_redraw(rt, area.x, area.y, area.width, area.height,
- FALSE, TILE_RENDER_ALL, FALSE, FALSE);
-
- }
- else
- {
- renderer_redraw(rt, event->area.x, event->area.y, event->area.width, event->area.height,
- FALSE, TILE_RENDER_ALL, FALSE, FALSE);
- }
- }
- }
-
- return FALSE;
-}
-#endif
-
-
RendererFuncs *renderer_tiles_new(PixbufRenderer *pr)
{
RendererTiles *rt = g_new0(RendererTiles, 1);
rt->stereo_off_x = 0;
rt->stereo_off_y = 0;
-#if GTK_CHECK_VERSION(3, 10, 0)
rt->hidpi_scale = gtk_widget_get_scale_factor(GTK_WIDGET(rt->pr));
-#else
- rt->hidpi_scale = 1;
-#endif
g_signal_connect(G_OBJECT(pr), "hierarchy-changed",
G_CALLBACK(rt_hierarchy_changed_cb), rt);
-#if GTK_CHECK_VERSION(3,0,0)
g_signal_connect(G_OBJECT(pr), "draw",
G_CALLBACK(rt_draw_cb), rt);
g_signal_connect(G_OBJECT(pr), "realize", G_CALLBACK(rt_realize_cb), rt);
g_signal_connect(G_OBJECT(pr), "size-allocate", G_CALLBACK(rt_size_allocate_cb), rt);
-#else
- g_signal_connect(G_OBJECT(pr), "expose_event",
- G_CALLBACK(rt_expose_cb), rt);
-#endif
return (RendererFuncs *) rt;
}
return g_list_reverse(list);
}
-static gboolean search_result_free_node(GtkTreeModel *store, GtkTreePath *tpath,
- GtkTreeIter *iter, gpointer data)
+static gboolean search_result_free_node(GtkTreeModel *store, GtkTreePath *UNUSED(tpath),
+ GtkTreeIter *iter, gpointer UNUSED(data))
{
MatchFileData *mfd;
}
}
-static gboolean search_result_select_cb(GtkTreeSelection *selection, GtkTreeModel *store,
- GtkTreePath *tpath, gboolean selected, gpointer data)
+static gboolean search_result_select_cb(GtkTreeSelection *UNUSED(selection), GtkTreeModel *UNUSED(store),
+ GtkTreePath *UNUSED(tpath), gboolean UNUSED(selected), gpointer data)
{
SearchData *sd = data;
search_result_thumb_set(sd, fd, NULL);
}
-static void search_result_thumb_done_cb(ThumbLoader *tl, gpointer data)
+static void search_result_thumb_done_cb(ThumbLoader *UNUSED(tl), gpointer data)
{
SearchData *sd = data;
*-------------------------------------------------------------------
*/
-static void sr_menu_view_cb(GtkWidget *widget, gpointer data)
+static void sr_menu_view_cb(GtkWidget *UNUSED(widget), gpointer data)
{
SearchData *sd = data;
if (sd->click_fd) layout_set_fd(NULL, sd->click_fd);
}
-static void sr_menu_viewnew_cb(GtkWidget *widget, gpointer data)
+static void sr_menu_viewnew_cb(GtkWidget *UNUSED(widget), gpointer data)
{
SearchData *sd = data;
GList *list;
filelist_free(list);
}
-static void sr_menu_select_all_cb(GtkWidget *widget, gpointer data)
+static void sr_menu_select_all_cb(GtkWidget *UNUSED(widget), gpointer data)
{
SearchData *sd = data;
GtkTreeSelection *selection;
gtk_tree_selection_select_all(selection);
}
-static void sr_menu_select_none_cb(GtkWidget *widget, gpointer data)
+static void sr_menu_select_none_cb(GtkWidget *UNUSED(widget), gpointer data)
{
SearchData *sd = data;
GtkTreeSelection *selection;
search_result_edit_selected(sd, key);
}
-static void sr_menu_print_cb(GtkWidget *widget, gpointer data)
+static void sr_menu_print_cb(GtkWidget *UNUSED(widget), gpointer data)
{
SearchData *sd = data;
search_result_get_filelist(sd), sd->window);
}
-static void sr_menu_copy_cb(GtkWidget *widget, gpointer data)
+static void sr_menu_copy_cb(GtkWidget *UNUSED(widget), gpointer data)
{
SearchData *sd = data;
file_util_copy(NULL, search_result_selection_list(sd), NULL, sd->window);
}
-static void sr_menu_move_cb(GtkWidget *widget, gpointer data)
+static void sr_menu_move_cb(GtkWidget *UNUSED(widget), gpointer data)
{
SearchData *sd = data;
file_util_move(NULL, search_result_selection_list(sd), NULL, sd->window);
}
-static void sr_menu_rename_cb(GtkWidget *widget, gpointer data)
+static void sr_menu_rename_cb(GtkWidget *UNUSED(widget), gpointer data)
{
SearchData *sd = data;
file_util_rename(NULL, search_result_selection_list(sd), sd->window);
}
-static void sr_menu_delete_cb(GtkWidget *widget, gpointer data)
+static void sr_menu_delete_cb(GtkWidget *UNUSED(widget), gpointer data)
{
SearchData *sd = data;
file_util_delete(NULL, search_result_selection_list(sd), sd->window);
}
-static void sr_menu_move_to_trash_cb(GtkWidget *widget, gpointer data)
+static void sr_menu_move_to_trash_cb(GtkWidget *UNUSED(widget), gpointer data)
{
SearchData *sd = data;
file_util_delete(NULL, search_result_selection_list(sd), sd->window);
}
-static void sr_menu_copy_path_cb(GtkWidget *widget, gpointer data)
+static void sr_menu_copy_path_cb(GtkWidget *UNUSED(widget), gpointer data)
{
SearchData *sd = data;
file_util_copy_path_list_to_clipboard(search_result_selection_list(sd), TRUE);
}
-static void sr_menu_copy_path_unquoted_cb(GtkWidget *widget, gpointer data)
+static void sr_menu_copy_path_unquoted_cb(GtkWidget *UNUSED(widget), gpointer data)
{
SearchData *sd = data;
file_util_copy_path_list_to_clipboard(search_result_selection_list(sd), FALSE);
}
-static void sr_menu_play_cb(GtkWidget *widget, gpointer data)
+static void sr_menu_play_cb(GtkWidget *UNUSED(widget), gpointer data)
{
SearchData *sd = data;
start_editor_from_file(options->image_l_click_video_editor, sd->click_fd);
}
-static void search_result_menu_destroy_cb(GtkWidget *widget, gpointer data)
+static void search_result_menu_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
{
GList *editmenu_fd_list = data;
return menu;
}
-static void search_result_menu_pos_cb(GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer data)
+static void search_result_menu_pos_cb(GtkMenu *menu, gint *x, gint *y, gboolean *UNUSED(push_in), gpointer data)
{
SearchData *sd = data;
GtkTreePath *tpath;
return stop_signal;
}
-static gboolean search_window_keypress_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
+static gboolean search_window_keypress_cb(GtkWidget *UNUSED(widget), GdkEventKey *event, gpointer data)
{
SearchData *sd = data;
gboolean stop_signal = FALSE;
};
static gint n_result_drop_types = 2;
-static void search_dnd_data_set(GtkWidget *widget, GdkDragContext *context,
- GtkSelectionData *selection_data, guint info,
- guint time, gpointer data)
+static void search_dnd_data_set(GtkWidget *UNUSED(widget), GdkDragContext *UNUSED(context),
+ GtkSelectionData *selection_data, guint UNUSED(info),
+ guint UNUSED(time), gpointer data)
{
SearchData *sd = data;
GList *list;
}
}
-static void search_gps_dnd_received_cb(GtkWidget *pane, GdkDragContext *context,
- gint x, gint y,
+static void search_gps_dnd_received_cb(GtkWidget *UNUSED(pane), GdkDragContext *UNUSED(context),
+ gint UNUSED(x), gint UNUSED(y),
GtkSelectionData *selection_data, guint info,
- guint time, gpointer data)
+ guint UNUSED(time), gpointer data)
{
SearchData *sd = data;
GList *list;
}
}
-static void search_path_entry_dnd_received_cb(GtkWidget *pane, GdkDragContext *context,
- gint x, gint y,
+static void search_path_entry_dnd_received_cb(GtkWidget *UNUSED(pane), GdkDragContext *UNUSED(context),
+ gint UNUSED(x), gint UNUSED(y),
GtkSelectionData *selection_data, guint info,
- guint time, gpointer data)
+ guint UNUSED(time), gpointer data)
{
SearchData *sd = data;
GList *list;
}
}
-static void search_image_content_dnd_received_cb(GtkWidget *pane, GdkDragContext *context,
- gint x, gint y,
+static void search_image_content_dnd_received_cb(GtkWidget *UNUSED(pane), GdkDragContext *UNUSED(context),
+ gint UNUSED(x), gint UNUSED(y),
GtkSelectionData *selection_data, guint info,
- guint time, gpointer data)
+ guint UNUSED(time), gpointer data)
{
SearchData *sd = data;
GList *list;
sd->search_idle_id = g_idle_add(search_step_cb, sd);
}
-static void search_file_load_done_cb(ImageLoader *il, gpointer data)
+static void search_file_load_done_cb(ImageLoader *UNUSED(il), gpointer data)
{
SearchData *sd = data;
search_file_load_process(sd, sd->img_cd);
return TRUE;
}
-static void search_similarity_load_done_cb(ImageLoader *il, gpointer data)
+static void search_similarity_load_done_cb(ImageLoader *UNUSED(il), gpointer data)
{
SearchData *sd = data;
search_file_load_process(sd, sd->search_similarity_cd);
sd->search_idle_id = g_idle_add(search_step_cb, sd);
}
-static void search_start_cb(GtkWidget *widget, gpointer data)
+static void search_start_cb(GtkWidget *UNUSED(widget), gpointer data)
{
SearchData *sd = data;
GtkTreeViewColumn *column;
GtkWidget *button;
GtkWidget *option;
- base_box = gtk_hbox_new(FALSE, PREF_PAD_GAP);
+ base_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP);
gtk_box_pack_start(GTK_BOX(box), base_box, FALSE, FALSE, 0);
gtk_widget_show(base_box);
if (check) *check = button;
if (value) g_object_set_data(G_OBJECT(button), "check_var", value);
- hbox = gtk_hbox_new(FALSE, PREF_PAD_SPACE);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
gtk_box_pack_start(GTK_BOX(base_box), hbox, TRUE, TRUE, 0);
gtk_widget_show(hbox);
gtk_widget_destroy(sd->window);
}
-static void search_window_close_cb(GtkWidget *widget, gpointer data)
+static void search_window_close_cb(GtkWidget *UNUSED(widget), gpointer data)
{
SearchData *sd = data;
search_window_close(sd);
}
-static void search_window_help_cb(GtkWidget *widget, gpointer data)
+static void search_window_help_cb(GtkWidget *UNUSED(widget), gpointer UNUSED(data))
{
help_window_show("GuideImageSearchSearch.html");
}
-static gboolean search_window_delete_cb(GtkWidget *widget, GdkEventAny *event, gpointer data)
+static gboolean search_window_delete_cb(GtkWidget *UNUSED(widget), GdkEventAny *UNUSED(event), gpointer data)
{
SearchData *sd = data;
return TRUE;
}
-static void search_window_destroy_cb(GtkWidget *widget, gpointer data)
+static void search_window_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
{
SearchData *sd = data;
g_free(sd);
}
-static void select_collection_dialog_close_cb(FileDialog *fdlg, gpointer data)
+static void select_collection_dialog_close_cb(FileDialog *fdlg, gpointer UNUSED(data))
{
file_dialog_close(fdlg);
}
g_free(collection);
}
-static void select_collection_clicked_cb(GtkWidget *widget, gpointer data)
+static void select_collection_clicked_cb(GtkWidget *UNUSED(widget), gpointer data)
{
SearchData *sd = data;
FileDialog *fdlg;
title = _("Select collection");
btntext = NULL;
- btnfunc = select_collection_dialog_ok_cb;
+ btnfunc = (void *)select_collection_dialog_ok_cb;
stock_id = GTK_STOCK_OK;
fdlg = file_util_file_dlg(title, "dlg_collection", sd->window, select_collection_dialog_close_cb, sd);
generic_dialog_add_message(GENERIC_DIALOG(fdlg), NULL, title, NULL, FALSE);
- file_dialog_add_button(fdlg, stock_id, btntext, btnfunc, TRUE);
+ file_dialog_add_button(fdlg, stock_id, btntext, (void(*)(FileDialog *, gpointer))btnfunc, TRUE);
file_dialog_add_path_widgets(fdlg, get_collections_dir(), NULL, "search_collection", GQ_COLLECTION_EXT, _("Collection Files"));
g_signal_connect(G_OBJECT(sd->window), "key_press_event",
G_CALLBACK(search_window_keypress_cb), sd);
- vbox = gtk_vbox_new(FALSE, PREF_PAD_GAP);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
gtk_container_set_border_width(GTK_CONTAINER(vbox), PREF_PAD_GAP);
gtk_container_add(GTK_CONTAINER(sd->window), vbox);
gtk_widget_show(vbox);
G_CALLBACK(menu_choice_size_cb), sd);
sd->spin_size = menu_spin(hbox, 0, 1024*1024*1024, sd->search_size,
G_CALLBACK(menu_choice_spin_cb), &sd->search_size);
- hbox2 = gtk_hbox_new(FALSE, PREF_PAD_SPACE);
+ hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
gtk_box_pack_start(GTK_BOX(hbox), hbox2, FALSE, FALSE, 0);
pref_label_new(hbox2, _("and"));
sd->spin_size_end = menu_spin(hbox2, 0, 1024*1024*1024, sd->search_size_end,
gtk_box_pack_start(GTK_BOX(hbox), sd->date_sel, FALSE, FALSE, 0);
gtk_widget_show(sd->date_sel);
- hbox2 = gtk_hbox_new(FALSE, PREF_PAD_SPACE);
+ hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
gtk_box_pack_start(GTK_BOX(hbox), hbox2, FALSE, FALSE, 0);
pref_label_new(hbox2, _("and"));
sd->date_sel_end = date_selection_new();
pref_label_new(pad_box, "x");
sd->spin_height = menu_spin(pad_box, 0, 1000000, sd->search_height,
G_CALLBACK(menu_choice_spin_cb), &sd->search_height);
- hbox2 = gtk_hbox_new(FALSE, 2);
+ hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2);
gtk_box_pack_start(GTK_BOX(hbox), hbox2, FALSE, FALSE, 0);
pref_label_new(hbox2, _("and"));
pref_spacer(hbox2, PREF_PAD_SPACE - 2*2);
G_CALLBACK(menu_choice_rating_cb), sd);
sd->spin_size = menu_spin(hbox, -1, 5, sd->search_rating,
G_CALLBACK(menu_choice_spin_cb), &sd->search_rating);
- hbox2 = gtk_hbox_new(FALSE, PREF_PAD_SPACE);
+ hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
gtk_box_pack_start(GTK_BOX(hbox), hbox2, FALSE, FALSE, 0);
pref_label_new(hbox2, _("and"));
sd->spin_rating_end = menu_spin(hbox2, -1, 5, sd->search_rating_end,
text_search_menu_gps, sizeof(text_search_menu_gps) / sizeof(MatchList),
G_CALLBACK(menu_choice_gps_cb), sd);
- hbox2 = gtk_hbox_new(FALSE, PREF_PAD_SPACE);
+ hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
gtk_box_pack_start(GTK_BOX(hbox), hbox2, FALSE, FALSE, 0);
sd->spin_gps = menu_spin(hbox2, 1, 9999, sd->search_gps,
G_CALLBACK(menu_choice_spin_cb), &sd->search_gps);
sd->label_progress = gtk_progress_bar_new();
gtk_widget_set_size_request(sd->label_progress, 50, -1);
-#if GTK_CHECK_VERSION(3,0,0)
+
gtk_progress_bar_set_text(GTK_PROGRESS_BAR(sd->label_progress), "");
gtk_progress_bar_set_show_text(GTK_PROGRESS_BAR(sd->label_progress), TRUE);
-#endif
+
gtk_box_pack_start(GTK_BOX(hbox), sd->label_progress, TRUE, TRUE, 0);
gtk_widget_show(sd->label_progress);
gboolean match_found;
};
-static gint sort_iter_compare_func (GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer data)
+static gint sort_iter_compare_func (GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer UNUSED(data))
{
gint ret = 0;
gchar *label1, *label2;
return TRUE;
}
-static gboolean entry_box_activate_cb(GtkWidget *widget, gpointer data)
+static gboolean entry_box_activate_cb(GtkWidget *UNUSED(widget), gpointer data)
{
SarData *sar = data;
return TRUE;
}
-static gboolean keypress_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
+static gboolean keypress_cb(GtkWidget *UNUSED(widget), GdkEventKey *event, gpointer data)
{
SarData *sar = data;
gboolean ret = FALSE;
return ret;
}
-static gboolean match_selected_cb(GtkEntryCompletion *widget, GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
+static gboolean match_selected_cb(GtkEntryCompletion *UNUSED(widget), GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
{
SarData *sar = data;
normalized = g_utf8_normalize(label, -1, G_NORMALIZE_DEFAULT);
- reg_exp_str = g_string_new("\\b\(\?=.*:)");
+ reg_exp_str = g_string_new("\\b(\?=.*:)");
reg_exp_str = g_string_append(reg_exp_str, key);
reg_exp = g_regex_new(reg_exp_str->str, G_REGEX_CASELESS, 0, &error);
shortcuts_add_close(scd);
}
-static void shortcuts_add_cancel_cb(FileDialog *fd, gpointer data)
+static void shortcuts_add_cancel_cb(FileDialog *UNUSED(fd), gpointer data)
{
ShortcutsData *scd = data;
gtk_widget_show(GENERIC_DIALOG(scd->dialog)->dialog);
}
-static void shortcuts_destroy(GtkWidget *widget, gpointer data)
+static void shortcuts_destroy(GtkWidget *UNUSED(widget), gpointer data)
{
ShortcutsData *scd = data;
return scd->vbox;
}
-GtkWidget *shortcuts_new_from_config(LayoutWindow *lw, const gchar **attribute_names, const gchar **attribute_values)
+GtkWidget *shortcuts_new_from_config(LayoutWindow *lw, const gchar **UNUSED(attribute_names), const gchar **UNUSED(attribute_values))
{
GtkWidget *shortcuts_bar;
return success;
}
-static void thumb_loader_percent_cb(ImageLoader *il, gdouble percent, gpointer data)
+static void thumb_loader_percent_cb(ImageLoader *UNUSED(il), gdouble percent, gpointer data)
{
ThumbLoader *tl = data;
}
/* release thumb_pixbuf on file change - this forces reload. */
-void thumb_notify_cb(FileData *fd, NotifyType type, gpointer data)
+void thumb_notify_cb(FileData *fd, NotifyType type, gpointer UNUSED(data))
{
if ((type & (NOTIFY_REREAD | NOTIFY_CHANGE)) && fd->thumb_pixbuf)
{
}
#undef XV_BUFFER
-static void free_rgb_buffer(guchar *pixels, gpointer data)
+static void free_rgb_buffer(guchar *pixels, gpointer UNUSED(data))
{
g_free(pixels);
}
if (tl->func_error) tl->func_error(tl, tl->data);
}
-static void thumb_loader_std_progress_cb(ImageLoader *il, gdouble percent, gpointer data)
+static void thumb_loader_std_progress_cb(ImageLoader *UNUSED(il), gdouble percent, gpointer data)
{
ThumbLoaderStd *tl = data;
thumb_loader_std_thumb_file_validate_free(tv);
}
-static void thumb_loader_std_thumb_file_validate_done_cb(ThumbLoaderStd *tl, gpointer data)
+static void thumb_loader_std_thumb_file_validate_done_cb(ThumbLoaderStd *UNUSED(tl), gpointer data)
{
ThumbValidate *tv = data;
GdkPixbuf *pixbuf;
thumb_loader_std_thumb_file_validate_finish(tv, valid);
}
-static void thumb_loader_std_thumb_file_validate_error_cb(ThumbLoaderStd *tl, gpointer data)
+static void thumb_loader_std_thumb_file_validate_error_cb(ThumbLoaderStd *UNUSED(tl), gpointer data)
{
ThumbValidate *tv = data;
static gboolean thumb_std_maint_move_idle(gpointer data);
-static void thumb_std_maint_move_validate_cb(const gchar *path, gboolean valid, gpointer data)
+static void thumb_std_maint_move_validate_cb(const gchar *UNUSED(path), gboolean UNUSED(valid), gpointer data)
{
TMaintMove *tm = data;
GdkPixbuf *pixbuf;
thumb_std_maint_move_validate_cb, tm);
}
-static gboolean thumb_std_maint_move_idle(gpointer data)
+static gboolean thumb_std_maint_move_idle(gpointer UNUSED(data))
{
TMaintMove *tm;
gchar *pathl;
* @param single_step Move up/down one step, or to top/bottom
*
*/
-static void toolbar_item_move(GtkWidget *widget, gpointer data,
+static void toolbar_item_move(GtkWidget *UNUSED(widget), gpointer data,
gboolean up, gboolean single_step)
{
GtkWidget *list_item = data;
toolbar_item_move(widget, data, FALSE, FALSE);
}
-static void toolbar_item_delete_cb(GtkWidget *widget, gpointer data)
+static void toolbar_item_delete_cb(GtkWidget *UNUSED(widget), gpointer data)
{
gtk_widget_destroy(data);
}
gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, vbox, 0, GDK_CURRENT_TIME);
}
-static gboolean toolbar_press_cb(GtkWidget *button, GdkEventButton *event, gpointer data)
+static gboolean toolbar_press_cb(GtkWidget *UNUSED(button), GdkEventButton *event, gpointer data)
{
ToolbarButtonData *button_data = data;
g_object_set_data_full(G_OBJECT(toolbar_entry->button), "toolbarbuttondata",
toolbar_entry, (GDestroyNotify)toolbar_item_free);
- hbox = gtk_hbox_new(FALSE, PREF_PAD_BUTTON_GAP);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_BUTTON_GAP);
gtk_container_add(GTK_CONTAINER(toolbar_entry->button), hbox);
gtk_widget_show(hbox);
}
toolbarlist[bar]->lw = lw;
- toolbarlist[bar]->widget = gtk_vbox_new(FALSE, PREF_PAD_GAP);
+ toolbarlist[bar]->widget = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
gtk_widget_show(toolbarlist[bar]->widget);
scrolled = gtk_scrolled_window_new(NULL, NULL);
gtk_box_pack_start(GTK_BOX(toolbarlist[bar]->widget), scrolled, TRUE, TRUE, 0);
gtk_widget_show(scrolled);
- toolbarlist[bar]->vbox = gtk_vbox_new(FALSE, 0);
+ toolbarlist[bar]->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show(toolbarlist[bar]->vbox);
- gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled), toolbarlist[bar]->vbox);
+ gtk_container_add(GTK_CONTAINER(scrolled), toolbarlist[bar]->vbox);
gtk_viewport_set_shadow_type(GTK_VIEWPORT(gtk_bin_get_child(GTK_BIN(scrolled))),
GTK_SHADOW_NONE);
- add_box = gtk_vbox_new(FALSE, 0);
+ add_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show(add_box);
gtk_box_pack_end(GTK_BOX(toolbarlist[bar]->widget), add_box, FALSE, FALSE, 0);
tbar = pref_toolbar_new(add_box, GTK_TOOLBAR_ICONS);
CHANGE_WARN_CHANGED_EXT = 1 << 3,
CHANGE_WARN_UNSAVED_META = 1 << 4,
CHANGE_WARN_NO_WRITE_PERM_DEST_DIR = 1 << 5,
- CHANGE_ERROR_MASK = (~0U) << 8, /**< the values below are fatal errors */
+ CHANGE_ERROR_MASK = ~0xff, /**< the values below are fatal errors */
CHANGE_NO_READ_PERM = 1 << 8,
CHANGE_NO_WRITE_PERM_DIR = 1 << 9,
CHANGE_NO_DEST_DIR = 1 << 10,
if (bm->select_func) bm->select_func(b->path, bm->select_data);
}
-static void bookmark_edit_destroy_cb(GtkWidget *widget, gpointer data)
+static void bookmark_edit_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
{
BookPropData *p = data;
g_free(p);
}
-static void bookmark_edit_cancel_cb(GenericDialog *gd, gpointer data)
+static void bookmark_edit_cancel_cb(GenericDialog *UNUSED(gd), gpointer UNUSED(data))
{
}
-static void bookmark_edit_ok_cb(GenericDialog *gd, gpointer data)
+static void bookmark_edit_ok_cb(GenericDialog *UNUSED(gd), gpointer data)
{
BookPropData *p = data;
const gchar *name;
bookmark_move(bm, bm->active_button->button, direction);
}
-static void bookmark_menu_up_cb(GtkWidget *widget, gpointer data)
+static void bookmark_menu_up_cb(GtkWidget *UNUSED(widget), gpointer data)
{
bookmark_menu_move(data, -1);
}
-static void bookmark_menu_down_cb(GtkWidget *widget, gpointer data)
+static void bookmark_menu_down_cb(GtkWidget *UNUSED(widget), gpointer data)
{
bookmark_menu_move(data, 1);
}
-static void bookmark_menu_remove_cb(GtkWidget *widget, gpointer data)
+static void bookmark_menu_remove_cb(GtkWidget *UNUSED(widget), gpointer data)
{
BookMarkData *bm = data;
bookmark_populate_all(bm->key);
}
-static void bookmark_menu_position_cb(GtkMenu *menu, gint *x, gint *y, gint *pushed_in, gpointer data)
+static void bookmark_menu_position_cb(GtkMenu *UNUSED(menu), gint *x, gint *y, gint *UNUSED(pushed_in), gpointer data)
{
GtkWidget *button = data;
GtkAllocation allocation;
static void bookmark_drag_set_data(GtkWidget *button,
GdkDragContext *context, GtkSelectionData *selection_data,
- guint info, guint time, gpointer data)
+ guint UNUSED(info), guint UNUSED(time), gpointer data)
{
BookMarkData *bm = data;
BookButtonData *b;
GList *list = NULL;
-#if GTK_CHECK_VERSION(3,0,0)
return;
if (gdk_drag_context_get_dest_window(context) == gtk_widget_get_window(bm->widget)) return;
-#else
- if (context->dest_window == bm->widget->window) return;
-#endif
b = g_object_get_data(G_OBJECT(button), "bookbuttondata");
if (!b) return;
g_list_free(list);
}
-static void bookmark_drag_begin(GtkWidget *button, GdkDragContext *context, gpointer data)
+static void bookmark_drag_begin(GtkWidget *button, GdkDragContext *context, gpointer UNUSED(data))
{
GdkPixbuf *pixbuf;
GdkModifierType mask;
gint x, y;
GtkAllocation allocation;
-#if GTK_CHECK_VERSION(3,0,0)
GdkDeviceManager *device_manager;
GdkDevice *device;
-#endif
gtk_widget_get_allocation(button, &allocation);
-#if GTK_CHECK_VERSION(3,0,0)
pixbuf = gdk_pixbuf_get_from_window(gtk_widget_get_window(button),
allocation.x, allocation.y,
allocation.width, allocation.height);
device_manager = gdk_display_get_device_manager(gdk_window_get_display(gtk_widget_get_window(button)));
device = gdk_device_manager_get_client_pointer(device_manager);
gdk_window_get_device_position(gtk_widget_get_window(button), device, &x, &y, &mask);
-#else
- pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8,
- allocation.width, allocation.height);
- gdk_pixbuf_get_from_drawable(pixbuf, gtk_widget_get_window(button), NULL,
- allocation.x, allocation.y,
- 0, 0, allocation.width, allocation.height);
- gdk_window_get_pointer(gtk_widget_get_window(button), &x, &y, &mask);
-#endif
gtk_drag_set_icon_pixbuf(context, pixbuf,
x - allocation.x, y - allocation.y);
g_object_unref(pixbuf);
}
-static gboolean bookmark_path_tooltip_cb(GtkWidget *button, gpointer data)
+static gboolean bookmark_path_tooltip_cb(GtkWidget *button, gpointer UNUSED(data))
{
BookButtonData *b;
g_object_set_data_full(G_OBJECT(b->button), "bookbuttondata",
b, (GDestroyNotify)bookmark_free);
- box = gtk_hbox_new(FALSE, PREF_PAD_BUTTON_GAP);
+ box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_BUTTON_GAP);
gtk_container_add(GTK_CONTAINER(b->button), box);
gtk_widget_show(box);
}
}
-static void bookmark_dnd_get_data(GtkWidget *widget,
- GdkDragContext *context, gint x, gint y,
- GtkSelectionData *selection_data, guint info,
- guint time, gpointer data)
+static void bookmark_dnd_get_data(GtkWidget *UNUSED(widget),
+ GdkDragContext *UNUSED(context), gint UNUSED(x), gint UNUSED(y),
+ GtkSelectionData *selection_data, guint UNUSED(info),
+ guint UNUSED(time), gpointer data)
{
BookMarkData *bm = data;
GList *list = NULL;
}
}
-static void bookmark_list_destroy(GtkWidget *widget, gpointer data)
+static void bookmark_list_destroy(GtkWidget *UNUSED(widget), gpointer data)
{
BookMarkData *bm = data;
scrolled = gtk_scrolled_window_new(NULL, NULL);
-#if GTK_CHECK_VERSION(3,0,0)
PangoLayout *layout;
gint width, height;
g_object_unref(layout);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-#else
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-#endif
- bm->box = gtk_vbox_new(FALSE, 0);
- gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled), bm->box);
+ bm->box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+ gtk_container_add(GTK_CONTAINER(scrolled), bm->box);
gtk_widget_show(bm->box);
bookmark_populate(bm);
gint history_levels;
};
-static void history_combo_destroy(GtkWidget *widget, gpointer data)
+static void history_combo_destroy(GtkWidget *UNUSED(widget), gpointer data)
{
HistoryComboData *hc = data;
return path8;
}
-void list_free_wrapper(void *data, void *userdata)
+void list_free_wrapper(void *data, void *UNUSED(userdata))
{
g_free(data);
}
}
}
-static void download_web_file_cancel_button_cb(GenericDialog *gd, gpointer data)
+static void download_web_file_cancel_button_cb(GenericDialog *UNUSED(gd), gpointer data)
{
WebData* web = data;
GError *error = NULL;
WebData *web;
gchar *base;
- gboolean ret;
+ gboolean ret = FALSE;
gchar *message;
FileFormatClass format_class;
{
LayoutWindow *lw = NULL;
-#if GTK_CHECK_VERSION(3, 10, 0)
layout_valid(&lw);
return gtk_widget_get_scale_factor(lw->window);
-#else
- return 1;
-#endif
}
/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
gtk_text_view_scroll_to_iter(GTK_TEXT_VIEW(text), &iter, 0.0, TRUE, 0, 0);
}
-static gboolean help_window_delete_cb(GtkWidget *widget, GdkEventAny *event, gpointer data)
+static gboolean help_window_delete_cb(GtkWidget *widget, GdkEventAny *UNUSED(event), gpointer UNUSED(data))
{
gtk_widget_destroy(widget);
return TRUE;
}
-static void help_window_close(GtkWidget *widget, gpointer data)
+static void help_window_close(GtkWidget *UNUSED(widget), gpointer data)
{
GtkWidget *window = data;
gtk_widget_destroy(window);
g_signal_connect(G_OBJECT(window), "delete_event",
G_CALLBACK(help_window_delete_cb), NULL);
- vbox = gtk_vbox_new(FALSE, 0);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add(GTK_CONTAINER(window), vbox);
gtk_widget_show(vbox);
/* text window */
- hbox = gtk_hbox_new(FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
gtk_widget_show(hbox);
*-----------------------------------------------------------------------------
*/
-static void popup_menu_short_lived_cb(GtkWidget *widget, gpointer data)
+static void popup_menu_short_lived_cb(GtkWidget *UNUSED(widget), gpointer data)
{
/* destroy the menu */
g_object_unref(G_OBJECT(data));
if (orientation == GTK_ORIENTATION_HORIZONTAL)
{
- box = gtk_hbox_new(FALSE, padding);
+ box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, padding);
}
else
{
- box = gtk_vbox_new(FALSE, padding);
+ box = gtk_box_new(GTK_ORIENTATION_VERTICAL, padding);
}
gtk_box_pack_start(GTK_BOX(parent_box), box, fill, fill, 0);
GtkWidget *hbox;
GtkWidget *label;
- vbox = gtk_vbox_new(FALSE, PREF_PAD_GAP);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
/* add additional spacing if necessary */
if (GTK_IS_VBOX(parent_box))
gtk_widget_show(vbox);
label = gtk_label_new(text);
-#if GTK_CHECK_VERSION(3,16,0)
gtk_label_set_xalign(GTK_LABEL(label), 0.0);
gtk_label_set_yalign(GTK_LABEL(label), 0.5);
-#else
- gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-#endif
pref_label_bold(label, TRUE, FALSE);
gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
gtk_widget_show(label);
- hbox = gtk_hbox_new(FALSE, PREF_PAD_INDENT);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_INDENT);
gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
gtk_widget_show(hbox);
if (orientation == GTK_ORIENTATION_HORIZONTAL)
{
- box = gtk_hbox_new(FALSE, PREF_PAD_SPACE);
+ box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
}
else
{
- box = gtk_vbox_new(FALSE, PREF_PAD_GAP);
+ box = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
}
gtk_box_pack_start(GTK_BOX(hbox), box, TRUE, TRUE, 0);
gtk_widget_show(box);
if (orientation == GTK_ORIENTATION_HORIZONTAL)
{
- box = gtk_hbox_new(FALSE, padding);
+ box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, padding);
}
else
{
- box = gtk_vbox_new(FALSE, padding);
+ box = gtk_box_new(GTK_ORIENTATION_VERTICAL, padding);
}
gtk_container_add(GTK_CONTAINER(frame), box);
gtk_container_set_border_width(GTK_CONTAINER(box), PREF_PAD_BORDER);
{
GtkWidget *spacer;
- spacer = gtk_hbox_new(FALSE, 0);
+ spacer = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(parent_box), spacer, FALSE, FALSE, padding / 2);
gtk_widget_show(spacer);
button = gtk_button_new();
- if (stock_id) image = gtk_image_new_from_stock(stock_id, GTK_ICON_SIZE_BUTTON);
+ if (stock_id) image = gtk_image_new_from_icon_name(stock_id, GTK_ICON_SIZE_BUTTON);
if (text)
{
label = gtk_label_new_with_mnemonic(text);
-#if GTK_CHECK_VERSION(3,16,0)
gtk_label_set_xalign(GTK_LABEL(label), 0.5);
gtk_label_set_yalign(GTK_LABEL(label), 0.5);
-#else
- gtk_misc_set_alignment(GTK_MISC(label), 0.5, 0.5);
-#endif
gtk_label_set_mnemonic_widget(GTK_LABEL(label), button);
}
GtkWidget *align;
GtkWidget *hbox;
- hbox = gtk_hbox_new(FALSE, PREF_PAD_BUTTON_ICON_GAP);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_BUTTON_ICON_GAP);
align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
gtk_container_add(GTK_CONTAINER(button), align);
GtkWidget *pref_radiobutton_new_int(GtkWidget *parent_box, GtkWidget *sibling,
const gchar *text, gboolean active,
gboolean *result, gboolean value,
- GCallback func, gpointer data)
+ GCallback UNUSED(func), gpointer UNUSED(data))
{
GtkWidget *button;
G_CALLBACK(pref_spin_int_cb), value_var);
}
-static void pref_link_sensitivity_cb(GtkWidget *watch, GtkStateType prev_state, gpointer data)
+static void pref_link_sensitivity_cb(GtkWidget *watch, GtkStateType UNUSED(prev_state), gpointer data)
{
GtkWidget *widget = data;
if (text)
{
- shell = gtk_vbox_new(FALSE, 0);
+ shell = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
box = pref_group_new(shell, TRUE, text, orientation);
}
else
{
if (orientation == GTK_ORIENTATION_HORIZONTAL)
{
- box = gtk_hbox_new(FALSE, PREF_PAD_SPACE);
+ box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
}
else
{
- box = gtk_vbox_new(FALSE, PREF_PAD_GAP);
+ box = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
}
shell = box;
}
if (suffix)
{
- box = gtk_hbox_new(FALSE, PREF_PAD_SPACE);
+ box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
gtk_box_pack_start(GTK_BOX(box), spin, FALSE, FALSE, 0);
gtk_widget_show(spin);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ds->button), FALSE);
}
-static gboolean date_selection_popup_release_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
+static gboolean date_selection_popup_release_cb(GtkWidget *UNUSED(widget), GdkEventButton *UNUSED(event), gpointer data)
{
DateSelection *ds = data;
return TRUE;
}
-static gboolean date_selection_popup_press_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
+static gboolean date_selection_popup_press_cb(GtkWidget *UNUSED(widget), GdkEventButton *event, gpointer data)
{
DateSelection *ds = data;
gint x, y;
date_selection_set(ds->box, day, month + 1, year);
}
-static gboolean date_selection_popup_keypress_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
+static gboolean date_selection_popup_keypress_cb(GtkWidget *UNUSED(widget), GdkEventKey *event, gpointer data)
{
DateSelection *ds = data;
return FALSE;
}
-static void date_selection_day_cb(GtkWidget *widget, gpointer data)
+static void date_selection_day_cb(GtkWidget *UNUSED(widget), gpointer data)
{
DateSelection *ds = data;
date_selection_popup_sync(ds);
}
-static void date_selection_doubleclick_cb(GtkWidget *widget, gpointer data)
+static void date_selection_doubleclick_cb(GtkWidget *UNUSED(widget), gpointer data)
{
DateSelection *ds = data;
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ds->button), TRUE);
}
-static void date_selection_button_cb(GtkWidget *widget, gpointer data)
+static void date_selection_button_cb(GtkWidget *UNUSED(widget), gpointer data)
{
DateSelection *ds = data;
gtk_widget_set_size_request(spin, req.width + value, -1);
}
-static void date_selection_destroy_cb(GtkWidget *widget, gpointer data)
+static void date_selection_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
{
DateSelection *ds = data;
gchar *date_format;
gint i;
- ds->box = gtk_hbox_new(FALSE, 2);
+ ds->box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2);
g_signal_connect(G_OBJECT(ds->box), "destroy",
G_CALLBACK(date_selection_destroy_cb), ds);
return handle_size;
}
-static gboolean sizer_motion_cb(GtkWidget *widget, GdkEventMotion *event, gpointer data)
+static gboolean sizer_motion_cb(GtkWidget *UNUSED(widget), GdkEventMotion *event, gpointer data)
{
SizerData *sd = data;
gint x, y;
return TRUE;
}
-static gboolean sizer_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+static gboolean sizer_press_cb(GtkWidget *UNUSED(widget), GdkEventButton *bevent, gpointer data)
{
SizerData *sd = data;
GtkAllocation parent_allocation;
return TRUE;
}
-static gboolean sizer_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+static gboolean sizer_release_cb(GtkWidget *UNUSED(widget), GdkEventButton *bevent, gpointer data)
{
SizerData *sd = data;
sizer_allocation.width, sizer_allocation.height);
}
-static gboolean sizer_enter_cb(GtkWidget *widget, GdkEventCrossing *event, gpointer data)
+static gboolean sizer_enter_cb(GtkWidget *UNUSED(widget), GdkEventCrossing *UNUSED(event), gpointer data)
{
SizerData *sd = data;
return TRUE;
}
-static gboolean sizer_leave_cb(GtkWidget *widget, GdkEventCrossing *event, gpointer data)
+static gboolean sizer_leave_cb(GtkWidget *UNUSED(widget), GdkEventCrossing *UNUSED(event), gpointer data)
{
SizerData *sd = data;
return TRUE;
}
-static gboolean sizer_expose_cb(GtkWidget *widget, GdkEventExpose *event, gpointer data)
+static gboolean sizer_expose_cb(GtkWidget *widget, GdkEventExpose *UNUSED(event), gpointer UNUSED(data))
{
-#if GTK_CHECK_VERSION(3,0,0)
GtkAllocation allocation;
gtk_widget_get_allocation(widget, &allocation);
gtk_render_handle (gtk_widget_get_style_context (widget),
cr, allocation.x, allocation.y, allocation.width, allocation.height);
cairo_destroy(cr);
-#else
- SizerData *sd = data;
- GdkRectangle clip;
- GtkOrientation orientation;
- GtkStateType state;
- GtkAllocation allocation;
-
- gtk_widget_get_allocation(widget, &allocation);
-
- if (sd->position & SIZER_POS_LEFT || sd->position & SIZER_POS_RIGHT)
- {
- orientation = GTK_ORIENTATION_VERTICAL;
- }
- else
- {
- orientation = GTK_ORIENTATION_HORIZONTAL;
- }
-
- if (sd->handle_prelit)
- {
- state = GTK_STATE_PRELIGHT;
- }
- else
- {
- state = gtk_widget_get_state(widget);
- }
-
- gdk_region_get_clipbox(event->region, &clip);
-
- gtk_paint_handle(gtk_widget_get_style(widget), gtk_widget_get_window(widget), state,
- GTK_SHADOW_NONE, &clip, widget, "paned",
- 0, 0,
- allocation.width, allocation.height,
- orientation);
-#endif
return TRUE;
}
GdkCursor *cursor;
cursor = gdk_cursor_new(n);
gdk_window_set_cursor(gtk_widget_get_window(widget), cursor);
- gdk_cursor_unref(cursor);
+ g_object_unref(G_OBJECT(cursor));
}
}
-static void sizer_destroy_cb(GtkWidget *widget, gpointer data)
+static void sizer_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
{
SizerData *sd = data;
gtk_color_button_set_title(GTK_COLOR_BUTTON(button), title);
label = gtk_label_new(title);
- hbox = gtk_hbox_new(TRUE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(parent_box), hbox, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
}
}
-gboolean defined_mouse_buttons(GtkWidget *widget, GdkEventButton *event, gpointer data)
+gboolean defined_mouse_buttons(GtkWidget *UNUSED(widget), GdkEventButton *event, gpointer data)
{
LayoutWindow *lw = data;
GtkAction *action;
*-----------------------------------------------------------------------------
*/
-static void dest_free_data(GtkWidget *widget, gpointer data)
+static void dest_free_data(GtkWidget *UNUSED(widget), gpointer data)
{
Dest_Data *dd = data;
static void dest_dnd_set_data(GtkWidget *view,
- GdkDragContext *context, GtkSelectionData *selection_data,
- guint info, guint time, gpointer data)
+ GdkDragContext *UNUSED(context), GtkSelectionData *selection_data,
+ guint UNUSED(info), guint UNUSED(time), gpointer UNUSED(data))
{
gchar *path = NULL;
GList *list = NULL;
g_free(text);
}
-static void dest_view_delete_dlg_cancel(GenericDialog *gd, gpointer data)
+static void dest_view_delete_dlg_cancel(GenericDialog *UNUSED(gd), gpointer data)
{
DestDel_Data *dl = data;
g_free(path);
}
-static void dest_popup_dir_rename_cb(GtkWidget *widget, gpointer data)
+static void dest_popup_dir_rename_cb(GtkWidget *UNUSED(widget), gpointer data)
{
Dest_Data *dd = data;
dest_view_rename(dd, GTK_TREE_VIEW(dd->d_view));
}
-static void dest_popup_dir_bookmark_cb(GtkWidget *widget, gpointer data)
+static void dest_popup_dir_bookmark_cb(GtkWidget *UNUSED(widget), gpointer data)
{
Dest_Data *dd = data;
dest_view_bookmark(dd, GTK_TREE_VIEW(dd->d_view));
}
-static void dest_popup_file_rename_cb(GtkWidget *widget, gpointer data)
+static void dest_popup_file_rename_cb(GtkWidget *UNUSED(widget), gpointer data)
{
Dest_Data *dd = data;
dest_view_rename(dd, GTK_TREE_VIEW(dd->f_view));
}
-static void dest_popup_file_delete_cb(GtkWidget *widget, gpointer data)
+static void dest_popup_file_delete_cb(GtkWidget *UNUSED(widget), gpointer data)
{
Dest_Data *dd = data;
dest_view_delete(dd, GTK_TREE_VIEW(dd->f_view));
}
-static void dest_popup_file_bookmark_cb(GtkWidget *widget, gpointer data)
+static void dest_popup_file_bookmark_cb(GtkWidget *UNUSED(widget), gpointer data)
{
Dest_Data *dd = data;
dest_view_bookmark(dd, GTK_TREE_VIEW(dd->f_view));
}
static void dest_popup_position_cb(GtkMenu *menu, gint *x, gint *y,
- gboolean *push_in, gpointer data)
+ gboolean *UNUSED(push_in), gpointer data)
{
Dest_Data *dd = data;
GtkTreeView *view;
g_free(path);
}
-static void dest_activate_cb(GtkWidget *view, GtkTreePath *tpath, GtkTreeViewColumn *column, gpointer data)
+static void dest_activate_cb(GtkWidget *view, GtkTreePath *tpath, GtkTreeViewColumn *UNUSED(column), gpointer data)
{
Dest_Data *dd = data;
GtkTreeModel *store;
g_free(path);
}
-static void dest_home_cb(GtkWidget *widget, gpointer data)
+static void dest_home_cb(GtkWidget *UNUSED(widget), gpointer data)
{
Dest_Data *dd = data;
dest_change_dir(dd, homedir(), (dd->f_view != NULL));
}
-static void dest_show_hidden_cb(GtkWidget *widget, gpointer data)
+static void dest_show_hidden_cb(GtkWidget *UNUSED(widget), gpointer data)
{
Dest_Data *dd = data;
gchar *buf;
g_free(buf);
}
-static void dest_entry_changed_cb(GtkEditable *editable, gpointer data)
+static void dest_entry_changed_cb(GtkEditable *UNUSED(editable), gpointer data)
{
Dest_Data *dd = data;
const gchar *path;
dest_filter_add(dd, "*", _("All Files"), TRUE);
}
-static void dest_filter_changed_cb(GtkEditable *editable, gpointer data)
+static void dest_filter_changed_cb(GtkEditable *UNUSED(editable), gpointer data)
{
Dest_Data *dd = data;
GtkWidget *entry;
gtk_box_pack_end(GTK_BOX(hbox2), dd->hidden_button, FALSE, FALSE, 0);
gtk_widget_show(dd->hidden_button);
- hbox2 = gtk_hbox_new(FALSE, PREF_PAD_GAP);
+ hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP);
if (filter)
{
paned = gtk_hpaned_new();
gtk_widget_set_sensitive(sp->image, (interval >= 0));
}
-static void spinner_destroy_cb(GtkWidget *widget, gpointer data)
+static void spinner_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
{
SpinnerData *sp = data;
GList *work;
g_free(pathl);
}
-static void tab_completion_destroy(GtkWidget *widget, gpointer data)
+static void tab_completion_destroy(GtkWidget *UNUSED(widget), gpointer data)
{
TabCompData *td = data;
tab_completion_emit_tab_signal(td);
}
-static void tab_completion_popup_pos_cb(GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer data)
+static void tab_completion_popup_pos_cb(GtkMenu *menu, gint *x, gint *y, gboolean *UNUSED(push_in), gpointer data)
{
TabCompData *td = data;
gint height;
return (stop_signal);
}
-static void tab_completion_button_pressed(GtkWidget *widget, gpointer data)
+static void tab_completion_button_pressed(GtkWidget *UNUSED(widget), gpointer data)
{
TabCompData *td;
GtkWidget *entry = data;
TabCompData *td;
gint n = 0;
- box = gtk_hbox_new(FALSE, 0);
+ box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
combo = gtk_combo_box_text_new_with_entry();
gtk_box_pack_start(GTK_BOX(box), combo, TRUE, TRUE, 0);
GtkWidget *button;
GtkWidget *newentry;
- hbox = gtk_hbox_new(FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
newentry = gtk_entry_new();
if (text) gtk_entry_set_text(GTK_ENTRY(newentry), text);
gtk_widget_show(GENERIC_DIALOG(td->fd)->dialog);
}
-static void tab_completion_select_pressed(GtkWidget *widget, gpointer data)
+static void tab_completion_select_pressed(GtkWidget *UNUSED(widget), gpointer data)
{
TabCompData *td = data;
#include "compat.h"
+#include "main.h"
#include "ui_tree_edit.h"
/*
}
}
-static gboolean tree_edit_click_end_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
+static gboolean tree_edit_click_end_cb(GtkWidget *UNUSED(widget), GdkEventButton *UNUSED(event), gpointer data)
{
TreeEditData *ted = data;
return TRUE;
}
-static gboolean tree_edit_click_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
+static gboolean tree_edit_click_cb(GtkWidget *UNUSED(widget), GdkEventButton *event, gpointer data)
{
TreeEditData *ted = data;
GdkWindow *window = gtk_widget_get_window(ted->window);
return FALSE;
}
-static gboolean tree_edit_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
+static gboolean tree_edit_key_press_cb(GtkWidget *UNUSED(widget), GdkEventKey *event, gpointer data)
{
TreeEditData *ted = data;
if (gtk_tree_view_get_headers_visible(widget))
{
GtkAllocation allocation;
-#if GTK_CHECK_VERSION(3,0,0)
gtk_widget_get_allocation(gtk_tree_view_column_get_button(tv_column), &allocation);
-#else
- gtk_widget_get_allocation(tv_column->button, &allocation);
-#endif
header_size = allocation.height;
}
else
gint x, y;
gint w, h;
gint amt = 0;
-#if GTK_CHECK_VERSION(3,0,0)
GdkDeviceManager *device_manager;
GdkDevice *device;
-#endif
if (sd->max_step < sd->region_size)
{
}
window = gtk_widget_get_window(sd->widget);
-#if GTK_CHECK_VERSION(3,0,0)
device_manager = gdk_display_get_device_manager(gdk_window_get_display(window));
device = gdk_device_manager_get_client_pointer(device_manager);
gdk_window_get_device_position(window, device, &x, &y, NULL);
-#else
- gdk_window_get_pointer(window, &x, &y, NULL);
-#endif
+
w = gdk_window_get_width(window);
h = gdk_window_get_height(window);
void (*func)(GenericDialog *, gpointer);
gboolean auto_close;
- func = g_object_get_data(G_OBJECT(widget), "dialog_function");
+ func = (void(*)(GenericDialog *, gpointer))(g_object_get_data(G_OBJECT(widget), "dialog_function"));
auto_close = gd->auto_close;
if (func) func(gd, gd->data);
return FALSE;
}
-static gboolean generic_dialog_delete_cb(GtkWidget *w, GdkEventAny *event, gpointer data)
+static gboolean generic_dialog_delete_cb(GtkWidget *UNUSED(w), GdkEventAny *UNUSED(event), gpointer data)
{
GenericDialog *gd = data;
gboolean auto_close;
gtk_box_reorder_child(GTK_BOX(gd->hbox), gd->cancel_button, -1);
}
- g_signal_handlers_disconnect_by_func(G_OBJECT(widget),
- G_CALLBACK(generic_dialog_show_cb), gd);
+ g_signal_handlers_disconnect_by_func(G_OBJECT(widget), (gpointer)(generic_dialog_show_cb), gd);
}
gboolean generic_dialog_get_alternative_button_order(GtkWidget *widget)
G_CALLBACK(generic_dialog_click_cb), gd);
gtk_widget_set_can_default(button, TRUE);
- g_object_set_data(G_OBJECT(button), "dialog_function", func_cb);
+ g_object_set_data(G_OBJECT(button), "dialog_function", (void *)func_cb);
gtk_container_add(GTK_CONTAINER(gd->hbox), button);
GtkWidget *image;
image = gtk_image_new_from_stock(icon_stock_id, GTK_ICON_SIZE_DIALOG);
-#if GTK_CHECK_VERSION(3,16,0)
gtk_widget_set_halign(GTK_WIDGET(image), GTK_ALIGN_CENTER);
gtk_widget_set_valign(GTK_WIDGET(image), GTK_ALIGN_START);
-#else
- gtk_misc_set_alignment(GTK_MISC(image), 0.5, 0.0);
-#endif
gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0);
gtk_widget_show(image);
}
{
label = pref_label_new(vbox, heading);
pref_label_bold(label, TRUE, TRUE);
-#if GTK_CHECK_VERSION(3,16,0)
gtk_label_set_xalign(GTK_LABEL(label), 0.0);
gtk_label_set_yalign(GTK_LABEL(label), 0.5);
-#else
- gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-#endif
}
if (text)
{
label = pref_label_new(vbox, text);
-#if GTK_CHECK_VERSION(3,16,0)
gtk_label_set_xalign(GTK_LABEL(label), 0.0);
gtk_label_set_yalign(GTK_LABEL(label), 0.5);
-#else
- gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-#endif
gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
}
gtk_window_set_resizable(GTK_WINDOW(gd->dialog), TRUE);
gtk_container_set_border_width(GTK_CONTAINER(gd->dialog), PREF_PAD_BORDER);
-#if GTK_CHECK_VERSION(3,22,0)
scrolled = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_propagate_natural_height(GTK_SCROLLED_WINDOW(scrolled), TRUE);
gtk_scrolled_window_set_propagate_natural_width(GTK_SCROLLED_WINDOW(scrolled), TRUE);
- vbox = gtk_vbox_new(FALSE, PREF_PAD_BUTTON_SPACE);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_BUTTON_SPACE);
gtk_container_add(GTK_CONTAINER(scrolled), vbox);
gtk_container_add(GTK_CONTAINER(gd->dialog), scrolled);
gtk_widget_show(scrolled);
-#else
- vbox = gtk_vbox_new(FALSE, PREF_PAD_BUTTON_SPACE);
- gtk_container_add(GTK_CONTAINER(gd->dialog), vbox);
-#endif
+
gtk_widget_show(vbox);
- gd->vbox = gtk_vbox_new(FALSE, PREF_PAD_GAP);
+ gd->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
gtk_box_pack_start(GTK_BOX(vbox), gd->vbox, TRUE, TRUE, 0);
gtk_widget_show(gd->vbox);
*-----------------------------------------------------------------------------
*/
-static void warning_dialog_ok_cb(GenericDialog *gd, gpointer data)
+static void warning_dialog_ok_cb(GenericDialog *UNUSED(gd), gpointer UNUSED(data))
{
/* no op */
}
generic_dialog_setup(GENERIC_DIALOG(fdlg), title,
role, parent, FALSE,
- (gpointer)cancel_cb, data);
+ (void(*)(GenericDialog *, gpointer))cancel_cb, data);
return fdlg;
}
void (*func_cb)(FileDialog *, gpointer), gboolean is_default)
{
return generic_dialog_add_button(GENERIC_DIALOG(fdlg), stock_id, text,
- (gpointer)func_cb, is_default);
+ (void(*)(GenericDialog *, gpointer))func_cb, is_default);
}
-static void file_dialog_entry_cb(GtkWidget *widget, gpointer data)
+static void file_dialog_entry_cb(GtkWidget *UNUSED(widget), gpointer data)
{
FileDialog *fdlg = data;
g_free(fdlg->dest_path);
fdlg->dest_path = remove_trailing_slash(gtk_entry_get_text(GTK_ENTRY(fdlg->entry)));
}
-static void file_dialog_entry_enter_cb(const gchar *path, gpointer data)
+static void file_dialog_entry_enter_cb(const gchar *UNUSED(path), gpointer data)
{
GenericDialog *gd = data;
/* image 1 */
- vbox = gtk_vbox_new(FALSE, PREF_PAD_GAP);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
if (preview_box)
{
GtkWidget *sep;
head = pref_label_new(vbox, header1);
pref_label_bold(head, TRUE, FALSE);
-#if GTK_CHECK_VERSION(3,16,0)
gtk_label_set_xalign(GTK_LABEL(head), 0.0);
gtk_label_set_yalign(GTK_LABEL(head), 0.5);
-#else
- gtk_misc_set_alignment(GTK_MISC(head), 0.0, 0.5);
-#endif
}
imd = image_new(FALSE);
head = pref_label_new(vbox, header2);
pref_label_bold(head, TRUE, FALSE);
-#if GTK_CHECK_VERSION(3,16,0)
gtk_label_set_xalign(GTK_LABEL(head), 0.0);
gtk_label_set_yalign(GTK_LABEL(head), 0.5);
-#else
- gtk_misc_set_alignment(GTK_MISC(head), 0.0, 0.5);
-#endif
}
imd = image_new(FALSE);
* because it does not have a mouse center option,
* and we must center it before show, implement it here.
*/
-static void file_util_warning_dialog_ok_cb(GenericDialog *gd, gpointer data)
+static void file_util_warning_dialog_ok_cb(GenericDialog *UNUSED(gd), gpointer UNUSED(data))
{
/* no op */
}
/* call file_util_perform_ci_internal or start_editor_from_filelist_full */
-static void file_util_resume_cb(GenericDialog *gd, gpointer data)
+static void file_util_resume_cb(GenericDialog *UNUSED(gd), gpointer data)
{
UtilityData *ud = data;
if (ud->external)
file_util_perform_ci_internal(ud);
}
-static void file_util_abort_cb(GenericDialog *gd, gpointer data)
+static void file_util_abort_cb(GenericDialog *UNUSED(gd), gpointer data)
{
UtilityData *ud = data;
if (ud->external)
file_util_dialog_run(ud);
}
-static gint file_util_perform_ci_dir_cb(gpointer resume_data, EditorFlags flags, GList *list, gpointer data)
+static gint file_util_perform_ci_dir_cb(gpointer UNUSED(resume_data), EditorFlags flags, GList *UNUSED(list), gpointer data)
{
UtilityData *ud = data;
file_util_perform_ci_dir(ud, FALSE, !EDITOR_ERRORS_BUT_SKIPPED(flags));
}
}
-static void file_util_check_resume_cb(GenericDialog *gd, gpointer data)
+static void file_util_check_resume_cb(GenericDialog *UNUSED(gd), gpointer data)
{
UtilityData *ud = data;
ud->phase = UTILITY_PHASE_CHECKED;
file_util_dialog_run(ud);
}
-static void file_util_check_abort_cb(GenericDialog *gd, gpointer data)
+static void file_util_check_abort_cb(GenericDialog *UNUSED(gd), gpointer data)
{
UtilityData *ud = data;
ud->phase = UTILITY_PHASE_START;
return;
}
-static void file_util_dest_folder_entry_cb(GtkWidget *entry, gpointer data)
+static void file_util_dest_folder_entry_cb(GtkWidget *UNUSED(entry), gpointer data)
{
UtilityData *ud = data;
file_util_dest_folder_update_path(ud);
}
-static void file_util_rename_preview_entry_cb(GtkWidget *entry, gpointer data)
+static void file_util_rename_preview_entry_cb(GtkWidget *UNUSED(entry), gpointer data)
{
UtilityData *ud = data;
file_util_rename_preview_update(ud);
}
-static void file_util_rename_preview_adj_cb(GtkWidget *spin, gpointer data)
+static void file_util_rename_preview_adj_cb(GtkWidget *UNUSED(spin), gpointer data)
{
UtilityData *ud = data;
file_util_rename_preview_update(ud);
return FALSE;
}
-static void file_util_rename_preview_order_cb(GtkTreeModel *treemodel, GtkTreePath *tpath,
- GtkTreeIter *iter, gpointer data)
+static void file_util_rename_preview_order_cb(GtkTreeModel *UNUSED(treemodel), GtkTreePath *UNUSED(tpath),
+ GtkTreeIter *UNUSED(iter), gpointer data)
{
UtilityData *ud = data;
}
-static gboolean file_util_preview_cb(GtkTreeSelection *selection, GtkTreeModel *store,
+static gboolean file_util_preview_cb(GtkTreeSelection *UNUSED(selection), GtkTreeModel *store,
GtkTreePath *tpath, gboolean path_currently_selected,
gpointer data)
{
gtk_widget_grab_focus(ud->rename_entry);
gtk_label_set_text(GTK_LABEL(ud->rename_label), fd->name);
- g_signal_handlers_block_by_func(ud->rename_entry, G_CALLBACK(file_util_rename_preview_entry_cb), ud);
+ g_signal_handlers_block_by_func(ud->rename_entry, (gpointer)(file_util_rename_preview_entry_cb), ud);
gtk_entry_set_text(GTK_ENTRY(ud->rename_entry), name);
gtk_editable_select_region(GTK_EDITABLE(ud->rename_entry), 0, filename_base_length(name));
- g_signal_handlers_unblock_by_func(ud->rename_entry, G_CALLBACK(file_util_rename_preview_entry_cb), ud);
+ g_signal_handlers_unblock_by_func(ud->rename_entry, (gpointer)file_util_rename_preview_entry_cb, ud);
}
return TRUE;
label = pref_label_new(gd->vbox, buf);
g_free(buf);
-#if GTK_CHECK_VERSION(3,16,0)
gtk_label_set_xalign(GTK_LABEL(label), 1.0);
gtk_label_set_yalign(GTK_LABEL(label), 0.5);
-#else
- gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
-#endif
gtk_widget_set_sensitive(label, FALSE);
}
-static void file_util_details_cb(GenericDialog *gd, gpointer data)
+static void file_util_details_cb(GenericDialog *UNUSED(gd), gpointer data)
{
UtilityData *ud = data;
if (ud->details_func && ud->sel_fd)
generic_dialog_add_message(GENERIC_DIALOG(fdlg), NULL, ud->messages.question, NULL, FALSE);
label = pref_label_new(GENERIC_DIALOG(fdlg)->vbox, _("Choose the destination folder."));
-#if GTK_CHECK_VERSION(3,16,0)
gtk_label_set_xalign(GTK_LABEL(label), 0.0);
gtk_label_set_yalign(GTK_LABEL(label), 0.5);
-#else
- gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-#endif
+
pref_spacer(GENERIC_DIALOG(fdlg)->vbox, 0);
if (options->with_rename)
GtkWidget *vbox;
GtkWidget *label;
- vbox = gtk_vbox_new(FALSE, 0);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_box_pack_start(GTK_BOX(box), vbox, expand, expand, 0);
gtk_widget_show(vbox);
gtk_widget_show(ud->notebook);
- page = gtk_vbox_new(FALSE, PREF_PAD_GAP);
+ page = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
gtk_notebook_append_page(GTK_NOTEBOOK(ud->notebook), page, gtk_label_new(_("Manual rename")));
gtk_widget_show(page);
gtk_widget_show(ud->rename_entry);
- page = gtk_vbox_new(FALSE, PREF_PAD_GAP);
+ page = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
gtk_notebook_append_page(GTK_NOTEBOOK(ud->notebook), page, gtk_label_new(_("Auto rename")));
gtk_widget_show(page);
1.0, 8.0, 1.0, 0, options->cp_mv_rn.auto_padding,
G_CALLBACK(file_util_rename_preview_adj_cb), ud);
- page = gtk_vbox_new(FALSE, PREF_PAD_GAP);
+ page = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
gtk_notebook_append_page(GTK_NOTEBOOK(ud->notebook), page, gtk_label_new(_("Formatted rename")));
gtk_widget_show(page);
file_util_warning_dialog(title, _("Another operation in progress.\n"), GTK_STOCK_DIALOG_ERROR, NULL);
}
-static void file_util_details_dialog_close_cb(GtkWidget *widget, gpointer data)
+static void file_util_details_dialog_close_cb(GtkWidget *UNUSED(widget), gpointer data)
{
gtk_widget_destroy(data);
static void file_util_details_dialog_destroy_cb(GtkWidget *widget, gpointer data)
{
UtilityData *ud = data;
- g_signal_handlers_disconnect_by_func(ud->gd->dialog, G_CALLBACK(file_util_details_dialog_close_cb), widget);
+ g_signal_handlers_disconnect_by_func(ud->gd->dialog, (gpointer)(file_util_details_dialog_close_cb), widget);
}
-static void file_util_details_dialog_ok_cb(GenericDialog *gd, gpointer data)
+static void file_util_details_dialog_ok_cb(GenericDialog *UNUSED(gd), gpointer UNUSED(data))
{
/* no op */
}
if (!ud->flist)
{
/* both dialogs will be closed anyway, the signals would cause duplicate calls */
- g_signal_handlers_disconnect_by_func(ud->gd->dialog, G_CALLBACK(file_util_details_dialog_close_cb), gd->dialog);
- g_signal_handlers_disconnect_by_func(gd->dialog, G_CALLBACK(file_util_details_dialog_destroy_cb), ud);
+ g_signal_handlers_disconnect_by_func(ud->gd->dialog, (gpointer)(file_util_details_dialog_close_cb), gd->dialog);
+ g_signal_handlers_disconnect_by_func(gd->dialog, (gpointer)(file_util_details_dialog_destroy_cb), ud);
file_util_cancel_cb(ud->gd, ud);
}
label = gtk_label_new(title_f);
-#if GTK_CHECK_VERSION(3,16,0)
gtk_label_set_xalign(GTK_LABEL(label), 1.0);
gtk_label_set_yalign(GTK_LABEL(label), 0.0);
-#else
- gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.0);
-#endif
+
pref_label_bold(label, TRUE, FALSE);
gtk_table_attach(GTK_TABLE(table), label,
0, 1, i, i + 1,
label = gtk_label_new(value);
-#if GTK_CHECK_VERSION(3,16,0)
gtk_label_set_xalign(GTK_LABEL(label), 0.0);
gtk_label_set_yalign(GTK_LABEL(label), 0.0);
-#else
- gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
-#endif
+
gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
gtk_table_attach(GTK_TABLE(table), label,
1, 2, i, i + 1,
return FALSE;
}
-static void file_util_write_metadata_first_done(gboolean success, const gchar *done_path, gpointer data)
+static void file_util_write_metadata_first_done(gboolean success, const gchar *UNUSED(done_path), gpointer data)
{
UtilityDelayData *dd = data;
filelist_free(list);
}
-static void new_folder_entry_activate_cb(GtkWidget *widget, gpointer data)
+static void new_folder_entry_activate_cb(GtkWidget *UNUSED(widget), gpointer data)
{
GtkDialog *dialog = data;
gtk_window_set_default_size(GTK_WINDOW(dialog), width * 2, -1);
content_area = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
- vbox = gtk_vbox_new(FALSE, PREF_PAD_GAP);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
gtk_box_pack_start(GTK_BOX(content_area), vbox, FALSE, FALSE, 0);
- hbox = gtk_hbox_new(FALSE, PREF_PAD_GAP);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP);
gtk_container_set_border_width(GTK_CONTAINER(hbox), PREF_PAD_GAP);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
image = gtk_image_new_from_icon_name("dialog-question", GTK_ICON_SIZE_DIALOG);
}
}
-static gboolean vd_rename_cb(TreeEditData *td, const gchar *old, const gchar *new, gpointer data)
+static gboolean vd_rename_cb(TreeEditData *td, const gchar *UNUSED(old), const gchar *new, gpointer data)
{
ViewDir *vd = data;
FileData *fd;
}
}
-void vd_popup_destroy_cb(GtkWidget *widget, gpointer data)
+void vd_popup_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewDir *vd = data;
*-----------------------------------------------------------------------------
*/
-static void vd_drop_menu_copy_cb(GtkWidget *widget, gpointer data)
+static void vd_drop_menu_copy_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewDir *vd = data;
const gchar *path;
file_util_copy_simple(list, path, vd->widget);
}
-static void vd_drop_menu_move_cb(GtkWidget *widget, gpointer data)
+static void vd_drop_menu_move_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewDir *vd = data;
const gchar *path;
*-----------------------------------------------------------------------------
*/
-static void vd_pop_menu_up_cb(GtkWidget *widget, gpointer data)
+static void vd_pop_menu_up_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewDir *vd = data;
gchar *path;
g_free(path);
}
-static void vd_pop_menu_slide_cb(GtkWidget *widget, gpointer data)
+static void vd_pop_menu_slide_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewDir *vd = data;
layout_image_slideshow_start(vd->layout);
}
-static void vd_pop_menu_slide_rec_cb(GtkWidget *widget, gpointer data)
+static void vd_pop_menu_slide_rec_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewDir *vd = data;
GList *list;
filelist_free(list);
}
-static void vd_pop_menu_dupe_cb(GtkWidget *widget, gpointer data)
+static void vd_pop_menu_dupe_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewDir *vd = data;
vd_pop_menu_dupe(vd, FALSE);
}
-static void vd_pop_menu_dupe_rec_cb(GtkWidget *widget, gpointer data)
+static void vd_pop_menu_dupe_rec_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewDir *vd = data;
vd_pop_menu_dupe(vd, TRUE);
}
-static void vd_pop_menu_delete_cb(GtkWidget *widget, gpointer data)
+static void vd_pop_menu_delete_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewDir *vd = data;
file_util_delete_dir(vd->click_fd, vd->widget);
}
-static void vd_pop_menu_copy_path_cb(GtkWidget *widget, gpointer data)
+static void vd_pop_menu_copy_path_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewDir *vd = data;
file_util_copy_path_to_clipboard(vd->click_fd, TRUE);
}
-static void vd_pop_menu_copy_path_unquoted_cb(GtkWidget *widget, gpointer data)
+static void vd_pop_menu_copy_path_unquoted_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewDir *vd = data;
layout_views_set(vd->layout, new_type, vd->layout->options.file_view_type);
}
-static void vd_pop_menu_refresh_cb(GtkWidget *widget, gpointer data)
+static void vd_pop_menu_refresh_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewDir *vd = data;
if (vd->layout) layout_refresh(vd->layout);
}
-static void vd_toggle_show_hidden_files_cb(GtkWidget *widget, gpointer data)
+static void vd_toggle_show_hidden_files_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewDir *vd = data;
gtk_tree_path_free(tpath);
}
-static void vd_pop_menu_new_cb(GtkWidget *widget, gpointer data)
+static void vd_pop_menu_new_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewDir *vd = data;
FileData *dir_fd = NULL;
file_util_create_dir(dir_fd, vd->layout->window, vd_pop_menu_new_folder_cb, vd);
}
-static void vd_pop_menu_rename_cb(GtkWidget *widget, gpointer data)
+static void vd_pop_menu_rename_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewDir *vd = data;
}
}
-static void vd_dnd_get(GtkWidget *widget, GdkDragContext *context,
+static void vd_dnd_get(GtkWidget *UNUSED(widget), GdkDragContext *UNUSED(context),
GtkSelectionData *selection_data, guint info,
- guint time, gpointer data)
+ guint UNUSED(time), gpointer data)
{
ViewDir *vd = data;
GList *list;
}
}
-static void vd_dnd_begin(GtkWidget *widget, GdkDragContext *context, gpointer data)
+static void vd_dnd_begin(GtkWidget *UNUSED(widget), GdkDragContext *UNUSED(context), gpointer data)
{
ViewDir *vd = data;
vd_dest_set(vd, FALSE);
}
-static void vd_dnd_end(GtkWidget *widget, GdkDragContext *context, gpointer data)
+static void vd_dnd_end(GtkWidget *UNUSED(widget), GdkDragContext *context, gpointer data)
{
ViewDir *vd = data;
}
static void vd_dnd_drop_receive(GtkWidget *widget,
- GdkDragContext *context, gint x, gint y,
+ GdkDragContext *UNUSED(context), gint x, gint y,
GtkSelectionData *selection_data, guint info,
guint time, gpointer data)
{
ViewDir *vd = data;
GtkTreePath *tpath;
FileData *fd = NULL;
- GdkDragAction action;
+ GdkDragAction action = GDK_ACTION_ASK;
vd->click_fd = NULL;
* shift and control keys during the drag operation. With GTK3 this is not
* so. This is a workaround.
*/
-#if GTK_CHECK_VERSION(3,0,0)
GdkModifierType mask;
gdk_window_get_pointer(gtk_widget_get_window(widget), NULL, NULL, &mask);
{
action = GDK_ACTION_MOVE;
}
-#else
- action = (gdk_drag_context_get_actions(context));
-#endif
+
if (action != GDK_ACTION_COPY && action != GDK_ACTION_MOVE)
{
if (options->dnd_default_action == DND_ACTION_COPY)
static gboolean vd_auto_scroll_idle_cb(gpointer data)
{
ViewDir *vd = data;
-#if GTK_CHECK_VERSION(3,0,0)
GdkDeviceManager *device_manager;
GdkDevice *device;
-#endif
if (vd->drop_fd)
{
gint w, h;
window = gtk_widget_get_window(vd->view);
-#if GTK_CHECK_VERSION(3,0,0)
device_manager = gdk_display_get_device_manager(gdk_window_get_display(window));
device = gdk_device_manager_get_client_pointer(device_manager);
gdk_window_get_device_position(window, device, &x, &y, NULL);
-#else
- gdk_window_get_pointer(window, &x, &y, NULL);
-#endif
+
w = gdk_window_get_width(window);
h = gdk_window_get_height(window);
if (x >= 0 && x < w && y >= 0 && y < h)
return FALSE;
}
-static gboolean vd_auto_scroll_notify_cb(GtkWidget *widget, gint x, gint y, gpointer data)
+static gboolean vd_auto_scroll_notify_cb(GtkWidget *UNUSED(widget), gint UNUSED(x), gint UNUSED(y), gpointer data)
{
ViewDir *vd = data;
return TRUE;
}
-static gboolean vd_dnd_drop_motion(GtkWidget *widget, GdkDragContext *context,
+static gboolean vd_dnd_drop_motion(GtkWidget *UNUSED(widget), GdkDragContext *context,
gint x, gint y, guint time, gpointer data)
{
ViewDir *vd = data;
return FALSE;
}
-static void vd_dnd_drop_leave(GtkWidget *widget, GdkDragContext *context, guint time, gpointer data)
+static void vd_dnd_drop_leave(GtkWidget *UNUSED(widget), GdkDragContext *UNUSED(context), guint UNUSED(time), gpointer data)
{
ViewDir *vd = data;
*----------------------------------------------------------------------------
*/
-void vd_menu_position_cb(GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer data)
+void vd_menu_position_cb(GtkMenu *menu, gint *x, gint *y, gboolean *UNUSED(push_in), gpointer data)
{
ViewDir *vd = data;
GtkTreeModel *store;
popup_menu_position_clamp(menu, x, y, 0);
}
-void vd_activate_cb(GtkTreeView *tview, GtkTreePath *tpath, GtkTreeViewColumn *column, gpointer data)
+void vd_activate_cb(GtkTreeView *tview, GtkTreePath *tpath, GtkTreeViewColumn *UNUSED(column), gpointer data)
{
ViewDir *vd = data;
FileData *fd = vd_get_fd_from_tree_path(vd, tview, tpath);
return &color;
}
-void vd_color_cb(GtkTreeViewColumn *tree_column, GtkCellRenderer *cell,
+void vd_color_cb(GtkTreeViewColumn *UNUSED(tree_column), GtkCellRenderer *cell,
GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
{
ViewDir *vd = data;
return options->view_dir_list_single_click_enter;
}
-void vdlist_destroy_cb(GtkWidget *widget, gpointer data)
+void vdlist_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewDir *vd = data;
filelist_free(VDLIST(vd)->list);
}
-ViewDir *vdlist_new(ViewDir *vd, FileData *dir_fd)
+ViewDir *vdlist_new(ViewDir *vd, FileData *UNUSED(dir_fd))
{
GtkListStore *store;
GtkTreeSelection *selection;
if (cursor_type > -1) cursor = gdk_cursor_new(cursor_type);
gdk_window_set_cursor(gtk_widget_get_window(widget), cursor);
- if (cursor) gdk_cursor_unref(cursor);
+ if (cursor) g_object_unref(G_OBJECT(cursor));
gdk_flush();
}
{
/* block signal handler, icon is set here, the caller of vdtree_expand_by_iter must make sure
that the iter is populated */
- g_signal_handlers_block_by_func(G_OBJECT(vd->view), vdtree_row_expanded, vd);
+ g_signal_handlers_block_by_func(G_OBJECT(vd->view), (gpointer)vdtree_row_expanded, vd);
gtk_tree_view_expand_row(GTK_TREE_VIEW(vd->view), tpath, FALSE);
gtk_tree_model_get(store, iter, DIR_COLUMN_POINTER, &nd, -1);
fd = (nd) ? nd->fd : NULL;
vdtree_icon_set_by_iter(vd, iter, vd->pf->open);
}
- g_signal_handlers_unblock_by_func(G_OBJECT(vd->view), vdtree_row_expanded, vd);
+ g_signal_handlers_unblock_by_func(G_OBJECT(vd->view), (gpointer)vdtree_row_expanded, vd);
}
else
{
static gboolean selection_is_ok = FALSE;
-static gboolean vdtree_select_cb(GtkTreeSelection *selection, GtkTreeModel *store, GtkTreePath *tpath,
- gboolean path_currently_selected, gpointer data)
+static gboolean vdtree_select_cb(GtkTreeSelection *UNUSED(selection), GtkTreeModel *UNUSED(store), GtkTreePath *UNUSED(tpath), gboolean UNUSED(path_currently_selected), gpointer UNUSED(data))
{
return selection_is_ok;
}
vdtree_populate_path(vd, vd->dir_fd, FALSE, TRUE);
}
-const gchar *vdtree_row_get_path(ViewDir *vd, gint row)
+const gchar *vdtree_row_get_path(ViewDir *UNUSED(vd), gint UNUSED(row))
{
/** @FIXME no get row path */
log_printf("FIXME: no get row path\n");
}
static gboolean vdtree_clicked_on_expander(GtkTreeView *treeview, GtkTreePath *tpath,
- GtkTreeViewColumn *column, gint x, gint y, gint *left_of_expander)
+ GtkTreeViewColumn *column, gint x, gint UNUSED(y), gint *left_of_expander)
{
gint depth;
gint size;
}
}
-static gint vdtree_sort_cb(GtkTreeModel *store, GtkTreeIter *a, GtkTreeIter *b, gpointer data)
+static gint vdtree_sort_cb(GtkTreeModel *store, GtkTreeIter *a, GtkTreeIter *b, gpointer UNUSED(data))
{
NodeData *nda;
NodeData *ndb;
vdtree_populate_path(vd, fd, FALSE, FALSE);
}
-static gboolean vdtree_destroy_node_cb(GtkTreeModel *store, GtkTreePath *tpath, GtkTreeIter *iter, gpointer data)
+static gboolean vdtree_destroy_node_cb(GtkTreeModel *store, GtkTreePath *UNUSED(tpath), GtkTreeIter *iter, gpointer UNUSED(data))
{
NodeData *nd;
return FALSE;
}
-void vdtree_destroy_cb(GtkWidget *widget, gpointer data)
+void vdtree_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewDir *vd = data;
GtkTreeModel *store;
gtk_tree_model_foreach(store, vdtree_destroy_node_cb, vd);
}
-ViewDir *vdtree_new(ViewDir *vd, FileData *dir_fd)
+ViewDir *vdtree_new(ViewDir *vd, FileData *UNUSED(dir_fd))
{
GtkTreeStore *store;
GtkTreeSelection *selection;
}
}
-static void vf_pop_menu_open_archive_cb(GtkWidget *widget, gpointer data)
+static void vf_pop_menu_open_archive_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewFile *vf = data;
LayoutWindow *lw_new;
}
}
-static void vf_pop_menu_copy_cb(GtkWidget *widget, gpointer data)
+static void vf_pop_menu_copy_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewFile *vf = data;
file_util_copy(NULL, vf_pop_menu_file_list(vf), NULL, vf->listview);
}
-static void vf_pop_menu_move_cb(GtkWidget *widget, gpointer data)
+static void vf_pop_menu_move_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewFile *vf = data;
}
}
-static void vf_pop_menu_delete_cb(GtkWidget *widget, gpointer data)
+static void vf_pop_menu_delete_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewFile *vf = data;
file_util_delete(NULL, vf_pop_menu_file_list(vf), vf->listview);
}
-static void vf_pop_menu_move_to_trash_cb(GtkWidget *widget, gpointer data)
+static void vf_pop_menu_move_to_trash_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewFile *vf = data;
file_util_delete(NULL, vf_pop_menu_file_list(vf), vf->listview);
}
-static void vf_pop_menu_copy_path_cb(GtkWidget *widget, gpointer data)
+static void vf_pop_menu_copy_path_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewFile *vf = data;
file_util_copy_path_list_to_clipboard(vf_pop_menu_file_list(vf), TRUE);
}
-static void vf_pop_menu_copy_path_unquoted_cb(GtkWidget *widget, gpointer data)
+static void vf_pop_menu_copy_path_unquoted_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewFile *vf = data;
file_util_copy_path_list_to_clipboard(vf_pop_menu_file_list(vf), FALSE);
}
-static void vf_pop_menu_enable_grouping_cb(GtkWidget *widget, gpointer data)
+static void vf_pop_menu_enable_grouping_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewFile *vf = data;
file_data_disable_grouping_list(vf_pop_menu_file_list(vf), FALSE);
}
-static void vf_pop_menu_duplicates_cb(GtkWidget *widget, gpointer data)
+static void vf_pop_menu_duplicates_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewFile *vf = data;
DupeWindow *dw;
dupe_window_add_files(dw, vf_pop_menu_file_list(vf), FALSE);
}
-static void vf_pop_menu_disable_grouping_cb(GtkWidget *widget, gpointer data)
+static void vf_pop_menu_disable_grouping_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewFile *vf = data;
}
}
-static void vf_pop_menu_sort_ascend_cb(GtkWidget *widget, gpointer data)
+static void vf_pop_menu_sort_ascend_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewFile *vf = data;
}
}
-static void vf_pop_menu_sel_mark_cb(GtkWidget *widget, gpointer data)
+static void vf_pop_menu_sel_mark_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewFile *vf = data;
vf_mark_to_selection(vf, vf->active_mark, MTS_MODE_SET);
}
-static void vf_pop_menu_sel_mark_and_cb(GtkWidget *widget, gpointer data)
+static void vf_pop_menu_sel_mark_and_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewFile *vf = data;
vf_mark_to_selection(vf, vf->active_mark, MTS_MODE_AND);
}
-static void vf_pop_menu_sel_mark_or_cb(GtkWidget *widget, gpointer data)
+static void vf_pop_menu_sel_mark_or_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewFile *vf = data;
vf_mark_to_selection(vf, vf->active_mark, MTS_MODE_OR);
}
-static void vf_pop_menu_sel_mark_minus_cb(GtkWidget *widget, gpointer data)
+static void vf_pop_menu_sel_mark_minus_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewFile *vf = data;
vf_mark_to_selection(vf, vf->active_mark, MTS_MODE_MINUS);
}
-static void vf_pop_menu_set_mark_sel_cb(GtkWidget *widget, gpointer data)
+static void vf_pop_menu_set_mark_sel_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewFile *vf = data;
vf_selection_to_mark(vf, vf->active_mark, STM_MODE_SET);
}
-static void vf_pop_menu_res_mark_sel_cb(GtkWidget *widget, gpointer data)
+static void vf_pop_menu_res_mark_sel_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewFile *vf = data;
vf_selection_to_mark(vf, vf->active_mark, STM_MODE_RESET);
}
-static void vf_pop_menu_toggle_mark_sel_cb(GtkWidget *widget, gpointer data)
+static void vf_pop_menu_toggle_mark_sel_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewFile *vf = data;
vf_selection_to_mark(vf, vf->active_mark, STM_MODE_TOGGLE);
g_free(vf);
}
-static void vf_marks_filter_toggle_cb(GtkWidget *widget, gpointer data)
+static void vf_marks_filter_toggle_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewFile *vf = data;
vf_refresh_idle(vf);
generic_dialog_close(gd);
}
-void vf_marks_filter_on_icon_press(GtkEntry *entry, GtkEntryIconPosition pos,
- GdkEvent *event, gpointer userdata)
+void vf_marks_filter_on_icon_press(GtkEntry *UNUSED(entry), GtkEntryIconPosition UNUSED(pos),
+ GdkEvent *UNUSED(event), gpointer userdata)
{
MarksTextEntry *mte = userdata;
gtk_entry_set_text(GTK_ENTRY(mte->edit_widget), "");
}
-static void vf_marks_tooltip_help_cb(GenericDialog *gd, gpointer data)
+static void vf_marks_tooltip_help_cb(GenericDialog *UNUSED(gd), gpointer UNUSED(data))
{
help_window_show("GuideImageMarks.html");
}
return FALSE;
}
-static void vf_file_filter_save_cb(GtkWidget *widget, gpointer data)
+static void vf_file_filter_save_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewFile *vf = data;
gchar *entry_text;
g_free(entry_text);
}
-static void vf_file_filter_cb(GtkWidget *widget, gpointer data)
+static void vf_file_filter_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewFile *vf = data;
vf_refresh(vf);
}
-static gboolean vf_file_filter_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+static gboolean vf_file_filter_press_cb(GtkWidget *widget, GdkEventButton *UNUSED(bevent), gpointer data)
{
ViewFile *vf = data;
vf->file_filter.last_selected = gtk_combo_box_get_active(GTK_COMBO_BOX(vf->file_filter.combo));
static GtkWidget *vf_marks_filter_init(ViewFile *vf)
{
GtkWidget *frame = gtk_frame_new(NULL);
- GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
+ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gint i;
vf_refresh(vf);
}
-static void file_filter_clear_cb(GtkEntry *entry, GtkEntryIconPosition pos, GdkEvent *event, gpointer userdata)
+static void file_filter_clear_cb(GtkEntry *UNUSED(entry), GtkEntryIconPosition pos, GdkEvent *UNUSED(event), gpointer userdata)
{
if (pos == GTK_ENTRY_ICON_SECONDARY)
{
static GtkWidget *vf_file_filter_init(ViewFile *vf)
{
GtkWidget *frame = gtk_frame_new(NULL);
- GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
+ GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
GList *work;
gint n = 0;
GtkWidget *combo_entry;
vf->filter = vf_marks_filter_init(vf);
vf->file_filter.frame = vf_file_filter_init(vf);
- vf->widget = gtk_vbox_new(FALSE, 0);
+ vf->widget = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_box_pack_start(GTK_BOX(vf->widget), vf->filter, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(vf->widget), vf->file_filter.frame, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(vf->widget), vf->scrolled, TRUE, TRUE, 0);
*-----------------------------------------------------------------------------
*/
-GList *vficon_selection_get_one(ViewFile *vf, FileData *fd)
+GList *vficon_selection_get_one(ViewFile *UNUSED(vf), FileData *fd)
{
return g_list_prepend(filelist_copy(fd->sidecar_files), file_data_ref(fd));
}
return vficon_selection_get_one(vf, VFICON(vf)->click_fd);
}
-void vficon_pop_menu_view_cb(GtkWidget *widget, gpointer data)
+void vficon_pop_menu_view_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewFile *vf = data;
}
}
-void vficon_pop_menu_rename_cb(GtkWidget *widget, gpointer data)
+void vficon_pop_menu_rename_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewFile *vf = data;
file_util_rename(NULL, vf_pop_menu_file_list(vf), vf->listview);
}
-void vficon_pop_menu_show_names_cb(GtkWidget *widget, gpointer data)
+void vficon_pop_menu_show_names_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewFile *vf = data;
vficon_populate_at_new_size(vf, allocation.width, allocation.height, TRUE);
}
-void vficon_pop_menu_show_star_rating_cb(GtkWidget *widget, gpointer data)
+void vficon_pop_menu_show_star_rating_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewFile *vf = data;
vficon_toggle_star_rating(vf);
}
-void vficon_pop_menu_refresh_cb(GtkWidget *widget, gpointer data)
+void vficon_pop_menu_refresh_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewFile *vf = data;
vf_refresh(vf);
}
-void vficon_popup_destroy_cb(GtkWidget *widget, gpointer data)
+void vficon_popup_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewFile *vf = data;
vficon_selection_remove(vf, VFICON(vf)->click_fd, SELECTION_PRELIGHT, NULL);
{
GtkWidget *label;
gint x, y;
-#if GTK_CHECK_VERSION(3,0,0)
GdkDisplay *display;
GdkDeviceManager *device_manager;
GdkDevice *device;
-#endif
if (VFICON(vf)->tip_window) return;
-#if GTK_CHECK_VERSION(3,0,0)
device_manager = gdk_display_get_device_manager(gdk_window_get_display(
gtk_tree_view_get_bin_window(GTK_TREE_VIEW(vf->listview))));
device = gdk_device_manager_get_client_pointer(device_manager);
gdk_window_get_device_position(gtk_tree_view_get_bin_window(GTK_TREE_VIEW(vf->listview)),
device, &x, &y, NULL);
-#else
- gdk_window_get_pointer(gtk_tree_view_get_bin_window(GTK_TREE_VIEW(vf->listview)), &x, &y, NULL);
-#endif
VFICON(vf)->tip_fd = vficon_find_data_by_coord(vf, x, y, NULL);
if (!VFICON(vf)->tip_fd) return;
gtk_container_add(GTK_CONTAINER(VFICON(vf)->tip_window), label);
gtk_widget_show(label);
-#if GTK_CHECK_VERSION(3,0,0)
display = gdk_display_get_default();
device_manager = gdk_display_get_device_manager(display);
device = gdk_device_manager_get_client_pointer(device_manager);
gdk_device_get_position(device, NULL, &x, &y);
-#else
- gdk_window_get_pointer(NULL, &x, &y, NULL);
-#endif
if (!gtk_widget_get_realized(VFICON(vf)->tip_window)) gtk_widget_realize(VFICON(vf)->tip_window);
gtk_window_move(GTK_WINDOW(VFICON(vf)->tip_window), x + 16, y + 16);
static void tip_update(ViewFile *vf, FileData *fd)
{
-#if GTK_CHECK_VERSION(3,0,0)
GdkDisplay *display = gdk_display_get_default();
GdkDeviceManager *device_manager = gdk_display_get_device_manager(display);
GdkDevice *device = gdk_device_manager_get_client_pointer(device_manager);
-#endif
if (VFICON(vf)->tip_window)
{
gint x, y;
-#if GTK_CHECK_VERSION(3,0,0)
gdk_device_get_position(device, NULL, &x, &y);
-#else
- gdk_window_get_pointer(NULL, &x, &y, NULL);
-#endif
+
gtk_window_move(GTK_WINDOW(VFICON(vf)->tip_window), x + 16, y + 16);
if (fd != VFICON(vf)->tip_fd)
*-------------------------------------------------------------------
*/
-static void vficon_dnd_get(GtkWidget *widget, GdkDragContext *context,
- GtkSelectionData *selection_data, guint info,
- guint time, gpointer data)
+static void vficon_dnd_get(GtkWidget *UNUSED(widget), GdkDragContext *UNUSED(context),
+ GtkSelectionData *selection_data, guint UNUSED(info),
+ guint UNUSED(time), gpointer data)
{
ViewFile *vf = data;
GList *list = NULL;
filelist_free(list);
}
-static void vficon_drag_data_received(GtkWidget *entry_widget, GdkDragContext *context,
+static void vficon_drag_data_received(GtkWidget *UNUSED(entry_widget), GdkDragContext *UNUSED(context),
int x, int y, GtkSelectionData *selection,
- guint info, guint time, gpointer data)
+ guint info, guint UNUSED(time), gpointer data)
{
ViewFile *vf = data;
}
}
-static void vficon_dnd_end(GtkWidget *widget, GdkDragContext *context, gpointer data)
+static void vficon_dnd_end(GtkWidget *UNUSED(widget), GdkDragContext *context, gpointer data)
{
ViewFile *vf = data;
vficon_selection_set(vf, fd, fd->selected & ~mask, iter);
}
-void vficon_marks_set(ViewFile *vf, gint enable)
+void vficon_marks_set(ViewFile *vf, gint UNUSED(enable))
{
GtkAllocation allocation;
gtk_widget_get_allocation(vf->listview, &allocation);
vficon_populate_at_new_size(vf, allocation.width, allocation.height, TRUE);
}
-void vficon_star_rating_set(ViewFile *vf, gint enable)
+void vficon_star_rating_set(ViewFile *vf, gint UNUSED(enable))
{
GtkAllocation allocation;
gtk_widget_get_allocation(vf->listview, &allocation);
{
/* ensure focus row col are correct */
vficon_find_position(vf, VFICON(vf)->focus_fd, &VFICON(vf)->focus_row, &VFICON(vf)->focus_column);
-#if GTK_CHECK_VERSION(3,0,0)
+
/** @FIXME Refer to issue #467 on Github. The thumbnail position is not
* preserved when the icon view is refreshed. Caused by an unknown call from
* the idle loop. This patch hides the problem.
{
tree_view_row_make_visible(GTK_TREE_VIEW(vf->listview), &iter, FALSE);
}
-#endif
+
return;
}
vficon_selection_remove(vf, VFICON(vf)->focus_fd, SELECTION_FOCUS, NULL);
*-------------------------------------------------------------------
*/
-static void vfi_menu_position_cb(GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer data)
+static void vfi_menu_position_cb(GtkMenu *menu, gint *x, gint *y, gboolean *UNUSED(push_in), gpointer data)
{
ViewFile *vf = data;
GtkTreeModel *store;
popup_menu_position_clamp(menu, x, y, 0);
}
-gboolean vficon_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
+gboolean vficon_press_key_cb(GtkWidget *UNUSED(widget), GdkEventKey *event, gpointer data)
{
ViewFile *vf = data;
gint focus_row = 0;
*-------------------------------------------------------------------
*/
-static gboolean vficon_motion_cb(GtkWidget *widget, GdkEventMotion *event, gpointer data)
+static gboolean vficon_motion_cb(GtkWidget *UNUSED(widget), GdkEventMotion *event, gpointer data)
{
ViewFile *vf = data;
FileData *fd;
return FALSE;
}
-gboolean vficon_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+gboolean vficon_press_cb(GtkWidget *UNUSED(widget), GdkEventButton *bevent, gpointer data)
{
ViewFile *vf = data;
GtkTreeIter iter;
return TRUE;
}
-static gboolean vficon_leave_cb(GtkWidget *widget, GdkEventCrossing *event, gpointer data)
+static gboolean vficon_leave_cb(GtkWidget *UNUSED(widget), GdkEventCrossing *UNUSED(event), gpointer data)
{
ViewFile *vf = data;
*-------------------------------------------------------------------
*/
-static gboolean vficon_destroy_node_cb(GtkTreeModel *store, GtkTreePath *tpath, GtkTreeIter *iter, gpointer data)
+static gboolean vficon_destroy_node_cb(GtkTreeModel *store, GtkTreePath *UNUSED(tpath), GtkTreeIter *iter, gpointer UNUSED(data))
{
GList *list;
vf_star_update(vf);
}
-static void vficon_populate_at_new_size(ViewFile *vf, gint w, gint h, gboolean force)
+static void vficon_populate_at_new_size(ViewFile *vf, gint w, gint UNUSED(h), gboolean force)
{
gint new_cols;
gint thumb_width;
DEBUG_1("col tab pop cols=%d rows=%d", VFICON(vf)->columns, VFICON(vf)->rows);
}
-static void vficon_sized_cb(GtkWidget *widget, GtkAllocation *allocation, gpointer data)
+static void vficon_sized_cb(GtkWidget *UNUSED(widget), GtkAllocation *allocation, gpointer data)
{
ViewFile *vf = data;
{
gboolean ret = TRUE;
GList *work, *new_work;
- FileData *focus_fd;
FileData *first_selected = NULL;
GList *new_filelist = NULL;
GList *new_fd_list = NULL;
GtkTreePath *end_path = NULL;
GtkTreePath *start_path = NULL;
- focus_fd = VFICON(vf)->focus_fd;
-
gtk_tree_view_get_visible_range(GTK_TREE_VIEW(vf->listview), &start_path, &end_path);
if (vf->dir_fd)
gint number;
};
-static void vficon_cell_data_cb(GtkTreeViewColumn *tree_column, GtkCellRenderer *cell,
+static void vficon_cell_data_cb(GtkTreeViewColumn *UNUSED(tree_column), GtkCellRenderer *cell,
GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
{
GList *list;
return ret;
}
-void vficon_destroy_cb(GtkWidget *widget, gpointer data)
+void vficon_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewFile *vf = data;
g_list_free(VFICON(vf)->selection);
}
-ViewFile *vficon_new(ViewFile *vf, FileData *dir_fd)
+ViewFile *vficon_new(ViewFile *vf, FileData *UNUSED(dir_fd))
{
GtkListStore *store;
GtkTreeSelection *selection;
gint row;
} ViewFileFindRowData;
-static gboolean vflist_find_row_cb(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
+static gboolean vflist_find_row_cb(GtkTreeModel *model, GtkTreePath *UNUSED(path), GtkTreeIter *iter, gpointer data)
{
ViewFileFindRowData *find = data;
FileData *fd;
return -1;
}
-static FileData *vflist_find_data_by_coord(ViewFile *vf, gint x, gint y, GtkTreeIter *iter)
+static FileData *vflist_find_data_by_coord(ViewFile *vf, gint x, gint y, GtkTreeIter *UNUSED(iter))
{
GtkTreePath *tpath;
GtkTreeViewColumn *column;
return NULL;
}
-static gboolean vflist_store_clear_cb(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
+static gboolean vflist_store_clear_cb(GtkTreeModel *model, GtkTreePath *UNUSED(path), GtkTreeIter *iter, gpointer UNUSED(data))
{
FileData *fd;
gtk_tree_model_get(model, iter, FILE_COLUMN_POINTER, &fd, -1);
*-----------------------------------------------------------------------------
*/
-static void vflist_dnd_get(GtkWidget *widget, GdkDragContext *context,
- GtkSelectionData *selection_data, guint info,
- guint time, gpointer data)
+static void vflist_dnd_get(GtkWidget *UNUSED(widget), GdkDragContext *UNUSED(context),
+ GtkSelectionData *selection_data, guint UNUSED(info),
+ guint UNUSED(time), gpointer data)
{
ViewFile *vf = data;
GList *list = NULL;
}
}
-static void vflist_dnd_end(GtkWidget *widget, GdkDragContext *context, gpointer data)
+static void vflist_dnd_end(GtkWidget *UNUSED(widget), GdkDragContext *context, gpointer data)
{
ViewFile *vf = data;
}
}
-static void vflist_drag_data_received(GtkWidget *entry_widget, GdkDragContext *context,
+static void vflist_drag_data_received(GtkWidget *UNUSED(entry_widget), GdkDragContext *UNUSED(context),
int x, int y, GtkSelectionData *selection,
- guint info, guint time, gpointer data)
+ guint info, guint UNUSED(time), gpointer data)
{
ViewFile *vf = data;
}
-void vflist_pop_menu_view_cb(GtkWidget *widget, gpointer data)
+void vflist_pop_menu_view_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewFile *vf = data;
}
}
-void vflist_pop_menu_rename_cb(GtkWidget *widget, gpointer data)
+void vflist_pop_menu_rename_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewFile *vf = data;
GList *list;
file_util_rename(NULL, list, vf->listview);
}
-void vflist_pop_menu_thumbs_cb(GtkWidget *widget, gpointer data)
+void vflist_pop_menu_thumbs_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewFile *vf = data;
g_list_free(columns);
}
-void vflist_pop_menu_show_star_rating_cb(GtkWidget *widget, gpointer data)
+void vflist_pop_menu_show_star_rating_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewFile *vf = data;
vflist_star_rating_set(vf, options->show_star_rating);
}
-void vflist_pop_menu_refresh_cb(GtkWidget *widget, gpointer data)
+void vflist_pop_menu_refresh_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewFile *vf = data;
gtk_tree_view_columns_autosize(GTK_TREE_VIEW(vf->listview));
}
-void vflist_popup_destroy_cb(GtkWidget *widget, gpointer data)
+void vflist_popup_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewFile *vf = data;
vflist_color_set(vf, VFLIST(vf)->click_fd, FALSE);
*-----------------------------------------------------------------------------
*/
-static gboolean vflist_row_rename_cb(TreeEditData *td, const gchar *old, const gchar *new, gpointer data)
+static gboolean vflist_row_rename_cb(TreeEditData *UNUSED(td), const gchar *old, const gchar *new, gpointer data)
{
ViewFile *vf = data;
gchar *new_path;
return FALSE;
}
-static void vflist_menu_position_cb(GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer data)
+static void vflist_menu_position_cb(GtkMenu *menu, gint *x, gint *y, gboolean *UNUSED(push_in), gpointer data)
{
ViewFile *vf = data;
GtkTreeModel *store;
}
}
-static gboolean vflist_select_cb(GtkTreeSelection *selection, GtkTreeModel *store, GtkTreePath *tpath,
- gboolean path_currently_selected, gpointer data)
+static gboolean vflist_select_cb(GtkTreeSelection *UNUSED(selection), GtkTreeModel *store, GtkTreePath *tpath, gboolean path_currently_selected, gpointer data)
{
ViewFile *vf = data;
GtkTreeIter iter;
return TRUE;
}
-static void vflist_expand_cb(GtkTreeView *tree_view, GtkTreeIter *iter, GtkTreePath *path, gpointer data)
+static void vflist_expand_cb(GtkTreeView *UNUSED(tree_view), GtkTreeIter *iter, GtkTreePath *UNUSED(path), gpointer data)
{
ViewFile *vf = data;
vflist_set_expanded(vf, iter, TRUE);
}
-static void vflist_collapse_cb(GtkTreeView *tree_view, GtkTreeIter *iter, GtkTreePath *path, gpointer data)
+static void vflist_collapse_cb(GtkTreeView *UNUSED(tree_view), GtkTreeIter *iter, GtkTreePath *UNUSED(path), gpointer data)
{
ViewFile *vf = data;
vflist_set_expanded(vf, iter, FALSE);
return &color;
}
-static void vflist_listview_color_cb(GtkTreeViewColumn *tree_column, GtkCellRenderer *cell,
+static void vflist_listview_color_cb(GtkTreeViewColumn *UNUSED(tree_column), GtkCellRenderer *cell,
GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
{
ViewFile *vf = data;
return ret;
}
-void vflist_destroy_cb(GtkWidget *widget, gpointer data)
+void vflist_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewFile *vf = data;
filelist_free(vf->list);
}
-ViewFile *vflist_new(ViewFile *vf, FileData *dir_fd)
+ViewFile *vflist_new(ViewFile *vf, FileData *UNUSED(dir_fd))
{
GtkTreeStore *store;
GtkTreeSelection *selection;
static GtkWidget *help_window = NULL;
-static void help_window_destroy_cb(GtkWidget *window, gpointer data)
+static void help_window_destroy_cb(GtkWidget *UNUSED(window), gpointer UNUSED(data))
{
help_window = NULL;
}
gchar *text_entry;
};
-static void help_search_window_show_icon_press(GtkEntry *entry, GtkEntryIconPosition pos,
- GdkEvent *event, gpointer userdata)
+static void help_search_window_show_icon_press(GtkEntry *UNUSED(entry), GtkEntryIconPosition UNUSED(pos),
+ GdkEvent *UNUSED(event), gpointer userdata)
{
HelpSearchData *hsd = userdata;
gtk_entry_set_text(GTK_ENTRY(hsd->edit_widget), hsd->text_entry);
}
-static void help_search_window_ok_cb(GenericDialog *gd, gpointer data)
+static void help_search_window_ok_cb(GenericDialog *UNUSED(gd), gpointer data)
{
HelpSearchData *hsd = data;
gchar *search_command;
g_free(hsd);
}
-static void help_search_window_cancel_cb(GenericDialog *gd, gpointer data)
+static void help_search_window_cancel_cb(GenericDialog *UNUSED(gd), gpointer data)
{
HelpSearchData *hsd = data;
help_search_window_ok_cb, TRUE);
label1 = pref_label_new(GENERIC_DIALOG(gd)->vbox, _("Search engine:"));
-#if GTK_CHECK_VERSION(3,16,0)
gtk_label_set_xalign(GTK_LABEL(label1), 0.0);
gtk_label_set_yalign(GTK_LABEL(label1), 0.5);
-#else
- gtk_misc_set_alignment(GTK_MISC(label1), 0.0, 0.5);
-#endif
label2 = pref_label_new(GENERIC_DIALOG(gd)->vbox, options->help_search_engine);
-#if GTK_CHECK_VERSION(3,16,0)
gtk_label_set_xalign(GTK_LABEL(label2), 0.0);
gtk_label_set_yalign(GTK_LABEL(label2), 0.5);
-#else
- gtk_misc_set_alignment(GTK_MISC(label2), 0.0, 0.5);
-#endif
+
pref_spacer(GENERIC_DIALOG(gd)->vbox, 0);
table = pref_table_new(gd->vbox, 3, 1, FALSE, TRUE);
projects / geeqie.git / commitdiff