clutter: remove x11/clutter-x11-texure-pixmap.c
We're not using this, our path to BindTexImage is hidden down in cogl instead. In general we should reduce the amount of X-specific API we expose. https://gitlab.gnome.org/GNOME/mutter/merge_requests/463
This commit is contained in:
Adam Jackson
parent
6a5772c881
commit
6cbaeae64d
@ -277,7 +277,6 @@ if have_x11
|
|||||||
'x11/clutter-keymap-x11.c',
|
'x11/clutter-keymap-x11.c',
|
||||||
'x11/clutter-stage-x11.c',
|
'x11/clutter-stage-x11.c',
|
||||||
'x11/clutter-virtual-input-device-x11.c',
|
'x11/clutter-virtual-input-device-x11.c',
|
||||||
'x11/clutter-x11-texture-pixmap.c',
|
|
||||||
]
|
]
|
||||||
clutter_backend_sources += clutter_x11_sources
|
clutter_backend_sources += clutter_x11_sources
|
||||||
|
|
||||||
@ -288,7 +287,6 @@ if have_x11
|
|||||||
|
|
||||||
clutter_x11_headers = [
|
clutter_x11_headers = [
|
||||||
'x11/clutter-x11.h',
|
'x11/clutter-x11.h',
|
||||||
'x11/clutter-x11-texture-pixmap.h',
|
|
||||||
]
|
]
|
||||||
clutter_backend_headers += clutter_x11_headers
|
clutter_backend_headers += clutter_x11_headers
|
||||||
|
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -1,116 +0,0 @@
|
|||||||
/*
|
|
||||||
* Clutter.
|
|
||||||
*
|
|
||||||
* An OpenGL based 'interactive canvas' library.
|
|
||||||
*
|
|
||||||
* Authored By Johan Bilien <johan.bilien@nokia.com>
|
|
||||||
*
|
|
||||||
* Copyright (C) 2007 OpenedHand
|
|
||||||
*
|
|
||||||
* 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/>.
|
|
||||||
*
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __CLUTTER_X11_TEXTURE_PIXMAP_H__
|
|
||||||
#define __CLUTTER_X11_TEXTURE_PIXMAP_H__
|
|
||||||
|
|
||||||
#include <glib.h>
|
|
||||||
#include <glib-object.h>
|
|
||||||
#include <clutter/clutter.h>
|
|
||||||
|
|
||||||
#include <X11/Xlib.h>
|
|
||||||
|
|
||||||
G_BEGIN_DECLS
|
|
||||||
|
|
||||||
#define CLUTTER_X11_TYPE_TEXTURE_PIXMAP (clutter_x11_texture_pixmap_get_type ())
|
|
||||||
#define CLUTTER_X11_TEXTURE_PIXMAP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_X11_TYPE_TEXTURE_PIXMAP, ClutterX11TexturePixmap))
|
|
||||||
#define CLUTTER_X11_TEXTURE_PIXMAP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_X11_TYPE_TEXTURE_PIXMAP, ClutterX11TexturePixmapClass))
|
|
||||||
#define CLUTTER_X11_IS_TEXTURE_PIXMAP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_X11_TYPE_TEXTURE_PIXMAP))
|
|
||||||
#define CLUTTER_X11_IS_TEXTURE_PIXMAP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_X11_TYPE_TEXTURE_PIXMAP))
|
|
||||||
#define CLUTTER_X11_TEXTURE_PIXMAP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_X11_TYPE_TEXTURE_PIXMAP, ClutterX11TexturePixmapClass))
|
|
||||||
|
|
||||||
typedef struct _ClutterX11TexturePixmap ClutterX11TexturePixmap;
|
|
||||||
typedef struct _ClutterX11TexturePixmapClass ClutterX11TexturePixmapClass;
|
|
||||||
typedef struct _ClutterX11TexturePixmapPrivate ClutterX11TexturePixmapPrivate;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* ClutterX11TexturePixmap:
|
|
||||||
*
|
|
||||||
* The #ClutterX11TexturePixmap structure contains only private data
|
|
||||||
*
|
|
||||||
* Since: 0.8
|
|
||||||
*/
|
|
||||||
struct _ClutterX11TexturePixmap
|
|
||||||
{
|
|
||||||
/*< private >*/
|
|
||||||
ClutterTexture parent;
|
|
||||||
|
|
||||||
ClutterX11TexturePixmapPrivate *priv;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* ClutterX11TexturePixmapClass:
|
|
||||||
* @update_area: virtual function for updating the area of the texture
|
|
||||||
*
|
|
||||||
* The #ClutterX11TexturePixmapClass structure contains only private data
|
|
||||||
*
|
|
||||||
* Since: 0.8
|
|
||||||
*/
|
|
||||||
struct _ClutterX11TexturePixmapClass
|
|
||||||
{
|
|
||||||
/*< private >*/
|
|
||||||
ClutterTextureClass parent_class;
|
|
||||||
|
|
||||||
/*< public >*/
|
|
||||||
void (* update_area) (ClutterX11TexturePixmap *texture,
|
|
||||||
gint x,
|
|
||||||
gint y,
|
|
||||||
gint width,
|
|
||||||
gint height);
|
|
||||||
};
|
|
||||||
|
|
||||||
CLUTTER_EXPORT
|
|
||||||
GType clutter_x11_texture_pixmap_get_type (void) G_GNUC_CONST;
|
|
||||||
|
|
||||||
CLUTTER_EXPORT
|
|
||||||
ClutterActor *clutter_x11_texture_pixmap_new (void);
|
|
||||||
CLUTTER_EXPORT
|
|
||||||
ClutterActor *clutter_x11_texture_pixmap_new_with_pixmap (Pixmap pixmap);
|
|
||||||
CLUTTER_EXPORT
|
|
||||||
ClutterActor *clutter_x11_texture_pixmap_new_with_window (Window window);
|
|
||||||
|
|
||||||
CLUTTER_EXPORT
|
|
||||||
void clutter_x11_texture_pixmap_set_automatic (ClutterX11TexturePixmap *texture,
|
|
||||||
gboolean setting);
|
|
||||||
CLUTTER_EXPORT
|
|
||||||
void clutter_x11_texture_pixmap_set_pixmap (ClutterX11TexturePixmap *texture,
|
|
||||||
Pixmap pixmap);
|
|
||||||
CLUTTER_EXPORT
|
|
||||||
void clutter_x11_texture_pixmap_set_window (ClutterX11TexturePixmap *texture,
|
|
||||||
Window window,
|
|
||||||
gboolean automatic);
|
|
||||||
|
|
||||||
CLUTTER_EXPORT
|
|
||||||
void clutter_x11_texture_pixmap_sync_window (ClutterX11TexturePixmap *texture);
|
|
||||||
CLUTTER_EXPORT
|
|
||||||
void clutter_x11_texture_pixmap_update_area (ClutterX11TexturePixmap *texture,
|
|
||||||
gint x,
|
|
||||||
gint y,
|
|
||||||
gint width,
|
|
||||||
gint height);
|
|
||||||
|
|
||||||
G_END_DECLS
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@ -42,7 +42,6 @@
|
|||||||
#include <X11/Xatom.h>
|
#include <X11/Xatom.h>
|
||||||
#include <X11/Xutil.h>
|
#include <X11/Xutil.h>
|
||||||
#include <clutter/clutter.h>
|
#include <clutter/clutter.h>
|
||||||
#include <clutter/x11/clutter-x11-texture-pixmap.h>
|
|
||||||
|
|
||||||
G_BEGIN_DECLS
|
G_BEGIN_DECLS
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user