+1999-10-03 Tor Lillqvist <tml@iki.fi>
+
+ * gdk/gdkimage.h gdk/gdkpixmap.h: Change GDK_WINDOWING_WIN32 usage
+ to #ifdef also here.
+
+ * gdk/win32/*.h gdk/win32/*.c: Make corresponding changes as those
+ Owen did to the X11 backend.
+
+ * gdk/win32/gdkdraw.c (gdk_draw_pixmap): Fix it again, don't use
+ ScrollWindowEx when blitting inside a window, it can't be correct
+ in the general case.
+
+ * gdk/win32/gdkevents.c: Don't handle WM_SIZING, handling
+ WM_GETMINMAXINFO is easier.
+
+ * gdk/win32/gdkimage.c (gdk_image_new): Create new image with
+ depth equal to the bitspixel value, not the visual's depth.
+
+ * gdk/win32/gdkvisual.c (gdk_visual_init): Set the visual's depth
+ to 24 even if the bitspixel value is 32.
+
+ * gdk/gdkrgb.c (gdk_rgb_select_conv): After the above change, no
+ need to check for depth==32 when bpp==32, depth will always be 24.
+
Fri Oct 1 18:03:36 1999 Owen Taylor <otaylor@redhat.com>
* docs/Changes-1.4.txt: Started
+1999-10-03 Tor Lillqvist <tml@iki.fi>
+
+ * gdk/gdkimage.h gdk/gdkpixmap.h: Change GDK_WINDOWING_WIN32 usage
+ to #ifdef also here.
+
+ * gdk/win32/*.h gdk/win32/*.c: Make corresponding changes as those
+ Owen did to the X11 backend.
+
+ * gdk/win32/gdkdraw.c (gdk_draw_pixmap): Fix it again, don't use
+ ScrollWindowEx when blitting inside a window, it can't be correct
+ in the general case.
+
+ * gdk/win32/gdkevents.c: Don't handle WM_SIZING, handling
+ WM_GETMINMAXINFO is easier.
+
+ * gdk/win32/gdkimage.c (gdk_image_new): Create new image with
+ depth equal to the bitspixel value, not the visual's depth.
+
+ * gdk/win32/gdkvisual.c (gdk_visual_init): Set the visual's depth
+ to 24 even if the bitspixel value is 32.
+
+ * gdk/gdkrgb.c (gdk_rgb_select_conv): After the above change, no
+ need to check for depth==32 when bpp==32, depth will always be 24.
+
Fri Oct 1 18:03:36 1999 Owen Taylor <otaylor@redhat.com>
* docs/Changes-1.4.txt: Started
+1999-10-03 Tor Lillqvist <tml@iki.fi>
+
+ * gdk/gdkimage.h gdk/gdkpixmap.h: Change GDK_WINDOWING_WIN32 usage
+ to #ifdef also here.
+
+ * gdk/win32/*.h gdk/win32/*.c: Make corresponding changes as those
+ Owen did to the X11 backend.
+
+ * gdk/win32/gdkdraw.c (gdk_draw_pixmap): Fix it again, don't use
+ ScrollWindowEx when blitting inside a window, it can't be correct
+ in the general case.
+
+ * gdk/win32/gdkevents.c: Don't handle WM_SIZING, handling
+ WM_GETMINMAXINFO is easier.
+
+ * gdk/win32/gdkimage.c (gdk_image_new): Create new image with
+ depth equal to the bitspixel value, not the visual's depth.
+
+ * gdk/win32/gdkvisual.c (gdk_visual_init): Set the visual's depth
+ to 24 even if the bitspixel value is 32.
+
+ * gdk/gdkrgb.c (gdk_rgb_select_conv): After the above change, no
+ need to check for depth==32 when bpp==32, depth will always be 24.
+
Fri Oct 1 18:03:36 1999 Owen Taylor <otaylor@redhat.com>
* docs/Changes-1.4.txt: Started
+1999-10-03 Tor Lillqvist <tml@iki.fi>
+
+ * gdk/gdkimage.h gdk/gdkpixmap.h: Change GDK_WINDOWING_WIN32 usage
+ to #ifdef also here.
+
+ * gdk/win32/*.h gdk/win32/*.c: Make corresponding changes as those
+ Owen did to the X11 backend.
+
+ * gdk/win32/gdkdraw.c (gdk_draw_pixmap): Fix it again, don't use
+ ScrollWindowEx when blitting inside a window, it can't be correct
+ in the general case.
+
+ * gdk/win32/gdkevents.c: Don't handle WM_SIZING, handling
+ WM_GETMINMAXINFO is easier.
+
+ * gdk/win32/gdkimage.c (gdk_image_new): Create new image with
+ depth equal to the bitspixel value, not the visual's depth.
+
+ * gdk/win32/gdkvisual.c (gdk_visual_init): Set the visual's depth
+ to 24 even if the bitspixel value is 32.
+
+ * gdk/gdkrgb.c (gdk_rgb_select_conv): After the above change, no
+ need to check for depth==32 when bpp==32, depth will always be 24.
+
Fri Oct 1 18:03:36 1999 Owen Taylor <otaylor@redhat.com>
* docs/Changes-1.4.txt: Started
+1999-10-03 Tor Lillqvist <tml@iki.fi>
+
+ * gdk/gdkimage.h gdk/gdkpixmap.h: Change GDK_WINDOWING_WIN32 usage
+ to #ifdef also here.
+
+ * gdk/win32/*.h gdk/win32/*.c: Make corresponding changes as those
+ Owen did to the X11 backend.
+
+ * gdk/win32/gdkdraw.c (gdk_draw_pixmap): Fix it again, don't use
+ ScrollWindowEx when blitting inside a window, it can't be correct
+ in the general case.
+
+ * gdk/win32/gdkevents.c: Don't handle WM_SIZING, handling
+ WM_GETMINMAXINFO is easier.
+
+ * gdk/win32/gdkimage.c (gdk_image_new): Create new image with
+ depth equal to the bitspixel value, not the visual's depth.
+
+ * gdk/win32/gdkvisual.c (gdk_visual_init): Set the visual's depth
+ to 24 even if the bitspixel value is 32.
+
+ * gdk/gdkrgb.c (gdk_rgb_select_conv): After the above change, no
+ need to check for depth==32 when bpp==32, depth will always be 24.
+
Fri Oct 1 18:03:36 1999 Owen Taylor <otaylor@redhat.com>
* docs/Changes-1.4.txt: Started
+1999-10-03 Tor Lillqvist <tml@iki.fi>
+
+ * gdk/gdkimage.h gdk/gdkpixmap.h: Change GDK_WINDOWING_WIN32 usage
+ to #ifdef also here.
+
+ * gdk/win32/*.h gdk/win32/*.c: Make corresponding changes as those
+ Owen did to the X11 backend.
+
+ * gdk/win32/gdkdraw.c (gdk_draw_pixmap): Fix it again, don't use
+ ScrollWindowEx when blitting inside a window, it can't be correct
+ in the general case.
+
+ * gdk/win32/gdkevents.c: Don't handle WM_SIZING, handling
+ WM_GETMINMAXINFO is easier.
+
+ * gdk/win32/gdkimage.c (gdk_image_new): Create new image with
+ depth equal to the bitspixel value, not the visual's depth.
+
+ * gdk/win32/gdkvisual.c (gdk_visual_init): Set the visual's depth
+ to 24 even if the bitspixel value is 32.
+
+ * gdk/gdkrgb.c (gdk_rgb_select_conv): After the above change, no
+ need to check for depth==32 when bpp==32, depth will always be 24.
+
Fri Oct 1 18:03:36 1999 Owen Taylor <otaylor@redhat.com>
* docs/Changes-1.4.txt: Started
+1999-10-03 Tor Lillqvist <tml@iki.fi>
+
+ * gdk/gdkimage.h gdk/gdkpixmap.h: Change GDK_WINDOWING_WIN32 usage
+ to #ifdef also here.
+
+ * gdk/win32/*.h gdk/win32/*.c: Make corresponding changes as those
+ Owen did to the X11 backend.
+
+ * gdk/win32/gdkdraw.c (gdk_draw_pixmap): Fix it again, don't use
+ ScrollWindowEx when blitting inside a window, it can't be correct
+ in the general case.
+
+ * gdk/win32/gdkevents.c: Don't handle WM_SIZING, handling
+ WM_GETMINMAXINFO is easier.
+
+ * gdk/win32/gdkimage.c (gdk_image_new): Create new image with
+ depth equal to the bitspixel value, not the visual's depth.
+
+ * gdk/win32/gdkvisual.c (gdk_visual_init): Set the visual's depth
+ to 24 even if the bitspixel value is 32.
+
+ * gdk/gdkrgb.c (gdk_rgb_select_conv): After the above change, no
+ need to check for depth==32 when bpp==32, depth will always be 24.
+
Fri Oct 1 18:03:36 1999 Owen Taylor <otaylor@redhat.com>
* docs/Changes-1.4.txt: Started
GdkVisual *visual,
gint width,
gint height);
-#if GDK_WINDOWING == GDK_WINDOWING_WIN32
+#ifdef GDK_WINDOWING_WIN32
GdkImage* gdk_image_bitmap_new(GdkImageType type,
GdkVisual *visual,
gint width,
gint width,
gint height,
gint depth);
-#if GDK_WINDOWING == GDK_WINDOWING_WIN32
+#ifdef GDK_WINDOWING_WIN32
GdkPixmap* gdk_pixmap_create_on_shared_image
(GdkImage **image_return,
GdkWindow *window,
else if (bpp == 32 && depth == 24 && vtype == GDK_VISUAL_TRUE_COLOR &&
(mask_rgb && byte_order == GDK_MSB_FIRST))
conv = gdk_rgb_convert_0888_br;
- else if (bpp == 32 && (depth == 32 || depth == 24) && vtype == GDK_VISUAL_TRUE_COLOR &&
+ else if (bpp == 32 && depth == 24 && vtype == GDK_VISUAL_TRUE_COLOR &&
(mask_rgb && byte_order == GDK_LSB_FIRST))
conv = gdk_rgb_convert_0888;
else if (bpp == 32 && depth == 24 && vtype == GDK_VISUAL_TRUE_COLOR &&
gdk_threads_enter
gdk_threads_leave
gdk_threads_mutex
- gdk_time_get
- gdk_timer_disable
- gdk_timer_enable
- gdk_timer_get
- gdk_timer_set
gdk_visual_get_best
gdk_visual_get_best_depth
gdk_visual_get_best_type
#include <limits.h>
#include <io.h>
-#include <gdk/gdk.h>
-#include <gdk/gdkkeysyms.h>
-#include <gdk/gdki18n.h>
-#include "gdkx.h"
-#include "gdkinput.h"
+#include "gdk.h"
+#include "gdkprivate.h"
+#include "gdkinputprivate.h"
+#include "gdkkeysyms.h"
static void gdkx_XConvertCase (KeySym symbol,
KeySym *lower,
static int gdk_initialized = 0; /* 1 if the library is initialized,
* 0 otherwise.
*/
-static guint start; /* We use the millisecond
- * timestamps from GetTickCount
- */
-static gboolean timerp = TRUE; /* If TRUE use timeouts when waiting
- * for Windows messages
- */
-static guint32 timer_val = 20; /* Timeout in milliseconds.
- */
-
#ifdef G_ENABLE_DEBUG
static const GDebugKey gdk_debug_keys[] = {
{"events", GDK_DEBUG_EVENTS},
if (g_thread_supported ())
gdk_threads_mutex = g_mutex_new ();
- start = GetTickCount ();
-
#ifdef G_ENABLE_DEBUG
{
gchar *debug_string = getenv("GDK_DEBUG");
return TRUE;
}
-/*
- *--------------------------------------------------------------
- * gdk_time_get
- *
- * Get the number of milliseconds since the library was
- * initialized.
- *
- * Arguments:
- *
- * Results:
- * The time since the library was initialized is returned.
- * This time value is accurate to milliseconds even though
- * a more accurate time down to the microsecond could be
- * returned.
- *
- * Side effects:
- *
- *--------------------------------------------------------------
- */
-
-guint32
-gdk_time_get (void)
-{
- guint32 milliseconds;
- guint32 end = GetTickCount ();
-
- if (end < start)
- milliseconds = 0xFFFFFFFF - (start - end) + 1;
- else
- milliseconds = end - start;
-
- return milliseconds;
-}
-
-/*
- *--------------------------------------------------------------
- * gdk_timer_get
- *
- * Returns the current timer.
- *
- * Arguments:
- *
- * Results:
- * Returns the current timer interval. This interval is
- * in units of milliseconds.
- *
- * Side effects:
- *
- *--------------------------------------------------------------
- */
-
-guint32
-gdk_timer_get (void)
-{
- return timer_val;
-}
-
-/*
- *--------------------------------------------------------------
- * gdk_timer_set
- *
- * Sets the timer interval.
- *
- * Arguments:
- * "milliseconds" is the new value for the timer.
- *
- * Results:
- *
- * Side effects:
- * Calls to "gdk_event_get" will last for a maximum
- * of time of "milliseconds". However, a value of 0
- * milliseconds will cause "gdk_event_get" to block
- * indefinately until an event is received.
- *
- *--------------------------------------------------------------
- */
-
-void
-gdk_timer_set (guint32 milliseconds)
-{
- timer_val = milliseconds;
-#ifdef USE_PEEKNAMEDPIPE
- /* When using PeekNamedPipe, can't have too long timeouts.
- */
- if (timer_val > 10)
- timer_val = 10;
- else if (timer_val == 0)
- timer_val = 0;
-#endif
-}
-
-void
-gdk_timer_enable (void)
-{
- timerp = TRUE;
-}
-
-void
-gdk_timer_disable (void)
-{
-#ifdef USE_PEEKNAMEDPIPE
- /* Can't disable timeouts when using PeekNamedPipe */
-#else
- timerp = FALSE;
-#endif
-}
-
/*
*--------------------------------------------------------------
* gdk_screen_width
gdk_threads_enter
gdk_threads_leave
gdk_threads_mutex
- gdk_time_get
- gdk_timer_disable
- gdk_timer_enable
- gdk_timer_get
- gdk_timer_set
gdk_visual_get_best
gdk_visual_get_best_depth
gdk_visual_get_best_type
#include <stdlib.h>
#include <string.h>
+#include "gdkcc.h"
+#include "gdkcolor.h"
#include "gdkx.h"
#define MAX_IMAGE_COLORS 256
+typedef struct _GdkColorContextPrivate GdkColorContextPrivate;
+
+struct _GdkColorContextPrivate
+{
+ GdkColorContext color_context;
+ XStandardColormap std_cmap;
+};
static guint
hash_color (gconstpointer key)
return ((GdkColor *) a)->pixel - ((GdkColor *) b)->pixel;
}
-/* XXX: This function does an XQueryColors() the hard way, because there is
- * no corresponding function in Gdk.
- */
-
static void
my_x_query_colors (GdkColormap *colormap,
GdkColor *colors,
gint ncolors)
{
- XColor *xcolors;
gint i;
for (i = 0; i < ncolors; i++)
gdouble dinc;
cc->num_colors = 256; /* Bogus, but will never get here anyway? */
+
cc->clut = g_new (gulong, cc->num_colors);
cstart = g_new (GdkColor, cc->num_colors);
if (cc->color_hash)
{
- /* XXX: quick-and-dirty way to remove everything */
-
+ g_hash_table_foreach (cc->color_hash,
+ free_hash_entry,
+ NULL);
g_hash_table_destroy (cc->color_hash);
cc->color_hash = g_hash_table_new (hash_color, compare_colors);
}
init_bw (cc);
else
init_gray (cc);
+
break;
case GDK_VISUAL_TRUE_COLOR: /* shifts */
g_message ("gdk_color_context_new: screen depth is %i, no. of colors is %i\n",
cc->visual->depth, cc->num_colors));
- /* check if we need to initialize a hash table */
-
- if ((cc->mode == GDK_CC_MODE_STD_CMAP) || (cc->mode == GDK_CC_MODE_UNDEFINED))
- cc->color_hash = g_hash_table_new (hash_color, compare_colors);
-
return (GdkColorContext *) cc;
}
gdk_colormap_unref (cc->colormap);
/* free any palette that has been associated with this GdkColorContext */
-
+
init_palette (cc);
- if (cc->color_hash)
- {
- g_hash_table_foreach (cc->color_hash,
- free_hash_entry,
- NULL);
- g_hash_table_destroy (cc->color_hash);
- }
-
g_free (cc);
}
g_assert (failed != NULL);
*failed = FALSE;
-
+
switch (cc->mode)
{
case GDK_CC_MODE_BW:
default:
{
GdkColor color;
- GdkColor *result;
+ GdkColor *result = NULL;
color.red = red;
color.green = green;
color.blue = blue;
-
- result = g_hash_table_lookup (cc->color_hash, &color);
+
+ if (cc->color_hash)
+ result = g_hash_table_lookup (cc->color_hash, &color);
if (!result)
{
cnew = g_new (GdkColor, 1);
*cnew = color;
+
+ if (!cc->color_hash)
+ cc->color_hash = g_hash_table_new (hash_color, compare_colors);
g_hash_table_insert (cc->color_hash, cnew, cnew);
cc->clut[cc->num_allocated] = color.pixel;
/* restore previous mode if we aren't adding a new palette */
if (num_palette == 0)
- {
- /* GDK_CC_MODE_STD_CMAP uses a hash table, so we'd better initialize one */
-
- /* XXX: here, the hash table is already initialized */
-
- return 0;
- }
-
- /* Initialize a hash table for this palette (we need one for allocating
- * the pixels in the palette using the current settings)
- */
-
- if (cc->color_hash == NULL)
- cc->color_hash = g_hash_table_new (hash_color, compare_colors);
+ return 0;
/* copy incoming palette */
cc->palette = g_new0(GdkColor, num_palette);
j = 0;
-
+
for (i = 0; i < num_palette; i++)
{
erg = 0;
if (cc->color_hash)
{
+ g_hash_table_foreach (cc->color_hash,
+ free_hash_entry,
+ NULL);
g_hash_table_destroy (cc->color_hash);
cc->color_hash = NULL;
}
#include <string.h>
#include <time.h>
-#include "gdkx.h"
+#include "gdkcolor.h"
+#include "gdkprivate.h"
static gint gdk_colormap_match_color (GdkColormap *cmap,
GdkColor *color,
static int
alloc_color(Colormap colormap,
XColor *color,
- guint *pixelp)
+ gulong *pixelp)
{
PALETTEENTRY entry, closeEntry;
HDC hdc;
#include <string.h>
#include <time.h>
-#include "gdkx.h"
+#include "gdkcolor.h"
+#include "gdkprivate.h"
static gint gdk_colormap_match_color (GdkColormap *cmap,
GdkColor *color,
static int
alloc_color(Colormap colormap,
XColor *color,
- guint *pixelp)
+ gulong *pixelp)
{
PALETTEENTRY entry, closeEntry;
HDC hdc;
#include "config.h"
-#include <gdk/gdk.h>
+#include "gdkcursor.h"
#include "gdkprivate.h"
static const struct { const char *name; int type; } cursors[] = {
#include "config.h"
-#include <gdk/gdk.h>
+#include "gdkcursor.h"
#include "gdkprivate.h"
static const struct { const char *name; int type; } cursors[] = {
#define INITGUID
+#include "gdkdnd.h"
+#include "gdkproperty.h"
+#include "gdkprivate.h"
#include "gdkx.h"
+
#ifdef OLE2_DND
#include <ole2.h>
#endif
#ifdef OLE2_DND
+#define PRINT_RIID(riid) \
+ g_print ("riid = %.08x-%.04x-%.04x-%.02x%.02x-%.02x%.02x%.02x%.02x%.02x%.02x", \
+ ((gulong *) riid)[0], \
+ ((gushort *) riid)[2], \
+ ((gushort *) riid)[3], \
+ ((guchar *) riid)[8], \
+ ((guchar *) riid)[9], \
+ ((guchar *) riid)[10], \
+ ((guchar *) riid)[11], \
+ ((guchar *) riid)[12], \
+ ((guchar *) riid)[13], \
+ ((guchar *) riid)[14], \
+ ((guchar *) riid)[15]);
+
+
HRESULT STDMETHODCALLTYPE
m_query_interface_target (IDropTarget __RPC_FAR *This,
/* [in] */ REFIID riid,
*ppvObject = NULL;
- g_print ("riid = %.08x-%.04x-%.04x-%.02x%.02x-%.02x%.02x%.02x%.02x%.02x%.02x",
- ((gulong *) riid)[0],
- ((gushort *) riid)[2],
- ((gushort *) riid)[3],
- ((guchar *) riid)[8],
- ((guchar *) riid)[9],
- ((guchar *) riid)[10],
- ((guchar *) riid)[11],
- ((guchar *) riid)[12],
- ((guchar *) riid)[13],
- ((guchar *) riid)[14],
- ((guchar *) riid)[15]);
+ PRINT_RIID (riid);
+
if (IsEqualGUID (riid, &IID_IUnknown))
{
+ g_print ("...IUnknown\n");
m_add_ref_target (This);
*ppvObject = This;
- g_print ("...IUnknown\n");
return S_OK;
}
else if (IsEqualGUID (riid, &IID_IDropTarget))
{
+ g_print ("...IDropTarget\n");
m_add_ref_target (This);
*ppvObject = This;
- g_print ("...IDropTarget\n");
return S_OK;
}
else
*ppvObject = NULL;
- g_print ("riid = %.02x%.02x%.02x%.02x-%.02x%.02x-%.02x%.02x-%.02x%.02x-%.02x%.02x%.02x%.02x%.02x%.02x",
- ((guchar *) riid)[0],
- ((guchar *) riid)[1],
- ((guchar *) riid)[2],
- ((guchar *) riid)[3],
- ((guchar *) riid)[4],
- ((guchar *) riid)[5],
- ((guchar *) riid)[6],
- ((guchar *) riid)[7],
- ((guchar *) riid)[8],
- ((guchar *) riid)[9],
- ((guchar *) riid)[10],
- ((guchar *) riid)[11],
- ((guchar *) riid)[12],
- ((guchar *) riid)[13],
- ((guchar *) riid)[14],
- ((guchar *) riid)[15]);
+ PRINT_RIID (riid);
if (IsEqualGUID (riid, &IID_IUnknown))
{
+ g_print ("...IUnknown\n");
m_add_ref_source (This);
*ppvObject = This;
- g_print ("...IUnknown\n");
return S_OK;
}
else if (IsEqualGUID (riid, &IID_IDropSource))
{
+ g_print ("...IDropSource\n");
m_add_ref_source (This);
*ppvObject = This;
- g_print ("...IDropSource\n");
return S_OK;
}
else
{
}
+static GdkFilterReturn
+gdk_destroy_filter (GdkXEvent *xev,
+ GdkEvent *event,
+ gpointer data)
+{
+#ifdef OLE2_DND
+ MSG *msg = (MSG *) xev;
+
+ if (msg->message == WM_DESTROY)
+ {
+ IDropTarget *idtp = (IDropTarget *) data;
+
+ GDK_NOTE (DND, g_print ("gdk_destroy_filter: WM_DESTROY: %#x\n", msg->hwnd));
+ RevokeDragDrop (msg->hwnd);
+ CoLockObjectExternal (idtp, FALSE, TRUE);
+ }
+#endif
+ return GDK_FILTER_CONTINUE;
+}
+
void
gdk_window_register_dnd (GdkWindow *window)
{
}
else if (!SUCCEEDED (hres))
g_warning ("gdk_window_register_dnd: RegisterDragDrop failed");
+ else
+ {
+ gdk_window_add_filter (window, gdk_destroy_filter, &context->idt);
+ }
}
#endif
}
#define INITGUID
+#include "gdkdnd.h"
+#include "gdkproperty.h"
+#include "gdkprivate.h"
#include "gdkx.h"
+
#ifdef OLE2_DND
#include <ole2.h>
#endif
#ifdef OLE2_DND
+#define PRINT_RIID(riid) \
+ g_print ("riid = %.08x-%.04x-%.04x-%.02x%.02x-%.02x%.02x%.02x%.02x%.02x%.02x", \
+ ((gulong *) riid)[0], \
+ ((gushort *) riid)[2], \
+ ((gushort *) riid)[3], \
+ ((guchar *) riid)[8], \
+ ((guchar *) riid)[9], \
+ ((guchar *) riid)[10], \
+ ((guchar *) riid)[11], \
+ ((guchar *) riid)[12], \
+ ((guchar *) riid)[13], \
+ ((guchar *) riid)[14], \
+ ((guchar *) riid)[15]);
+
+
HRESULT STDMETHODCALLTYPE
m_query_interface_target (IDropTarget __RPC_FAR *This,
/* [in] */ REFIID riid,
*ppvObject = NULL;
- g_print ("riid = %.08x-%.04x-%.04x-%.02x%.02x-%.02x%.02x%.02x%.02x%.02x%.02x",
- ((gulong *) riid)[0],
- ((gushort *) riid)[2],
- ((gushort *) riid)[3],
- ((guchar *) riid)[8],
- ((guchar *) riid)[9],
- ((guchar *) riid)[10],
- ((guchar *) riid)[11],
- ((guchar *) riid)[12],
- ((guchar *) riid)[13],
- ((guchar *) riid)[14],
- ((guchar *) riid)[15]);
+ PRINT_RIID (riid);
+
if (IsEqualGUID (riid, &IID_IUnknown))
{
+ g_print ("...IUnknown\n");
m_add_ref_target (This);
*ppvObject = This;
- g_print ("...IUnknown\n");
return S_OK;
}
else if (IsEqualGUID (riid, &IID_IDropTarget))
{
+ g_print ("...IDropTarget\n");
m_add_ref_target (This);
*ppvObject = This;
- g_print ("...IDropTarget\n");
return S_OK;
}
else
*ppvObject = NULL;
- g_print ("riid = %.02x%.02x%.02x%.02x-%.02x%.02x-%.02x%.02x-%.02x%.02x-%.02x%.02x%.02x%.02x%.02x%.02x",
- ((guchar *) riid)[0],
- ((guchar *) riid)[1],
- ((guchar *) riid)[2],
- ((guchar *) riid)[3],
- ((guchar *) riid)[4],
- ((guchar *) riid)[5],
- ((guchar *) riid)[6],
- ((guchar *) riid)[7],
- ((guchar *) riid)[8],
- ((guchar *) riid)[9],
- ((guchar *) riid)[10],
- ((guchar *) riid)[11],
- ((guchar *) riid)[12],
- ((guchar *) riid)[13],
- ((guchar *) riid)[14],
- ((guchar *) riid)[15]);
+ PRINT_RIID (riid);
if (IsEqualGUID (riid, &IID_IUnknown))
{
+ g_print ("...IUnknown\n");
m_add_ref_source (This);
*ppvObject = This;
- g_print ("...IUnknown\n");
return S_OK;
}
else if (IsEqualGUID (riid, &IID_IDropSource))
{
+ g_print ("...IDropSource\n");
m_add_ref_source (This);
*ppvObject = This;
- g_print ("...IDropSource\n");
return S_OK;
}
else
{
}
+static GdkFilterReturn
+gdk_destroy_filter (GdkXEvent *xev,
+ GdkEvent *event,
+ gpointer data)
+{
+#ifdef OLE2_DND
+ MSG *msg = (MSG *) xev;
+
+ if (msg->message == WM_DESTROY)
+ {
+ IDropTarget *idtp = (IDropTarget *) data;
+
+ GDK_NOTE (DND, g_print ("gdk_destroy_filter: WM_DESTROY: %#x\n", msg->hwnd));
+ RevokeDragDrop (msg->hwnd);
+ CoLockObjectExternal (idtp, FALSE, TRUE);
+ }
+#endif
+ return GDK_FILTER_CONTINUE;
+}
+
void
gdk_window_register_dnd (GdkWindow *window)
{
}
else if (!SUCCEEDED (hres))
g_warning ("gdk_window_register_dnd: RegisterDragDrop failed");
+ else
+ {
+ gdk_window_add_filter (window, gdk_destroy_filter, &context->idt);
+ }
}
#endif
}
#include "config.h"
#include <math.h>
-#include <gdk/gdk.h>
+
+#include "gdkdrawable.h"
#include "gdkprivate.h"
#ifndef G_PI
}
else
{
- if ((srcdc = GetDC (src_private->xwindow)) == NULL)
- g_warning ("gdk_draw_pixmap: GetDC failed");
-
-#if 0
- if (!BitBlt (hdc, xdest, ydest, width, height,
- srcdc, xsrc, ysrc, SRCCOPY))
- g_warning ("gdk_draw_pixmap: BitBlt failed");
-#else
- /* If we are in fact just blitting inside one window,
- * ScrollWindowEx works better.
- * Thanks to Philippe Colantoni <colanton@aris.ss.uci.edu>
- * for noticing and fixing this.
- */
- if (drawable_private->xwindow==src_private->xwindow)
+ if (drawable_private->xwindow == src_private->xwindow)
{
- if (!ScrollWindowEx (drawable_private->xwindow,-xsrc+xdest, -ysrc+ydest, NULL,
- NULL, NULL, NULL, SW_INVALIDATE))
- g_warning ("gdk_draw_pixmap: ScrollWindowEx failed");
-
+ /* Blitting inside a window, use ScrollDC */
+ RECT scrollRect, clipRect, emptyRect;
+ HRGN updateRgn;
+
+ scrollRect.left = MIN (xsrc, xdest);
+ scrollRect.top = MIN (ysrc, ydest);
+ scrollRect.right = MAX (xsrc + width + 1, xdest + width + 1);
+ scrollRect.bottom = MAX (ysrc + height + 1, ydest + height + 1);
+
+ clipRect.left = xdest;
+ clipRect.top = ydest;
+ clipRect.right = xdest + width + 1;
+ clipRect.bottom = ydest + height + 1;
+
+ SetRectEmpty (&emptyRect);
+ updateRgn = CreateRectRgnIndirect (&emptyRect);
+ if (!ScrollDC (hdc, xdest - xsrc, ydest - ysrc,
+ &scrollRect, &clipRect,
+ updateRgn, NULL))
+ g_warning ("gdk_draw_pixmap: ScrollDC failed");
+ if (!InvalidateRgn (drawable_private->xwindow, updateRgn, FALSE))
+ g_warning ("gdk_draw_pixmap: InvalidateRgn failed");
if (!UpdateWindow (drawable_private->xwindow))
g_warning ("gdk_draw_pixmap: UpdateWindow failed");
}
else
- if (!BitBlt (hdc, xdest, ydest, width, height,
- srcdc, xsrc, ysrc, SRCCOPY))
- g_warning ("gdk_draw_pixmap: BitBlt failed");
-#endif
-
- ReleaseDC (src_private->xwindow, srcdc);
+ {
+ if ((srcdc = GetDC (src_private->xwindow)) == NULL)
+ g_warning ("gdk_draw_pixmap: GetDC failed");
+
+ if (!BitBlt (hdc, xdest, ydest, width, height,
+ srcdc, xsrc, ysrc, SRCCOPY))
+ g_warning ("gdk_draw_pixmap: BitBlt failed");
+ ReleaseDC (src_private->xwindow, srcdc);
+ }
}
gdk_gc_postdraw (drawable_private, gc_private);
}
#include "config.h"
#include <math.h>
-#include <gdk/gdk.h>
+
+#include "gdkdrawable.h"
#include "gdkprivate.h"
#ifndef G_PI
}
else
{
- if ((srcdc = GetDC (src_private->xwindow)) == NULL)
- g_warning ("gdk_draw_pixmap: GetDC failed");
-
-#if 0
- if (!BitBlt (hdc, xdest, ydest, width, height,
- srcdc, xsrc, ysrc, SRCCOPY))
- g_warning ("gdk_draw_pixmap: BitBlt failed");
-#else
- /* If we are in fact just blitting inside one window,
- * ScrollWindowEx works better.
- * Thanks to Philippe Colantoni <colanton@aris.ss.uci.edu>
- * for noticing and fixing this.
- */
- if (drawable_private->xwindow==src_private->xwindow)
+ if (drawable_private->xwindow == src_private->xwindow)
{
- if (!ScrollWindowEx (drawable_private->xwindow,-xsrc+xdest, -ysrc+ydest, NULL,
- NULL, NULL, NULL, SW_INVALIDATE))
- g_warning ("gdk_draw_pixmap: ScrollWindowEx failed");
-
+ /* Blitting inside a window, use ScrollDC */
+ RECT scrollRect, clipRect, emptyRect;
+ HRGN updateRgn;
+
+ scrollRect.left = MIN (xsrc, xdest);
+ scrollRect.top = MIN (ysrc, ydest);
+ scrollRect.right = MAX (xsrc + width + 1, xdest + width + 1);
+ scrollRect.bottom = MAX (ysrc + height + 1, ydest + height + 1);
+
+ clipRect.left = xdest;
+ clipRect.top = ydest;
+ clipRect.right = xdest + width + 1;
+ clipRect.bottom = ydest + height + 1;
+
+ SetRectEmpty (&emptyRect);
+ updateRgn = CreateRectRgnIndirect (&emptyRect);
+ if (!ScrollDC (hdc, xdest - xsrc, ydest - ysrc,
+ &scrollRect, &clipRect,
+ updateRgn, NULL))
+ g_warning ("gdk_draw_pixmap: ScrollDC failed");
+ if (!InvalidateRgn (drawable_private->xwindow, updateRgn, FALSE))
+ g_warning ("gdk_draw_pixmap: InvalidateRgn failed");
if (!UpdateWindow (drawable_private->xwindow))
g_warning ("gdk_draw_pixmap: UpdateWindow failed");
}
else
- if (!BitBlt (hdc, xdest, ydest, width, height,
- srcdc, xsrc, ysrc, SRCCOPY))
- g_warning ("gdk_draw_pixmap: BitBlt failed");
-#endif
-
- ReleaseDC (src_private->xwindow, srcdc);
+ {
+ if ((srcdc = GetDC (src_private->xwindow)) == NULL)
+ g_warning ("gdk_draw_pixmap: GetDC failed");
+
+ if (!BitBlt (hdc, xdest, ydest, width, height,
+ srcdc, xsrc, ysrc, SRCCOPY))
+ g_warning ("gdk_draw_pixmap: BitBlt failed");
+ ReleaseDC (src_private->xwindow, srcdc);
+ }
}
gdk_gc_postdraw (drawable_private, gc_private);
}
#include <stdio.h>
-#include <gdk/gdk.h>
-#include <gdk/gdkkeysyms.h>
+#include "gdk.h"
+#include "gdkprivate.h"
#include "gdkx.h"
+
+#include "gdkkeysyms.h"
+
#ifdef HAVE_WINTAB
#include <wintab.h>
#endif
-#include "gdkinput.h"
+#include "gdkinputprivate.h"
#define PING() printf("%s: %d\n",__FILE__,__LINE__),fflush(stdout)
*/
static GdkEvent *gdk_event_new (void);
-static gint gdk_event_apply_filters(MSG *xevent,
+static GdkFilterReturn
+ gdk_event_apply_filters (MSG *xevent,
GdkEvent *event,
GList *filters);
static gint gdk_event_translate (GdkEvent *event,
g_source_remove (tag);
}
-static gint
+static GdkFilterReturn
gdk_event_apply_filters (MSG *xevent,
GdkEvent *event,
GList *filters)
HBRUSH hbr;
RECT rect;
POINT pt;
+ MINMAXINFO *lpmmi;
GdkWindowPrivate *curWnd_private;
GdkEventMask mask;
int button;
PostMessage (xevent->hwnd, xevent->message,
xevent->wParam, xevent->lParam);
}
- else if (xevent->message == WM_NCCREATE
- || xevent->message == WM_CREATE
- || xevent->message == WM_GETMINMAXINFO
- || xevent->message == WM_NCCALCSIZE
- || xevent->message == WM_NCDESTROY
- || xevent->message == WM_DESTROY)
- {
- /* Nothing */
- }
return FALSE;
}
{
/* Check for filters for this window */
GdkFilterReturn result;
- result = gdk_event_apply_filters (xevent, event,
- window_private
- ?window_private->filters
- :gdk_default_filters);
+ result = gdk_event_apply_filters
+ (xevent, event,
+ window_private ? window_private->filters : gdk_default_filters);
if (result != GDK_FILTER_CONTINUE)
{
case VK_BACK:
event->key.keyval = GDK_BackSpace; break;
case VK_TAB:
- event->key.keyval = GDK_Tab; break;
+ event->key.keyval = (GetKeyState(VK_SHIFT) < 0 ?
+ GDK_ISO_Left_Tab : GDK_Tab);
+ break;
case VK_CLEAR:
event->key.keyval = GDK_Clear; break;
case VK_RETURN:
gdk_input_vtable.configure_event (&event->configure, window);
}
break;
-
+#if 0 /* Bernd Herd suggests responding to WM_GETMINMAXINFO instead,
+ * which indeed is much easier.
+ */
case WM_SIZING:
GDK_NOTE (EVENTS, g_print ("WM_SIZING: %#x\n", xevent->hwnd));
if (ret_val_flagp == NULL)
}
}
break;
+#else
+ case WM_GETMINMAXINFO:
+ GDK_NOTE (EVENTS, g_print ("WM_GETMINMAXINFO: %#x\n", xevent->hwnd));
+ lpmmi = (MINMAXINFO*) xevent->lParam;
+ if (window_private->hint_flags & GDK_HINT_MIN_SIZE)
+ {
+ lpmmi->ptMinTrackSize.x = window_private->hint_min_width;
+ lpmmi->ptMinTrackSize.y = window_private->hint_min_height;
+ }
+ if (window_private->hint_flags & GDK_HINT_MAX_SIZE)
+ {
+ lpmmi->ptMaxTrackSize.x = window_private->hint_max_width;
+ lpmmi->ptMaxTrackSize.y = window_private->hint_max_height;
+
+ lpmmi->ptMaxSize.x = window_private->hint_max_width;
+ lpmmi->ptMaxSize.y = window_private->hint_max_height;
+ }
+ break;
+#endif
case WM_MOVE:
GDK_NOTE (EVENTS, g_print ("WM_MOVE: %#x +%d+%d\n",
#include <stdio.h>
-#include <gdk/gdk.h>
-#include <gdk/gdkkeysyms.h>
+#include "gdk.h"
+#include "gdkprivate.h"
#include "gdkx.h"
+
+#include "gdkkeysyms.h"
+
#ifdef HAVE_WINTAB
#include <wintab.h>
#endif
-#include "gdkinput.h"
+#include "gdkinputprivate.h"
#define PING() printf("%s: %d\n",__FILE__,__LINE__),fflush(stdout)
*/
static GdkEvent *gdk_event_new (void);
-static gint gdk_event_apply_filters(MSG *xevent,
+static GdkFilterReturn
+ gdk_event_apply_filters (MSG *xevent,
GdkEvent *event,
GList *filters);
static gint gdk_event_translate (GdkEvent *event,
g_source_remove (tag);
}
-static gint
+static GdkFilterReturn
gdk_event_apply_filters (MSG *xevent,
GdkEvent *event,
GList *filters)
HBRUSH hbr;
RECT rect;
POINT pt;
+ MINMAXINFO *lpmmi;
GdkWindowPrivate *curWnd_private;
GdkEventMask mask;
int button;
PostMessage (xevent->hwnd, xevent->message,
xevent->wParam, xevent->lParam);
}
- else if (xevent->message == WM_NCCREATE
- || xevent->message == WM_CREATE
- || xevent->message == WM_GETMINMAXINFO
- || xevent->message == WM_NCCALCSIZE
- || xevent->message == WM_NCDESTROY
- || xevent->message == WM_DESTROY)
- {
- /* Nothing */
- }
return FALSE;
}
{
/* Check for filters for this window */
GdkFilterReturn result;
- result = gdk_event_apply_filters (xevent, event,
- window_private
- ?window_private->filters
- :gdk_default_filters);
+ result = gdk_event_apply_filters
+ (xevent, event,
+ window_private ? window_private->filters : gdk_default_filters);
if (result != GDK_FILTER_CONTINUE)
{
case VK_BACK:
event->key.keyval = GDK_BackSpace; break;
case VK_TAB:
- event->key.keyval = GDK_Tab; break;
+ event->key.keyval = (GetKeyState(VK_SHIFT) < 0 ?
+ GDK_ISO_Left_Tab : GDK_Tab);
+ break;
case VK_CLEAR:
event->key.keyval = GDK_Clear; break;
case VK_RETURN:
gdk_input_vtable.configure_event (&event->configure, window);
}
break;
-
+#if 0 /* Bernd Herd suggests responding to WM_GETMINMAXINFO instead,
+ * which indeed is much easier.
+ */
case WM_SIZING:
GDK_NOTE (EVENTS, g_print ("WM_SIZING: %#x\n", xevent->hwnd));
if (ret_val_flagp == NULL)
}
}
break;
+#else
+ case WM_GETMINMAXINFO:
+ GDK_NOTE (EVENTS, g_print ("WM_GETMINMAXINFO: %#x\n", xevent->hwnd));
+ lpmmi = (MINMAXINFO*) xevent->lParam;
+ if (window_private->hint_flags & GDK_HINT_MIN_SIZE)
+ {
+ lpmmi->ptMinTrackSize.x = window_private->hint_min_width;
+ lpmmi->ptMinTrackSize.y = window_private->hint_min_height;
+ }
+ if (window_private->hint_flags & GDK_HINT_MAX_SIZE)
+ {
+ lpmmi->ptMaxTrackSize.x = window_private->hint_max_width;
+ lpmmi->ptMaxTrackSize.y = window_private->hint_max_height;
+
+ lpmmi->ptMaxSize.x = window_private->hint_max_width;
+ lpmmi->ptMaxSize.y = window_private->hint_max_height;
+ }
+ break;
+#endif
case WM_MOVE:
GDK_NOTE (EVENTS, g_print ("WM_MOVE: %#x +%d+%d\n",
#include <stdio.h>
#include <ctype.h>
-#include <gdk/gdk.h>
+#include "gdkfont.h"
#include "gdkprivate.h"
GdkFont*
#include <stdio.h>
#include <ctype.h>
-#include <gdk/gdk.h>
+#include "gdkfont.h"
#include "gdkprivate.h"
GdkFont*
#include "config.h"
#include <string.h>
-#include <gdk/gdk.h>
+#include "gdkgc.h"
#include "gdkprivate.h"
GdkGC*
if (SetTextColor (gc_private->xgc, fg) == CLR_INVALID)
g_warning ("gdk_gc_predraw: SetTextColor failed");
+#if 0
+ switch (gc_private->fill_style)
+ {
+ case GDK_STIPPLED:
+ {
+ GdkPixmap *stipple = gc_private->stipple;
+ GdkPixmapPrivate *stipple_private = (GdkPixmapPrivate *) stipple;
+ HBITMAP hbm = stipple_private->xwindow;
+ if (NULL == (hbr = CreatePatternBrush (hbm)))
+ g_warning ("gdk_gc_predraw: CreatePatternBrush failed");
+
+#ifdef NATIVE_WIN16
+ SetBrushOrg (gc_private->xgc, gc_private->ts_x_origin,
+ gc_private->ts_y_origin);
+#else
+ SetBrushOrgEx(gc_private->xgc, gc_private->ts_x_origin,
+ gc_private->ts_y_origin, NULL);
+#endif
+ }
+ break;
+ case GDK_SOLID:
+ default:
+ if ((hbr = CreateSolidBrush (fg)) == NULL)
+ g_warning ("gdk_gc_predraw: CreateSolidBrush failed");
+ break;
+ }
+#else
if ((hbr = CreateSolidBrush (fg)) == NULL)
g_warning ("gdk_gc_predraw: CreateSolidBrush failed");
-
+#endif
if (SelectObject (gc_private->xgc, hbr) == NULL)
g_warning ("gdk_gc_predraw: SelectObject #3 failed");
#include "config.h"
#include <string.h>
-#include <gdk/gdk.h>
+#include "gdkgc.h"
#include "gdkprivate.h"
GdkGC*
if (SetTextColor (gc_private->xgc, fg) == CLR_INVALID)
g_warning ("gdk_gc_predraw: SetTextColor failed");
+#if 0
+ switch (gc_private->fill_style)
+ {
+ case GDK_STIPPLED:
+ {
+ GdkPixmap *stipple = gc_private->stipple;
+ GdkPixmapPrivate *stipple_private = (GdkPixmapPrivate *) stipple;
+ HBITMAP hbm = stipple_private->xwindow;
+ if (NULL == (hbr = CreatePatternBrush (hbm)))
+ g_warning ("gdk_gc_predraw: CreatePatternBrush failed");
+
+#ifdef NATIVE_WIN16
+ SetBrushOrg (gc_private->xgc, gc_private->ts_x_origin,
+ gc_private->ts_y_origin);
+#else
+ SetBrushOrgEx(gc_private->xgc, gc_private->ts_x_origin,
+ gc_private->ts_y_origin, NULL);
+#endif
+ }
+ break;
+ case GDK_SOLID:
+ default:
+ if ((hbr = CreateSolidBrush (fg)) == NULL)
+ g_warning ("gdk_gc_predraw: CreateSolidBrush failed");
+ break;
+ }
+#else
if ((hbr = CreateSolidBrush (fg)) == NULL)
g_warning ("gdk_gc_predraw: CreateSolidBrush failed");
-
+#endif
if (SelectObject (gc_private->xgc, hbr) == NULL)
g_warning ("gdk_gc_predraw: SelectObject #3 failed");
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#include <stdio.h>
-#include <gdk/gdk.h>
+#include "gdktypes.h"
#include "gdkprivate.h"
guint gdk_debug_flags = 0;
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#include <stdio.h>
-#include <gdk/gdk.h>
+#include "gdktypes.h"
#include "gdkprivate.h"
guint gdk_debug_flags = 0;
#include <stdlib.h>
#include <string.h>
-#include <gdk/gdk.h>
-#include <gdk/gdki18n.h>
+#include "gdkim.h"
+#include "gdkpixmap.h"
+#include "gdkprivate.h"
+#include "gdki18n.h"
#include "gdkx.h"
/* If this variable is FALSE, it indicates that we should
#include <stdlib.h>
#include <string.h>
-#include <gdk/gdk.h>
-#include <gdk/gdki18n.h>
+#include "gdkim.h"
+#include "gdkpixmap.h"
+#include "gdkprivate.h"
+#include "gdki18n.h"
#include "gdkx.h"
/* If this variable is FALSE, it indicates that we should
#include "config.h"
-#include <gdk/gdk.h>
+#include "gdk.h" /* For gdk_error_trap_* / gdk_flush_* */
+#include "gdkimage.h"
#include "gdkprivate.h"
static void gdk_image_put_normal (GdkDrawable *drawable,
gint width,
gint height)
{
- return gdk_image_new_with_depth (type, visual, width, height, visual->depth);
+ GdkVisualPrivate *visual_private = (GdkVisualPrivate *) visual;
+ return gdk_image_new_with_depth (type, visual, width, height,
+ visual_private->xvisual->bitspixel);
}
GdkImage*
#include "config.h"
-#include <gdk/gdk.h>
+#include "gdk.h" /* For gdk_error_trap_* / gdk_flush_* */
+#include "gdkimage.h"
#include "gdkprivate.h"
static void gdk_image_put_normal (GdkDrawable *drawable,
gint width,
gint height)
{
- return gdk_image_new_with_depth (type, visual, width, height, visual->depth);
+ GdkVisualPrivate *visual_private = (GdkVisualPrivate *) visual;
+ return gdk_image_new_with_depth (type, visual, width, height,
+ visual_private->xvisual->bitspixel);
}
GdkImage*
#include <stdio.h>
#include <math.h>
-#include <gdk/gdk.h>
-#include "gdkx.h"
+#include "gdkinput.h"
+#include "gdkprivate.h"
#ifdef HAVE_WINTAB
#include <wintab.h>
#include <pktdef.h>
#endif
-#include "gdkinput.h"
+#include "gdkinputprivate.h"
struct _GdkDevicePrivate {
GdkDeviceInfo info;
input_window = gdk_input_window_find (window);
g_return_if_fail (window != NULL);
- gdk_input_get_root_relative_geometry (GDK_WINDOW_XWINDOW (window),
- &root_x, &root_y);
+ gdk_input_get_root_relative_geometry
+ ((((GdkWindowPrivate*) window)->xwindow), &root_x, &root_y);
input_window->root_x = root_x;
input_window->root_y = root_y;
input_window = gdk_input_window_find (window);
g_return_if_fail (window != NULL);
- gdk_input_get_root_relative_geometry (GDK_WINDOW_XWINDOW (window),
- &root_x, &root_y);
+ gdk_input_get_root_relative_geometry
+ ((((GdkWindowPrivate*) window)->xwindow), &root_x, &root_y);
input_window->root_x = root_x;
input_window->root_y = root_y;
#include <stdio.h>
#include <math.h>
-#include <gdk/gdk.h>
-#include "gdkx.h"
+#include "gdkinput.h"
+#include "gdkprivate.h"
#ifdef HAVE_WINTAB
#include <wintab.h>
#include <pktdef.h>
#endif
-#include "gdkinput.h"
+#include "gdkinputprivate.h"
struct _GdkDevicePrivate {
GdkDeviceInfo info;
input_window = gdk_input_window_find (window);
g_return_if_fail (window != NULL);
- gdk_input_get_root_relative_geometry (GDK_WINDOW_XWINDOW (window),
- &root_x, &root_y);
+ gdk_input_get_root_relative_geometry
+ ((((GdkWindowPrivate*) window)->xwindow), &root_x, &root_y);
input_window->root_x = root_x;
input_window->root_y = root_y;
input_window = gdk_input_window_find (window);
g_return_if_fail (window != NULL);
- gdk_input_get_root_relative_geometry (GDK_WINDOW_XWINDOW (window),
- &root_x, &root_y);
+ gdk_input_get_root_relative_geometry
+ ((((GdkWindowPrivate*) window)->xwindow), &root_x, &root_y);
input_window->root_x = root_x;
input_window->root_y = root_y;
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#ifndef __GDK_INPUT_H__
-#define __GDK_INPUT_H__
+#ifndef __GDK_INPUTPRIVATE_H__
+#define __GDK_INPUTPRIVATE_H__
typedef struct _GdkAxisInfo GdkAxisInfo;
typedef struct _GdkInputVTable GdkInputVTable;
void gdk_input_window_destroy (GdkWindow *window);
-#endif /* __GDK_INPUT_H__ */
+#endif /* __GDK_INPUTPRIVATE_H__ */
#include <limits.h>
#include <io.h>
-#include <gdk/gdk.h>
-#include <gdk/gdkkeysyms.h>
-#include <gdk/gdki18n.h>
-#include "gdkx.h"
-#include "gdkinput.h"
+#include "gdk.h"
+#include "gdkprivate.h"
+#include "gdkinputprivate.h"
+#include "gdkkeysyms.h"
static void gdkx_XConvertCase (KeySym symbol,
KeySym *lower,
static int gdk_initialized = 0; /* 1 if the library is initialized,
* 0 otherwise.
*/
-static guint start; /* We use the millisecond
- * timestamps from GetTickCount
- */
-static gboolean timerp = TRUE; /* If TRUE use timeouts when waiting
- * for Windows messages
- */
-static guint32 timer_val = 20; /* Timeout in milliseconds.
- */
-
#ifdef G_ENABLE_DEBUG
static const GDebugKey gdk_debug_keys[] = {
{"events", GDK_DEBUG_EVENTS},
if (g_thread_supported ())
gdk_threads_mutex = g_mutex_new ();
- start = GetTickCount ();
-
#ifdef G_ENABLE_DEBUG
{
gchar *debug_string = getenv("GDK_DEBUG");
return TRUE;
}
-/*
- *--------------------------------------------------------------
- * gdk_time_get
- *
- * Get the number of milliseconds since the library was
- * initialized.
- *
- * Arguments:
- *
- * Results:
- * The time since the library was initialized is returned.
- * This time value is accurate to milliseconds even though
- * a more accurate time down to the microsecond could be
- * returned.
- *
- * Side effects:
- *
- *--------------------------------------------------------------
- */
-
-guint32
-gdk_time_get (void)
-{
- guint32 milliseconds;
- guint32 end = GetTickCount ();
-
- if (end < start)
- milliseconds = 0xFFFFFFFF - (start - end) + 1;
- else
- milliseconds = end - start;
-
- return milliseconds;
-}
-
-/*
- *--------------------------------------------------------------
- * gdk_timer_get
- *
- * Returns the current timer.
- *
- * Arguments:
- *
- * Results:
- * Returns the current timer interval. This interval is
- * in units of milliseconds.
- *
- * Side effects:
- *
- *--------------------------------------------------------------
- */
-
-guint32
-gdk_timer_get (void)
-{
- return timer_val;
-}
-
-/*
- *--------------------------------------------------------------
- * gdk_timer_set
- *
- * Sets the timer interval.
- *
- * Arguments:
- * "milliseconds" is the new value for the timer.
- *
- * Results:
- *
- * Side effects:
- * Calls to "gdk_event_get" will last for a maximum
- * of time of "milliseconds". However, a value of 0
- * milliseconds will cause "gdk_event_get" to block
- * indefinately until an event is received.
- *
- *--------------------------------------------------------------
- */
-
-void
-gdk_timer_set (guint32 milliseconds)
-{
- timer_val = milliseconds;
-#ifdef USE_PEEKNAMEDPIPE
- /* When using PeekNamedPipe, can't have too long timeouts.
- */
- if (timer_val > 10)
- timer_val = 10;
- else if (timer_val == 0)
- timer_val = 0;
-#endif
-}
-
-void
-gdk_timer_enable (void)
-{
- timerp = TRUE;
-}
-
-void
-gdk_timer_disable (void)
-{
-#ifdef USE_PEEKNAMEDPIPE
- /* Can't disable timeouts when using PeekNamedPipe */
-#else
- timerp = FALSE;
-#endif
-}
-
/*
*--------------------------------------------------------------
* gdk_screen_width
#include <stdio.h>
#include <string.h>
-#include <gdk/gdk.h>
+#include "gdkpixmap.h"
#include "gdkprivate.h"
typedef struct
#include <stdio.h>
#include <string.h>
-#include <gdk/gdk.h>
+#include "gdkpixmap.h"
#include "gdkprivate.h"
typedef struct
#endif
#include <time.h>
+
+#include <gdk/gdkcursor.h>
+#include <gdk/gdkevents.h>
+#include <gdk/gdkfont.h>
+#include <gdk/gdkgc.h>
+#include <gdk/gdkim.h>
+#include <gdk/gdkimage.h>
+#include <gdk/gdkregion.h>
+#include <gdk/gdkvisual.h>
+#include <gdk/gdkwindow.h>
+
#include <gdk/gdktypes.h>
+#define gdk_window_lookup(xid) ((GdkWindow*) gdk_xid_table_lookup (xid))
+#define gdk_pixmap_lookup(xid) ((GdkPixmap*) gdk_xid_table_lookup (xid))
+
+/* HFONTs clash with HWNDs, so add dithering to HFONTs... (hack) */
+#define HFONT_DITHER 43
+#define gdk_font_lookup(xid) ((GdkFont*) gdk_xid_table_lookup ((HANDLE) ((guint) xid + HFONT_DITHER)))
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
/* Define corresponding Windows types for some X11 types, just for laziness.
*/
-#include <glib.h>
-
typedef HANDLE XID;
typedef PALETTEENTRY XColor;
typedef HDC GC;
unsigned long base_pixel;
} XStandardColormap;
-extern LRESULT CALLBACK
-gdk_WindowProc (HWND, UINT, WPARAM, LPARAM);
-
-#define gdk_window_lookup(xid) ((GdkWindow*) gdk_xid_table_lookup (xid))
-#define gdk_pixmap_lookup(xid) ((GdkPixmap*) gdk_xid_table_lookup (xid))
-
-/* HFONTs clash with HWNDs, so add dithering to HFONTs... (hack) */
-#define HFONT_DITHER 43
-#define gdk_font_lookup(xid) ((GdkFont*) gdk_xid_table_lookup ((HANDLE) ((guint) xid + HFONT_DITHER)))
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
typedef struct _GdkWindowPrivate GdkWindowPrivate;
typedef struct _GdkWindowPrivate GdkPixmapPrivate;
typedef struct _GdkImagePrivate GdkImagePrivate;
typedef struct _GdkCursorPrivate GdkCursorPrivate;
typedef struct _GdkEventFilter GdkEventFilter;
typedef struct _GdkClientFilter GdkClientFilter;
-typedef struct _GdkColorContextPrivate GdkColorContextPrivate;
typedef struct _GdkRegionPrivate GdkRegionPrivate;
#endif /* USE_XIM */
-struct _GdkColorContextPrivate
-{
- GdkColorContext color_context;
- XStandardColormap std_cmap;
-};
-
struct _GdkRegionPrivate
{
GdkRegion region;
extern GdkAtom gdk_win32_dropfiles_atom;
extern GdkAtom gdk_ole2_dnd_atom;
+extern LRESULT CALLBACK gdk_WindowProc (HWND, UINT, WPARAM, LPARAM);
+
/* Debugging support */
#ifdef G_ENABLE_DEBUG
#endif
#include <time.h>
+
+#include <gdk/gdkcursor.h>
+#include <gdk/gdkevents.h>
+#include <gdk/gdkfont.h>
+#include <gdk/gdkgc.h>
+#include <gdk/gdkim.h>
+#include <gdk/gdkimage.h>
+#include <gdk/gdkregion.h>
+#include <gdk/gdkvisual.h>
+#include <gdk/gdkwindow.h>
+
#include <gdk/gdktypes.h>
+#define gdk_window_lookup(xid) ((GdkWindow*) gdk_xid_table_lookup (xid))
+#define gdk_pixmap_lookup(xid) ((GdkPixmap*) gdk_xid_table_lookup (xid))
+
+/* HFONTs clash with HWNDs, so add dithering to HFONTs... (hack) */
+#define HFONT_DITHER 43
+#define gdk_font_lookup(xid) ((GdkFont*) gdk_xid_table_lookup ((HANDLE) ((guint) xid + HFONT_DITHER)))
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
/* Define corresponding Windows types for some X11 types, just for laziness.
*/
-#include <glib.h>
-
typedef HANDLE XID;
typedef PALETTEENTRY XColor;
typedef HDC GC;
unsigned long base_pixel;
} XStandardColormap;
-extern LRESULT CALLBACK
-gdk_WindowProc (HWND, UINT, WPARAM, LPARAM);
-
-#define gdk_window_lookup(xid) ((GdkWindow*) gdk_xid_table_lookup (xid))
-#define gdk_pixmap_lookup(xid) ((GdkPixmap*) gdk_xid_table_lookup (xid))
-
-/* HFONTs clash with HWNDs, so add dithering to HFONTs... (hack) */
-#define HFONT_DITHER 43
-#define gdk_font_lookup(xid) ((GdkFont*) gdk_xid_table_lookup ((HANDLE) ((guint) xid + HFONT_DITHER)))
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
typedef struct _GdkWindowPrivate GdkWindowPrivate;
typedef struct _GdkWindowPrivate GdkPixmapPrivate;
typedef struct _GdkImagePrivate GdkImagePrivate;
typedef struct _GdkCursorPrivate GdkCursorPrivate;
typedef struct _GdkEventFilter GdkEventFilter;
typedef struct _GdkClientFilter GdkClientFilter;
-typedef struct _GdkColorContextPrivate GdkColorContextPrivate;
typedef struct _GdkRegionPrivate GdkRegionPrivate;
#endif /* USE_XIM */
-struct _GdkColorContextPrivate
-{
- GdkColorContext color_context;
- XStandardColormap std_cmap;
-};
-
struct _GdkRegionPrivate
{
GdkRegion region;
extern GdkAtom gdk_win32_dropfiles_atom;
extern GdkAtom gdk_ole2_dnd_atom;
+extern LRESULT CALLBACK gdk_WindowProc (HWND, UINT, WPARAM, LPARAM);
+
/* Debugging support */
#ifdef G_ENABLE_DEBUG
#include "config.h"
#include <string.h>
-#include <gdk/gdk.h>
+
+#include "gdkproperty.h"
+#include "gdkselection.h"
#include "gdkprivate.h"
GdkAtom
#include "config.h"
#include <string.h>
-#include <gdk/gdk.h>
+
+#include "gdkproperty.h"
+#include "gdkselection.h"
#include "gdkprivate.h"
GdkAtom
#include "config.h"
-#include <gdk/gdk.h>
+#include "gdk.h"
#include "gdkprivate.h"
#include "config.h"
-#include <gdk/gdk.h>
+#include "gdk.h"
#include "gdkprivate.h"
#include "config.h"
-#include <gdk/gdk.h>
-#include "gdkx.h"
+#include "gdkvisual.h"
+#include "gdkprivate.h"
static void gdk_visual_decompose_mask (gulong mask,
gint *shift,
}
else if (bitspixel == 24 || bitspixel == 32)
{
+ bitspixel = 24;
system_visual->visual.type = GDK_VISUAL_TRUE_COLOR;
system_visual->visual.red_mask = 0x00FF0000;
system_visual->visual.green_mask = 0x0000FF00;
#include "config.h"
-#include <gdk/gdk.h>
-#include "gdkx.h"
+#include "gdkvisual.h"
+#include "gdkprivate.h"
static void gdk_visual_decompose_mask (gulong mask,
gint *shift,
}
else if (bitspixel == 24 || bitspixel == 32)
{
+ bitspixel = 24;
system_visual->visual.type = GDK_VISUAL_TRUE_COLOR;
system_visual->visual.red_mask = 0x00FF0000;
system_visual->visual.green_mask = 0x0000FF00;
#include <stdio.h>
#include <gdk/gdk.h>
+
#include "gdkprivate.h"
static guint gdk_xid_hash (XID *xid);
#include <stdlib.h>
#include <stdio.h>
-#include <gdk/gdk.h>
+
+#include "gdkevents.h"
+#include "gdkwindow.h"
#include "gdkprivate.h"
-#include "gdkinput.h"
+#include "gdkinputprivate.h"
/* The Win API function AdjustWindowRect may return negative values
* resulting in obscured title bars. This helper function is coreccting it.
#include <stdlib.h>
#include <stdio.h>
-#include <gdk/gdk.h>
+
+#include "gdkevents.h"
+#include "gdkwindow.h"
#include "gdkprivate.h"
-#include "gdkinput.h"
+#include "gdkinputprivate.h"
/* The Win API function AdjustWindowRect may return negative values
* resulting in obscured title bars. This helper function is coreccting it.
#include <stdio.h>
#include <gdk/gdk.h>
+
#include "gdkprivate.h"
static guint gdk_xid_hash (XID *xid);
GTK_VER=1.3
GLIB = ../../../glib
-CFLAGS = $(OPTIMIZE) -I . -I ../.. -I $(WTKIT)/include -I $(GLIB) -DG_ENABLE_DEBUG -DHAVE_CONFIG_H -DGDK_VERSION=\"$(GTK_VER)\" -DNEAR= -DFAR=
+CFLAGS = $(OPTIMIZE) -I . -I .. -I ../.. -I $(WTKIT)/include -I $(GLIB) -DG_ENABLE_DEBUG -DHAVE_CONFIG_H -DGDK_VERSION=\"$(GTK_VER)\" -DNEAR= -DFAR=
all: \
gdk/gdkprivate.h \
# #include <gdk/gdkprivate.h>.
# Applications that depend on GTk+ 1.3 or later should include
-# gdkprivate.h and gdkx.h without the gdk/ prefix. The CFLAGS should
+# gdkprivate.h and/or gdkx.h without the gdk/ prefix. The CFLAGS should
# include an -I switch pointing to the backend-specific directory
# (*this* directory in the Win32 case).
libwntab32x.a : $(WTKIT)/lib/i386/wntab32x.lib
cp $(WTKIT)/lib/i386/wntab32x.lib libwntab32x.a
+.SUFFIXES: .c .o .i
+
.c.o :
$(CC) $(CFLAGS) -c -DGDK_COMPILATION -DG_LOG_DOMAIN=\"Gdk\" $<
+.c.i :
+ $(CC) $(CFLAGS) -E -DGDK_COMPILATION -DG_LOG_DOMAIN=\"Gdk\" $< >$@
+
gdkrgb.c : ../gdkrgb.c
$(CP) ../gdkrgb.c .
GTK_VER=1.3
GLIB = ..\..\..\glib
-CFLAGS = -I. -I..\.. -I$(WTKIT)\include -I$(GLIB) -DG_ENABLE_DEBUG -DHAVE_CONFIG_H -DGDK_VERSION=\"$(GTK_VER)\"
+CFLAGS = -I. -I.. -I..\.. -I$(WTKIT)\include -I$(GLIB) -DG_ENABLE_DEBUG -DHAVE_CONFIG_H -DGDK_VERSION=\"$(GTK_VER)\"
all: \
gdk\gdkprivate.h \
projects / ~andy / gtk / commitdiff