mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-11-18 17:30:10 +00:00
1bbf2ac7ee
Fri Sep 7 11:51:44 2001 Owen Taylor <otaylor@redhat.com> Make gdkx.h the only installed header from gdk/x11. All structures in gdk/x11 are opaque. * gdk/x11/Makefile.am gdk/x11/gdkx.h gdk/x11/gdkprivate-x11.h: Don't install gdk{drawable,pixmap,window}-x11.h. * gdk/x11/{gdkcolormap-x11.c, gdkfont-x11.c, gdkx.h, gdkvisual-x11.c: Move GdkColormapPrivateX11, GdkFontPrivateX GdkImagePrivateX11, GdkVisualClass into C files. * gdk/gdkpixmap-x11.[ch]: Make gdk_pixmap_impl_get_type() static. * gdk/x11/{gdkcolor-x11.c, gdkcursor-x11.c, gdkdrawable-x11.c, gdkfont-x11.c, gdkgc-x11.c, gdkx.h, gdkimage-x11,gdkvisual-x11.c} Add public functions to replace previously exported direct structure access. gdk_x11_colormap_get_{xdisplay,xcolormap} gdk_x11_cursor_get_{xdisplay,xcursor}, gdk_x11_drawable_get_{xdisplay,xcursor,gdk_x11_visual_get_xvisual, gdk_x11_font_get_{xdisplay,xfont}, gdk_x11_image_get_{xdisplay,ximage}, gdk_x11_gc_get_{xdisplay,ximage} * gdk/gdkprivate.h gdk/gdkinternals.h: Move GdkColorInfo, GdkEventFilter, GdkClientFilter, GdkFontPrivate to gdkinternals. Fix a number of variables and functions that were exported "accidentally" from GDK. * gdk/**.[ch]: gdk => _gdk for gdk_visual_init, gdk_events_init, gdk_input_init, gdk_dnd_init, gdk_image_exit, gdk_input_exit, gdk_windowing_exit, gdk_event_func, gdk_event_data, gdk_event_notify, gdk_queued_events, gdk_queued_tail, gdk_event_new, gdk_events_queue, gdk_events_unqueue, gdk_event_queue_find_first, gdk_event_queue_remove_link, gdk_event_queue_append, gdk_event_button_generate, gdk_debug_flags, gdk_default_filters, gdk_parent_root. * gdk/x11/{gdkevents-x11.c, gdkglobals-x11.c, gdkimage-x11.c, gdkmain-x11.c, gdkprivate-x11.h, gdk/x11/gdkwindow-x11.c}: gdk => _gdk for gdk_event_mask_table, gkd_nevent_masks, gdk_wm_window_protocols, gdk_leader_window, gdk_xgrab_window, gdk_use_xshm, gdk_input_ignore_core. * gdk/x11/xsettings-common.h (xsettings_list_insert): Add #defines to namespace functions into the private _gdk_ namespace. * gdk/gdkwindow.[ch] gdk/x11/gdkx.h: Add gdk_get_default_root_window () to replace gdk_parent_root exported variable. Adjust and deprecate GDK_ROOT_PARENT(). * demos/{testpixbuf-drawable.c,testpixbuf-save.c}: Fix GDK_ROOT_PARENT usage, remove includes of port-specific headers. * gdk/{win32,x11,fb}/gdkinput*.[ch]: s/gdk/_gdk/ for _gdk_input_gxid_host, _gdk_input_gxid_port, _gdk_input_ignore_core, gdk_input_devices, _gdk_input_windows, gdk_init_input_core. * gdk/x11/{gdkevents-x11.,c gdkglobals-x11.c, gdkmain-x11.c} docs/Changes-2.0.txt: Remove gdk_wm_protocols, gdk_wm_delete_window functions, gdk_wm_take_focus, use gdk_atom_intern() instead. * gdk/linux-fb/{gdkselection-fb.c, gdkmain-fb.c, gdkprivatefb.h} gdk/win32/{gdkselection-win32.c, gdkmgdkwin32.h, gdkprivate-win32.h} gdk/x11/{gdkselection-x11.c gdkx.h, gtkprivate-x11.h} gtk/gtkselection.c Unexport gdk_selection_property, just use gdk_atom_intern ("GDK_SELECTION"). * gdk/x11/{gdkprivate-x11.h,gdkdrawable-x11h,gdkgc-x11.c,gdkx.h}: Unexport gdk_drawable_impl_x11_get_type, gdk_gc_x11_get_type, GDK_GC_X11 cast macros, GdkGCX11 structures, GdkCursorPrivate, GdkVisualprivate, gdk_x11_gc_flush. Make a number of public exports of variables into functions to increase encapsulation. * gdk/gdkinternals.h gdk/gdkinput.h gdk/gdkevents.h gdk/linux-fb/gdkmouse-fb.c: gdk_core_pointer => _gdk_core_pointer, move to gdkinternals.h. Add gdk_device_get_core_pointer (). * gdk/gdkprivate.h gdk/gdkpango.c gdk/gdkinternals.h docs/Changes-2.0.txt: Unexport gdk_parent_root, gdk_error_code, gdk_error_warnings. * gdk/x11/{gdkcolormap-x11.c, gdkmain-x11.c, gdkx.h} docs/Changes-2.0.txt: s/gdk_screen/_gdk_screen/, add gdk_x11_get_default_screen() s/gdk_root_window/_gdk_root_window/, add gdk_x11_get_default_root_xwindow() Add gdk_x11_get_default_xdisplay(). * gdk/gdk.h gdk/gdk.c linux-fb/gdkfb.h linux-fb/gdkglobals-fb.c win32/gdkwin32.h x11/gdkglobals-x11.c gdk/x11/gdkmain-x11.c gdk/x11/gdkx.h: gdk/gdk.def: Add gdk_get/set_program_class, Don't export gdk_progclass, move --class command line option and handling to common portion of GDK. Miscellaneous fixes: * gdk/x11/gdkwindow-x11.c (gdk_window_set_icon_list): Fix g_return_val_if_fail that should have been g_return_if_fail. * gdk/gdkinternals.h gdk/gdkprivate.h: Move gdk_synthesize_window_state() to the semi-public gdkprivate.h. * gtk/gtkdnd.c (_gtk_drag_source_handle_event): Remove uneeded X11 dependency. * gdk/linux-fb/gdkmain-fb.c gdk/win32/gdkmain-win32.c gdk/TODO: Remove unused gdk_key_repeat_disable/restore. * linux-fb/gdkglobals-fb.c win32/gdkglobals-win32.c x11/gdkglobals-x11.c x11/gdkprivate-x11.h gdk/gdk.def: Remove unused gdk_null_window_warnings variable. * gdk/Makefile.am (DIST_SUBDIRS) nanox/*: cvs remove nanox; it can be retrieved from the repository; it is too far from functional to be worth having people check out; it would be easier to start from scratch, I suspect. * gdk/x11/gdkpixmap-x11.c: Fix lvalue usage of GDK_PIXMAP_XID(). * gdk/x11/gdkkeys-x11.c gdk/gdkrgb.c gdk/gdkwindow.c gdk/x11/gdkpango-x11.c gdk/x11/gdkselection-x11.c: Fix some accidentally global variables and unused global variables. * gdk/x11/gdkkeys-x11.c gdk/gdkrgb.c gdk/gdkwindow.c gdk/x11/gdkpango-x11.c gdk/x11/gdkselection-x11.c: Fix some accidentally global variables and unused global variables. Add some space for future expansion to multihead. * gdk/gdkdrawable.h: Add four reserved function pointers for future expansion of GdkDrawableClass. * gtk/gtkwindow.h gtk/gtkinvisible.h: Add reserved pointer where we can put a GdkScreen * later.
317 lines
7.4 KiB
C
317 lines
7.4 KiB
C
/* GDK - The GIMP Drawing Kit
|
|
* 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 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, 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/.
|
|
*/
|
|
|
|
#include <config.h>
|
|
|
|
#include <stdlib.h>
|
|
#include <sys/types.h>
|
|
#include <string.h>
|
|
|
|
#include "gdk.h"
|
|
#include "gdkimage.h"
|
|
#include "gdkprivate.h"
|
|
#include "gdkprivate-fb.h"
|
|
|
|
static gpointer parent_class = NULL;
|
|
|
|
#define GDK_IMAGE_PRIVATE_DATA(image) ((GdkImagePrivateFB *) GDK_IMAGE (image)->windowing_data)
|
|
|
|
void
|
|
_gdk_windowing_image_init (void)
|
|
{
|
|
}
|
|
|
|
static void
|
|
gdk_image_init (GdkImage *image)
|
|
{
|
|
image->windowing_data = g_new0 (GdkImagePrivateFB, 1);
|
|
}
|
|
|
|
static void
|
|
gdk_image_finalize (GObject *object)
|
|
{
|
|
GdkImage *image = GDK_IMAGE (object);
|
|
|
|
g_free (image->windowing_data);
|
|
image->windowing_data = NULL;
|
|
|
|
g_free (image->mem);
|
|
image->mem = NULL;
|
|
|
|
G_OBJECT_CLASS (parent_class)->finalize (object);
|
|
}
|
|
|
|
static void
|
|
gdk_image_class_init (GdkImageClass *klass)
|
|
{
|
|
GObjectClass *object_class = G_OBJECT_CLASS (klass);
|
|
|
|
parent_class = g_type_class_peek_parent (klass);
|
|
|
|
object_class->finalize = gdk_image_finalize;
|
|
}
|
|
|
|
GType
|
|
gdk_image_get_type (void)
|
|
{
|
|
static GType object_type = 0;
|
|
|
|
if (!object_type)
|
|
{
|
|
static const GTypeInfo object_info =
|
|
{
|
|
sizeof (GdkImageClass),
|
|
(GBaseInitFunc) NULL,
|
|
(GBaseFinalizeFunc) NULL,
|
|
(GClassInitFunc) gdk_image_class_init,
|
|
NULL, /* class_finalize */
|
|
NULL, /* class_data */
|
|
sizeof (GdkImage),
|
|
0, /* n_preallocs */
|
|
(GInstanceInitFunc) gdk_image_init,
|
|
};
|
|
|
|
object_type = g_type_register_static (G_TYPE_OBJECT,
|
|
"GdkImage",
|
|
&object_info,
|
|
0);
|
|
}
|
|
|
|
return object_type;
|
|
}
|
|
|
|
GdkImage *
|
|
gdk_image_new_bitmap(GdkVisual *visual,
|
|
gpointer data,
|
|
gint w,
|
|
gint h)
|
|
{
|
|
GdkImage *image;
|
|
GdkImagePrivateFB *private;
|
|
|
|
image = g_object_new (gdk_image_get_type (), NULL);
|
|
private = GDK_IMAGE_PRIVATE_DATA (image);
|
|
|
|
image->type = GDK_IMAGE_NORMAL;
|
|
image->visual = visual;
|
|
image->width = w;
|
|
image->height = h;
|
|
image->depth = 1;
|
|
|
|
image->byte_order = 1 /* MSBFirst */;
|
|
image->bits_per_pixel = 1;
|
|
image->bpp = 1;
|
|
image->bpl = (w+7)/8;
|
|
image->mem = g_malloc (image->bpl * h / 8);
|
|
memcpy (image->mem, data, image->bpl * h / 8);
|
|
|
|
/* This must be freed using free, not g_free, since in the X version
|
|
this is freed by xlib. */
|
|
free (data);
|
|
|
|
return image;
|
|
}
|
|
|
|
GdkImage*
|
|
gdk_image_new (GdkImageType type,
|
|
GdkVisual *visual,
|
|
gint width,
|
|
gint height)
|
|
{
|
|
GdkImage *image;
|
|
GdkImagePrivateFB *private;
|
|
|
|
image = g_object_new (gdk_image_get_type (), NULL);
|
|
private = GDK_IMAGE_PRIVATE_DATA (image);
|
|
|
|
image->type = 0;
|
|
image->visual = visual;
|
|
image->width = width;
|
|
image->height = height;
|
|
image->depth = visual->depth;
|
|
|
|
image->byte_order = 0;
|
|
image->bits_per_pixel = image->depth;
|
|
image->bpp = image->depth/8;
|
|
image->bpl = (width * image->depth + 7) / 8;
|
|
image->mem = g_malloc (image->bpl * height);
|
|
|
|
return image;
|
|
}
|
|
|
|
GdkImage*
|
|
_gdk_fb_get_image (GdkDrawable *drawable,
|
|
gint x,
|
|
gint y,
|
|
gint width,
|
|
gint height)
|
|
{
|
|
GdkImage *image;
|
|
GdkImagePrivateFB *private;
|
|
GdkPixmapFBData fbd;
|
|
GdkRegion *region = NULL;
|
|
gboolean handle_cursor = FALSE;
|
|
|
|
g_return_val_if_fail (drawable != NULL, NULL);
|
|
|
|
image = g_object_new (gdk_image_get_type (), NULL);
|
|
private = GDK_IMAGE_PRIVATE_DATA (image);
|
|
|
|
image->type = GDK_IMAGE_NORMAL;
|
|
image->visual = gdk_drawable_get_visual (drawable);
|
|
image->width = width;
|
|
image->height = height;
|
|
image->bits_per_pixel = GDK_DRAWABLE_FBDATA (drawable)->depth;
|
|
image->depth = image->bits_per_pixel;
|
|
|
|
if (image->bits_per_pixel <= 8)
|
|
image->bpp = 1;
|
|
else if (image->bits_per_pixel <= 16)
|
|
image->bpp = 2;
|
|
else if (image->bits_per_pixel <= 24)
|
|
image->bpp = 3;
|
|
else
|
|
image->bpp = 4;
|
|
image->byte_order = 1;
|
|
|
|
image->bpl = (image->width * image->depth + 7) / 8; /* Packed pixels */
|
|
image->mem = g_malloc (image->bpl * image->height);
|
|
|
|
/* Fake its existence as a pixmap */
|
|
memset (&fbd, 0, sizeof(fbd));
|
|
((GTypeInstance *)&fbd)->g_class = g_type_class_peek (_gdk_pixmap_impl_get_type ());
|
|
fbd.drawable_data.mem = image->mem;
|
|
fbd.drawable_data.rowstride = image->bpl;
|
|
fbd.drawable_data.width = fbd.drawable_data.lim_x = image->width;
|
|
fbd.drawable_data.height = fbd.drawable_data.lim_y = image->height;
|
|
fbd.drawable_data.depth = image->depth;
|
|
fbd.drawable_data.window_type = GDK_DRAWABLE_PIXMAP;
|
|
|
|
if (GDK_DRAWABLE_FBDATA (drawable)->mem == GDK_DRAWABLE_IMPL_FBDATA (_gdk_parent_root)->mem)
|
|
{
|
|
region = gdk_fb_clip_region (drawable, _gdk_fb_screen_gc, TRUE, FALSE, FALSE);
|
|
|
|
if (gdk_fb_cursor_region_need_hide (region))
|
|
{
|
|
handle_cursor = TRUE;
|
|
gdk_fb_cursor_hide ();
|
|
}
|
|
}
|
|
|
|
gdk_fb_draw_drawable_2 ((GdkPixmap *)&fbd,
|
|
_gdk_fb_screen_gc,
|
|
drawable,
|
|
x, y,
|
|
0, 0,
|
|
width, height,
|
|
TRUE, TRUE);
|
|
|
|
if (region)
|
|
gdk_region_destroy (region);
|
|
|
|
if (handle_cursor)
|
|
gdk_fb_cursor_unhide ();
|
|
|
|
return image;
|
|
}
|
|
|
|
guint32
|
|
gdk_image_get_pixel (GdkImage *image,
|
|
gint x,
|
|
gint y)
|
|
{
|
|
GdkImagePrivateFB *private;
|
|
|
|
g_return_val_if_fail (image != NULL, 0);
|
|
|
|
private = GDK_IMAGE_PRIVATE_DATA (image);
|
|
|
|
switch (image->depth)
|
|
{
|
|
case 8:
|
|
return ((guchar *)image->mem)[x + y * image->bpl];
|
|
break;
|
|
case 16:
|
|
return *((guint16 *)&((guchar *)image->mem)[x*2 + y*image->bpl]);
|
|
break;
|
|
case 24:
|
|
case 32:
|
|
{
|
|
guchar *smem = &(((guchar *)image->mem)[x*image->bpp + y*image->bpl]);
|
|
return smem[0]|(smem[1]<<8)|(smem[2]<<16);
|
|
}
|
|
break;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
void
|
|
gdk_image_put_pixel (GdkImage *image,
|
|
gint x,
|
|
gint y,
|
|
guint32 pixel)
|
|
{
|
|
guchar *ptr = image->mem;
|
|
|
|
g_return_if_fail (image != NULL);
|
|
|
|
switch (image->depth)
|
|
{
|
|
case 8:
|
|
ptr[x + y * image->bpl] = pixel;
|
|
break;
|
|
case 16:
|
|
{
|
|
guint16 *p16 = (guint16 *)&ptr[x*2 + y*image->bpl];
|
|
*p16 = pixel;
|
|
}
|
|
break;
|
|
case 24:
|
|
{
|
|
guchar *smem = &ptr[x*3 + y*image->bpl];
|
|
smem[0] = (pixel & 0xFF);
|
|
smem[1] = (pixel & 0xFF00) >> 8;
|
|
smem[2] = (pixel & 0xFF0000) >> 16;
|
|
}
|
|
break;
|
|
case 32:
|
|
{
|
|
guint32 *smem = (guint32 *)&ptr[x*4 + y*image->bpl];
|
|
*smem = pixel;
|
|
}
|
|
break;
|
|
default:
|
|
g_assert_not_reached ();
|
|
break;
|
|
}
|
|
}
|
|
|
|
void
|
|
_gdk_image_exit(void)
|
|
{
|
|
}
|