1999-11-12 21:56:29 +00:00
|
|
|
/* 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
|
2000-07-26 11:33:08 +00:00
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
1999-11-12 21:56:29 +00:00
|
|
|
* 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
|
2000-07-26 11:33:08 +00:00
|
|
|
* Lesser General Public License for more details.
|
1999-11-12 21:56:29 +00:00
|
|
|
*
|
2000-07-26 11:33:08 +00:00
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
1999-11-12 21:56:29 +00:00
|
|
|
* License along with this library; if not, write to the
|
|
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
* Boston, MA 02111-1307, USA.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
2000-07-26 11:33:08 +00:00
|
|
|
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
|
1999-11-12 21:56:29 +00:00
|
|
|
* 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 "gdkimage.h"
|
2000-07-25 17:31:05 +00:00
|
|
|
#include "gdkpixmap.h"
|
Large changes to the Win32 backend, partially made necessary by the
2000-05-02 Tor Lillqvist <tml@iki.fi>
Large changes to the Win32 backend, partially made necessary by
the changes to the backend-independent internal
structures. Attempts to implement similar backing store stuff as
on X11. The current (CVS) version of the Win32 backend is *not* as
stable as it was before the no-flicker branch was merged. A
zipfile with that version is available from
http://www.gimp.org/win32/. That should be use by "production"
code until this CVS version is usable. (But note, the Win32
backend has never been claimed to be "production quality".)
* README.win32: Add the above comment about versions.
* gdk/gdkwindow.c: Don't use backing store for now on Win32.
* gdk/gdk.def: Update.
* gdk/gdkfont.h: Declare temporary Win32-only functions. Will
presumably be replaced by some more better mechanism as 1.4 gets
closer to release shape.
* gdk/makefile.{cygwin,msc}: Update.
* gdk/win32/*.c: Correct inclusions of the backend-specific and
internal headers. Change code according to changes in these. Use
gdk_drawable_*, not gdk_window_* where necessary.
* gdk/win32/gdkdnd-win32.c: Use MISC selector for GDK_NOTE, not
our old DND.
* gdk/win32/gdkdrawable-win32.c (gdk_win32_draw_text): Don't try
to interpret single characters as UTF-8. Thanks to Hans Breuer.
Use correct function name in warning messages.
* gdk/win32/gdkevents-win32.c: Use correct parameter lists for the
GSourceFuncs gdk_event_prepare and gdk_event_check.
(gdk_event_get_graphics_expose): Do implement, use
PeekMessage. Thanks to Hans Breuer.
(event_mask_string): Debugging function to print an GdkEventMask.
(gdk_pointer_grab): Use it.
* gdk/win32/gdkfont-win32.c: The Unicode subrange that the
(old) book I used claimed was Hangul actually is CJK Unified
Ideographs Extension A. Also, Hangul Syllables were missing.
Improve logging.
* gdk/win32/gdkgc-win32.c: Largish changes.
* gdk/win32/gdkim-win32.c (gdk_set_locale): Use
g_win32_getlocale() from GLib, and not setlocale() to get current
locale name.
* gdk/win32/gdkprivate-win32.h
* gdk/win32/gdkwin32.h: Move stuff from gdkprivate-win32.h to
gdkwin32.h, similarily as in the X11 backend.
* gdk/win32/gdkwindow-win32.c (gdk_propagate_shapes): Bugfix,
assignment was used instead of equals in if test. Thanks to Hans
Breuer.
* gdk/win32/makefile.{cygwin,msc}
* gtk/makefile.{cygwin,msc}: Updates. Better kludge to get the
path to the Win32 headers that works also with the mingw compiler.
* gtk/gtkstyle.c: Include <string.h>.
2000-05-01 22:06:49 +00:00
|
|
|
#include "gdkinternals.h"
|
|
|
|
#include "gdkprivate-win32.h"
|
2000-07-25 17:31:05 +00:00
|
|
|
#include "gdkdrawable-win32.h"
|
|
|
|
#include "gdkwindow-win32.h"
|
|
|
|
#include "gdkpixmap-win32.h"
|
1999-11-20 01:22:57 +00:00
|
|
|
|
1999-11-12 21:56:29 +00:00
|
|
|
static GList *image_list = NULL;
|
2000-07-23 01:18:34 +00:00
|
|
|
static gpointer parent_class = NULL;
|
|
|
|
|
|
|
|
static void gdk_win32_image_destroy (GdkImage *image);
|
|
|
|
static void gdk_image_init (GdkImage *image);
|
|
|
|
static void gdk_image_class_init (GdkImageClass *klass);
|
|
|
|
static void gdk_image_finalize (GObject *object);
|
|
|
|
|
|
|
|
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",
|
2000-11-11 18:39:57 +00:00
|
|
|
&object_info, 0);
|
2000-07-23 01:18:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return object_type;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gdk_image_init (GdkImage *image)
|
|
|
|
{
|
|
|
|
image->windowing_data = g_new0 (GdkImagePrivateWin32, 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gdk_image_finalize (GObject *object)
|
|
|
|
{
|
|
|
|
GdkImage *image = GDK_IMAGE (object);
|
|
|
|
|
|
|
|
gdk_win32_image_destroy (image);
|
|
|
|
|
|
|
|
G_OBJECT_CLASS (parent_class)->finalize (object);
|
|
|
|
}
|
1999-11-12 21:56:29 +00:00
|
|
|
|
|
|
|
void
|
Make gdkx.h the only installed header from gdk/x11. All structures in
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.
2001-09-07 21:50:20 +00:00
|
|
|
_gdk_image_exit (void)
|
1999-11-12 21:56:29 +00:00
|
|
|
{
|
|
|
|
GdkImage *image;
|
|
|
|
|
|
|
|
while (image_list)
|
|
|
|
{
|
|
|
|
image = image_list->data;
|
1999-11-20 01:22:57 +00:00
|
|
|
gdk_win32_image_destroy (image);
|
1999-11-12 21:56:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
GdkImage *
|
2000-07-23 21:43:23 +00:00
|
|
|
gdk_image_new_bitmap (GdkVisual *visual,
|
|
|
|
gpointer data,
|
|
|
|
gint w,
|
|
|
|
gint h)
|
1999-11-12 21:56:29 +00:00
|
|
|
/*
|
|
|
|
* Desc: create a new bitmap image
|
|
|
|
*/
|
|
|
|
{
|
|
|
|
Visual *xvisual;
|
|
|
|
GdkImage *image;
|
1999-11-20 01:22:57 +00:00
|
|
|
GdkImagePrivateWin32 *private;
|
1999-11-12 21:56:29 +00:00
|
|
|
struct {
|
|
|
|
BITMAPINFOHEADER bmiHeader;
|
|
|
|
union {
|
|
|
|
WORD bmiIndices[2];
|
|
|
|
RGBQUAD bmiColors[2];
|
|
|
|
} u;
|
|
|
|
} bmi;
|
|
|
|
char *bits;
|
|
|
|
int bpl = (w-1)/8 + 1;
|
|
|
|
int bpl32 = ((w-1)/32 + 1)*4;
|
|
|
|
|
2000-07-25 17:31:05 +00:00
|
|
|
image = g_object_new (gdk_image_get_type (), NULL);
|
2000-10-22 17:16:42 +00:00
|
|
|
private = IMAGE_PRIVATE_DATA (image);
|
1999-11-20 01:22:57 +00:00
|
|
|
|
1999-11-12 21:56:29 +00:00
|
|
|
image->type = GDK_IMAGE_SHARED;
|
|
|
|
image->visual = visual;
|
|
|
|
image->width = w;
|
|
|
|
image->height = h;
|
|
|
|
image->depth = 1;
|
|
|
|
xvisual = ((GdkVisualPrivate*) visual)->xvisual;
|
|
|
|
|
|
|
|
GDK_NOTE (MISC, g_print ("gdk_image_new_bitmap: %dx%d\n", w, h));
|
|
|
|
|
|
|
|
bmi.bmiHeader.biSize = sizeof (BITMAPINFOHEADER);
|
|
|
|
bmi.bmiHeader.biWidth = w;
|
|
|
|
bmi.bmiHeader.biHeight = -h;
|
|
|
|
bmi.bmiHeader.biPlanes = 1;
|
|
|
|
bmi.bmiHeader.biBitCount = 1;
|
|
|
|
bmi.bmiHeader.biCompression = BI_RGB;
|
|
|
|
bmi.bmiHeader.biSizeImage = 0;
|
|
|
|
bmi.bmiHeader.biXPelsPerMeter =
|
|
|
|
bmi.bmiHeader.biYPelsPerMeter = 0;
|
|
|
|
bmi.bmiHeader.biClrUsed = 0;
|
|
|
|
bmi.bmiHeader.biClrImportant = 0;
|
|
|
|
|
|
|
|
bmi.u.bmiColors[0].rgbBlue =
|
|
|
|
bmi.u.bmiColors[0].rgbGreen =
|
|
|
|
bmi.u.bmiColors[0].rgbRed = 0x00;
|
|
|
|
bmi.u.bmiColors[0].rgbReserved = 0x00;
|
|
|
|
|
|
|
|
bmi.u.bmiColors[1].rgbBlue =
|
|
|
|
bmi.u.bmiColors[1].rgbGreen =
|
|
|
|
bmi.u.bmiColors[1].rgbRed = 0xFF;
|
|
|
|
bmi.u.bmiColors[1].rgbReserved = 0x00;
|
|
|
|
|
2000-07-25 17:31:05 +00:00
|
|
|
private->hbitmap = CreateDIBSection (gdk_display_hdc, (BITMAPINFO *) &bmi,
|
|
|
|
DIB_RGB_COLORS, &bits, NULL, 0);
|
1999-11-12 21:56:29 +00:00
|
|
|
if (bpl != bpl32)
|
|
|
|
{
|
|
|
|
/* Win32 expects scanlines in DIBs to be 32 bit aligned */
|
|
|
|
int i;
|
|
|
|
for (i = 0; i < h; i++)
|
|
|
|
memmove (bits + i*bpl32, ((char *) data) + i*bpl, bpl);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
memmove (bits, data, bpl*h);
|
|
|
|
image->mem = bits;
|
|
|
|
image->bpl = bpl32;
|
|
|
|
image->byte_order = GDK_MSB_FIRST;
|
|
|
|
|
2001-02-02 22:19:31 +00:00
|
|
|
image->bits_per_pixel = 1;
|
1999-11-12 21:56:29 +00:00
|
|
|
image->bpp = 1;
|
2001-05-06 14:02:45 +00:00
|
|
|
|
|
|
|
/* free data right now, in contrast to the X11 version we have made
|
|
|
|
* our own copy. Use free, it was malloc()ed.
|
|
|
|
*/
|
|
|
|
free (data);
|
1999-11-12 21:56:29 +00:00
|
|
|
return(image);
|
|
|
|
} /* gdk_image_new_bitmap() */
|
|
|
|
|
|
|
|
void
|
2000-07-23 01:18:34 +00:00
|
|
|
_gdk_windowing_image_init (void)
|
1999-11-12 21:56:29 +00:00
|
|
|
{
|
2000-07-23 01:18:34 +00:00
|
|
|
/* Nothing needed AFAIK */
|
1999-11-12 21:56:29 +00:00
|
|
|
}
|
|
|
|
|
2000-07-25 17:31:05 +00:00
|
|
|
GdkImage*
|
|
|
|
gdk_image_new (GdkImageType type,
|
|
|
|
GdkVisual *visual,
|
|
|
|
gint width,
|
|
|
|
gint height)
|
1999-11-12 21:56:29 +00:00
|
|
|
{
|
|
|
|
GdkImage *image;
|
1999-11-20 01:22:57 +00:00
|
|
|
GdkImagePrivateWin32 *private;
|
1999-11-12 21:56:29 +00:00
|
|
|
Visual *xvisual;
|
|
|
|
struct {
|
|
|
|
BITMAPINFOHEADER bmiHeader;
|
|
|
|
union {
|
|
|
|
WORD bmiIndices[256];
|
|
|
|
DWORD bmiMasks[3];
|
|
|
|
RGBQUAD bmiColors[256];
|
|
|
|
} u;
|
|
|
|
} bmi;
|
|
|
|
UINT iUsage;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (type == GDK_IMAGE_FASTEST || type == GDK_IMAGE_NORMAL)
|
|
|
|
type = GDK_IMAGE_SHARED;
|
|
|
|
|
2000-07-25 17:31:05 +00:00
|
|
|
GDK_NOTE (MISC, g_print ("gdk_image_new: %dx%d %s\n",
|
|
|
|
width, height,
|
1999-11-12 21:56:29 +00:00
|
|
|
(type == GDK_IMAGE_SHARED ? "shared" :
|
2000-08-19 21:46:05 +00:00
|
|
|
"???")));
|
|
|
|
|
2000-07-25 17:31:05 +00:00
|
|
|
image = g_object_new (gdk_image_get_type (), NULL);
|
2000-10-22 17:16:42 +00:00
|
|
|
private = IMAGE_PRIVATE_DATA (image);
|
1999-11-12 21:56:29 +00:00
|
|
|
|
|
|
|
image->type = type;
|
|
|
|
image->visual = visual;
|
|
|
|
image->width = width;
|
|
|
|
image->height = height;
|
2000-07-25 17:31:05 +00:00
|
|
|
image->depth = visual->depth;
|
1999-11-12 21:56:29 +00:00
|
|
|
|
|
|
|
xvisual = ((GdkVisualPrivate*) visual)->xvisual;
|
|
|
|
|
|
|
|
bmi.bmiHeader.biSize = sizeof (BITMAPINFOHEADER);
|
|
|
|
bmi.bmiHeader.biWidth = width;
|
|
|
|
bmi.bmiHeader.biHeight = -height;
|
|
|
|
bmi.bmiHeader.biPlanes = 1;
|
2000-07-25 17:31:05 +00:00
|
|
|
if (image->depth == 15)
|
1999-11-12 21:56:29 +00:00
|
|
|
bmi.bmiHeader.biBitCount = 16;
|
|
|
|
else
|
2000-07-25 17:31:05 +00:00
|
|
|
bmi.bmiHeader.biBitCount = image->depth;
|
|
|
|
if (image->depth == 16)
|
1999-11-12 21:56:29 +00:00
|
|
|
bmi.bmiHeader.biCompression = BI_BITFIELDS;
|
|
|
|
else
|
|
|
|
bmi.bmiHeader.biCompression = BI_RGB;
|
|
|
|
bmi.bmiHeader.biSizeImage = 0;
|
|
|
|
bmi.bmiHeader.biXPelsPerMeter =
|
|
|
|
bmi.bmiHeader.biYPelsPerMeter = 0;
|
|
|
|
bmi.bmiHeader.biClrUsed = 0;
|
|
|
|
bmi.bmiHeader.biClrImportant = 0;
|
|
|
|
|
|
|
|
if (image->visual->type == GDK_VISUAL_PSEUDO_COLOR)
|
|
|
|
{
|
|
|
|
iUsage = DIB_PAL_COLORS;
|
|
|
|
for (i = 0; i < 256; i++)
|
|
|
|
bmi.u.bmiIndices[i] = i;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2000-07-25 17:31:05 +00:00
|
|
|
iUsage = DIB_RGB_COLORS;
|
|
|
|
if (image->depth == 1)
|
1999-11-12 21:56:29 +00:00
|
|
|
{
|
|
|
|
bmi.u.bmiColors[0].rgbBlue =
|
|
|
|
bmi.u.bmiColors[0].rgbGreen =
|
|
|
|
bmi.u.bmiColors[0].rgbRed = 0x00;
|
|
|
|
bmi.u.bmiColors[0].rgbReserved = 0x00;
|
|
|
|
|
|
|
|
bmi.u.bmiColors[1].rgbBlue =
|
|
|
|
bmi.u.bmiColors[1].rgbGreen =
|
|
|
|
bmi.u.bmiColors[1].rgbRed = 0xFF;
|
|
|
|
bmi.u.bmiColors[1].rgbReserved = 0x00;
|
|
|
|
|
|
|
|
}
|
2000-07-25 17:31:05 +00:00
|
|
|
else if (image->depth == 16)
|
1999-11-12 21:56:29 +00:00
|
|
|
{
|
|
|
|
bmi.u.bmiMasks[0] = visual->red_mask;
|
|
|
|
bmi.u.bmiMasks[1] = visual->green_mask;
|
|
|
|
bmi.u.bmiMasks[2] = visual->blue_mask;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2000-07-25 17:31:05 +00:00
|
|
|
private->hbitmap = CreateDIBSection (gdk_display_hdc, (BITMAPINFO *) &bmi,
|
|
|
|
iUsage, &image->mem, NULL, 0);
|
1999-11-12 21:56:29 +00:00
|
|
|
|
2000-07-25 17:31:05 +00:00
|
|
|
if (private->hbitmap == NULL)
|
1999-11-12 21:56:29 +00:00
|
|
|
{
|
Internal GDK error reporting changes: (gdk_win32_gdi_failed) New function
2000-03-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkmain-win32.c: Internal GDK error reporting changes:
(gdk_win32_gdi_failed) New function for reporting errors from GDI,
for which it is no use to call GetLastError on Win9x.
(gdk_other_api_failed) New function, for
general error reporting without calling GetLastError.
(gdk_win32_api_failed) OTOH, this function always calls
GetLastError. (gdk_win32_last_error_string) Remove this function,
GLib has the equivalent now.
* gdk/win32/gdkprivate-win32.h: Declare the above, and macros to
call them with function name, file name and line number in the
arguments.
* gdk/win32/*.c: Use the new macros for reporting errors from GDI
functions.
* gtk/gtk.def: Add some missing entry points.
* gtk/gtkcompat.h.in: Define gtk_paned_gutter_size and
gtk_paned_set_gutter_size, which don't exist any longer, as void.
Fixes by Hans Breuer:
* gdk/makefile.msc: Update for debugging.
* gdk/win32/gdkgc-win32.c (gdk_win32_gc_set_dashes): Fake
implementation, just use the PS_DASH, PS_DOT, PS_DASHDOT or
PS_DASHDOTDOT or PS_DASH styles depending on the number of entries
in the dash_list.
* gdk/win32/gdkwin32.h (GDK_FONT_XFONT): New macro, similar as in
the x11 backend.
* gdk/win32/gdkprivate-win32.h (IS_WIN_NT): New macro.
* gtk/testgtk.c: Include config.h, guard inclusion of unistd.h.
2000-03-08 06:18:41 +00:00
|
|
|
WIN32_GDI_FAILED ("CreateDIBSection");
|
1999-11-12 21:56:29 +00:00
|
|
|
g_free (image);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2000-07-25 17:31:05 +00:00
|
|
|
switch (image->depth)
|
1999-11-12 21:56:29 +00:00
|
|
|
{
|
|
|
|
case 1:
|
|
|
|
case 8:
|
|
|
|
image->bpp = 1;
|
|
|
|
break;
|
|
|
|
case 15:
|
|
|
|
case 16:
|
|
|
|
image->bpp = 2;
|
|
|
|
break;
|
|
|
|
case 24:
|
|
|
|
image->bpp = 3;
|
|
|
|
break;
|
|
|
|
case 32:
|
|
|
|
image->bpp = 4;
|
|
|
|
break;
|
|
|
|
default:
|
2000-07-25 17:31:05 +00:00
|
|
|
g_warning ("gdk_image_new: depth = %d", image->depth);
|
1999-11-12 21:56:29 +00:00
|
|
|
g_assert_not_reached ();
|
|
|
|
}
|
2001-02-02 22:19:31 +00:00
|
|
|
image->bits_per_pixel = image->depth;
|
1999-11-12 21:56:29 +00:00
|
|
|
image->byte_order = GDK_LSB_FIRST;
|
2000-07-25 17:31:05 +00:00
|
|
|
if (image->depth == 1)
|
1999-11-12 21:56:29 +00:00
|
|
|
image->bpl = ((width-1)/32 + 1)*4;
|
|
|
|
else
|
|
|
|
image->bpl = ((width*image->bpp - 1)/4 + 1)*4;
|
|
|
|
|
2000-10-22 17:16:42 +00:00
|
|
|
GDK_NOTE (MISC, g_print ("... = %#x mem = %p, bpl = %d\n",
|
|
|
|
(guint) private->hbitmap, image->mem, image->bpl));
|
1999-11-12 21:56:29 +00:00
|
|
|
|
|
|
|
return image;
|
|
|
|
}
|
|
|
|
|
|
|
|
GdkImage*
|
2000-10-25 18:07:12 +00:00
|
|
|
_gdk_win32_get_image (GdkDrawable *drawable,
|
|
|
|
gint x,
|
|
|
|
gint y,
|
|
|
|
gint width,
|
|
|
|
gint height)
|
1999-11-12 21:56:29 +00:00
|
|
|
{
|
|
|
|
GdkImage *image;
|
1999-11-20 01:22:57 +00:00
|
|
|
GdkImagePrivateWin32 *private;
|
2000-10-25 18:07:12 +00:00
|
|
|
GdkDrawableImplWin32 *impl;
|
1999-11-12 21:56:29 +00:00
|
|
|
HDC hdc, memdc;
|
|
|
|
struct {
|
|
|
|
BITMAPINFOHEADER bmiHeader;
|
|
|
|
union {
|
|
|
|
WORD bmiIndices[256];
|
|
|
|
DWORD bmiMasks[3];
|
|
|
|
RGBQUAD bmiColors[256];
|
|
|
|
} u;
|
|
|
|
} bmi;
|
|
|
|
HGDIOBJ oldbitmap1, oldbitmap2;
|
|
|
|
UINT iUsage;
|
|
|
|
BITMAP bm;
|
|
|
|
int i;
|
|
|
|
|
2000-10-25 18:07:12 +00:00
|
|
|
g_return_val_if_fail (GDK_IS_DRAWABLE_IMPL_WIN32 (drawable), NULL);
|
1999-11-12 21:56:29 +00:00
|
|
|
|
2000-10-25 18:07:12 +00:00
|
|
|
GDK_NOTE (MISC, g_print ("_gdk_win32_get_image: %#x %dx%d@+%d+%d\n",
|
2001-03-19 19:37:59 +00:00
|
|
|
(guint) GDK_DRAWABLE_IMPL_WIN32 (drawable)->handle,
|
2000-10-22 17:16:42 +00:00
|
|
|
width, height, x, y));
|
1999-11-12 21:56:29 +00:00
|
|
|
|
2000-10-25 18:07:12 +00:00
|
|
|
impl = GDK_DRAWABLE_IMPL_WIN32 (drawable);
|
|
|
|
|
2000-07-23 01:18:34 +00:00
|
|
|
image = g_object_new (gdk_image_get_type (), NULL);
|
2000-10-22 17:16:42 +00:00
|
|
|
private = IMAGE_PRIVATE_DATA (image);
|
1999-11-12 21:56:29 +00:00
|
|
|
|
|
|
|
image->type = GDK_IMAGE_SHARED;
|
2000-10-25 18:07:12 +00:00
|
|
|
image->visual = gdk_drawable_get_visual (drawable);
|
1999-11-12 21:56:29 +00:00
|
|
|
image->width = width;
|
|
|
|
image->height = height;
|
|
|
|
|
|
|
|
/* This function is called both to blit from a window and from
|
|
|
|
* a pixmap.
|
|
|
|
*/
|
2000-11-12 15:46:55 +00:00
|
|
|
if (GDK_IS_PIXMAP_IMPL_WIN32 (drawable))
|
1999-11-12 21:56:29 +00:00
|
|
|
{
|
|
|
|
if ((hdc = CreateCompatibleDC (NULL)) == NULL)
|
|
|
|
{
|
Internal GDK error reporting changes: (gdk_win32_gdi_failed) New function
2000-03-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkmain-win32.c: Internal GDK error reporting changes:
(gdk_win32_gdi_failed) New function for reporting errors from GDI,
for which it is no use to call GetLastError on Win9x.
(gdk_other_api_failed) New function, for
general error reporting without calling GetLastError.
(gdk_win32_api_failed) OTOH, this function always calls
GetLastError. (gdk_win32_last_error_string) Remove this function,
GLib has the equivalent now.
* gdk/win32/gdkprivate-win32.h: Declare the above, and macros to
call them with function name, file name and line number in the
arguments.
* gdk/win32/*.c: Use the new macros for reporting errors from GDI
functions.
* gtk/gtk.def: Add some missing entry points.
* gtk/gtkcompat.h.in: Define gtk_paned_gutter_size and
gtk_paned_set_gutter_size, which don't exist any longer, as void.
Fixes by Hans Breuer:
* gdk/makefile.msc: Update for debugging.
* gdk/win32/gdkgc-win32.c (gdk_win32_gc_set_dashes): Fake
implementation, just use the PS_DASH, PS_DOT, PS_DASHDOT or
PS_DASHDOTDOT or PS_DASH styles depending on the number of entries
in the dash_list.
* gdk/win32/gdkwin32.h (GDK_FONT_XFONT): New macro, similar as in
the x11 backend.
* gdk/win32/gdkprivate-win32.h (IS_WIN_NT): New macro.
* gtk/testgtk.c: Include config.h, guard inclusion of unistd.h.
2000-03-08 06:18:41 +00:00
|
|
|
WIN32_GDI_FAILED ("CreateCompatibleDC");
|
1999-11-12 21:56:29 +00:00
|
|
|
g_free (image);
|
|
|
|
return NULL;
|
|
|
|
}
|
2000-10-25 18:07:12 +00:00
|
|
|
if ((oldbitmap1 = SelectObject (hdc, impl->handle)) == NULL)
|
1999-11-12 21:56:29 +00:00
|
|
|
{
|
Internal GDK error reporting changes: (gdk_win32_gdi_failed) New function
2000-03-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkmain-win32.c: Internal GDK error reporting changes:
(gdk_win32_gdi_failed) New function for reporting errors from GDI,
for which it is no use to call GetLastError on Win9x.
(gdk_other_api_failed) New function, for
general error reporting without calling GetLastError.
(gdk_win32_api_failed) OTOH, this function always calls
GetLastError. (gdk_win32_last_error_string) Remove this function,
GLib has the equivalent now.
* gdk/win32/gdkprivate-win32.h: Declare the above, and macros to
call them with function name, file name and line number in the
arguments.
* gdk/win32/*.c: Use the new macros for reporting errors from GDI
functions.
* gtk/gtk.def: Add some missing entry points.
* gtk/gtkcompat.h.in: Define gtk_paned_gutter_size and
gtk_paned_set_gutter_size, which don't exist any longer, as void.
Fixes by Hans Breuer:
* gdk/makefile.msc: Update for debugging.
* gdk/win32/gdkgc-win32.c (gdk_win32_gc_set_dashes): Fake
implementation, just use the PS_DASH, PS_DOT, PS_DASHDOT or
PS_DASHDOTDOT or PS_DASH styles depending on the number of entries
in the dash_list.
* gdk/win32/gdkwin32.h (GDK_FONT_XFONT): New macro, similar as in
the x11 backend.
* gdk/win32/gdkprivate-win32.h (IS_WIN_NT): New macro.
* gtk/testgtk.c: Include config.h, guard inclusion of unistd.h.
2000-03-08 06:18:41 +00:00
|
|
|
WIN32_GDI_FAILED ("SelectObject");
|
1999-11-12 21:56:29 +00:00
|
|
|
DeleteDC (hdc);
|
|
|
|
g_free (image);
|
|
|
|
return NULL;
|
|
|
|
}
|
2000-10-25 18:07:12 +00:00
|
|
|
GetObject (impl->handle, sizeof (BITMAP), &bm);
|
1999-11-12 21:56:29 +00:00
|
|
|
GDK_NOTE (MISC,
|
2000-10-22 17:16:42 +00:00
|
|
|
g_print ("gdk_image_get: bmWidth:%ld bmHeight:%ld bmWidthBytes:%ld bmBitsPixel:%d\n",
|
1999-11-12 21:56:29 +00:00
|
|
|
bm.bmWidth, bm.bmHeight, bm.bmWidthBytes, bm.bmBitsPixel));
|
|
|
|
image->depth = bm.bmBitsPixel;
|
|
|
|
if (image->depth <= 8)
|
|
|
|
{
|
|
|
|
iUsage = DIB_PAL_COLORS;
|
|
|
|
for (i = 0; i < 256; i++)
|
|
|
|
bmi.u.bmiIndices[i] = i;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
iUsage = DIB_RGB_COLORS;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2000-10-25 18:07:12 +00:00
|
|
|
if ((hdc = GetDC (impl->handle)) == NULL)
|
1999-11-12 21:56:29 +00:00
|
|
|
{
|
Internal GDK error reporting changes: (gdk_win32_gdi_failed) New function
2000-03-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkmain-win32.c: Internal GDK error reporting changes:
(gdk_win32_gdi_failed) New function for reporting errors from GDI,
for which it is no use to call GetLastError on Win9x.
(gdk_other_api_failed) New function, for
general error reporting without calling GetLastError.
(gdk_win32_api_failed) OTOH, this function always calls
GetLastError. (gdk_win32_last_error_string) Remove this function,
GLib has the equivalent now.
* gdk/win32/gdkprivate-win32.h: Declare the above, and macros to
call them with function name, file name and line number in the
arguments.
* gdk/win32/*.c: Use the new macros for reporting errors from GDI
functions.
* gtk/gtk.def: Add some missing entry points.
* gtk/gtkcompat.h.in: Define gtk_paned_gutter_size and
gtk_paned_set_gutter_size, which don't exist any longer, as void.
Fixes by Hans Breuer:
* gdk/makefile.msc: Update for debugging.
* gdk/win32/gdkgc-win32.c (gdk_win32_gc_set_dashes): Fake
implementation, just use the PS_DASH, PS_DOT, PS_DASHDOT or
PS_DASHDOTDOT or PS_DASH styles depending on the number of entries
in the dash_list.
* gdk/win32/gdkwin32.h (GDK_FONT_XFONT): New macro, similar as in
the x11 backend.
* gdk/win32/gdkprivate-win32.h (IS_WIN_NT): New macro.
* gtk/testgtk.c: Include config.h, guard inclusion of unistd.h.
2000-03-08 06:18:41 +00:00
|
|
|
WIN32_GDI_FAILED ("GetDC");
|
1999-11-12 21:56:29 +00:00
|
|
|
g_free (image);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
image->depth = gdk_visual_get_system ()->depth;
|
|
|
|
if (image->visual->type == GDK_VISUAL_PSEUDO_COLOR)
|
|
|
|
{
|
|
|
|
iUsage = DIB_PAL_COLORS;
|
|
|
|
for (i = 0; i < 256; i++)
|
|
|
|
bmi.u.bmiIndices[i] = i;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
iUsage = DIB_RGB_COLORS;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((memdc = CreateCompatibleDC (hdc)) == NULL)
|
|
|
|
{
|
Internal GDK error reporting changes: (gdk_win32_gdi_failed) New function
2000-03-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkmain-win32.c: Internal GDK error reporting changes:
(gdk_win32_gdi_failed) New function for reporting errors from GDI,
for which it is no use to call GetLastError on Win9x.
(gdk_other_api_failed) New function, for
general error reporting without calling GetLastError.
(gdk_win32_api_failed) OTOH, this function always calls
GetLastError. (gdk_win32_last_error_string) Remove this function,
GLib has the equivalent now.
* gdk/win32/gdkprivate-win32.h: Declare the above, and macros to
call them with function name, file name and line number in the
arguments.
* gdk/win32/*.c: Use the new macros for reporting errors from GDI
functions.
* gtk/gtk.def: Add some missing entry points.
* gtk/gtkcompat.h.in: Define gtk_paned_gutter_size and
gtk_paned_set_gutter_size, which don't exist any longer, as void.
Fixes by Hans Breuer:
* gdk/makefile.msc: Update for debugging.
* gdk/win32/gdkgc-win32.c (gdk_win32_gc_set_dashes): Fake
implementation, just use the PS_DASH, PS_DOT, PS_DASHDOT or
PS_DASHDOTDOT or PS_DASH styles depending on the number of entries
in the dash_list.
* gdk/win32/gdkwin32.h (GDK_FONT_XFONT): New macro, similar as in
the x11 backend.
* gdk/win32/gdkprivate-win32.h (IS_WIN_NT): New macro.
* gtk/testgtk.c: Include config.h, guard inclusion of unistd.h.
2000-03-08 06:18:41 +00:00
|
|
|
WIN32_GDI_FAILED ("CreateCompatibleDC");
|
2000-10-25 18:07:12 +00:00
|
|
|
if (GDK_IS_PIXMAP (drawable))
|
1999-11-12 21:56:29 +00:00
|
|
|
{
|
|
|
|
SelectObject (hdc, oldbitmap1);
|
coalescing property notifies
2001-08-11 Hans Breuer <hans@breuer.org>
* gtk/gtkalignment.c, gtk/gtkarrow.c, gtk/gtkaspectframe.c,
gtk/gtkcellrenderer.c, gtk/gtkcellrenderertext.c,
gtk/gtkcombo.c, gtk/gtkcurve.c, gtk/gtkfontsel.c,
gtk/gtklayout.c, gtk/gtkmisc.c, gtk/gtkpacker.c,
gtk/gtkprogress.c, gtk/gtkruler.c,, gtk/gtksettings.c,
gtk/gtkspinbutton.c, gtk/gtktexttag.c : coalescing property notifies
* gtk/gtkclist.c, gtk/gtktipsquery.c, gtk/gtktexttag.c,
gtk/gtkwidget.c : added G_SIGNAL_TYPE_STATIC_SCOPE to all
GDK_TYPE_EVENT signals
* gtk/gtkalignment.c : removed 'direct allocation bug',
which Tim discovered while reading the patch
2001-08-11 20:27:36 +00:00
|
|
|
if (!DeleteDC (hdc))
|
|
|
|
WIN32_GDI_FAILED ("DeleteDC");
|
1999-11-12 21:56:29 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
coalescing property notifies
2001-08-11 Hans Breuer <hans@breuer.org>
* gtk/gtkalignment.c, gtk/gtkarrow.c, gtk/gtkaspectframe.c,
gtk/gtkcellrenderer.c, gtk/gtkcellrenderertext.c,
gtk/gtkcombo.c, gtk/gtkcurve.c, gtk/gtkfontsel.c,
gtk/gtklayout.c, gtk/gtkmisc.c, gtk/gtkpacker.c,
gtk/gtkprogress.c, gtk/gtkruler.c,, gtk/gtksettings.c,
gtk/gtkspinbutton.c, gtk/gtktexttag.c : coalescing property notifies
* gtk/gtkclist.c, gtk/gtktipsquery.c, gtk/gtktexttag.c,
gtk/gtkwidget.c : added G_SIGNAL_TYPE_STATIC_SCOPE to all
GDK_TYPE_EVENT signals
* gtk/gtkalignment.c : removed 'direct allocation bug',
which Tim discovered while reading the patch
2001-08-11 20:27:36 +00:00
|
|
|
if (!ReleaseDC (impl->handle, hdc))
|
|
|
|
WIN32_GDI_FAILED ("ReleaseDC");
|
1999-11-12 21:56:29 +00:00
|
|
|
}
|
|
|
|
g_free (image);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
bmi.bmiHeader.biSize = sizeof (BITMAPINFOHEADER);
|
|
|
|
bmi.bmiHeader.biWidth = width;
|
|
|
|
bmi.bmiHeader.biHeight = -height;
|
|
|
|
bmi.bmiHeader.biPlanes = 1;
|
|
|
|
bmi.bmiHeader.biBitCount = image->depth;
|
|
|
|
if (image->depth == 16)
|
|
|
|
{
|
|
|
|
bmi.bmiHeader.biCompression = BI_BITFIELDS;
|
|
|
|
if (image->visual == NULL)
|
|
|
|
{
|
|
|
|
/* XXX ??? Is it always this if depth==16 and a pixmap? Guess so. */
|
|
|
|
bmi.u.bmiMasks[0] = 0xf800;
|
|
|
|
bmi.u.bmiMasks[1] = 0x07e0;
|
|
|
|
bmi.u.bmiMasks[2] = 0x001f;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
bmi.u.bmiMasks[0] = image->visual->red_mask;
|
|
|
|
bmi.u.bmiMasks[1] = image->visual->green_mask;
|
|
|
|
bmi.u.bmiMasks[2] = image->visual->blue_mask;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
bmi.bmiHeader.biCompression = BI_RGB;
|
|
|
|
bmi.bmiHeader.biSizeImage = 0;
|
|
|
|
bmi.bmiHeader.biXPelsPerMeter =
|
|
|
|
bmi.bmiHeader.biYPelsPerMeter = 0;
|
|
|
|
bmi.bmiHeader.biClrUsed = 0;
|
|
|
|
bmi.bmiHeader.biClrImportant = 0;
|
|
|
|
|
2000-07-25 17:31:05 +00:00
|
|
|
if ((private->hbitmap = CreateDIBSection (hdc, (BITMAPINFO *) &bmi, iUsage,
|
|
|
|
&image->mem, NULL, 0)) == NULL)
|
1999-11-12 21:56:29 +00:00
|
|
|
{
|
Internal GDK error reporting changes: (gdk_win32_gdi_failed) New function
2000-03-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkmain-win32.c: Internal GDK error reporting changes:
(gdk_win32_gdi_failed) New function for reporting errors from GDI,
for which it is no use to call GetLastError on Win9x.
(gdk_other_api_failed) New function, for
general error reporting without calling GetLastError.
(gdk_win32_api_failed) OTOH, this function always calls
GetLastError. (gdk_win32_last_error_string) Remove this function,
GLib has the equivalent now.
* gdk/win32/gdkprivate-win32.h: Declare the above, and macros to
call them with function name, file name and line number in the
arguments.
* gdk/win32/*.c: Use the new macros for reporting errors from GDI
functions.
* gtk/gtk.def: Add some missing entry points.
* gtk/gtkcompat.h.in: Define gtk_paned_gutter_size and
gtk_paned_set_gutter_size, which don't exist any longer, as void.
Fixes by Hans Breuer:
* gdk/makefile.msc: Update for debugging.
* gdk/win32/gdkgc-win32.c (gdk_win32_gc_set_dashes): Fake
implementation, just use the PS_DASH, PS_DOT, PS_DASHDOT or
PS_DASHDOTDOT or PS_DASH styles depending on the number of entries
in the dash_list.
* gdk/win32/gdkwin32.h (GDK_FONT_XFONT): New macro, similar as in
the x11 backend.
* gdk/win32/gdkprivate-win32.h (IS_WIN_NT): New macro.
* gtk/testgtk.c: Include config.h, guard inclusion of unistd.h.
2000-03-08 06:18:41 +00:00
|
|
|
WIN32_GDI_FAILED ("CreateDIBSection");
|
1999-11-12 21:56:29 +00:00
|
|
|
DeleteDC (memdc);
|
2000-10-25 18:07:12 +00:00
|
|
|
if (GDK_IS_PIXMAP (drawable))
|
1999-11-12 21:56:29 +00:00
|
|
|
{
|
|
|
|
SelectObject (hdc, oldbitmap1);
|
|
|
|
DeleteDC (hdc);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2000-10-25 18:07:12 +00:00
|
|
|
ReleaseDC (impl->handle, hdc);
|
1999-11-12 21:56:29 +00:00
|
|
|
}
|
|
|
|
g_free (image);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2000-07-25 17:31:05 +00:00
|
|
|
if ((oldbitmap2 = SelectObject (memdc, private->hbitmap)) == NULL)
|
1999-11-12 21:56:29 +00:00
|
|
|
{
|
Internal GDK error reporting changes: (gdk_win32_gdi_failed) New function
2000-03-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkmain-win32.c: Internal GDK error reporting changes:
(gdk_win32_gdi_failed) New function for reporting errors from GDI,
for which it is no use to call GetLastError on Win9x.
(gdk_other_api_failed) New function, for
general error reporting without calling GetLastError.
(gdk_win32_api_failed) OTOH, this function always calls
GetLastError. (gdk_win32_last_error_string) Remove this function,
GLib has the equivalent now.
* gdk/win32/gdkprivate-win32.h: Declare the above, and macros to
call them with function name, file name and line number in the
arguments.
* gdk/win32/*.c: Use the new macros for reporting errors from GDI
functions.
* gtk/gtk.def: Add some missing entry points.
* gtk/gtkcompat.h.in: Define gtk_paned_gutter_size and
gtk_paned_set_gutter_size, which don't exist any longer, as void.
Fixes by Hans Breuer:
* gdk/makefile.msc: Update for debugging.
* gdk/win32/gdkgc-win32.c (gdk_win32_gc_set_dashes): Fake
implementation, just use the PS_DASH, PS_DOT, PS_DASHDOT or
PS_DASHDOTDOT or PS_DASH styles depending on the number of entries
in the dash_list.
* gdk/win32/gdkwin32.h (GDK_FONT_XFONT): New macro, similar as in
the x11 backend.
* gdk/win32/gdkprivate-win32.h (IS_WIN_NT): New macro.
* gtk/testgtk.c: Include config.h, guard inclusion of unistd.h.
2000-03-08 06:18:41 +00:00
|
|
|
WIN32_GDI_FAILED ("SelectObject");
|
2000-07-25 17:31:05 +00:00
|
|
|
DeleteObject (private->hbitmap);
|
1999-11-12 21:56:29 +00:00
|
|
|
DeleteDC (memdc);
|
2000-10-25 18:07:12 +00:00
|
|
|
if (GDK_IS_PIXMAP (drawable))
|
1999-11-12 21:56:29 +00:00
|
|
|
{
|
|
|
|
SelectObject (hdc, oldbitmap1);
|
|
|
|
DeleteDC (hdc);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2000-10-25 18:07:12 +00:00
|
|
|
ReleaseDC (impl->handle, hdc);
|
1999-11-12 21:56:29 +00:00
|
|
|
}
|
|
|
|
g_free (image);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!BitBlt (memdc, 0, 0, width, height, hdc, x, y, SRCCOPY))
|
|
|
|
{
|
Internal GDK error reporting changes: (gdk_win32_gdi_failed) New function
2000-03-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkmain-win32.c: Internal GDK error reporting changes:
(gdk_win32_gdi_failed) New function for reporting errors from GDI,
for which it is no use to call GetLastError on Win9x.
(gdk_other_api_failed) New function, for
general error reporting without calling GetLastError.
(gdk_win32_api_failed) OTOH, this function always calls
GetLastError. (gdk_win32_last_error_string) Remove this function,
GLib has the equivalent now.
* gdk/win32/gdkprivate-win32.h: Declare the above, and macros to
call them with function name, file name and line number in the
arguments.
* gdk/win32/*.c: Use the new macros for reporting errors from GDI
functions.
* gtk/gtk.def: Add some missing entry points.
* gtk/gtkcompat.h.in: Define gtk_paned_gutter_size and
gtk_paned_set_gutter_size, which don't exist any longer, as void.
Fixes by Hans Breuer:
* gdk/makefile.msc: Update for debugging.
* gdk/win32/gdkgc-win32.c (gdk_win32_gc_set_dashes): Fake
implementation, just use the PS_DASH, PS_DOT, PS_DASHDOT or
PS_DASHDOTDOT or PS_DASH styles depending on the number of entries
in the dash_list.
* gdk/win32/gdkwin32.h (GDK_FONT_XFONT): New macro, similar as in
the x11 backend.
* gdk/win32/gdkprivate-win32.h (IS_WIN_NT): New macro.
* gtk/testgtk.c: Include config.h, guard inclusion of unistd.h.
2000-03-08 06:18:41 +00:00
|
|
|
WIN32_GDI_FAILED ("BitBlt");
|
1999-11-12 21:56:29 +00:00
|
|
|
SelectObject (memdc, oldbitmap2);
|
2000-07-25 17:31:05 +00:00
|
|
|
DeleteObject (private->hbitmap);
|
1999-11-12 21:56:29 +00:00
|
|
|
DeleteDC (memdc);
|
2000-10-25 18:07:12 +00:00
|
|
|
if (GDK_IS_PIXMAP (drawable))
|
1999-11-12 21:56:29 +00:00
|
|
|
{
|
|
|
|
SelectObject (hdc, oldbitmap1);
|
|
|
|
DeleteDC (hdc);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2000-10-25 18:07:12 +00:00
|
|
|
ReleaseDC (impl->handle, hdc);
|
1999-11-12 21:56:29 +00:00
|
|
|
}
|
|
|
|
g_free (image);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (SelectObject (memdc, oldbitmap2) == NULL)
|
Internal GDK error reporting changes: (gdk_win32_gdi_failed) New function
2000-03-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkmain-win32.c: Internal GDK error reporting changes:
(gdk_win32_gdi_failed) New function for reporting errors from GDI,
for which it is no use to call GetLastError on Win9x.
(gdk_other_api_failed) New function, for
general error reporting without calling GetLastError.
(gdk_win32_api_failed) OTOH, this function always calls
GetLastError. (gdk_win32_last_error_string) Remove this function,
GLib has the equivalent now.
* gdk/win32/gdkprivate-win32.h: Declare the above, and macros to
call them with function name, file name and line number in the
arguments.
* gdk/win32/*.c: Use the new macros for reporting errors from GDI
functions.
* gtk/gtk.def: Add some missing entry points.
* gtk/gtkcompat.h.in: Define gtk_paned_gutter_size and
gtk_paned_set_gutter_size, which don't exist any longer, as void.
Fixes by Hans Breuer:
* gdk/makefile.msc: Update for debugging.
* gdk/win32/gdkgc-win32.c (gdk_win32_gc_set_dashes): Fake
implementation, just use the PS_DASH, PS_DOT, PS_DASHDOT or
PS_DASHDOTDOT or PS_DASH styles depending on the number of entries
in the dash_list.
* gdk/win32/gdkwin32.h (GDK_FONT_XFONT): New macro, similar as in
the x11 backend.
* gdk/win32/gdkprivate-win32.h (IS_WIN_NT): New macro.
* gtk/testgtk.c: Include config.h, guard inclusion of unistd.h.
2000-03-08 06:18:41 +00:00
|
|
|
WIN32_GDI_FAILED ("SelectObject");
|
1999-11-12 21:56:29 +00:00
|
|
|
|
|
|
|
if (!DeleteDC (memdc))
|
Internal GDK error reporting changes: (gdk_win32_gdi_failed) New function
2000-03-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkmain-win32.c: Internal GDK error reporting changes:
(gdk_win32_gdi_failed) New function for reporting errors from GDI,
for which it is no use to call GetLastError on Win9x.
(gdk_other_api_failed) New function, for
general error reporting without calling GetLastError.
(gdk_win32_api_failed) OTOH, this function always calls
GetLastError. (gdk_win32_last_error_string) Remove this function,
GLib has the equivalent now.
* gdk/win32/gdkprivate-win32.h: Declare the above, and macros to
call them with function name, file name and line number in the
arguments.
* gdk/win32/*.c: Use the new macros for reporting errors from GDI
functions.
* gtk/gtk.def: Add some missing entry points.
* gtk/gtkcompat.h.in: Define gtk_paned_gutter_size and
gtk_paned_set_gutter_size, which don't exist any longer, as void.
Fixes by Hans Breuer:
* gdk/makefile.msc: Update for debugging.
* gdk/win32/gdkgc-win32.c (gdk_win32_gc_set_dashes): Fake
implementation, just use the PS_DASH, PS_DOT, PS_DASHDOT or
PS_DASHDOTDOT or PS_DASH styles depending on the number of entries
in the dash_list.
* gdk/win32/gdkwin32.h (GDK_FONT_XFONT): New macro, similar as in
the x11 backend.
* gdk/win32/gdkprivate-win32.h (IS_WIN_NT): New macro.
* gtk/testgtk.c: Include config.h, guard inclusion of unistd.h.
2000-03-08 06:18:41 +00:00
|
|
|
WIN32_GDI_FAILED ("DeleteDC");
|
1999-11-12 21:56:29 +00:00
|
|
|
|
2000-11-12 15:46:55 +00:00
|
|
|
if (GDK_IS_PIXMAP_IMPL_WIN32 (drawable))
|
1999-11-12 21:56:29 +00:00
|
|
|
{
|
|
|
|
SelectObject (hdc, oldbitmap1);
|
|
|
|
DeleteDC (hdc);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2000-10-25 18:07:12 +00:00
|
|
|
ReleaseDC (impl->handle, hdc);
|
1999-11-12 21:56:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
switch (image->depth)
|
|
|
|
{
|
|
|
|
case 1:
|
|
|
|
case 8:
|
|
|
|
image->bpp = 1;
|
|
|
|
break;
|
|
|
|
case 15:
|
|
|
|
case 16:
|
|
|
|
image->bpp = 2;
|
|
|
|
break;
|
|
|
|
case 24:
|
|
|
|
image->bpp = 3;
|
|
|
|
break;
|
|
|
|
case 32:
|
|
|
|
image->bpp = 4;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
g_warning ("gdk_image_get: image->depth = %d", image->depth);
|
|
|
|
g_assert_not_reached ();
|
|
|
|
}
|
2001-02-02 22:19:31 +00:00
|
|
|
image->bits_per_pixel = image->depth;
|
1999-11-12 21:56:29 +00:00
|
|
|
image->byte_order = GDK_LSB_FIRST;
|
|
|
|
if (image->depth == 1)
|
|
|
|
image->bpl = ((width - 1)/32 + 1)*4;
|
|
|
|
else
|
|
|
|
image->bpl = ((width*image->bpp - 1)/4 + 1)*4;
|
|
|
|
|
2000-10-22 17:16:42 +00:00
|
|
|
GDK_NOTE (MISC, g_print ("... = %#x mem = %p, bpl = %d\n",
|
|
|
|
(guint) private->hbitmap, image->mem, image->bpl));
|
1999-11-12 21:56:29 +00:00
|
|
|
|
|
|
|
return image;
|
|
|
|
}
|
|
|
|
|
|
|
|
guint32
|
|
|
|
gdk_image_get_pixel (GdkImage *image,
|
2000-07-23 21:43:23 +00:00
|
|
|
gint x,
|
|
|
|
gint y)
|
1999-11-12 21:56:29 +00:00
|
|
|
{
|
|
|
|
guint32 pixel;
|
|
|
|
|
2000-07-25 17:31:05 +00:00
|
|
|
g_return_val_if_fail (GDK_IS_IMAGE (image), 0);
|
1999-11-12 21:56:29 +00:00
|
|
|
|
2000-07-25 17:31:05 +00:00
|
|
|
if (!(x >= 0 && x < image->width && y >= 0 && y < image->height))
|
|
|
|
return 0;
|
1999-11-12 21:56:29 +00:00
|
|
|
|
|
|
|
if (image->depth == 1)
|
|
|
|
pixel = (((char *) image->mem)[y * image->bpl + (x >> 3)] & (1 << (7 - (x & 0x7)))) != 0;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
guchar *pixelp = (guchar *) image->mem + y * image->bpl + x * image->bpp;
|
|
|
|
|
|
|
|
switch (image->bpp)
|
|
|
|
{
|
|
|
|
case 1:
|
|
|
|
pixel = *pixelp;
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* Windows is always LSB, no need to check image->byte_order. */
|
|
|
|
case 2:
|
|
|
|
pixel = pixelp[0] | (pixelp[1] << 8);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 3:
|
|
|
|
pixel = pixelp[0] | (pixelp[1] << 8) | (pixelp[2] << 16);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 4:
|
|
|
|
pixel = pixelp[0] | (pixelp[1] << 8) | (pixelp[2] << 16);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return pixel;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
gdk_image_put_pixel (GdkImage *image,
|
2000-07-23 21:43:23 +00:00
|
|
|
gint x,
|
|
|
|
gint y,
|
|
|
|
guint32 pixel)
|
1999-11-12 21:56:29 +00:00
|
|
|
{
|
|
|
|
g_return_if_fail (image != NULL);
|
|
|
|
|
2000-07-25 17:31:05 +00:00
|
|
|
if (!(x >= 0 && x < image->width && y >= 0 && y < image->height))
|
|
|
|
return;
|
1999-11-12 21:56:29 +00:00
|
|
|
|
|
|
|
if (image->depth == 1)
|
|
|
|
if (pixel & 1)
|
|
|
|
((guchar *) image->mem)[y * image->bpl + (x >> 3)] |= (1 << (7 - (x & 0x7)));
|
|
|
|
else
|
|
|
|
((guchar *) image->mem)[y * image->bpl + (x >> 3)] &= ~(1 << (7 - (x & 0x7)));
|
|
|
|
else
|
|
|
|
{
|
|
|
|
guchar *pixelp = (guchar *) image->mem + y * image->bpl + x * image->bpp;
|
|
|
|
|
|
|
|
/* Windows is always LSB, no need to check image->byte_order. */
|
|
|
|
switch (image->bpp)
|
|
|
|
{
|
|
|
|
case 4:
|
|
|
|
pixelp[3] = 0;
|
|
|
|
case 3:
|
|
|
|
pixelp[2] = ((pixel >> 16) & 0xFF);
|
|
|
|
case 2:
|
|
|
|
pixelp[1] = ((pixel >> 8) & 0xFF);
|
|
|
|
case 1:
|
|
|
|
pixelp[0] = (pixel & 0xFF);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1999-11-20 01:22:57 +00:00
|
|
|
static void
|
|
|
|
gdk_win32_image_destroy (GdkImage *image)
|
1999-11-12 21:56:29 +00:00
|
|
|
{
|
1999-11-20 01:22:57 +00:00
|
|
|
GdkImagePrivateWin32 *private;
|
1999-11-12 21:56:29 +00:00
|
|
|
|
2000-07-25 17:31:05 +00:00
|
|
|
g_return_if_fail (GDK_IS_IMAGE (image));
|
1999-11-12 21:56:29 +00:00
|
|
|
|
2000-10-22 17:16:42 +00:00
|
|
|
private = IMAGE_PRIVATE_DATA (image);
|
1999-11-12 21:56:29 +00:00
|
|
|
|
Make gdkx.h the only installed header from gdk/x11. All structures in
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.
2001-09-07 21:50:20 +00:00
|
|
|
if (private == NULL) /* This means that _gdk_image_exit() destroyed the
|
2000-07-23 01:18:34 +00:00
|
|
|
* image already, and now we're called a second
|
|
|
|
* time from _finalize()
|
|
|
|
*/
|
|
|
|
return;
|
|
|
|
|
2000-10-22 17:16:42 +00:00
|
|
|
GDK_NOTE (MISC, g_print ("gdk_win32_image_destroy: %#x\n",
|
|
|
|
(guint) private->hbitmap));
|
1999-11-12 21:56:29 +00:00
|
|
|
|
|
|
|
switch (image->type)
|
|
|
|
{
|
|
|
|
case GDK_IMAGE_SHARED:
|
2000-07-25 17:31:05 +00:00
|
|
|
if (!DeleteObject (private->hbitmap))
|
Internal GDK error reporting changes: (gdk_win32_gdi_failed) New function
2000-03-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkmain-win32.c: Internal GDK error reporting changes:
(gdk_win32_gdi_failed) New function for reporting errors from GDI,
for which it is no use to call GetLastError on Win9x.
(gdk_other_api_failed) New function, for
general error reporting without calling GetLastError.
(gdk_win32_api_failed) OTOH, this function always calls
GetLastError. (gdk_win32_last_error_string) Remove this function,
GLib has the equivalent now.
* gdk/win32/gdkprivate-win32.h: Declare the above, and macros to
call them with function name, file name and line number in the
arguments.
* gdk/win32/*.c: Use the new macros for reporting errors from GDI
functions.
* gtk/gtk.def: Add some missing entry points.
* gtk/gtkcompat.h.in: Define gtk_paned_gutter_size and
gtk_paned_set_gutter_size, which don't exist any longer, as void.
Fixes by Hans Breuer:
* gdk/makefile.msc: Update for debugging.
* gdk/win32/gdkgc-win32.c (gdk_win32_gc_set_dashes): Fake
implementation, just use the PS_DASH, PS_DOT, PS_DASHDOT or
PS_DASHDOTDOT or PS_DASH styles depending on the number of entries
in the dash_list.
* gdk/win32/gdkwin32.h (GDK_FONT_XFONT): New macro, similar as in
the x11 backend.
* gdk/win32/gdkprivate-win32.h (IS_WIN_NT): New macro.
* gtk/testgtk.c: Include config.h, guard inclusion of unistd.h.
2000-03-08 06:18:41 +00:00
|
|
|
WIN32_GDI_FAILED ("DeleteObject");
|
1999-11-12 21:56:29 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
g_assert_not_reached ();
|
|
|
|
}
|
|
|
|
|
2000-07-23 01:18:34 +00:00
|
|
|
g_free (private);
|
2000-07-25 17:31:05 +00:00
|
|
|
image->windowing_data = NULL;
|
1999-11-12 21:56:29 +00:00
|
|
|
}
|
|
|
|
|