Author: cazfi
Date: Tue Nov 1 09:40:52 2016
New Revision: 34308
URL: http://svn.gna.org/viewcvs/freeciv?rev=34308&view=rev
Log:
Dropped unused copies of gtkpixcomm.[ch] from version control.
See patch #7893
Removed:
branches/S2_6/client/gui-gtk-3.22/gtkpixcomm.c
branches/S2_6/client/gui-gtk-3.22/gtkpixcomm.h
Removed: branches/S2_6/client/gui-gtk-3.22/gtkpixcomm.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.22/gtkpixcomm.c?rev=34307&view=auto
==============================================================================
--- branches/S2_6/client/gui-gtk-3.22/gtkpixcomm.c (original)
+++ branches/S2_6/client/gui-gtk-3.22/gtkpixcomm.c (removed)
@@ -1,350 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * Insensitive pixcomm building code by Eckehard Berns from GNOME Stock
- * Copyright (C) 1997, 1998 Free Software Foundation
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
- * file for a list of people on the GTK+ Team. See the ChangeLog
- * files for a list of changes. These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-/*
- * Based code for GtkPixcomm off GtkImage from the standard GTK+ distribution.
- * This widget will have a built-in X window for capturing "click" events, so
- * that we no longer need to insert it inside a GtkEventBox. -vasc
- */
-
-#ifdef HAVE_CONFIG_H
-#include <fc_config.h>
-#endif
-
-#include <math.h>
-
-#include <gtk/gtk.h>
-
-/* gui-gtk-3.22 */
-#include "gui_main.h"
-#include "sprite.h"
-
-#include "gtkpixcomm.h"
-
-static gboolean gtk_pixcomm_draw(GtkWidget *widget, cairo_t *cr);
-static void gtk_pixcomm_destroy(GtkWidget *object);
-static void
-gtk_pixcomm_get_preferred_width(GtkWidget *widget, gint *minimal_width,
- gint *natural_width);
-static void
-gtk_pixcomm_get_preferred_height(GtkWidget *widget, gint *minimal_height,
- gint *natural_height);
-
-static GtkWidgetClass *parent_class;
-
-typedef struct _GtkPixcommPrivate GtkPixcommPrivate;
-struct _GtkPixcommPrivate
-{
- cairo_surface_t *surface;
-};
-
-#define GTK_PIXCOMM_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj),
GTK_TYPE_PIXCOMM, GtkPixcommPrivate))
-
-G_DEFINE_TYPE (GtkPixcomm, gtk_pixcomm, GTK_TYPE_WIDGET)
-
-/***************************************************************************
- Initialize pixcomm class
-***************************************************************************/
-static void
-gtk_pixcomm_class_init(GtkPixcommClass *klass)
-{
- GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
-
- parent_class = g_type_class_peek_parent(klass);
-
- widget_class->destroy = gtk_pixcomm_destroy;
- widget_class->draw = gtk_pixcomm_draw;
- widget_class->get_preferred_width = gtk_pixcomm_get_preferred_width;
- widget_class->get_preferred_height = gtk_pixcomm_get_preferred_height;
- g_type_class_add_private (widget_class, sizeof(GtkPixcommPrivate));
-}
-
-/***************************************************************************
- Initialize pixcomm instance
-***************************************************************************/
-static void
-gtk_pixcomm_init(GtkPixcomm *pixcomm)
-{
- GtkPixcommPrivate *priv = GTK_PIXCOMM_GET_PRIVATE(pixcomm);
- gtk_widget_set_has_window(GTK_WIDGET(pixcomm), FALSE);
-
- priv->surface = NULL;
-}
-
-/***************************************************************************
- Destroy pixcomm instance
-***************************************************************************/
-static void gtk_pixcomm_destroy(GtkWidget *object)
-{
- GtkPixcomm *p = GTK_PIXCOMM(object);
- GtkPixcommPrivate *priv = GTK_PIXCOMM_GET_PRIVATE(p);
-
- g_object_freeze_notify(G_OBJECT(p));
-
- cairo_surface_destroy(priv->surface);
- priv->surface = NULL;
-
- g_object_thaw_notify(G_OBJECT(p));
-
- if (GTK_WIDGET_CLASS(parent_class)->destroy) {
- (*GTK_WIDGET_CLASS(parent_class)->destroy)(object);
- }
-}
-
-/***************************************************************************
- Create new pixcomm instance
-***************************************************************************/
-GtkWidget*
-gtk_pixcomm_new(gint width, gint height)
-{
- GtkPixcomm *p;
- GtkPixcommPrivate *priv;
- cairo_t *cr;
- int start_pad;
- int end_pad;
- int top_pad;
- int bottom_pad;
-
- p = g_object_new(gtk_pixcomm_get_type(), NULL);
- priv = GTK_PIXCOMM_GET_PRIVATE(p);
- p->w = width; p->h = height;
- start_pad = gtk_widget_get_margin_left(GTK_WIDGET(p));
- end_pad = gtk_widget_get_margin_right(GTK_WIDGET(p));
- top_pad = gtk_widget_get_margin_top(GTK_WIDGET(p));
- bottom_pad = gtk_widget_get_margin_bottom(GTK_WIDGET(p));
- gtk_widget_set_size_request(GTK_WIDGET(p), width + start_pad + end_pad,
- height + top_pad + bottom_pad);
- gtk_widget_set_halign(GTK_WIDGET(p), GTK_ALIGN_CENTER);
- gtk_widget_set_valign(GTK_WIDGET(p), GTK_ALIGN_CENTER);
-
- p->is_scaled = FALSE;
- p->scale = 1.0;
-
- priv->surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width,
height);
- cr = cairo_create(priv->surface);
- cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
- cairo_paint(cr);
- cairo_destroy(cr);
-
- return GTK_WIDGET(p);
-}
-
-/****************************************************************************
- Set the scaling on the pixcomm. All operations drawn on the pixcomm
- (before or after this function is called) will simply be scaled
- by this amount.
-****************************************************************************/
-void gtk_pixcomm_set_scale(GtkPixcomm *pixcomm, gdouble scale)
-{
- fc_assert_ret(GTK_IS_PIXCOMM(pixcomm));
- fc_assert_ret(scale > 0.0);
-
- if (scale == 1.0) {
- pixcomm->is_scaled = FALSE;
- pixcomm->scale = 1.0;
- } else {
- pixcomm->is_scaled = TRUE;
- pixcomm->scale = scale;
- }
-}
-
-/***************************************************************************
- Get cairo surface from pixcomm.
-***************************************************************************/
-cairo_surface_t *gtk_pixcomm_get_surface(GtkPixcomm *pixcomm)
-{
- fc_assert_ret_val(GTK_IS_PIXCOMM(pixcomm), NULL);
- return GTK_PIXCOMM_GET_PRIVATE(pixcomm)->surface;
-}
-
-/***************************************************************************
- Clear pixcomm
-***************************************************************************/
-void
-gtk_pixcomm_clear(GtkPixcomm *p)
-{
- fc_assert_ret(GTK_IS_PIXCOMM(p));
- GtkPixcommPrivate *priv = GTK_PIXCOMM_GET_PRIVATE(p);
-
- cairo_t *cr = cairo_create(priv->surface);
- cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
- cairo_paint(cr);
- cairo_destroy(cr);
- gtk_widget_queue_draw(GTK_WIDGET(p));
-}
-
-/***************************************************************************
- Copy sprite to pixcomm
-***************************************************************************/
-void gtk_pixcomm_copyto(GtkPixcomm *p, struct sprite *src, gint x, gint y)
-{
- GtkPixcommPrivate *priv = GTK_PIXCOMM_GET_PRIVATE(p);
- int width, height;
- GtkAllocation allocation;
- cairo_t *cr = cairo_create(priv->surface);
- int start_pad;
- int top_pad;
-
- start_pad = gtk_widget_get_margin_left(GTK_WIDGET(p));
- top_pad = gtk_widget_get_margin_top(GTK_WIDGET(p));
- gtk_widget_get_allocation(GTK_WIDGET(p), &allocation);
-
- fc_assert_ret(GTK_IS_PIXCOMM(p));
- fc_assert_ret(src != NULL);
-
- get_sprite_dimensions(src, &width, &height);
- cairo_rectangle(cr, x, y, width, height);
- cairo_set_source_surface(cr, src->surface, x, y);
- cairo_paint(cr);
- cairo_destroy(cr);
- gtk_widget_queue_draw_area(GTK_WIDGET(p),
- allocation.x + x + start_pad,
- allocation.y + y + top_pad,
- width, height);
-}
-
-/***************************************************************************
- Draw pixcomm
-***************************************************************************/
-static gboolean gtk_pixcomm_draw(GtkWidget *widget, cairo_t *cr)
-{
- GtkPixcommPrivate *priv;
- GtkPixcomm *p;
- gint start_pad;
- gint top_pad;
-
- fc_assert_ret_val(GTK_IS_PIXCOMM(widget), FALSE);
-
- priv = GTK_PIXCOMM_GET_PRIVATE(GTK_PIXCOMM(widget));
-
- p = GTK_PIXCOMM(widget);
- start_pad = gtk_widget_get_margin_left(widget);
- top_pad = gtk_widget_get_margin_top(widget);
-
- cairo_translate(cr, start_pad, top_pad);
-
- if (p->is_scaled) {
- cairo_scale(cr, p->scale, p->scale);
- }
- cairo_set_source_surface(cr, priv->surface, 0, 0);
- cairo_paint(cr);
-
- return FALSE;
-}
-
-/***************************************************************************
- Get width pixcomm uses.
-***************************************************************************/
-static void
-gtk_pixcomm_get_preferred_width(GtkWidget *widget, gint *minimal_width,
- gint *natural_width)
-{
- int start_pad;
- int end_pad;
-
- start_pad = gtk_widget_get_margin_left(widget);
- end_pad = gtk_widget_get_margin_right(widget);
- *minimal_width = *natural_width = GTK_PIXCOMM(widget)->w + start_pad +
end_pad;
-}
-
-/***************************************************************************
- Get height pixcomm uses.
-***************************************************************************/
-static void
-gtk_pixcomm_get_preferred_height(GtkWidget *widget, gint *minimal_height,
- gint *natural_height)
-{
- int top_pad;
- int bottom_pad;
-
- top_pad = gtk_widget_get_margin_top(widget);
- bottom_pad = gtk_widget_get_margin_bottom(widget);
- *minimal_height = *natural_height = GTK_PIXCOMM(widget)->h + top_pad +
bottom_pad;
-}
-
-/***************************************************************************
- Create new gtkpixcomm from sprite.
-***************************************************************************/
-GtkWidget *gtk_pixcomm_new_from_sprite(struct sprite *sprite)
-{
- GtkPixcomm *p;
- GtkPixcommPrivate *priv;
- cairo_t *cr;
- int start_pad;
- int end_pad;
- int top_pad;
- int bottom_pad;
-
- p = g_object_new(gtk_pixcomm_get_type(), NULL);
- priv = GTK_PIXCOMM_GET_PRIVATE(p);
- get_sprite_dimensions(sprite, &p->w, &p->h);
- start_pad = gtk_widget_get_margin_left(GTK_WIDGET(p));
- end_pad = gtk_widget_get_margin_right(GTK_WIDGET(p));
- top_pad = gtk_widget_get_margin_top(GTK_WIDGET(p));
- bottom_pad = gtk_widget_get_margin_bottom(GTK_WIDGET(p));
- gtk_widget_set_size_request(GTK_WIDGET(p), p->w + start_pad + end_pad,
- p->h + top_pad + bottom_pad);
- gtk_widget_set_halign(GTK_WIDGET(p), GTK_ALIGN_CENTER);
- gtk_widget_set_valign(GTK_WIDGET(p), GTK_ALIGN_CENTER);
-
- p->is_scaled = FALSE;
- p->scale = 1.0;
-
- priv->surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, p->w, p->h);
- cr = cairo_create(priv->surface);
- cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
- cairo_set_source_surface(cr, sprite->surface, 0, 0);
- cairo_paint(cr);
- cairo_destroy(cr);
-
- return GTK_WIDGET(p);
-}
-
-/***************************************************************************
- Draw sprite to gtkpixcomm. Grkpixcomm dimensions may change.
-***************************************************************************/
-void gtk_pixcomm_set_from_sprite(GtkPixcomm *p, struct sprite *sprite)
-{
- GtkPixcommPrivate *priv;
- cairo_t *cr;
- int width, height;
- get_sprite_dimensions(sprite, &width, &height);
- priv = GTK_PIXCOMM_GET_PRIVATE(p);
-
- cairo_surface_destroy(priv->surface);
- priv->surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width,
height);
- cr = cairo_create(priv->surface);
- cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
- cairo_set_source_surface(cr, sprite->surface, 0, 0);
- cairo_paint(cr);
- cairo_destroy(cr);
- p->w = width;
- p->h = height;
- gtk_widget_queue_resize(GTK_WIDGET(p));
-}
Removed: branches/S2_6/client/gui-gtk-3.22/gtkpixcomm.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.22/gtkpixcomm.h?rev=34307&view=auto
==============================================================================
--- branches/S2_6/client/gui-gtk-3.22/gtkpixcomm.h (original)
+++ branches/S2_6/client/gui-gtk-3.22/gtkpixcomm.h (removed)
@@ -1,74 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
- * file for a list of people on the GTK+ Team. See the ChangeLog
- * files for a list of changes. These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __GTK_PIXCOMM_H__
-#define __GTK_PIXCOMM_H__
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_PIXCOMM (gtk_pixcomm_get_type ())
-#define GTK_PIXCOMM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
GTK_TYPE_PIXCOMM, GtkPixcomm))
-#define GTK_PIXCOMM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass),
GTK_TYPE_PIXCOMM, GtkPixcommClass))
-#define GTK_IS_PIXCOMM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),
GTK_TYPE_PIXCOMM))
-#define GTK_IS_PIXCOMM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),
GTK_TYPE_PIXCOMM))
-#define GTK_PIXCOMM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),
GTK_TYPE_PIXCOMM, GtkPixcommClass))
-
-
-typedef struct _GtkPixcomm GtkPixcomm;
-typedef struct _GtkPixcommClass GtkPixcommClass;
-
-struct _GtkPixcomm
-{
- GtkWidget widget;
-
- gint w, h;
-
- gboolean is_scaled;
- gdouble scale;
-};
-
-struct _GtkPixcommClass
-{
- GtkWidgetClass parent_class;
-};
-
-
-GType gtk_pixcomm_get_type (void)G_GNUC_CONST;
-GtkWidget *gtk_pixcomm_new(gint width, gint height);
-void gtk_pixcomm_set_scale(GtkPixcomm *pixcomm, gdouble scale);
-cairo_surface_t *gtk_pixcomm_get_surface(GtkPixcomm *pixcomm);
-void gtk_pixcomm_copyto(GtkPixcomm *pixcomm, struct sprite *src,
- gint x, gint y);
-void gtk_pixcomm_clear(GtkPixcomm *pixcomm);
-GtkWidget *gtk_pixcomm_new_from_sprite(struct sprite *sprite);
-void gtk_pixcomm_set_from_sprite(GtkPixcomm *p, struct sprite *sprite);
-
-G_END_DECLS
-
-#endif /* __GTK_PIXCOMM_H__ */
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
