clutter: Remove deprecated/clutter-backend.h
https://gitlab.gnome.org/GNOME/mutter/merge_requests/445
This commit is contained in:
Adam Jackson
Georges Basile Stavracas Neto
parent
75071aba68
commit
ef8f2876e3
4 changed files with 0 additions and 247 deletions
|
|
@ -53,9 +53,6 @@
|
||||||
#include "clutter-stage-window.h"
|
#include "clutter-stage-window.h"
|
||||||
#include "clutter-device-manager-private.h"
|
#include "clutter-device-manager-private.h"
|
||||||
|
|
||||||
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
|
|
||||||
#include "deprecated/clutter-backend.h"
|
|
||||||
|
|
||||||
#ifdef CLUTTER_HAS_WAYLAND_COMPOSITOR_SUPPORT
|
#ifdef CLUTTER_HAS_WAYLAND_COMPOSITOR_SUPPORT
|
||||||
#include "wayland/clutter-wayland-compositor.h"
|
#include "wayland/clutter-wayland-compositor.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -903,129 +900,6 @@ clutter_get_default_backend (void)
|
||||||
return clutter_context->backend;
|
return clutter_context->backend;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* clutter_backend_set_double_click_time:
|
|
||||||
* @backend: a #ClutterBackend
|
|
||||||
* @msec: milliseconds between two button press events
|
|
||||||
*
|
|
||||||
* Sets the maximum time between two button press events, used to
|
|
||||||
* verify whether it's a double click event or not.
|
|
||||||
*
|
|
||||||
* Since: 0.4
|
|
||||||
*
|
|
||||||
* Deprecated: 1.4: Use #ClutterSettings:double-click-time instead
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
clutter_backend_set_double_click_time (ClutterBackend *backend,
|
|
||||||
guint msec)
|
|
||||||
{
|
|
||||||
ClutterSettings *settings = clutter_settings_get_default ();
|
|
||||||
|
|
||||||
g_object_set (settings, "double-click-time", msec, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* clutter_backend_get_double_click_time:
|
|
||||||
* @backend: a #ClutterBackend
|
|
||||||
*
|
|
||||||
* Gets the maximum time between two button press events, as set
|
|
||||||
* by clutter_backend_set_double_click_time().
|
|
||||||
*
|
|
||||||
* Return value: a time in milliseconds
|
|
||||||
*
|
|
||||||
* Since: 0.4
|
|
||||||
*
|
|
||||||
* Deprecated: 1.4: Use #ClutterSettings:double-click-time instead
|
|
||||||
*/
|
|
||||||
guint
|
|
||||||
clutter_backend_get_double_click_time (ClutterBackend *backend)
|
|
||||||
{
|
|
||||||
ClutterSettings *settings = clutter_settings_get_default ();
|
|
||||||
gint retval;
|
|
||||||
|
|
||||||
g_object_get (settings, "double-click-time", &retval, NULL);
|
|
||||||
|
|
||||||
return retval;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* clutter_backend_set_double_click_distance:
|
|
||||||
* @backend: a #ClutterBackend
|
|
||||||
* @distance: a distance, in pixels
|
|
||||||
*
|
|
||||||
* Sets the maximum distance used to verify a double click event.
|
|
||||||
*
|
|
||||||
* Since: 0.4
|
|
||||||
*
|
|
||||||
* Deprecated: 1.4: Use #ClutterSettings:double-click-distance instead
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
clutter_backend_set_double_click_distance (ClutterBackend *backend,
|
|
||||||
guint distance)
|
|
||||||
{
|
|
||||||
ClutterSettings *settings = clutter_settings_get_default ();
|
|
||||||
|
|
||||||
g_object_set (settings, "double-click-distance", distance, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* clutter_backend_get_double_click_distance:
|
|
||||||
* @backend: a #ClutterBackend
|
|
||||||
*
|
|
||||||
* Retrieves the distance used to verify a double click event
|
|
||||||
*
|
|
||||||
* Return value: a distance, in pixels.
|
|
||||||
*
|
|
||||||
* Since: 0.4
|
|
||||||
*
|
|
||||||
* Deprecated: 1.4: Use #ClutterSettings:double-click-distance instead
|
|
||||||
*/
|
|
||||||
guint
|
|
||||||
clutter_backend_get_double_click_distance (ClutterBackend *backend)
|
|
||||||
{
|
|
||||||
ClutterSettings *settings = clutter_settings_get_default ();
|
|
||||||
gint retval;
|
|
||||||
|
|
||||||
g_object_get (settings, "double-click-distance", &retval, NULL);
|
|
||||||
|
|
||||||
return retval;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* clutter_backend_set_resolution:
|
|
||||||
* @backend: a #ClutterBackend
|
|
||||||
* @dpi: the resolution in "dots per inch" (Physical inches aren't
|
|
||||||
* actually involved; the terminology is conventional).
|
|
||||||
*
|
|
||||||
* Sets the resolution for font handling on the screen. This is a
|
|
||||||
* scale factor between points specified in a #PangoFontDescription
|
|
||||||
* and cairo units. The default value is 96, meaning that a 10 point
|
|
||||||
* font will be 13 units high. (10 * 96. / 72. = 13.3).
|
|
||||||
*
|
|
||||||
* Applications should never need to call this function.
|
|
||||||
*
|
|
||||||
* Since: 0.4
|
|
||||||
*
|
|
||||||
* Deprecated: 1.4: Use #ClutterSettings:font-dpi instead
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
clutter_backend_set_resolution (ClutterBackend *backend,
|
|
||||||
gdouble dpi)
|
|
||||||
{
|
|
||||||
ClutterSettings *settings;
|
|
||||||
gint resolution;
|
|
||||||
|
|
||||||
g_return_if_fail (CLUTTER_IS_BACKEND (backend));
|
|
||||||
|
|
||||||
if (dpi < 0)
|
|
||||||
resolution = -1;
|
|
||||||
else
|
|
||||||
resolution = dpi * 1024;
|
|
||||||
|
|
||||||
settings = clutter_settings_get_default ();
|
|
||||||
g_object_set (settings, "font-dpi", resolution, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* clutter_backend_get_resolution:
|
* clutter_backend_get_resolution:
|
||||||
* @backend: a #ClutterBackend
|
* @backend: a #ClutterBackend
|
||||||
|
|
@ -1131,61 +1005,6 @@ clutter_backend_get_font_options (ClutterBackend *backend)
|
||||||
return backend->font_options;
|
return backend->font_options;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* clutter_backend_set_font_name:
|
|
||||||
* @backend: a #ClutterBackend
|
|
||||||
* @font_name: the name of the font
|
|
||||||
*
|
|
||||||
* Sets the default font to be used by Clutter. The @font_name string
|
|
||||||
* must either be %NULL, which means that the font name from the
|
|
||||||
* default #ClutterBackend will be used; or be something that can
|
|
||||||
* be parsed by the pango_font_description_from_string() function.
|
|
||||||
*
|
|
||||||
* Since: 1.0
|
|
||||||
*
|
|
||||||
* Deprecated: 1.4: Use #ClutterSettings:font-name instead
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
clutter_backend_set_font_name (ClutterBackend *backend,
|
|
||||||
const gchar *font_name)
|
|
||||||
{
|
|
||||||
ClutterSettings *settings = clutter_settings_get_default ();
|
|
||||||
|
|
||||||
g_object_set (settings, "font-name", font_name, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* clutter_backend_get_font_name:
|
|
||||||
* @backend: a #ClutterBackend
|
|
||||||
*
|
|
||||||
* Retrieves the default font name as set by
|
|
||||||
* clutter_backend_set_font_name().
|
|
||||||
*
|
|
||||||
* Return value: the font name for the backend. The returned string is
|
|
||||||
* owned by the #ClutterBackend and should never be modified or freed
|
|
||||||
*
|
|
||||||
* Since: 1.0
|
|
||||||
*
|
|
||||||
* Deprecated: 1.4: Use #ClutterSettings:font-name instead
|
|
||||||
*/
|
|
||||||
const gchar *
|
|
||||||
clutter_backend_get_font_name (ClutterBackend *backend)
|
|
||||||
{
|
|
||||||
ClutterSettings *settings;
|
|
||||||
|
|
||||||
g_return_val_if_fail (CLUTTER_IS_BACKEND (backend), NULL);
|
|
||||||
|
|
||||||
settings = clutter_settings_get_default ();
|
|
||||||
|
|
||||||
/* XXX yuck. but we return a const pointer, so we need to
|
|
||||||
* store it in the backend
|
|
||||||
*/
|
|
||||||
g_free (backend->font_name);
|
|
||||||
g_object_get (settings, "font-name", &backend->font_name, NULL);
|
|
||||||
|
|
||||||
return backend->font_name;
|
|
||||||
}
|
|
||||||
|
|
||||||
gint32
|
gint32
|
||||||
_clutter_backend_get_units_serial (ClutterBackend *backend)
|
_clutter_backend_get_units_serial (ClutterBackend *backend)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,6 @@
|
||||||
#include "deprecated/clutter-animatable.h"
|
#include "deprecated/clutter-animatable.h"
|
||||||
#include "deprecated/clutter-animation.h"
|
#include "deprecated/clutter-animation.h"
|
||||||
#include "deprecated/clutter-animator.h"
|
#include "deprecated/clutter-animator.h"
|
||||||
#include "deprecated/clutter-backend.h"
|
|
||||||
#include "deprecated/clutter-behaviour.h"
|
#include "deprecated/clutter-behaviour.h"
|
||||||
#include "deprecated/clutter-behaviour-depth.h"
|
#include "deprecated/clutter-behaviour-depth.h"
|
||||||
#include "deprecated/clutter-behaviour-ellipse.h"
|
#include "deprecated/clutter-behaviour-ellipse.h"
|
||||||
|
|
|
||||||
|
|
@ -1,64 +0,0 @@
|
||||||
/*
|
|
||||||
* Clutter.
|
|
||||||
*
|
|
||||||
* An OpenGL based 'interactive canvas' library.
|
|
||||||
*
|
|
||||||
* Authored By Matthew Allum <mallum@openedhand.com>
|
|
||||||
*
|
|
||||||
* Copyright (C) 2006, 2007, 2008 OpenedHand Ltd
|
|
||||||
* Copyright (C) 2009, 2010 Intel Corp
|
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation; either
|
|
||||||
* version 2 of the License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This library 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
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
|
|
||||||
#error "Only <clutter/clutter.h> can be included directly."
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef __CLUTTER_BACKEND_DEPRECATED_H__
|
|
||||||
#define __CLUTTER_BACKEND_DEPRECATED_H__
|
|
||||||
|
|
||||||
#include <clutter/clutter-types.h>
|
|
||||||
|
|
||||||
G_BEGIN_DECLS
|
|
||||||
|
|
||||||
CLUTTER_DEPRECATED_FOR(ClutterSettings:font_dpi)
|
|
||||||
void clutter_backend_set_resolution (ClutterBackend *backend,
|
|
||||||
gdouble dpi);
|
|
||||||
|
|
||||||
CLUTTER_DEPRECATED_FOR(ClutterSettings:double_click_time)
|
|
||||||
void clutter_backend_set_double_click_time (ClutterBackend *backend,
|
|
||||||
guint msec);
|
|
||||||
|
|
||||||
CLUTTER_DEPRECATED_FOR(ClutterSettings:double_click_time)
|
|
||||||
guint clutter_backend_get_double_click_time (ClutterBackend *backend);
|
|
||||||
|
|
||||||
CLUTTER_DEPRECATED_FOR(ClutterSettings:double_click_distance)
|
|
||||||
void clutter_backend_set_double_click_distance (ClutterBackend *backend,
|
|
||||||
guint distance);
|
|
||||||
|
|
||||||
CLUTTER_DEPRECATED_FOR(ClutterSettings:double_click_distance)
|
|
||||||
guint clutter_backend_get_double_click_distance (ClutterBackend *backend);
|
|
||||||
|
|
||||||
CLUTTER_DEPRECATED_FOR(ClutterSettings:font_name)
|
|
||||||
void clutter_backend_set_font_name (ClutterBackend *backend,
|
|
||||||
const gchar *font_name);
|
|
||||||
|
|
||||||
CLUTTER_DEPRECATED_FOR(ClutterSettings:font_name)
|
|
||||||
const gchar * clutter_backend_get_font_name (ClutterBackend *backend);
|
|
||||||
|
|
||||||
|
|
||||||
G_END_DECLS
|
|
||||||
|
|
||||||
#endif /* __CLUTTER_BACKEND_DEPRECATED_H__ */
|
|
||||||
|
|
@ -221,7 +221,6 @@ clutter_deprecated_headers = [
|
||||||
'deprecated/clutter-animatable.h',
|
'deprecated/clutter-animatable.h',
|
||||||
'deprecated/clutter-animation.h',
|
'deprecated/clutter-animation.h',
|
||||||
'deprecated/clutter-animator.h',
|
'deprecated/clutter-animator.h',
|
||||||
'deprecated/clutter-backend.h',
|
|
||||||
'deprecated/clutter-behaviour.h',
|
'deprecated/clutter-behaviour.h',
|
||||||
'deprecated/clutter-behaviour-depth.h',
|
'deprecated/clutter-behaviour-depth.h',
|
||||||
'deprecated/clutter-behaviour-ellipse.h',
|
'deprecated/clutter-behaviour-ellipse.h',
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue