Commit dcbd83ca authored by Michael Natterer's avatar Michael Natterer 😴

devel-docs: undeprecate doc-shooter and add a few more widgets

Doesn't use X11 any longer, just plain GTK and cairo.
parent 9e88105e
......@@ -15,9 +15,9 @@ libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSIO
AM_CPPFLAGS = \
$(GTK_CFLAGS) \
-DTOP_SRCDIR=\"$(top_srcdir)\" \
-DTOP_SRCDIR=\"$(top_srcdir)\" \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
$(GEGL_CFLAGS)
AM_LDFLAGS = $(mwindows)
......@@ -43,8 +43,7 @@ doc_shooter_LDADD = \
$(libgimpmath) \
$(libgimpcolor) \
$(libgimpbase) \
$(GTK_LIBS) \
$(X_LIBS) -lX11 -lXext
$(GTK_LIBS)
EXTRA_PROGRAMS = doc-shooter
......
......@@ -98,8 +98,8 @@ create_shadow (GdkPixbuf *src)
src_y = -(BLUR_RADIUS + SHADOW_OFFSET) + y - (filter->size >> 1) + i;
src_x = -(BLUR_RADIUS + SHADOW_OFFSET) + x - (filter->size >> 1) + j;
if (src_y < 0 || src_y > gdk_pixbuf_get_height (src) ||
src_x < 0 || src_x > gdk_pixbuf_get_width (src))
if (src_y < 0 || src_y >= gdk_pixbuf_get_height (src) ||
src_x < 0 || src_x >= gdk_pixbuf_get_width (src))
continue;
sumr += src_pixels [src_y * src_rowstride +
......
#include "config.h"
#include <stdlib.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <gegl.h>
#include <gdk/gdkx.h>
#include <gtk/gtk.h>
#include <X11/extensions/shape.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpconfig/gimpconfig.h"
#include "libgimpmodule/gimpmodule.h"
......@@ -24,30 +15,6 @@
#include "widgets.h"
static Window
find_toplevel_window (Display *display,
Window xid)
{
Window root, parent, *children;
guint nchildren;
do
{
if (XQueryTree (display, xid,
&root, &parent, &children, &nchildren) == 0)
{
g_warning ("Couldn't find window manager window");
return 0;
}
if (root == parent)
return xid;
xid = parent;
}
while (TRUE);
}
static GdkPixbuf *
add_border_to_shot (GdkPixbuf *pixbuf)
{
......@@ -70,125 +37,48 @@ add_border_to_shot (GdkPixbuf *pixbuf)
}
static GdkPixbuf *
remove_shaped_area (GdkPixbuf *pixbuf,
Window window)
take_window_shot (GtkWidget *widget)
{
Display *display;
GdkPixbuf *retval;
XRectangle *rectangles;
gint rectangle_count, rectangle_order;
gint i;
retval = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8,
gdk_pixbuf_get_width (pixbuf),
gdk_pixbuf_get_height (pixbuf));
gdk_pixbuf_fill (retval, 0);
GtkAllocation allocation;
cairo_surface_t *surface;
cairo_t *cr;
GdkPixbuf *pixbuf;
display = gdk_x11_display_get_xdisplay (gdk_display_get_default ());
allocation.x = 0;
allocation.y = 0;
gtk_widget_get_preferred_width (widget, NULL, &allocation.width);
gtk_widget_get_preferred_height (widget, NULL, &allocation.height);
rectangles = XShapeGetRectangles (display, window, ShapeBounding,
&rectangle_count, &rectangle_order);
gtk_widget_size_allocate (widget, &allocation);
gtk_widget_get_allocation (widget, &allocation);
for (i = 0; i < rectangle_count; i++)
{
int y, x;
surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
allocation.width,
allocation.height);
cr = cairo_create (surface);
gtk_widget_draw (widget, cr);
cairo_destroy (cr);
for (y = rectangles[i].y;
y < rectangles[i].y + rectangles[i].height;
y++)
{
const guchar *src_pixels;
guchar *dest_pixels;
src_pixels = gdk_pixbuf_get_pixels (pixbuf) +
y * gdk_pixbuf_get_rowstride (pixbuf) +
rectangles[i].x * (gdk_pixbuf_get_has_alpha (pixbuf) ? 4 : 3);
dest_pixels = gdk_pixbuf_get_pixels (retval) +
y * gdk_pixbuf_get_rowstride (retval) +
rectangles[i].x * 4;
for (x = rectangles[i].x;
x < rectangles[i].x + rectangles[i].width;
x++)
{
*dest_pixels++ = *src_pixels ++;
*dest_pixels++ = *src_pixels ++;
*dest_pixels++ = *src_pixels ++;
*dest_pixels++ = 255;
if (gdk_pixbuf_get_has_alpha (pixbuf))
src_pixels++;
}
}
}
return retval;
}
pixbuf = gdk_pixbuf_get_from_surface (surface, 0, 0,
allocation.width,
allocation.height);
static GdkPixbuf *
take_window_shot (Window child,
gboolean include_decoration)
{
GdkDisplay *display;
GdkScreen *screen;
GdkWindow *window;
Window xid;
gint x_orig, y_orig;
gint x = 0, y = 0;
gint width, height;
GdkPixbuf *tmp, *tmp2;
GdkPixbuf *retval;
display = gdk_display_get_default ();
screen = gdk_screen_get_default ();
if (include_decoration)
xid = find_toplevel_window (gdk_x11_display_get_xdisplay (display), child);
else
xid = child;
window = gdk_x11_window_foreign_new_for_display (display, xid);
width = gdk_window_get_width (window);
height = gdk_window_get_height (window);
gdk_window_get_origin (window, &x_orig, &y_orig);
if (x_orig < 0)
{
x = - x_orig;
width = width + x_orig;
x_orig = 0;
}
cairo_surface_destroy (surface);
if (y_orig < 0)
if (GTK_IS_OFFSCREEN_WINDOW (widget))
{
y = - y_orig;
height = height + y_orig;
y_orig = 0;
}
GdkPixbuf *tmp;
if (x_orig + width > gdk_screen_get_width (screen))
width = gdk_screen_get_width (screen) - x_orig;
tmp = add_border_to_shot (pixbuf);
if (y_orig + height > gdk_screen_get_height (screen))
height = gdk_screen_get_height (screen) - y_orig;
g_object_unref (pixbuf);
tmp = gdk_pixbuf_get_from_window (window,
x, y, width, height);
pixbuf = create_shadowed_pixbuf (tmp);
if (include_decoration)
tmp2 = remove_shaped_area (tmp, xid);
else
tmp2 = add_border_to_shot (tmp);
retval = create_shadowed_pixbuf (tmp2);
g_object_unref (tmp);
g_object_unref (tmp2);
g_object_unref (tmp);
}
return retval;
return pixbuf;
}
static gboolean
......@@ -196,6 +86,7 @@ shooter_get_foreground (GimpRGB *color)
{
color->r = color->g = color->b = 0.0;
color->a = 1.0;
return TRUE;
}
......@@ -204,6 +95,7 @@ shooter_get_background (GimpRGB *color)
{
color->r = color->g = color->b = 1.0;
color->a = 1.0;
return TRUE;
}
......@@ -232,11 +124,11 @@ shooter_ensure_modules (void)
}
int
main (int argc, char **argv)
main (int argc,
char **argv)
{
GdkPixbuf *screenshot = NULL;
GList *toplevels;
GList *node;
GList *toplevels;
GList *node;
g_set_application_name ("GIMP documentation shooter");
......@@ -246,8 +138,6 @@ main (int argc, char **argv)
if (! gtk_init_check (&argc, &argv))
return EXIT_SUCCESS;
gtk_rc_add_default_file (gimp_gtkrc ());
units_init ();
gimp_widgets_init (shooter_standard_help,
......@@ -259,39 +149,29 @@ main (int argc, char **argv)
for (node = toplevels; node; node = g_list_next (node))
{
GdkWindow *window;
WidgetInfo *info;
XID xid;
gchar *filename;
info = node->data;
WidgetInfo *info = node->data;
GdkPixbuf *screenshot = NULL;
gtk_widget_show (info->window);
window = gtk_widget_get_window (info->window);
gtk_widget_show_now (info->window);
gtk_widget_queue_draw (info->window);
gtk_widget_show (info->widget);
gtk_widget_queue_draw (info->widget);
while (gtk_events_pending ())
{
gtk_main_iteration ();
}
sleep (1);
gtk_main_iteration ();
while (gtk_events_pending ())
screenshot = take_window_shot (info->widget);
if (screenshot)
{
gtk_main_iteration ();
}
gchar *filename;
xid = gdk_x11_window_get_xid (window);
screenshot = take_window_shot (xid, info->include_decorations);
filename = g_strdup_printf ("%s.png", info->name);
gdk_pixbuf_save (screenshot, filename, "png", NULL, NULL);
g_free(filename);
filename = g_strdup_printf ("%s.png", info->name);
gdk_pixbuf_save (screenshot, filename, "png", NULL, NULL);
g_free(filename);
g_object_unref (screenshot);
}
gtk_widget_hide (info->window);
gtk_widget_hide (info->widget);
}
return EXIT_SUCCESS;
......
This diff is collapsed.
......@@ -12,10 +12,10 @@ typedef enum
typedef struct WidgetInfo
{
GtkWidget *window;
GtkWidget *widget;
gchar *name;
gboolean no_focus;
gboolean include_decorations;
gboolean show_all;
WidgetSize size;
} WidgetInfo;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment