1999-03-05 19:53:56 +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
|
|
|
|
* modify it under the terms of the GNU Library General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* Library General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Library General Public
|
|
|
|
* License along with this library; if not, write to the
|
|
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
* Boston, MA 02111-1307, USA.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Modified by the GTK+ Team and others 1997-1999. See the AUTHORS
|
|
|
|
* file for a list of people on the GTK+ Team. See the ChangeLog
|
|
|
|
* files for a list of changes. These files are distributed with
|
|
|
|
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "config.h"
|
|
|
|
|
|
|
|
#include <math.h>
|
1999-10-02 22:42:58 +00:00
|
|
|
|
|
|
|
#include "gdkdrawable.h"
|
1999-03-05 19:53:56 +00:00
|
|
|
#include "gdkprivate.h"
|
1999-10-05 19:04:48 +00:00
|
|
|
#include "gdkwindow.h"
|
|
|
|
#include "gdkx.h"
|
1999-03-05 19:53:56 +00:00
|
|
|
|
1999-08-16 04:45:01 +00:00
|
|
|
#ifndef G_PI
|
|
|
|
#define G_PI 3.14159265358979323846
|
1999-03-05 19:53:56 +00:00
|
|
|
#endif
|
|
|
|
|
1999-10-05 19:04:48 +00:00
|
|
|
/* Manipulation of drawables
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
gdk_drawable_set_data (GdkDrawable *drawable,
|
|
|
|
const gchar *key,
|
|
|
|
gpointer data,
|
|
|
|
GDestroyNotify destroy_func)
|
|
|
|
{
|
|
|
|
g_dataset_set_data_full (drawable, key, data, destroy_func);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
gdk_drawable_get_data (GdkDrawable *drawable,
|
|
|
|
const gchar *key)
|
|
|
|
{
|
|
|
|
g_dataset_get_data (drawable, key);
|
|
|
|
}
|
|
|
|
|
|
|
|
GdkDrawableType
|
|
|
|
gdk_drawable_get_type (GdkDrawable *drawable)
|
|
|
|
{
|
|
|
|
g_return_val_if_fail (drawable != NULL, (GdkDrawableType) -1);
|
|
|
|
|
|
|
|
return GDK_DRAWABLE_TYPE (drawable);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
gdk_drawable_get_size (GdkDrawable *drawable,
|
|
|
|
gint *width,
|
|
|
|
gint *height)
|
|
|
|
{
|
|
|
|
GdkDrawablePrivate *drawable_private;
|
|
|
|
|
|
|
|
g_return_if_fail (drawable != NULL);
|
|
|
|
|
|
|
|
drawable_private = (GdkDrawablePrivate*) drawable;
|
|
|
|
|
|
|
|
if (width)
|
|
|
|
*width = drawable_private->width;
|
|
|
|
if (height)
|
|
|
|
*height = drawable_private->height;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
gdk_drawable_set_colormap (GdkDrawable *drawable,
|
|
|
|
GdkColormap *colormap)
|
|
|
|
{
|
|
|
|
GdkDrawablePrivate *drawable_private;
|
|
|
|
GdkColormapPrivate *colormap_private;
|
|
|
|
|
|
|
|
g_return_if_fail (drawable != NULL);
|
|
|
|
g_return_if_fail (colormap != NULL);
|
|
|
|
|
|
|
|
drawable_private = (GdkDrawablePrivate*) drawable;
|
|
|
|
colormap_private = (GdkColormapPrivate*) colormap;
|
|
|
|
|
|
|
|
if (!GDK_DRAWABLE_DESTROYED (drawable))
|
|
|
|
{
|
|
|
|
if (GDK_IS_WINDOW (drawable))
|
|
|
|
{
|
|
|
|
g_return_if_fail (colormap_private->visual !=
|
|
|
|
((GdkColormapPrivate*)(drawable_private->colormap))->visual);
|
|
|
|
/* XXX ??? */
|
|
|
|
GDK_NOTE (MISC, g_print ("gdk_drawable_set_colormap: %#x %#x\n",
|
|
|
|
GDK_DRAWABLE_XID (drawable),
|
|
|
|
colormap_private->xcolormap));
|
|
|
|
}
|
|
|
|
if (drawable_private->colormap)
|
|
|
|
gdk_colormap_unref (drawable_private->colormap);
|
|
|
|
drawable_private->colormap = colormap;
|
|
|
|
gdk_colormap_ref (drawable_private->colormap);
|
|
|
|
|
|
|
|
if (GDK_IS_WINDOW (drawable) &&
|
|
|
|
drawable_private->window_type != GDK_WINDOW_TOPLEVEL)
|
|
|
|
gdk_window_add_colormap_windows (drawable);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
GdkColormap*
|
|
|
|
gdk_drawable_get_colormap (GdkDrawable *drawable)
|
|
|
|
{
|
|
|
|
GdkDrawablePrivate *drawable_private;
|
|
|
|
|
|
|
|
g_return_val_if_fail (drawable != NULL, NULL);
|
|
|
|
drawable_private = (GdkDrawablePrivate*) drawable;
|
|
|
|
|
|
|
|
if (!GDK_DRAWABLE_DESTROYED (drawable))
|
|
|
|
{
|
|
|
|
if (drawable_private->colormap == NULL)
|
|
|
|
return gdk_colormap_get_system (); /* XXX ??? */
|
|
|
|
else
|
|
|
|
return drawable_private->colormap;
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
GdkVisual*
|
|
|
|
gdk_drawable_get_visual (GdkDrawable *drawable)
|
|
|
|
{
|
|
|
|
GdkColormap *colormap;
|
|
|
|
|
|
|
|
g_return_val_if_fail (drawable != NULL, NULL);
|
|
|
|
|
|
|
|
colormap = gdk_drawable_get_colormap (drawable);
|
|
|
|
return colormap ? gdk_colormap_get_visual (colormap) : NULL;
|
|
|
|
}
|
|
|
|
|
1999-03-05 19:53:56 +00:00
|
|
|
void
|
|
|
|
gdk_draw_point (GdkDrawable *drawable,
|
|
|
|
GdkGC *gc,
|
|
|
|
gint x,
|
|
|
|
gint y)
|
|
|
|
{
|
1999-10-05 19:04:48 +00:00
|
|
|
GdkDrawablePrivate *drawable_private;
|
1999-03-05 19:53:56 +00:00
|
|
|
GdkGCPrivate *gc_private;
|
|
|
|
HDC hdc;
|
|
|
|
|
|
|
|
g_return_if_fail (drawable != NULL);
|
|
|
|
g_return_if_fail (gc != NULL);
|
|
|
|
|
1999-10-05 19:04:48 +00:00
|
|
|
if (GDK_DRAWABLE_DESTROYED (drawable))
|
1999-03-05 19:53:56 +00:00
|
|
|
return;
|
1999-10-05 19:04:48 +00:00
|
|
|
drawable_private = (GdkDrawablePrivate*) drawable;
|
1999-03-05 19:53:56 +00:00
|
|
|
gc_private = (GdkGCPrivate*) gc;
|
|
|
|
|
|
|
|
hdc = gdk_gc_predraw (drawable_private, gc_private);
|
1999-03-07 22:25:54 +00:00
|
|
|
|
|
|
|
/* We use LineTo because SetPixel wants the COLORREF directly,
|
|
|
|
* and doesn't use the current pen, which is what we want.
|
1999-03-05 19:53:56 +00:00
|
|
|
*/
|
1999-03-07 22:25:54 +00:00
|
|
|
if (!MoveToEx (hdc, x, y, NULL))
|
|
|
|
g_warning ("gdk_draw_point: MoveToEx failed");
|
|
|
|
if (!LineTo (hdc, x + 1, y))
|
|
|
|
g_warning ("gdk_draw_point: LineTo failed");
|
1999-03-05 19:53:56 +00:00
|
|
|
|
|
|
|
gdk_gc_postdraw (drawable_private, gc_private);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
gdk_draw_line (GdkDrawable *drawable,
|
|
|
|
GdkGC *gc,
|
|
|
|
gint x1,
|
|
|
|
gint y1,
|
|
|
|
gint x2,
|
|
|
|
gint y2)
|
|
|
|
{
|
1999-10-05 19:04:48 +00:00
|
|
|
GdkDrawablePrivate *drawable_private;
|
1999-03-05 19:53:56 +00:00
|
|
|
GdkGCPrivate *gc_private;
|
|
|
|
HDC hdc;
|
|
|
|
|
|
|
|
g_return_if_fail (drawable != NULL);
|
|
|
|
g_return_if_fail (gc != NULL);
|
|
|
|
|
1999-10-05 19:04:48 +00:00
|
|
|
if (GDK_DRAWABLE_DESTROYED (drawable))
|
1999-03-05 19:53:56 +00:00
|
|
|
return;
|
1999-10-05 19:04:48 +00:00
|
|
|
drawable_private = (GdkDrawablePrivate*) drawable;
|
1999-03-05 19:53:56 +00:00
|
|
|
gc_private = (GdkGCPrivate*) gc;
|
|
|
|
|
|
|
|
hdc = gdk_gc_predraw (drawable_private, gc_private);
|
|
|
|
|
|
|
|
GDK_NOTE (MISC, g_print ("gdk_draw_line: %#x (%d) +%d+%d..+%d+%d\n",
|
|
|
|
drawable_private->xwindow, gc_private,
|
|
|
|
x1, y1, x2, y2));
|
|
|
|
|
|
|
|
MoveToEx (hdc, x1, y1, NULL);
|
|
|
|
if (!LineTo (hdc, x2, y2))
|
|
|
|
g_warning ("gdk_draw_line: LineTo #1 failed");
|
|
|
|
/* LineTo doesn't draw the last point, so if we have a pen width of 1,
|
1999-08-23 18:53:11 +00:00
|
|
|
* we draw the end pixel separately... With wider pens we don't care.
|
|
|
|
* //HB: But the NT developers don't read their API documentation ...
|
1999-03-05 19:53:56 +00:00
|
|
|
*/
|
New font private structures, related to fontsets.
1999-11-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkprivate.h: New font private structures, related to
fontsets.
* gdk/win32/gdkfont.c: New functions gdk_font_list_new() and
gdk_font_list_free(). On X11, will just be wrappers to
XListFonts() and XFreeFontNames(). On Win32, the code previously
in gtkfontsel.c is now here.
New function gdk_font_xlfd_create(). On X11 will get the FONT
property of the font (for GDK_FONT_FONTs), or call
XBaseFontNameListOfFontSet (for GDK_FONT_FONTSETs), on Win32
builds a XLFD style name from the font information in the LOGFONT
struct(s).
New function gdk_font_xlfd_free(), which correspondingly frees the
string returned by gdk_font_xlfd_create().
Implement fontsets on Win32. Add a function that iterates over a
wide char string and calls a callback function for each substring
of wide chars from the same Unicode subrange (and thus probably
available in the same real font).
Improve the XLFD emulation a bit.
* gdk/win32/gdkim.c (gdk_nmbstowchar_ts): Small bugfix.
* gdk/win32/gdkevents.c: Workaround for suspected bug on Win2k
Beta3, WM_IME_CHAR messages don't seem to contain the composed
multi-byte char as with the Active IMM on Win9x. Oh well, handle
WM_IME_COMPOSITION with GCS_RESULTSTR instead, use
ImmGetCompositionStringW() to get the composed Unicode chars.
* gdk/win32/gdkgc.c
* gdk/win32/gdkdraw.c: Changes needed because of the font private
struct changes.
* gdk/win32/gdk.def: Add the new functions.
1999-11-08 00:09:29 +00:00
|
|
|
if (gc_private->pen_width == 1 && windows_version > 0x80000000)
|
1999-03-05 19:53:56 +00:00
|
|
|
if (!LineTo (hdc, x2 + 1, y2))
|
|
|
|
g_warning ("gdk_draw_line: LineTo #2 failed");
|
|
|
|
gdk_gc_postdraw (drawable_private, gc_private);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
gdk_draw_rectangle (GdkDrawable *drawable,
|
|
|
|
GdkGC *gc,
|
|
|
|
gint filled,
|
|
|
|
gint x,
|
|
|
|
gint y,
|
|
|
|
gint width,
|
|
|
|
gint height)
|
|
|
|
{
|
1999-10-05 19:04:48 +00:00
|
|
|
GdkDrawablePrivate *drawable_private;
|
1999-03-05 19:53:56 +00:00
|
|
|
GdkGCPrivate *gc_private;
|
|
|
|
HDC hdc;
|
|
|
|
HGDIOBJ oldpen, oldbrush;
|
|
|
|
|
|
|
|
g_return_if_fail (drawable != NULL);
|
|
|
|
g_return_if_fail (gc != NULL);
|
|
|
|
|
1999-10-05 19:04:48 +00:00
|
|
|
if (GDK_DRAWABLE_DESTROYED (drawable))
|
1999-03-05 19:53:56 +00:00
|
|
|
return;
|
1999-10-05 19:04:48 +00:00
|
|
|
drawable_private = (GdkDrawablePrivate*) drawable;
|
1999-03-05 19:53:56 +00:00
|
|
|
gc_private = (GdkGCPrivate*) gc;
|
|
|
|
|
|
|
|
if (width == -1)
|
|
|
|
width = drawable_private->width;
|
|
|
|
if (height == -1)
|
|
|
|
height = drawable_private->height;
|
|
|
|
|
|
|
|
hdc = gdk_gc_predraw (drawable_private, gc_private);
|
|
|
|
|
|
|
|
GDK_NOTE (MISC, g_print ("gdk_draw_rectangle: %#x (%d) %s%dx%d@+%d+%d\n",
|
|
|
|
drawable_private->xwindow,
|
|
|
|
gc_private,
|
|
|
|
(filled ? "fill " : ""),
|
|
|
|
width, height, x, y));
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
{
|
|
|
|
HBRUSH hbr = GetCurrentObject (hdc, OBJ_BRUSH);
|
|
|
|
HPEN hpen = GetCurrentObject (hdc, OBJ_PEN);
|
|
|
|
LOGBRUSH lbr;
|
|
|
|
LOGPEN lpen;
|
|
|
|
GetObject (hbr, sizeof (lbr), &lbr);
|
|
|
|
GetObject (hpen, sizeof (lpen), &lpen);
|
|
|
|
|
|
|
|
g_print ("current brush: style = %s, color = 0x%.08x\n",
|
|
|
|
(lbr.lbStyle == BS_SOLID ? "SOLID" : "???"),
|
|
|
|
lbr.lbColor);
|
|
|
|
g_print ("current pen: style = %s, width = %d, color = 0x%.08x\n",
|
|
|
|
(lpen.lopnStyle == PS_SOLID ? "SOLID" : "???"),
|
|
|
|
lpen.lopnWidth,
|
|
|
|
lpen.lopnColor);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
if (filled)
|
|
|
|
oldpen = SelectObject (hdc, GetStockObject (NULL_PEN));
|
|
|
|
else
|
|
|
|
oldbrush = SelectObject (hdc, GetStockObject (HOLLOW_BRUSH));
|
|
|
|
|
|
|
|
if (!Rectangle (hdc, x, y, x+width+1, y+height+1))
|
|
|
|
g_warning ("gdk_draw_rectangle: Rectangle failed");
|
|
|
|
|
|
|
|
if (filled)
|
|
|
|
SelectObject (hdc, oldpen);
|
|
|
|
else
|
|
|
|
SelectObject (hdc, oldbrush);
|
|
|
|
|
|
|
|
gdk_gc_postdraw (drawable_private, gc_private);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
gdk_draw_arc (GdkDrawable *drawable,
|
|
|
|
GdkGC *gc,
|
|
|
|
gint filled,
|
|
|
|
gint x,
|
|
|
|
gint y,
|
|
|
|
gint width,
|
|
|
|
gint height,
|
|
|
|
gint angle1,
|
|
|
|
gint angle2)
|
|
|
|
{
|
1999-10-05 19:04:48 +00:00
|
|
|
GdkDrawablePrivate *drawable_private;
|
1999-03-05 19:53:56 +00:00
|
|
|
GdkGCPrivate *gc_private;
|
|
|
|
HDC hdc;
|
|
|
|
int nXStartArc, nYStartArc, nXEndArc, nYEndArc;
|
|
|
|
|
|
|
|
g_return_if_fail (drawable != NULL);
|
|
|
|
g_return_if_fail (gc != NULL);
|
|
|
|
|
1999-10-05 19:04:48 +00:00
|
|
|
if (GDK_DRAWABLE_DESTROYED (drawable))
|
1999-03-05 19:53:56 +00:00
|
|
|
return;
|
1999-10-05 19:04:48 +00:00
|
|
|
drawable_private = (GdkDrawablePrivate*) drawable;
|
1999-03-05 19:53:56 +00:00
|
|
|
gc_private = (GdkGCPrivate*) gc;
|
|
|
|
|
|
|
|
if (width == -1)
|
|
|
|
width = drawable_private->width;
|
|
|
|
if (height == -1)
|
|
|
|
height = drawable_private->height;
|
|
|
|
|
1999-08-16 04:45:01 +00:00
|
|
|
GDK_NOTE (MISC, g_print ("gdk_draw_arc: %#x %d,%d,%d,%d %d %d\n",
|
|
|
|
drawable_private->xwindow,
|
|
|
|
x, y, width, height, angle1, angle2));
|
|
|
|
|
|
|
|
if (width != 0 && height != 0 && angle2 != 0)
|
1999-03-05 19:53:56 +00:00
|
|
|
{
|
1999-07-10 00:26:54 +00:00
|
|
|
hdc = gdk_gc_predraw (drawable_private, gc_private);
|
|
|
|
|
1999-08-16 04:45:01 +00:00
|
|
|
if (angle2 >= 360*64)
|
|
|
|
{
|
|
|
|
nXStartArc = nYStartArc = nXEndArc = nYEndArc = 0;
|
|
|
|
}
|
|
|
|
else if (angle2 > 0)
|
|
|
|
{
|
|
|
|
/* The 100. is just an arbitrary value */
|
|
|
|
nXStartArc = x + width/2 + 100. * cos(angle1/64.*2.*G_PI/360.);
|
|
|
|
nYStartArc = y + height/2 + -100. * sin(angle1/64.*2.*G_PI/360.);
|
|
|
|
nXEndArc = x + width/2 + 100. * cos((angle1+angle2)/64.*2.*G_PI/360.);
|
|
|
|
nYEndArc = y + height/2 + -100. * sin((angle1+angle2)/64.*2.*G_PI/360.);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
nXEndArc = x + width/2 + 100. * cos(angle1/64.*2.*G_PI/360.);
|
|
|
|
nYEndArc = y + height/2 + -100. * sin(angle1/64.*2.*G_PI/360.);
|
|
|
|
nXStartArc = x + width/2 + 100. * cos((angle1+angle2)/64.*2.*G_PI/360.);
|
|
|
|
nYStartArc = y + height/2 + -100. * sin((angle1+angle2)/64.*2.*G_PI/360.);
|
|
|
|
}
|
1999-07-10 00:26:54 +00:00
|
|
|
|
|
|
|
if (filled)
|
|
|
|
{
|
1999-08-16 04:45:01 +00:00
|
|
|
GDK_NOTE (MISC, g_print ("...Pie(hdc,%d,%d,%d,%d,%d,%d,%d,%d)\n",
|
|
|
|
x, y, x+width, y+height,
|
|
|
|
nXStartArc, nYStartArc,
|
|
|
|
nXEndArc, nYEndArc));
|
1999-07-10 00:26:54 +00:00
|
|
|
Pie (hdc, x, y, x+width, y+height,
|
|
|
|
nXStartArc, nYStartArc, nXEndArc, nYEndArc);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
1999-08-16 04:45:01 +00:00
|
|
|
GDK_NOTE (MISC, g_print ("...Arc(hdc,%d,%d,%d,%d,%d,%d,%d,%d)\n",
|
|
|
|
x, y, x+width, y+height,
|
|
|
|
nXStartArc, nYStartArc,
|
|
|
|
nXEndArc, nYEndArc));
|
1999-07-10 00:26:54 +00:00
|
|
|
Arc (hdc, x, y, x+width, y+height,
|
|
|
|
nXStartArc, nYStartArc, nXEndArc, nYEndArc);
|
|
|
|
}
|
|
|
|
gdk_gc_postdraw (drawable_private, gc_private);
|
1999-03-05 19:53:56 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
gdk_draw_polygon (GdkDrawable *drawable,
|
|
|
|
GdkGC *gc,
|
|
|
|
gint filled,
|
|
|
|
GdkPoint *points,
|
|
|
|
gint npoints)
|
|
|
|
{
|
1999-10-05 19:04:48 +00:00
|
|
|
GdkDrawablePrivate *drawable_private;
|
1999-03-05 19:53:56 +00:00
|
|
|
GdkGCPrivate *gc_private;
|
|
|
|
HDC hdc;
|
|
|
|
POINT *pts;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
g_return_if_fail (drawable != NULL);
|
|
|
|
g_return_if_fail (gc != NULL);
|
|
|
|
|
1999-10-05 19:04:48 +00:00
|
|
|
if (GDK_DRAWABLE_DESTROYED (drawable))
|
1999-03-05 19:53:56 +00:00
|
|
|
return;
|
1999-10-05 19:04:48 +00:00
|
|
|
drawable_private = (GdkDrawablePrivate*) drawable;
|
1999-03-05 19:53:56 +00:00
|
|
|
gc_private = (GdkGCPrivate*) gc;
|
|
|
|
|
|
|
|
GDK_NOTE (MISC, g_print ("gdk_draw_polygon: %#x (%d) %d\n",
|
|
|
|
drawable_private->xwindow, gc_private,
|
|
|
|
npoints));
|
|
|
|
|
1999-07-10 00:26:54 +00:00
|
|
|
if (npoints < 2)
|
|
|
|
return;
|
|
|
|
|
|
|
|
hdc = gdk_gc_predraw (drawable_private, gc_private);
|
|
|
|
pts = g_malloc ((npoints+1) * sizeof (POINT));
|
|
|
|
|
1999-03-05 19:53:56 +00:00
|
|
|
for (i = 0; i < npoints; i++)
|
|
|
|
{
|
|
|
|
pts[i].x = points[i].x;
|
|
|
|
pts[i].y = points[i].y;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((points[0].x != points[npoints-1].x) ||
|
|
|
|
(points[0].y != points[npoints-1].y))
|
|
|
|
{
|
|
|
|
pts[npoints].x = points[0].x;
|
|
|
|
pts[npoints].y = points[0].y;
|
|
|
|
npoints++;
|
|
|
|
}
|
|
|
|
if (filled)
|
|
|
|
{
|
|
|
|
if (!Polygon (hdc, pts, npoints))
|
|
|
|
g_warning ("gdk_draw_polygon: Polygon failed");
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (!Polyline (hdc, pts, npoints))
|
|
|
|
g_warning ("gdk_draw_polygon: Polyline failed");
|
|
|
|
}
|
|
|
|
g_free (pts);
|
|
|
|
gdk_gc_postdraw (drawable_private, gc_private);
|
|
|
|
}
|
|
|
|
|
New font private structures, related to fontsets.
1999-11-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkprivate.h: New font private structures, related to
fontsets.
* gdk/win32/gdkfont.c: New functions gdk_font_list_new() and
gdk_font_list_free(). On X11, will just be wrappers to
XListFonts() and XFreeFontNames(). On Win32, the code previously
in gtkfontsel.c is now here.
New function gdk_font_xlfd_create(). On X11 will get the FONT
property of the font (for GDK_FONT_FONTs), or call
XBaseFontNameListOfFontSet (for GDK_FONT_FONTSETs), on Win32
builds a XLFD style name from the font information in the LOGFONT
struct(s).
New function gdk_font_xlfd_free(), which correspondingly frees the
string returned by gdk_font_xlfd_create().
Implement fontsets on Win32. Add a function that iterates over a
wide char string and calls a callback function for each substring
of wide chars from the same Unicode subrange (and thus probably
available in the same real font).
Improve the XLFD emulation a bit.
* gdk/win32/gdkim.c (gdk_nmbstowchar_ts): Small bugfix.
* gdk/win32/gdkevents.c: Workaround for suspected bug on Win2k
Beta3, WM_IME_CHAR messages don't seem to contain the composed
multi-byte char as with the Active IMM on Win9x. Oh well, handle
WM_IME_COMPOSITION with GCS_RESULTSTR instead, use
ImmGetCompositionStringW() to get the composed Unicode chars.
* gdk/win32/gdkgc.c
* gdk/win32/gdkdraw.c: Changes needed because of the font private
struct changes.
* gdk/win32/gdk.def: Add the new functions.
1999-11-08 00:09:29 +00:00
|
|
|
typedef struct
|
|
|
|
{
|
|
|
|
gint x, y;
|
|
|
|
HDC hdc;
|
|
|
|
} gdk_draw_text_arg;
|
|
|
|
|
1999-03-05 19:53:56 +00:00
|
|
|
/* gdk_draw_string
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
gdk_draw_string (GdkDrawable *drawable,
|
|
|
|
GdkFont *font,
|
|
|
|
GdkGC *gc,
|
|
|
|
gint x,
|
|
|
|
gint y,
|
|
|
|
const gchar *string)
|
|
|
|
{
|
|
|
|
gdk_draw_text (drawable, font, gc, x, y, string, strlen (string));
|
|
|
|
}
|
|
|
|
|
New font private structures, related to fontsets.
1999-11-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkprivate.h: New font private structures, related to
fontsets.
* gdk/win32/gdkfont.c: New functions gdk_font_list_new() and
gdk_font_list_free(). On X11, will just be wrappers to
XListFonts() and XFreeFontNames(). On Win32, the code previously
in gtkfontsel.c is now here.
New function gdk_font_xlfd_create(). On X11 will get the FONT
property of the font (for GDK_FONT_FONTs), or call
XBaseFontNameListOfFontSet (for GDK_FONT_FONTSETs), on Win32
builds a XLFD style name from the font information in the LOGFONT
struct(s).
New function gdk_font_xlfd_free(), which correspondingly frees the
string returned by gdk_font_xlfd_create().
Implement fontsets on Win32. Add a function that iterates over a
wide char string and calls a callback function for each substring
of wide chars from the same Unicode subrange (and thus probably
available in the same real font).
Improve the XLFD emulation a bit.
* gdk/win32/gdkim.c (gdk_nmbstowchar_ts): Small bugfix.
* gdk/win32/gdkevents.c: Workaround for suspected bug on Win2k
Beta3, WM_IME_CHAR messages don't seem to contain the composed
multi-byte char as with the Active IMM on Win9x. Oh well, handle
WM_IME_COMPOSITION with GCS_RESULTSTR instead, use
ImmGetCompositionStringW() to get the composed Unicode chars.
* gdk/win32/gdkgc.c
* gdk/win32/gdkdraw.c: Changes needed because of the font private
struct changes.
* gdk/win32/gdk.def: Add the new functions.
1999-11-08 00:09:29 +00:00
|
|
|
static void
|
|
|
|
gdk_draw_text_handler (GdkWin32SingleFont *singlefont,
|
|
|
|
const wchar_t *wcstr,
|
|
|
|
int wclen,
|
|
|
|
void *arg)
|
|
|
|
{
|
|
|
|
HGDIOBJ oldfont;
|
|
|
|
SIZE size;
|
|
|
|
gdk_draw_text_arg *argp = (gdk_draw_text_arg *) arg;
|
|
|
|
|
1999-11-08 21:34:06 +00:00
|
|
|
if (!singlefont)
|
|
|
|
return;
|
|
|
|
|
New font private structures, related to fontsets.
1999-11-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkprivate.h: New font private structures, related to
fontsets.
* gdk/win32/gdkfont.c: New functions gdk_font_list_new() and
gdk_font_list_free(). On X11, will just be wrappers to
XListFonts() and XFreeFontNames(). On Win32, the code previously
in gtkfontsel.c is now here.
New function gdk_font_xlfd_create(). On X11 will get the FONT
property of the font (for GDK_FONT_FONTs), or call
XBaseFontNameListOfFontSet (for GDK_FONT_FONTSETs), on Win32
builds a XLFD style name from the font information in the LOGFONT
struct(s).
New function gdk_font_xlfd_free(), which correspondingly frees the
string returned by gdk_font_xlfd_create().
Implement fontsets on Win32. Add a function that iterates over a
wide char string and calls a callback function for each substring
of wide chars from the same Unicode subrange (and thus probably
available in the same real font).
Improve the XLFD emulation a bit.
* gdk/win32/gdkim.c (gdk_nmbstowchar_ts): Small bugfix.
* gdk/win32/gdkevents.c: Workaround for suspected bug on Win2k
Beta3, WM_IME_CHAR messages don't seem to contain the composed
multi-byte char as with the Active IMM on Win9x. Oh well, handle
WM_IME_COMPOSITION with GCS_RESULTSTR instead, use
ImmGetCompositionStringW() to get the composed Unicode chars.
* gdk/win32/gdkgc.c
* gdk/win32/gdkdraw.c: Changes needed because of the font private
struct changes.
* gdk/win32/gdk.def: Add the new functions.
1999-11-08 00:09:29 +00:00
|
|
|
if ((oldfont = SelectObject (argp->hdc, singlefont->xfont)) == NULL)
|
|
|
|
{
|
|
|
|
g_warning ("gdk_draw_text_handler: SelectObject failed");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!TextOutW (argp->hdc, argp->x, argp->y, wcstr, wclen))
|
|
|
|
g_warning ("gdk_draw_text_handler: TextOutW failed");
|
|
|
|
GetTextExtentPoint32W (argp->hdc, wcstr, wclen, &size);
|
|
|
|
argp->x += size.cx;
|
|
|
|
|
1999-11-08 21:34:06 +00:00
|
|
|
SelectObject (argp->hdc, oldfont);
|
New font private structures, related to fontsets.
1999-11-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkprivate.h: New font private structures, related to
fontsets.
* gdk/win32/gdkfont.c: New functions gdk_font_list_new() and
gdk_font_list_free(). On X11, will just be wrappers to
XListFonts() and XFreeFontNames(). On Win32, the code previously
in gtkfontsel.c is now here.
New function gdk_font_xlfd_create(). On X11 will get the FONT
property of the font (for GDK_FONT_FONTs), or call
XBaseFontNameListOfFontSet (for GDK_FONT_FONTSETs), on Win32
builds a XLFD style name from the font information in the LOGFONT
struct(s).
New function gdk_font_xlfd_free(), which correspondingly frees the
string returned by gdk_font_xlfd_create().
Implement fontsets on Win32. Add a function that iterates over a
wide char string and calls a callback function for each substring
of wide chars from the same Unicode subrange (and thus probably
available in the same real font).
Improve the XLFD emulation a bit.
* gdk/win32/gdkim.c (gdk_nmbstowchar_ts): Small bugfix.
* gdk/win32/gdkevents.c: Workaround for suspected bug on Win2k
Beta3, WM_IME_CHAR messages don't seem to contain the composed
multi-byte char as with the Active IMM on Win9x. Oh well, handle
WM_IME_COMPOSITION with GCS_RESULTSTR instead, use
ImmGetCompositionStringW() to get the composed Unicode chars.
* gdk/win32/gdkgc.c
* gdk/win32/gdkdraw.c: Changes needed because of the font private
struct changes.
* gdk/win32/gdk.def: Add the new functions.
1999-11-08 00:09:29 +00:00
|
|
|
}
|
|
|
|
|
1999-03-05 19:53:56 +00:00
|
|
|
/* gdk_draw_text
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
gdk_draw_text (GdkDrawable *drawable,
|
|
|
|
GdkFont *font,
|
|
|
|
GdkGC *gc,
|
|
|
|
gint x,
|
|
|
|
gint y,
|
|
|
|
const gchar *text,
|
|
|
|
gint text_length)
|
|
|
|
{
|
1999-10-05 19:04:48 +00:00
|
|
|
GdkDrawablePrivate *drawable_private;
|
1999-03-05 19:53:56 +00:00
|
|
|
GdkGCPrivate *gc_private;
|
1999-10-20 22:58:37 +00:00
|
|
|
wchar_t *wcstr;
|
|
|
|
gint wlen;
|
New font private structures, related to fontsets.
1999-11-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkprivate.h: New font private structures, related to
fontsets.
* gdk/win32/gdkfont.c: New functions gdk_font_list_new() and
gdk_font_list_free(). On X11, will just be wrappers to
XListFonts() and XFreeFontNames(). On Win32, the code previously
in gtkfontsel.c is now here.
New function gdk_font_xlfd_create(). On X11 will get the FONT
property of the font (for GDK_FONT_FONTs), or call
XBaseFontNameListOfFontSet (for GDK_FONT_FONTSETs), on Win32
builds a XLFD style name from the font information in the LOGFONT
struct(s).
New function gdk_font_xlfd_free(), which correspondingly frees the
string returned by gdk_font_xlfd_create().
Implement fontsets on Win32. Add a function that iterates over a
wide char string and calls a callback function for each substring
of wide chars from the same Unicode subrange (and thus probably
available in the same real font).
Improve the XLFD emulation a bit.
* gdk/win32/gdkim.c (gdk_nmbstowchar_ts): Small bugfix.
* gdk/win32/gdkevents.c: Workaround for suspected bug on Win2k
Beta3, WM_IME_CHAR messages don't seem to contain the composed
multi-byte char as with the Active IMM on Win9x. Oh well, handle
WM_IME_COMPOSITION with GCS_RESULTSTR instead, use
ImmGetCompositionStringW() to get the composed Unicode chars.
* gdk/win32/gdkgc.c
* gdk/win32/gdkdraw.c: Changes needed because of the font private
struct changes.
* gdk/win32/gdk.def: Add the new functions.
1999-11-08 00:09:29 +00:00
|
|
|
gdk_draw_text_arg arg;
|
1999-03-05 19:53:56 +00:00
|
|
|
|
|
|
|
g_return_if_fail (drawable != NULL);
|
|
|
|
g_return_if_fail (font != NULL);
|
|
|
|
g_return_if_fail (gc != NULL);
|
|
|
|
g_return_if_fail (text != NULL);
|
|
|
|
|
1999-10-05 19:04:48 +00:00
|
|
|
if (GDK_DRAWABLE_DESTROYED (drawable))
|
1999-03-05 19:53:56 +00:00
|
|
|
return;
|
1999-10-20 22:58:37 +00:00
|
|
|
|
|
|
|
if (text_length == 0)
|
|
|
|
return;
|
|
|
|
|
Add new keysyms from X11R6.4 (including EuroSign).
1999-10-31 Tor Lillqvist <tml@iki.fi>
* gdk/gdkkeysyms.h: Add new keysyms from X11R6.4 (including
EuroSign).
* gdk/gdktypes.h: Add note about wchar_t not necessarily being the
same type as GdkWChar, especially on Win32.
* gdk/win32/*.c: Change gdk_root_parent to be a pointer.
* gdk/win32/*.c: Assume all strings are UTF-8. Convert to Unicode
before passing to Windows GDI for drawing etc. Convert to the
system default codepage before passing to Windows as window
titles.
* gdk/win32/gdkprivate.h: Add more fields to GdkWindowPrivate to
support changing input locale on the fly.
* gdk/win32/gdkevent.c: Support input language (keyboard locale)
on-the-fly changes. Convert incoming characters from the current
codepage to Unicode (and then to a UTF-8 multi-byte string) based
on the current input language. Use keysym<->Unicode mapping tables
and functions borrowed from xterm sources.
Support IMEs (Input Method Editors) for CJK languages. On non-CJK
editions of Win9x, use the ActiveX-based Active IMM (Input Method
Manager) if available. IMEs and the Active IMM are available under
the disguise of Chinese, Korean and Japanese support for IE and
Outlook Express from "Windows Update" for Win98. On Win2k, the CJK
support is present in all editions (as long as you install it).
Call DispatchMessage from gdk_events_queue() (and thus
gdk_WindowProc()), instead of duplicating the code in
gdk_WindowProc().
Reworked the grab handling and propagation code, factored out
duplicated code snippets into separate functions. Other cleanups,
too.
* gdk/win32/surrogate-dimm.h: Provide just the bits we need from
the <dimm.h> header describing the Active IMM.
* gdk/win32/gdkfont.c: Pretend to support fontsets, but so far
just do the same as for "single" fonts.
* gdk/win32/gdk.c: Call CoInitialize() (COM initialisation) from
gdk_init_check, and CoUninitialize() from gdk_exit_func. Handle
the new keysyms from gdkkeysyms.h.
* gtk/gtkfontsel.c (Win32): Load the font for the preview as a
fontset, so that gtkentry uses wide characters.
* gtk/gtkrc.c (Win32): Get the locale with gwin_getlocale(). Call
GTk+'s system directory "gtk+", not "gtk".
1999-10-31 21:35:39 +00:00
|
|
|
g_assert (font->type == GDK_FONT_FONT || font->type == GDK_FONT_FONTSET);
|
|
|
|
|
1999-10-05 19:04:48 +00:00
|
|
|
drawable_private = (GdkDrawablePrivate*) drawable;
|
1999-03-05 19:53:56 +00:00
|
|
|
gc_private = (GdkGCPrivate*) gc;
|
|
|
|
|
New font private structures, related to fontsets.
1999-11-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkprivate.h: New font private structures, related to
fontsets.
* gdk/win32/gdkfont.c: New functions gdk_font_list_new() and
gdk_font_list_free(). On X11, will just be wrappers to
XListFonts() and XFreeFontNames(). On Win32, the code previously
in gtkfontsel.c is now here.
New function gdk_font_xlfd_create(). On X11 will get the FONT
property of the font (for GDK_FONT_FONTs), or call
XBaseFontNameListOfFontSet (for GDK_FONT_FONTSETs), on Win32
builds a XLFD style name from the font information in the LOGFONT
struct(s).
New function gdk_font_xlfd_free(), which correspondingly frees the
string returned by gdk_font_xlfd_create().
Implement fontsets on Win32. Add a function that iterates over a
wide char string and calls a callback function for each substring
of wide chars from the same Unicode subrange (and thus probably
available in the same real font).
Improve the XLFD emulation a bit.
* gdk/win32/gdkim.c (gdk_nmbstowchar_ts): Small bugfix.
* gdk/win32/gdkevents.c: Workaround for suspected bug on Win2k
Beta3, WM_IME_CHAR messages don't seem to contain the composed
multi-byte char as with the Active IMM on Win9x. Oh well, handle
WM_IME_COMPOSITION with GCS_RESULTSTR instead, use
ImmGetCompositionStringW() to get the composed Unicode chars.
* gdk/win32/gdkgc.c
* gdk/win32/gdkdraw.c: Changes needed because of the font private
struct changes.
* gdk/win32/gdk.def: Add the new functions.
1999-11-08 00:09:29 +00:00
|
|
|
arg.x = x;
|
|
|
|
arg.y = y;
|
|
|
|
arg.hdc = gdk_gc_predraw (drawable_private, gc_private);
|
Add new keysyms from X11R6.4 (including EuroSign).
1999-10-31 Tor Lillqvist <tml@iki.fi>
* gdk/gdkkeysyms.h: Add new keysyms from X11R6.4 (including
EuroSign).
* gdk/gdktypes.h: Add note about wchar_t not necessarily being the
same type as GdkWChar, especially on Win32.
* gdk/win32/*.c: Change gdk_root_parent to be a pointer.
* gdk/win32/*.c: Assume all strings are UTF-8. Convert to Unicode
before passing to Windows GDI for drawing etc. Convert to the
system default codepage before passing to Windows as window
titles.
* gdk/win32/gdkprivate.h: Add more fields to GdkWindowPrivate to
support changing input locale on the fly.
* gdk/win32/gdkevent.c: Support input language (keyboard locale)
on-the-fly changes. Convert incoming characters from the current
codepage to Unicode (and then to a UTF-8 multi-byte string) based
on the current input language. Use keysym<->Unicode mapping tables
and functions borrowed from xterm sources.
Support IMEs (Input Method Editors) for CJK languages. On non-CJK
editions of Win9x, use the ActiveX-based Active IMM (Input Method
Manager) if available. IMEs and the Active IMM are available under
the disguise of Chinese, Korean and Japanese support for IE and
Outlook Express from "Windows Update" for Win98. On Win2k, the CJK
support is present in all editions (as long as you install it).
Call DispatchMessage from gdk_events_queue() (and thus
gdk_WindowProc()), instead of duplicating the code in
gdk_WindowProc().
Reworked the grab handling and propagation code, factored out
duplicated code snippets into separate functions. Other cleanups,
too.
* gdk/win32/surrogate-dimm.h: Provide just the bits we need from
the <dimm.h> header describing the Active IMM.
* gdk/win32/gdkfont.c: Pretend to support fontsets, but so far
just do the same as for "single" fonts.
* gdk/win32/gdk.c: Call CoInitialize() (COM initialisation) from
gdk_init_check, and CoUninitialize() from gdk_exit_func. Handle
the new keysyms from gdkkeysyms.h.
* gtk/gtkfontsel.c (Win32): Load the font for the preview as a
fontset, so that gtkentry uses wide characters.
* gtk/gtkrc.c (Win32): Get the locale with gwin_getlocale(). Call
GTk+'s system directory "gtk+", not "gtk".
1999-10-31 21:35:39 +00:00
|
|
|
|
New font private structures, related to fontsets.
1999-11-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkprivate.h: New font private structures, related to
fontsets.
* gdk/win32/gdkfont.c: New functions gdk_font_list_new() and
gdk_font_list_free(). On X11, will just be wrappers to
XListFonts() and XFreeFontNames(). On Win32, the code previously
in gtkfontsel.c is now here.
New function gdk_font_xlfd_create(). On X11 will get the FONT
property of the font (for GDK_FONT_FONTs), or call
XBaseFontNameListOfFontSet (for GDK_FONT_FONTSETs), on Win32
builds a XLFD style name from the font information in the LOGFONT
struct(s).
New function gdk_font_xlfd_free(), which correspondingly frees the
string returned by gdk_font_xlfd_create().
Implement fontsets on Win32. Add a function that iterates over a
wide char string and calls a callback function for each substring
of wide chars from the same Unicode subrange (and thus probably
available in the same real font).
Improve the XLFD emulation a bit.
* gdk/win32/gdkim.c (gdk_nmbstowchar_ts): Small bugfix.
* gdk/win32/gdkevents.c: Workaround for suspected bug on Win2k
Beta3, WM_IME_CHAR messages don't seem to contain the composed
multi-byte char as with the Active IMM on Win9x. Oh well, handle
WM_IME_COMPOSITION with GCS_RESULTSTR instead, use
ImmGetCompositionStringW() to get the composed Unicode chars.
* gdk/win32/gdkgc.c
* gdk/win32/gdkdraw.c: Changes needed because of the font private
struct changes.
* gdk/win32/gdk.def: Add the new functions.
1999-11-08 00:09:29 +00:00
|
|
|
GDK_NOTE (MISC, g_print ("gdk_draw_text: %#x (%d,%d) \"%.*s\" (len %d)\n",
|
Add new keysyms from X11R6.4 (including EuroSign).
1999-10-31 Tor Lillqvist <tml@iki.fi>
* gdk/gdkkeysyms.h: Add new keysyms from X11R6.4 (including
EuroSign).
* gdk/gdktypes.h: Add note about wchar_t not necessarily being the
same type as GdkWChar, especially on Win32.
* gdk/win32/*.c: Change gdk_root_parent to be a pointer.
* gdk/win32/*.c: Assume all strings are UTF-8. Convert to Unicode
before passing to Windows GDI for drawing etc. Convert to the
system default codepage before passing to Windows as window
titles.
* gdk/win32/gdkprivate.h: Add more fields to GdkWindowPrivate to
support changing input locale on the fly.
* gdk/win32/gdkevent.c: Support input language (keyboard locale)
on-the-fly changes. Convert incoming characters from the current
codepage to Unicode (and then to a UTF-8 multi-byte string) based
on the current input language. Use keysym<->Unicode mapping tables
and functions borrowed from xterm sources.
Support IMEs (Input Method Editors) for CJK languages. On non-CJK
editions of Win9x, use the ActiveX-based Active IMM (Input Method
Manager) if available. IMEs and the Active IMM are available under
the disguise of Chinese, Korean and Japanese support for IE and
Outlook Express from "Windows Update" for Win98. On Win2k, the CJK
support is present in all editions (as long as you install it).
Call DispatchMessage from gdk_events_queue() (and thus
gdk_WindowProc()), instead of duplicating the code in
gdk_WindowProc().
Reworked the grab handling and propagation code, factored out
duplicated code snippets into separate functions. Other cleanups,
too.
* gdk/win32/surrogate-dimm.h: Provide just the bits we need from
the <dimm.h> header describing the Active IMM.
* gdk/win32/gdkfont.c: Pretend to support fontsets, but so far
just do the same as for "single" fonts.
* gdk/win32/gdk.c: Call CoInitialize() (COM initialisation) from
gdk_init_check, and CoUninitialize() from gdk_exit_func. Handle
the new keysyms from gdkkeysyms.h.
* gtk/gtkfontsel.c (Win32): Load the font for the preview as a
fontset, so that gtkentry uses wide characters.
* gtk/gtkrc.c (Win32): Get the locale with gwin_getlocale(). Call
GTk+'s system directory "gtk+", not "gtk".
1999-10-31 21:35:39 +00:00
|
|
|
drawable_private->xwindow,
|
New font private structures, related to fontsets.
1999-11-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkprivate.h: New font private structures, related to
fontsets.
* gdk/win32/gdkfont.c: New functions gdk_font_list_new() and
gdk_font_list_free(). On X11, will just be wrappers to
XListFonts() and XFreeFontNames(). On Win32, the code previously
in gtkfontsel.c is now here.
New function gdk_font_xlfd_create(). On X11 will get the FONT
property of the font (for GDK_FONT_FONTs), or call
XBaseFontNameListOfFontSet (for GDK_FONT_FONTSETs), on Win32
builds a XLFD style name from the font information in the LOGFONT
struct(s).
New function gdk_font_xlfd_free(), which correspondingly frees the
string returned by gdk_font_xlfd_create().
Implement fontsets on Win32. Add a function that iterates over a
wide char string and calls a callback function for each substring
of wide chars from the same Unicode subrange (and thus probably
available in the same real font).
Improve the XLFD emulation a bit.
* gdk/win32/gdkim.c (gdk_nmbstowchar_ts): Small bugfix.
* gdk/win32/gdkevents.c: Workaround for suspected bug on Win2k
Beta3, WM_IME_CHAR messages don't seem to contain the composed
multi-byte char as with the Active IMM on Win9x. Oh well, handle
WM_IME_COMPOSITION with GCS_RESULTSTR instead, use
ImmGetCompositionStringW() to get the composed Unicode chars.
* gdk/win32/gdkgc.c
* gdk/win32/gdkdraw.c: Changes needed because of the font private
struct changes.
* gdk/win32/gdk.def: Add the new functions.
1999-11-08 00:09:29 +00:00
|
|
|
x, y,
|
Add new keysyms from X11R6.4 (including EuroSign).
1999-10-31 Tor Lillqvist <tml@iki.fi>
* gdk/gdkkeysyms.h: Add new keysyms from X11R6.4 (including
EuroSign).
* gdk/gdktypes.h: Add note about wchar_t not necessarily being the
same type as GdkWChar, especially on Win32.
* gdk/win32/*.c: Change gdk_root_parent to be a pointer.
* gdk/win32/*.c: Assume all strings are UTF-8. Convert to Unicode
before passing to Windows GDI for drawing etc. Convert to the
system default codepage before passing to Windows as window
titles.
* gdk/win32/gdkprivate.h: Add more fields to GdkWindowPrivate to
support changing input locale on the fly.
* gdk/win32/gdkevent.c: Support input language (keyboard locale)
on-the-fly changes. Convert incoming characters from the current
codepage to Unicode (and then to a UTF-8 multi-byte string) based
on the current input language. Use keysym<->Unicode mapping tables
and functions borrowed from xterm sources.
Support IMEs (Input Method Editors) for CJK languages. On non-CJK
editions of Win9x, use the ActiveX-based Active IMM (Input Method
Manager) if available. IMEs and the Active IMM are available under
the disguise of Chinese, Korean and Japanese support for IE and
Outlook Express from "Windows Update" for Win98. On Win2k, the CJK
support is present in all editions (as long as you install it).
Call DispatchMessage from gdk_events_queue() (and thus
gdk_WindowProc()), instead of duplicating the code in
gdk_WindowProc().
Reworked the grab handling and propagation code, factored out
duplicated code snippets into separate functions. Other cleanups,
too.
* gdk/win32/surrogate-dimm.h: Provide just the bits we need from
the <dimm.h> header describing the Active IMM.
* gdk/win32/gdkfont.c: Pretend to support fontsets, but so far
just do the same as for "single" fonts.
* gdk/win32/gdk.c: Call CoInitialize() (COM initialisation) from
gdk_init_check, and CoUninitialize() from gdk_exit_func. Handle
the new keysyms from gdkkeysyms.h.
* gtk/gtkfontsel.c (Win32): Load the font for the preview as a
fontset, so that gtkentry uses wide characters.
* gtk/gtkrc.c (Win32): Get the locale with gwin_getlocale(). Call
GTk+'s system directory "gtk+", not "gtk".
1999-10-31 21:35:39 +00:00
|
|
|
(text_length > 10 ? 10 : text_length),
|
|
|
|
text, text_length));
|
|
|
|
|
|
|
|
wcstr = g_new (wchar_t, text_length);
|
|
|
|
if ((wlen = gdk_nmbstowchar_ts (wcstr, text, text_length, text_length)) == -1)
|
|
|
|
g_warning ("gdk_draw_text: gdk_nmbstowchar_ts failed");
|
New font private structures, related to fontsets.
1999-11-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkprivate.h: New font private structures, related to
fontsets.
* gdk/win32/gdkfont.c: New functions gdk_font_list_new() and
gdk_font_list_free(). On X11, will just be wrappers to
XListFonts() and XFreeFontNames(). On Win32, the code previously
in gtkfontsel.c is now here.
New function gdk_font_xlfd_create(). On X11 will get the FONT
property of the font (for GDK_FONT_FONTs), or call
XBaseFontNameListOfFontSet (for GDK_FONT_FONTSETs), on Win32
builds a XLFD style name from the font information in the LOGFONT
struct(s).
New function gdk_font_xlfd_free(), which correspondingly frees the
string returned by gdk_font_xlfd_create().
Implement fontsets on Win32. Add a function that iterates over a
wide char string and calls a callback function for each substring
of wide chars from the same Unicode subrange (and thus probably
available in the same real font).
Improve the XLFD emulation a bit.
* gdk/win32/gdkim.c (gdk_nmbstowchar_ts): Small bugfix.
* gdk/win32/gdkevents.c: Workaround for suspected bug on Win2k
Beta3, WM_IME_CHAR messages don't seem to contain the composed
multi-byte char as with the Active IMM on Win9x. Oh well, handle
WM_IME_COMPOSITION with GCS_RESULTSTR instead, use
ImmGetCompositionStringW() to get the composed Unicode chars.
* gdk/win32/gdkgc.c
* gdk/win32/gdkdraw.c: Changes needed because of the font private
struct changes.
* gdk/win32/gdk.def: Add the new functions.
1999-11-08 00:09:29 +00:00
|
|
|
else
|
|
|
|
gdk_wchar_text_handle (font, wcstr, wlen,
|
|
|
|
gdk_draw_text_handler, &arg);
|
|
|
|
|
Add new keysyms from X11R6.4 (including EuroSign).
1999-10-31 Tor Lillqvist <tml@iki.fi>
* gdk/gdkkeysyms.h: Add new keysyms from X11R6.4 (including
EuroSign).
* gdk/gdktypes.h: Add note about wchar_t not necessarily being the
same type as GdkWChar, especially on Win32.
* gdk/win32/*.c: Change gdk_root_parent to be a pointer.
* gdk/win32/*.c: Assume all strings are UTF-8. Convert to Unicode
before passing to Windows GDI for drawing etc. Convert to the
system default codepage before passing to Windows as window
titles.
* gdk/win32/gdkprivate.h: Add more fields to GdkWindowPrivate to
support changing input locale on the fly.
* gdk/win32/gdkevent.c: Support input language (keyboard locale)
on-the-fly changes. Convert incoming characters from the current
codepage to Unicode (and then to a UTF-8 multi-byte string) based
on the current input language. Use keysym<->Unicode mapping tables
and functions borrowed from xterm sources.
Support IMEs (Input Method Editors) for CJK languages. On non-CJK
editions of Win9x, use the ActiveX-based Active IMM (Input Method
Manager) if available. IMEs and the Active IMM are available under
the disguise of Chinese, Korean and Japanese support for IE and
Outlook Express from "Windows Update" for Win98. On Win2k, the CJK
support is present in all editions (as long as you install it).
Call DispatchMessage from gdk_events_queue() (and thus
gdk_WindowProc()), instead of duplicating the code in
gdk_WindowProc().
Reworked the grab handling and propagation code, factored out
duplicated code snippets into separate functions. Other cleanups,
too.
* gdk/win32/surrogate-dimm.h: Provide just the bits we need from
the <dimm.h> header describing the Active IMM.
* gdk/win32/gdkfont.c: Pretend to support fontsets, but so far
just do the same as for "single" fonts.
* gdk/win32/gdk.c: Call CoInitialize() (COM initialisation) from
gdk_init_check, and CoUninitialize() from gdk_exit_func. Handle
the new keysyms from gdkkeysyms.h.
* gtk/gtkfontsel.c (Win32): Load the font for the preview as a
fontset, so that gtkentry uses wide characters.
* gtk/gtkrc.c (Win32): Get the locale with gwin_getlocale(). Call
GTk+'s system directory "gtk+", not "gtk".
1999-10-31 21:35:39 +00:00
|
|
|
g_free (wcstr);
|
New font private structures, related to fontsets.
1999-11-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkprivate.h: New font private structures, related to
fontsets.
* gdk/win32/gdkfont.c: New functions gdk_font_list_new() and
gdk_font_list_free(). On X11, will just be wrappers to
XListFonts() and XFreeFontNames(). On Win32, the code previously
in gtkfontsel.c is now here.
New function gdk_font_xlfd_create(). On X11 will get the FONT
property of the font (for GDK_FONT_FONTs), or call
XBaseFontNameListOfFontSet (for GDK_FONT_FONTSETs), on Win32
builds a XLFD style name from the font information in the LOGFONT
struct(s).
New function gdk_font_xlfd_free(), which correspondingly frees the
string returned by gdk_font_xlfd_create().
Implement fontsets on Win32. Add a function that iterates over a
wide char string and calls a callback function for each substring
of wide chars from the same Unicode subrange (and thus probably
available in the same real font).
Improve the XLFD emulation a bit.
* gdk/win32/gdkim.c (gdk_nmbstowchar_ts): Small bugfix.
* gdk/win32/gdkevents.c: Workaround for suspected bug on Win2k
Beta3, WM_IME_CHAR messages don't seem to contain the composed
multi-byte char as with the Active IMM on Win9x. Oh well, handle
WM_IME_COMPOSITION with GCS_RESULTSTR instead, use
ImmGetCompositionStringW() to get the composed Unicode chars.
* gdk/win32/gdkgc.c
* gdk/win32/gdkdraw.c: Changes needed because of the font private
struct changes.
* gdk/win32/gdk.def: Add the new functions.
1999-11-08 00:09:29 +00:00
|
|
|
|
Add new keysyms from X11R6.4 (including EuroSign).
1999-10-31 Tor Lillqvist <tml@iki.fi>
* gdk/gdkkeysyms.h: Add new keysyms from X11R6.4 (including
EuroSign).
* gdk/gdktypes.h: Add note about wchar_t not necessarily being the
same type as GdkWChar, especially on Win32.
* gdk/win32/*.c: Change gdk_root_parent to be a pointer.
* gdk/win32/*.c: Assume all strings are UTF-8. Convert to Unicode
before passing to Windows GDI for drawing etc. Convert to the
system default codepage before passing to Windows as window
titles.
* gdk/win32/gdkprivate.h: Add more fields to GdkWindowPrivate to
support changing input locale on the fly.
* gdk/win32/gdkevent.c: Support input language (keyboard locale)
on-the-fly changes. Convert incoming characters from the current
codepage to Unicode (and then to a UTF-8 multi-byte string) based
on the current input language. Use keysym<->Unicode mapping tables
and functions borrowed from xterm sources.
Support IMEs (Input Method Editors) for CJK languages. On non-CJK
editions of Win9x, use the ActiveX-based Active IMM (Input Method
Manager) if available. IMEs and the Active IMM are available under
the disguise of Chinese, Korean and Japanese support for IE and
Outlook Express from "Windows Update" for Win98. On Win2k, the CJK
support is present in all editions (as long as you install it).
Call DispatchMessage from gdk_events_queue() (and thus
gdk_WindowProc()), instead of duplicating the code in
gdk_WindowProc().
Reworked the grab handling and propagation code, factored out
duplicated code snippets into separate functions. Other cleanups,
too.
* gdk/win32/surrogate-dimm.h: Provide just the bits we need from
the <dimm.h> header describing the Active IMM.
* gdk/win32/gdkfont.c: Pretend to support fontsets, but so far
just do the same as for "single" fonts.
* gdk/win32/gdk.c: Call CoInitialize() (COM initialisation) from
gdk_init_check, and CoUninitialize() from gdk_exit_func. Handle
the new keysyms from gdkkeysyms.h.
* gtk/gtkfontsel.c (Win32): Load the font for the preview as a
fontset, so that gtkentry uses wide characters.
* gtk/gtkrc.c (Win32): Get the locale with gwin_getlocale(). Call
GTk+'s system directory "gtk+", not "gtk".
1999-10-31 21:35:39 +00:00
|
|
|
gdk_gc_postdraw (drawable_private, gc_private);
|
1999-03-05 19:53:56 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
gdk_draw_text_wc (GdkDrawable *drawable,
|
|
|
|
GdkFont *font,
|
|
|
|
GdkGC *gc,
|
|
|
|
gint x,
|
|
|
|
gint y,
|
|
|
|
const GdkWChar *text,
|
|
|
|
gint text_length)
|
|
|
|
{
|
1999-10-05 19:04:48 +00:00
|
|
|
GdkDrawablePrivate *drawable_private;
|
1999-03-05 19:53:56 +00:00
|
|
|
GdkGCPrivate *gc_private;
|
1999-10-20 22:58:37 +00:00
|
|
|
gint i, wlen;
|
1999-03-05 19:53:56 +00:00
|
|
|
wchar_t *wcstr;
|
New font private structures, related to fontsets.
1999-11-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkprivate.h: New font private structures, related to
fontsets.
* gdk/win32/gdkfont.c: New functions gdk_font_list_new() and
gdk_font_list_free(). On X11, will just be wrappers to
XListFonts() and XFreeFontNames(). On Win32, the code previously
in gtkfontsel.c is now here.
New function gdk_font_xlfd_create(). On X11 will get the FONT
property of the font (for GDK_FONT_FONTs), or call
XBaseFontNameListOfFontSet (for GDK_FONT_FONTSETs), on Win32
builds a XLFD style name from the font information in the LOGFONT
struct(s).
New function gdk_font_xlfd_free(), which correspondingly frees the
string returned by gdk_font_xlfd_create().
Implement fontsets on Win32. Add a function that iterates over a
wide char string and calls a callback function for each substring
of wide chars from the same Unicode subrange (and thus probably
available in the same real font).
Improve the XLFD emulation a bit.
* gdk/win32/gdkim.c (gdk_nmbstowchar_ts): Small bugfix.
* gdk/win32/gdkevents.c: Workaround for suspected bug on Win2k
Beta3, WM_IME_CHAR messages don't seem to contain the composed
multi-byte char as with the Active IMM on Win9x. Oh well, handle
WM_IME_COMPOSITION with GCS_RESULTSTR instead, use
ImmGetCompositionStringW() to get the composed Unicode chars.
* gdk/win32/gdkgc.c
* gdk/win32/gdkdraw.c: Changes needed because of the font private
struct changes.
* gdk/win32/gdk.def: Add the new functions.
1999-11-08 00:09:29 +00:00
|
|
|
gdk_draw_text_arg arg;
|
1999-03-05 19:53:56 +00:00
|
|
|
|
|
|
|
g_return_if_fail (drawable != NULL);
|
|
|
|
g_return_if_fail (font != NULL);
|
|
|
|
g_return_if_fail (gc != NULL);
|
|
|
|
g_return_if_fail (text != NULL);
|
|
|
|
|
1999-10-05 19:04:48 +00:00
|
|
|
if (GDK_DRAWABLE_DESTROYED (drawable))
|
1999-03-05 19:53:56 +00:00
|
|
|
return;
|
1999-10-20 22:58:37 +00:00
|
|
|
|
|
|
|
if (text_length == 0)
|
|
|
|
return;
|
|
|
|
|
Add new keysyms from X11R6.4 (including EuroSign).
1999-10-31 Tor Lillqvist <tml@iki.fi>
* gdk/gdkkeysyms.h: Add new keysyms from X11R6.4 (including
EuroSign).
* gdk/gdktypes.h: Add note about wchar_t not necessarily being the
same type as GdkWChar, especially on Win32.
* gdk/win32/*.c: Change gdk_root_parent to be a pointer.
* gdk/win32/*.c: Assume all strings are UTF-8. Convert to Unicode
before passing to Windows GDI for drawing etc. Convert to the
system default codepage before passing to Windows as window
titles.
* gdk/win32/gdkprivate.h: Add more fields to GdkWindowPrivate to
support changing input locale on the fly.
* gdk/win32/gdkevent.c: Support input language (keyboard locale)
on-the-fly changes. Convert incoming characters from the current
codepage to Unicode (and then to a UTF-8 multi-byte string) based
on the current input language. Use keysym<->Unicode mapping tables
and functions borrowed from xterm sources.
Support IMEs (Input Method Editors) for CJK languages. On non-CJK
editions of Win9x, use the ActiveX-based Active IMM (Input Method
Manager) if available. IMEs and the Active IMM are available under
the disguise of Chinese, Korean and Japanese support for IE and
Outlook Express from "Windows Update" for Win98. On Win2k, the CJK
support is present in all editions (as long as you install it).
Call DispatchMessage from gdk_events_queue() (and thus
gdk_WindowProc()), instead of duplicating the code in
gdk_WindowProc().
Reworked the grab handling and propagation code, factored out
duplicated code snippets into separate functions. Other cleanups,
too.
* gdk/win32/surrogate-dimm.h: Provide just the bits we need from
the <dimm.h> header describing the Active IMM.
* gdk/win32/gdkfont.c: Pretend to support fontsets, but so far
just do the same as for "single" fonts.
* gdk/win32/gdk.c: Call CoInitialize() (COM initialisation) from
gdk_init_check, and CoUninitialize() from gdk_exit_func. Handle
the new keysyms from gdkkeysyms.h.
* gtk/gtkfontsel.c (Win32): Load the font for the preview as a
fontset, so that gtkentry uses wide characters.
* gtk/gtkrc.c (Win32): Get the locale with gwin_getlocale(). Call
GTk+'s system directory "gtk+", not "gtk".
1999-10-31 21:35:39 +00:00
|
|
|
g_assert (font->type == GDK_FONT_FONT || font->type == GDK_FONT_FONTSET);
|
|
|
|
|
1999-10-05 19:04:48 +00:00
|
|
|
drawable_private = (GdkDrawablePrivate*) drawable;
|
1999-03-05 19:53:56 +00:00
|
|
|
gc_private = (GdkGCPrivate*) gc;
|
|
|
|
|
New font private structures, related to fontsets.
1999-11-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkprivate.h: New font private structures, related to
fontsets.
* gdk/win32/gdkfont.c: New functions gdk_font_list_new() and
gdk_font_list_free(). On X11, will just be wrappers to
XListFonts() and XFreeFontNames(). On Win32, the code previously
in gtkfontsel.c is now here.
New function gdk_font_xlfd_create(). On X11 will get the FONT
property of the font (for GDK_FONT_FONTs), or call
XBaseFontNameListOfFontSet (for GDK_FONT_FONTSETs), on Win32
builds a XLFD style name from the font information in the LOGFONT
struct(s).
New function gdk_font_xlfd_free(), which correspondingly frees the
string returned by gdk_font_xlfd_create().
Implement fontsets on Win32. Add a function that iterates over a
wide char string and calls a callback function for each substring
of wide chars from the same Unicode subrange (and thus probably
available in the same real font).
Improve the XLFD emulation a bit.
* gdk/win32/gdkim.c (gdk_nmbstowchar_ts): Small bugfix.
* gdk/win32/gdkevents.c: Workaround for suspected bug on Win2k
Beta3, WM_IME_CHAR messages don't seem to contain the composed
multi-byte char as with the Active IMM on Win9x. Oh well, handle
WM_IME_COMPOSITION with GCS_RESULTSTR instead, use
ImmGetCompositionStringW() to get the composed Unicode chars.
* gdk/win32/gdkgc.c
* gdk/win32/gdkdraw.c: Changes needed because of the font private
struct changes.
* gdk/win32/gdk.def: Add the new functions.
1999-11-08 00:09:29 +00:00
|
|
|
arg.x = x;
|
|
|
|
arg.y = y;
|
|
|
|
arg.hdc = gdk_gc_predraw (drawable_private, gc_private);
|
1999-03-05 19:53:56 +00:00
|
|
|
|
New font private structures, related to fontsets.
1999-11-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkprivate.h: New font private structures, related to
fontsets.
* gdk/win32/gdkfont.c: New functions gdk_font_list_new() and
gdk_font_list_free(). On X11, will just be wrappers to
XListFonts() and XFreeFontNames(). On Win32, the code previously
in gtkfontsel.c is now here.
New function gdk_font_xlfd_create(). On X11 will get the FONT
property of the font (for GDK_FONT_FONTs), or call
XBaseFontNameListOfFontSet (for GDK_FONT_FONTSETs), on Win32
builds a XLFD style name from the font information in the LOGFONT
struct(s).
New function gdk_font_xlfd_free(), which correspondingly frees the
string returned by gdk_font_xlfd_create().
Implement fontsets on Win32. Add a function that iterates over a
wide char string and calls a callback function for each substring
of wide chars from the same Unicode subrange (and thus probably
available in the same real font).
Improve the XLFD emulation a bit.
* gdk/win32/gdkim.c (gdk_nmbstowchar_ts): Small bugfix.
* gdk/win32/gdkevents.c: Workaround for suspected bug on Win2k
Beta3, WM_IME_CHAR messages don't seem to contain the composed
multi-byte char as with the Active IMM on Win9x. Oh well, handle
WM_IME_COMPOSITION with GCS_RESULTSTR instead, use
ImmGetCompositionStringW() to get the composed Unicode chars.
* gdk/win32/gdkgc.c
* gdk/win32/gdkdraw.c: Changes needed because of the font private
struct changes.
* gdk/win32/gdk.def: Add the new functions.
1999-11-08 00:09:29 +00:00
|
|
|
GDK_NOTE (MISC, g_print ("gdk_draw_text_wc: %#x (%d,%d) len: %d\n",
|
Add new keysyms from X11R6.4 (including EuroSign).
1999-10-31 Tor Lillqvist <tml@iki.fi>
* gdk/gdkkeysyms.h: Add new keysyms from X11R6.4 (including
EuroSign).
* gdk/gdktypes.h: Add note about wchar_t not necessarily being the
same type as GdkWChar, especially on Win32.
* gdk/win32/*.c: Change gdk_root_parent to be a pointer.
* gdk/win32/*.c: Assume all strings are UTF-8. Convert to Unicode
before passing to Windows GDI for drawing etc. Convert to the
system default codepage before passing to Windows as window
titles.
* gdk/win32/gdkprivate.h: Add more fields to GdkWindowPrivate to
support changing input locale on the fly.
* gdk/win32/gdkevent.c: Support input language (keyboard locale)
on-the-fly changes. Convert incoming characters from the current
codepage to Unicode (and then to a UTF-8 multi-byte string) based
on the current input language. Use keysym<->Unicode mapping tables
and functions borrowed from xterm sources.
Support IMEs (Input Method Editors) for CJK languages. On non-CJK
editions of Win9x, use the ActiveX-based Active IMM (Input Method
Manager) if available. IMEs and the Active IMM are available under
the disguise of Chinese, Korean and Japanese support for IE and
Outlook Express from "Windows Update" for Win98. On Win2k, the CJK
support is present in all editions (as long as you install it).
Call DispatchMessage from gdk_events_queue() (and thus
gdk_WindowProc()), instead of duplicating the code in
gdk_WindowProc().
Reworked the grab handling and propagation code, factored out
duplicated code snippets into separate functions. Other cleanups,
too.
* gdk/win32/surrogate-dimm.h: Provide just the bits we need from
the <dimm.h> header describing the Active IMM.
* gdk/win32/gdkfont.c: Pretend to support fontsets, but so far
just do the same as for "single" fonts.
* gdk/win32/gdk.c: Call CoInitialize() (COM initialisation) from
gdk_init_check, and CoUninitialize() from gdk_exit_func. Handle
the new keysyms from gdkkeysyms.h.
* gtk/gtkfontsel.c (Win32): Load the font for the preview as a
fontset, so that gtkentry uses wide characters.
* gtk/gtkrc.c (Win32): Get the locale with gwin_getlocale(). Call
GTk+'s system directory "gtk+", not "gtk".
1999-10-31 21:35:39 +00:00
|
|
|
drawable_private->xwindow,
|
New font private structures, related to fontsets.
1999-11-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkprivate.h: New font private structures, related to
fontsets.
* gdk/win32/gdkfont.c: New functions gdk_font_list_new() and
gdk_font_list_free(). On X11, will just be wrappers to
XListFonts() and XFreeFontNames(). On Win32, the code previously
in gtkfontsel.c is now here.
New function gdk_font_xlfd_create(). On X11 will get the FONT
property of the font (for GDK_FONT_FONTs), or call
XBaseFontNameListOfFontSet (for GDK_FONT_FONTSETs), on Win32
builds a XLFD style name from the font information in the LOGFONT
struct(s).
New function gdk_font_xlfd_free(), which correspondingly frees the
string returned by gdk_font_xlfd_create().
Implement fontsets on Win32. Add a function that iterates over a
wide char string and calls a callback function for each substring
of wide chars from the same Unicode subrange (and thus probably
available in the same real font).
Improve the XLFD emulation a bit.
* gdk/win32/gdkim.c (gdk_nmbstowchar_ts): Small bugfix.
* gdk/win32/gdkevents.c: Workaround for suspected bug on Win2k
Beta3, WM_IME_CHAR messages don't seem to contain the composed
multi-byte char as with the Active IMM on Win9x. Oh well, handle
WM_IME_COMPOSITION with GCS_RESULTSTR instead, use
ImmGetCompositionStringW() to get the composed Unicode chars.
* gdk/win32/gdkgc.c
* gdk/win32/gdkdraw.c: Changes needed because of the font private
struct changes.
* gdk/win32/gdk.def: Add the new functions.
1999-11-08 00:09:29 +00:00
|
|
|
x, y, text_length));
|
1999-03-05 19:53:56 +00:00
|
|
|
|
Add new keysyms from X11R6.4 (including EuroSign).
1999-10-31 Tor Lillqvist <tml@iki.fi>
* gdk/gdkkeysyms.h: Add new keysyms from X11R6.4 (including
EuroSign).
* gdk/gdktypes.h: Add note about wchar_t not necessarily being the
same type as GdkWChar, especially on Win32.
* gdk/win32/*.c: Change gdk_root_parent to be a pointer.
* gdk/win32/*.c: Assume all strings are UTF-8. Convert to Unicode
before passing to Windows GDI for drawing etc. Convert to the
system default codepage before passing to Windows as window
titles.
* gdk/win32/gdkprivate.h: Add more fields to GdkWindowPrivate to
support changing input locale on the fly.
* gdk/win32/gdkevent.c: Support input language (keyboard locale)
on-the-fly changes. Convert incoming characters from the current
codepage to Unicode (and then to a UTF-8 multi-byte string) based
on the current input language. Use keysym<->Unicode mapping tables
and functions borrowed from xterm sources.
Support IMEs (Input Method Editors) for CJK languages. On non-CJK
editions of Win9x, use the ActiveX-based Active IMM (Input Method
Manager) if available. IMEs and the Active IMM are available under
the disguise of Chinese, Korean and Japanese support for IE and
Outlook Express from "Windows Update" for Win98. On Win2k, the CJK
support is present in all editions (as long as you install it).
Call DispatchMessage from gdk_events_queue() (and thus
gdk_WindowProc()), instead of duplicating the code in
gdk_WindowProc().
Reworked the grab handling and propagation code, factored out
duplicated code snippets into separate functions. Other cleanups,
too.
* gdk/win32/surrogate-dimm.h: Provide just the bits we need from
the <dimm.h> header describing the Active IMM.
* gdk/win32/gdkfont.c: Pretend to support fontsets, but so far
just do the same as for "single" fonts.
* gdk/win32/gdk.c: Call CoInitialize() (COM initialisation) from
gdk_init_check, and CoUninitialize() from gdk_exit_func. Handle
the new keysyms from gdkkeysyms.h.
* gtk/gtkfontsel.c (Win32): Load the font for the preview as a
fontset, so that gtkentry uses wide characters.
* gtk/gtkrc.c (Win32): Get the locale with gwin_getlocale(). Call
GTk+'s system directory "gtk+", not "gtk".
1999-10-31 21:35:39 +00:00
|
|
|
if (sizeof (wchar_t) != sizeof (GdkWChar))
|
|
|
|
{
|
1999-03-05 19:53:56 +00:00
|
|
|
wcstr = g_new (wchar_t, text_length);
|
|
|
|
for (i = 0; i < text_length; i++)
|
|
|
|
wcstr[i] = text[i];
|
|
|
|
}
|
|
|
|
else
|
Add new keysyms from X11R6.4 (including EuroSign).
1999-10-31 Tor Lillqvist <tml@iki.fi>
* gdk/gdkkeysyms.h: Add new keysyms from X11R6.4 (including
EuroSign).
* gdk/gdktypes.h: Add note about wchar_t not necessarily being the
same type as GdkWChar, especially on Win32.
* gdk/win32/*.c: Change gdk_root_parent to be a pointer.
* gdk/win32/*.c: Assume all strings are UTF-8. Convert to Unicode
before passing to Windows GDI for drawing etc. Convert to the
system default codepage before passing to Windows as window
titles.
* gdk/win32/gdkprivate.h: Add more fields to GdkWindowPrivate to
support changing input locale on the fly.
* gdk/win32/gdkevent.c: Support input language (keyboard locale)
on-the-fly changes. Convert incoming characters from the current
codepage to Unicode (and then to a UTF-8 multi-byte string) based
on the current input language. Use keysym<->Unicode mapping tables
and functions borrowed from xterm sources.
Support IMEs (Input Method Editors) for CJK languages. On non-CJK
editions of Win9x, use the ActiveX-based Active IMM (Input Method
Manager) if available. IMEs and the Active IMM are available under
the disguise of Chinese, Korean and Japanese support for IE and
Outlook Express from "Windows Update" for Win98. On Win2k, the CJK
support is present in all editions (as long as you install it).
Call DispatchMessage from gdk_events_queue() (and thus
gdk_WindowProc()), instead of duplicating the code in
gdk_WindowProc().
Reworked the grab handling and propagation code, factored out
duplicated code snippets into separate functions. Other cleanups,
too.
* gdk/win32/surrogate-dimm.h: Provide just the bits we need from
the <dimm.h> header describing the Active IMM.
* gdk/win32/gdkfont.c: Pretend to support fontsets, but so far
just do the same as for "single" fonts.
* gdk/win32/gdk.c: Call CoInitialize() (COM initialisation) from
gdk_init_check, and CoUninitialize() from gdk_exit_func. Handle
the new keysyms from gdkkeysyms.h.
* gtk/gtkfontsel.c (Win32): Load the font for the preview as a
fontset, so that gtkentry uses wide characters.
* gtk/gtkrc.c (Win32): Get the locale with gwin_getlocale(). Call
GTk+'s system directory "gtk+", not "gtk".
1999-10-31 21:35:39 +00:00
|
|
|
wcstr = (wchar_t *) text;
|
|
|
|
|
New font private structures, related to fontsets.
1999-11-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkprivate.h: New font private structures, related to
fontsets.
* gdk/win32/gdkfont.c: New functions gdk_font_list_new() and
gdk_font_list_free(). On X11, will just be wrappers to
XListFonts() and XFreeFontNames(). On Win32, the code previously
in gtkfontsel.c is now here.
New function gdk_font_xlfd_create(). On X11 will get the FONT
property of the font (for GDK_FONT_FONTs), or call
XBaseFontNameListOfFontSet (for GDK_FONT_FONTSETs), on Win32
builds a XLFD style name from the font information in the LOGFONT
struct(s).
New function gdk_font_xlfd_free(), which correspondingly frees the
string returned by gdk_font_xlfd_create().
Implement fontsets on Win32. Add a function that iterates over a
wide char string and calls a callback function for each substring
of wide chars from the same Unicode subrange (and thus probably
available in the same real font).
Improve the XLFD emulation a bit.
* gdk/win32/gdkim.c (gdk_nmbstowchar_ts): Small bugfix.
* gdk/win32/gdkevents.c: Workaround for suspected bug on Win2k
Beta3, WM_IME_CHAR messages don't seem to contain the composed
multi-byte char as with the Active IMM on Win9x. Oh well, handle
WM_IME_COMPOSITION with GCS_RESULTSTR instead, use
ImmGetCompositionStringW() to get the composed Unicode chars.
* gdk/win32/gdkgc.c
* gdk/win32/gdkdraw.c: Changes needed because of the font private
struct changes.
* gdk/win32/gdk.def: Add the new functions.
1999-11-08 00:09:29 +00:00
|
|
|
gdk_wchar_text_handle (font, wcstr, text_length,
|
|
|
|
gdk_draw_text_handler, &arg);
|
Add new keysyms from X11R6.4 (including EuroSign).
1999-10-31 Tor Lillqvist <tml@iki.fi>
* gdk/gdkkeysyms.h: Add new keysyms from X11R6.4 (including
EuroSign).
* gdk/gdktypes.h: Add note about wchar_t not necessarily being the
same type as GdkWChar, especially on Win32.
* gdk/win32/*.c: Change gdk_root_parent to be a pointer.
* gdk/win32/*.c: Assume all strings are UTF-8. Convert to Unicode
before passing to Windows GDI for drawing etc. Convert to the
system default codepage before passing to Windows as window
titles.
* gdk/win32/gdkprivate.h: Add more fields to GdkWindowPrivate to
support changing input locale on the fly.
* gdk/win32/gdkevent.c: Support input language (keyboard locale)
on-the-fly changes. Convert incoming characters from the current
codepage to Unicode (and then to a UTF-8 multi-byte string) based
on the current input language. Use keysym<->Unicode mapping tables
and functions borrowed from xterm sources.
Support IMEs (Input Method Editors) for CJK languages. On non-CJK
editions of Win9x, use the ActiveX-based Active IMM (Input Method
Manager) if available. IMEs and the Active IMM are available under
the disguise of Chinese, Korean and Japanese support for IE and
Outlook Express from "Windows Update" for Win98. On Win2k, the CJK
support is present in all editions (as long as you install it).
Call DispatchMessage from gdk_events_queue() (and thus
gdk_WindowProc()), instead of duplicating the code in
gdk_WindowProc().
Reworked the grab handling and propagation code, factored out
duplicated code snippets into separate functions. Other cleanups,
too.
* gdk/win32/surrogate-dimm.h: Provide just the bits we need from
the <dimm.h> header describing the Active IMM.
* gdk/win32/gdkfont.c: Pretend to support fontsets, but so far
just do the same as for "single" fonts.
* gdk/win32/gdk.c: Call CoInitialize() (COM initialisation) from
gdk_init_check, and CoUninitialize() from gdk_exit_func. Handle
the new keysyms from gdkkeysyms.h.
* gtk/gtkfontsel.c (Win32): Load the font for the preview as a
fontset, so that gtkentry uses wide characters.
* gtk/gtkrc.c (Win32): Get the locale with gwin_getlocale(). Call
GTk+'s system directory "gtk+", not "gtk".
1999-10-31 21:35:39 +00:00
|
|
|
|
|
|
|
if (sizeof (wchar_t) != sizeof (GdkWChar))
|
|
|
|
g_free (wcstr);
|
New font private structures, related to fontsets.
1999-11-07 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkprivate.h: New font private structures, related to
fontsets.
* gdk/win32/gdkfont.c: New functions gdk_font_list_new() and
gdk_font_list_free(). On X11, will just be wrappers to
XListFonts() and XFreeFontNames(). On Win32, the code previously
in gtkfontsel.c is now here.
New function gdk_font_xlfd_create(). On X11 will get the FONT
property of the font (for GDK_FONT_FONTs), or call
XBaseFontNameListOfFontSet (for GDK_FONT_FONTSETs), on Win32
builds a XLFD style name from the font information in the LOGFONT
struct(s).
New function gdk_font_xlfd_free(), which correspondingly frees the
string returned by gdk_font_xlfd_create().
Implement fontsets on Win32. Add a function that iterates over a
wide char string and calls a callback function for each substring
of wide chars from the same Unicode subrange (and thus probably
available in the same real font).
Improve the XLFD emulation a bit.
* gdk/win32/gdkim.c (gdk_nmbstowchar_ts): Small bugfix.
* gdk/win32/gdkevents.c: Workaround for suspected bug on Win2k
Beta3, WM_IME_CHAR messages don't seem to contain the composed
multi-byte char as with the Active IMM on Win9x. Oh well, handle
WM_IME_COMPOSITION with GCS_RESULTSTR instead, use
ImmGetCompositionStringW() to get the composed Unicode chars.
* gdk/win32/gdkgc.c
* gdk/win32/gdkdraw.c: Changes needed because of the font private
struct changes.
* gdk/win32/gdk.def: Add the new functions.
1999-11-08 00:09:29 +00:00
|
|
|
|
Add new keysyms from X11R6.4 (including EuroSign).
1999-10-31 Tor Lillqvist <tml@iki.fi>
* gdk/gdkkeysyms.h: Add new keysyms from X11R6.4 (including
EuroSign).
* gdk/gdktypes.h: Add note about wchar_t not necessarily being the
same type as GdkWChar, especially on Win32.
* gdk/win32/*.c: Change gdk_root_parent to be a pointer.
* gdk/win32/*.c: Assume all strings are UTF-8. Convert to Unicode
before passing to Windows GDI for drawing etc. Convert to the
system default codepage before passing to Windows as window
titles.
* gdk/win32/gdkprivate.h: Add more fields to GdkWindowPrivate to
support changing input locale on the fly.
* gdk/win32/gdkevent.c: Support input language (keyboard locale)
on-the-fly changes. Convert incoming characters from the current
codepage to Unicode (and then to a UTF-8 multi-byte string) based
on the current input language. Use keysym<->Unicode mapping tables
and functions borrowed from xterm sources.
Support IMEs (Input Method Editors) for CJK languages. On non-CJK
editions of Win9x, use the ActiveX-based Active IMM (Input Method
Manager) if available. IMEs and the Active IMM are available under
the disguise of Chinese, Korean and Japanese support for IE and
Outlook Express from "Windows Update" for Win98. On Win2k, the CJK
support is present in all editions (as long as you install it).
Call DispatchMessage from gdk_events_queue() (and thus
gdk_WindowProc()), instead of duplicating the code in
gdk_WindowProc().
Reworked the grab handling and propagation code, factored out
duplicated code snippets into separate functions. Other cleanups,
too.
* gdk/win32/surrogate-dimm.h: Provide just the bits we need from
the <dimm.h> header describing the Active IMM.
* gdk/win32/gdkfont.c: Pretend to support fontsets, but so far
just do the same as for "single" fonts.
* gdk/win32/gdk.c: Call CoInitialize() (COM initialisation) from
gdk_init_check, and CoUninitialize() from gdk_exit_func. Handle
the new keysyms from gdkkeysyms.h.
* gtk/gtkfontsel.c (Win32): Load the font for the preview as a
fontset, so that gtkentry uses wide characters.
* gtk/gtkrc.c (Win32): Get the locale with gwin_getlocale(). Call
GTk+'s system directory "gtk+", not "gtk".
1999-10-31 21:35:39 +00:00
|
|
|
gdk_gc_postdraw (drawable_private, gc_private);
|
1999-03-05 19:53:56 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
gdk_draw_pixmap (GdkDrawable *drawable,
|
|
|
|
GdkGC *gc,
|
|
|
|
GdkPixmap *src,
|
|
|
|
gint xsrc,
|
|
|
|
gint ysrc,
|
|
|
|
gint xdest,
|
|
|
|
gint ydest,
|
|
|
|
gint width,
|
|
|
|
gint height)
|
|
|
|
{
|
1999-10-05 19:04:48 +00:00
|
|
|
GdkDrawablePrivate *drawable_private;
|
|
|
|
GdkDrawablePrivate *src_private;
|
1999-03-05 19:53:56 +00:00
|
|
|
GdkGCPrivate *gc_private;
|
|
|
|
HDC hdc;
|
|
|
|
HDC srcdc;
|
|
|
|
HGDIOBJ hgdiobj;
|
1999-07-10 00:26:54 +00:00
|
|
|
HRGN src_rgn, draw_rgn, outside_rgn;
|
|
|
|
RECT r;
|
1999-03-05 19:53:56 +00:00
|
|
|
|
|
|
|
g_return_if_fail (drawable != NULL);
|
|
|
|
g_return_if_fail (src != NULL);
|
|
|
|
g_return_if_fail (gc != NULL);
|
|
|
|
|
1999-10-05 19:04:48 +00:00
|
|
|
if (GDK_DRAWABLE_DESTROYED (drawable) || GDK_DRAWABLE_DESTROYED (src))
|
1999-03-05 19:53:56 +00:00
|
|
|
return;
|
1999-10-05 19:04:48 +00:00
|
|
|
drawable_private = (GdkDrawablePrivate*) drawable;
|
|
|
|
src_private = (GdkDrawablePrivate*) src;
|
1999-03-05 19:53:56 +00:00
|
|
|
gc_private = (GdkGCPrivate*) gc;
|
|
|
|
|
|
|
|
if (width == -1)
|
1999-07-10 00:26:54 +00:00
|
|
|
width = src_private->width; /* Or should we subtract xsrc? */
|
1999-03-05 19:53:56 +00:00
|
|
|
if (height == -1)
|
1999-07-10 00:26:54 +00:00
|
|
|
height = src_private->height; /* Ditto? */
|
1999-03-05 19:53:56 +00:00
|
|
|
|
1999-07-12 23:12:39 +00:00
|
|
|
GDK_NOTE (MISC, g_print ("gdk_draw_pixmap: dest: %#x "
|
1999-07-10 00:26:54 +00:00
|
|
|
"src: %#x %dx%d@+%d+%d"
|
|
|
|
" dest: %#x @+%d+%d\n",
|
1999-07-12 23:12:39 +00:00
|
|
|
drawable_private->xwindow,
|
1999-03-05 19:53:56 +00:00
|
|
|
src_private->xwindow,
|
1999-07-10 00:26:54 +00:00
|
|
|
width, height, xsrc, ysrc,
|
|
|
|
drawable_private->xwindow, xdest, ydest));
|
|
|
|
|
|
|
|
hdc = gdk_gc_predraw (drawable_private, gc_private);
|
|
|
|
|
|
|
|
src_rgn = CreateRectRgn (0, 0, src_private->width + 1, src_private->height + 1);
|
|
|
|
draw_rgn = CreateRectRgn (xsrc, ysrc, xsrc + width + 1, ysrc + height + 1);
|
|
|
|
SetRectEmpty (&r);
|
|
|
|
outside_rgn = CreateRectRgnIndirect (&r);
|
|
|
|
|
1999-10-05 19:04:48 +00:00
|
|
|
if (drawable_private->window_type != GDK_DRAWABLE_PIXMAP)
|
1999-07-10 00:26:54 +00:00
|
|
|
{
|
|
|
|
/* If we are drawing on a window, calculate the region that is
|
|
|
|
* outside the source pixmap, and invalidate that, causing it to
|
|
|
|
* be cleared. XXX
|
|
|
|
*/
|
|
|
|
if (CombineRgn (outside_rgn, draw_rgn, src_rgn, RGN_DIFF) != NULLREGION)
|
|
|
|
{
|
|
|
|
OffsetRgn (outside_rgn, xdest, ydest);
|
|
|
|
GDK_NOTE (MISC, (GetRgnBox (outside_rgn, &r),
|
|
|
|
g_print ("...calling InvalidateRgn, "
|
|
|
|
"bbox: %dx%d@+%d+%d\n",
|
|
|
|
r.right - r.left - 1, r.bottom - r.top - 1,
|
|
|
|
r.left, r.top)));
|
|
|
|
InvalidateRgn (drawable_private->xwindow, outside_rgn, TRUE);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#if 1 /* Don't know if this is necessary */
|
|
|
|
if (CombineRgn (draw_rgn, draw_rgn, src_rgn, RGN_AND) == COMPLEXREGION)
|
|
|
|
g_warning ("gdk_draw_pixmap: CombineRgn returned a COMPLEXREGION");
|
|
|
|
|
|
|
|
GetRgnBox (draw_rgn, &r);
|
|
|
|
if (r.left != xsrc
|
|
|
|
|| r.top != ysrc
|
|
|
|
|| r.right != xsrc + width + 1
|
|
|
|
|| r.bottom != ysrc + height + 1)
|
|
|
|
{
|
|
|
|
xdest += r.left - xsrc;
|
|
|
|
xsrc = r.left;
|
|
|
|
ydest += r.top - ysrc;
|
|
|
|
ysrc = r.top;
|
|
|
|
width = r.right - xsrc - 1;
|
|
|
|
height = r.bottom - ysrc - 1;
|
|
|
|
|
|
|
|
GDK_NOTE (MISC, g_print ("... restricted to src: %dx%d@+%d+%d, "
|
|
|
|
"dest: @+%d+%d\n",
|
|
|
|
width, height, xsrc, ysrc,
|
|
|
|
xdest, ydest));
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
DeleteObject (src_rgn);
|
|
|
|
DeleteObject (draw_rgn);
|
|
|
|
DeleteObject (outside_rgn);
|
1999-03-05 19:53:56 +00:00
|
|
|
|
|
|
|
/* Strangely enough, this function is called also to bitblt
|
|
|
|
* from a window.
|
|
|
|
*/
|
1999-10-05 19:04:48 +00:00
|
|
|
if (src_private->window_type == GDK_DRAWABLE_PIXMAP)
|
1999-03-05 19:53:56 +00:00
|
|
|
{
|
|
|
|
if ((srcdc = CreateCompatibleDC (hdc)) == NULL)
|
|
|
|
g_warning ("gdk_draw_pixmap: CreateCompatibleDC failed");
|
|
|
|
|
|
|
|
if ((hgdiobj = SelectObject (srcdc, src_private->xwindow)) == NULL)
|
|
|
|
g_warning ("gdk_draw_pixmap: SelectObject #1 failed");
|
|
|
|
|
|
|
|
if (!BitBlt (hdc, xdest, ydest, width, height,
|
|
|
|
srcdc, xsrc, ysrc, SRCCOPY))
|
|
|
|
g_warning ("gdk_draw_pixmap: BitBlt failed");
|
|
|
|
|
|
|
|
if ((SelectObject (srcdc, hgdiobj) == NULL))
|
|
|
|
g_warning ("gdk_draw_pixmap: SelectObject #2 failed");
|
|
|
|
|
|
|
|
if (!DeleteDC (srcdc))
|
|
|
|
g_warning ("gdk_draw_pixmap: DeleteDC failed");
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
1999-10-02 22:42:58 +00:00
|
|
|
if (drawable_private->xwindow == src_private->xwindow)
|
1999-08-17 17:47:14 +00:00
|
|
|
{
|
1999-10-02 22:42:58 +00:00
|
|
|
/* 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");
|
1999-08-17 17:47:14 +00:00
|
|
|
if (!UpdateWindow (drawable_private->xwindow))
|
|
|
|
g_warning ("gdk_draw_pixmap: UpdateWindow failed");
|
|
|
|
}
|
|
|
|
else
|
1999-10-02 22:42:58 +00:00
|
|
|
{
|
|
|
|
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);
|
|
|
|
}
|
1999-03-05 19:53:56 +00:00
|
|
|
}
|
|
|
|
gdk_gc_postdraw (drawable_private, gc_private);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
gdk_draw_image (GdkDrawable *drawable,
|
|
|
|
GdkGC *gc,
|
|
|
|
GdkImage *image,
|
|
|
|
gint xsrc,
|
|
|
|
gint ysrc,
|
|
|
|
gint xdest,
|
|
|
|
gint ydest,
|
|
|
|
gint width,
|
|
|
|
gint height)
|
|
|
|
{
|
|
|
|
GdkImagePrivate *image_private;
|
|
|
|
|
|
|
|
g_return_if_fail (drawable != NULL);
|
|
|
|
g_return_if_fail (image != NULL);
|
|
|
|
g_return_if_fail (gc != NULL);
|
|
|
|
|
|
|
|
image_private = (GdkImagePrivate*) image;
|
|
|
|
|
|
|
|
g_return_if_fail (image_private->image_put != NULL);
|
|
|
|
|
|
|
|
if (width == -1)
|
|
|
|
width = image->width;
|
|
|
|
if (height == -1)
|
|
|
|
height = image->height;
|
|
|
|
|
|
|
|
(* image_private->image_put) (drawable, gc, image, xsrc, ysrc,
|
|
|
|
xdest, ydest, width, height);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
gdk_draw_points (GdkDrawable *drawable,
|
|
|
|
GdkGC *gc,
|
|
|
|
GdkPoint *points,
|
|
|
|
gint npoints)
|
|
|
|
{
|
1999-10-05 19:04:48 +00:00
|
|
|
GdkDrawablePrivate *drawable_private;
|
1999-03-05 19:53:56 +00:00
|
|
|
GdkGCPrivate *gc_private;
|
|
|
|
HDC hdc;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
g_return_if_fail (drawable != NULL);
|
|
|
|
g_return_if_fail ((points != NULL) && (npoints > 0));
|
|
|
|
g_return_if_fail (gc != NULL);
|
|
|
|
|
1999-10-05 19:04:48 +00:00
|
|
|
if (GDK_DRAWABLE_DESTROYED (drawable))
|
1999-03-05 19:53:56 +00:00
|
|
|
return;
|
1999-10-05 19:04:48 +00:00
|
|
|
drawable_private = (GdkDrawablePrivate*) drawable;
|
1999-03-05 19:53:56 +00:00
|
|
|
gc_private = (GdkGCPrivate*) gc;
|
|
|
|
|
|
|
|
hdc = gdk_gc_predraw (drawable_private, gc_private);
|
|
|
|
|
1999-03-07 22:25:54 +00:00
|
|
|
GDK_NOTE (MISC, g_print ("gdk_draw_points: %#x destdc: (%d) %#x "
|
|
|
|
"npoints: %d\n",
|
|
|
|
drawable_private->xwindow, gc_private, hdc,
|
|
|
|
npoints));
|
|
|
|
|
1999-03-05 19:53:56 +00:00
|
|
|
for (i = 0; i < npoints; i++)
|
|
|
|
{
|
1999-03-07 22:25:54 +00:00
|
|
|
if (!MoveToEx (hdc, points[i].x, points[i].y, NULL))
|
|
|
|
g_warning ("gdk_draw_points: MoveToEx failed");
|
|
|
|
if (!LineTo (hdc, points[i].x + 1, points[i].y))
|
|
|
|
g_warning ("gdk_draw_points: LineTo failed");
|
1999-03-05 19:53:56 +00:00
|
|
|
}
|
|
|
|
gdk_gc_postdraw (drawable_private, gc_private);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
gdk_draw_segments (GdkDrawable *drawable,
|
|
|
|
GdkGC *gc,
|
|
|
|
GdkSegment *segs,
|
|
|
|
gint nsegs)
|
|
|
|
{
|
1999-10-05 19:04:48 +00:00
|
|
|
GdkDrawablePrivate *drawable_private;
|
1999-03-05 19:53:56 +00:00
|
|
|
GdkGCPrivate *gc_private;
|
|
|
|
HDC hdc;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (nsegs <= 0)
|
|
|
|
return;
|
|
|
|
|
|
|
|
g_return_if_fail (drawable != NULL);
|
|
|
|
g_return_if_fail (segs != NULL);
|
|
|
|
g_return_if_fail (gc != NULL);
|
|
|
|
|
1999-10-05 19:04:48 +00:00
|
|
|
if (GDK_DRAWABLE_DESTROYED (drawable))
|
1999-03-05 19:53:56 +00:00
|
|
|
return;
|
1999-10-05 19:04:48 +00:00
|
|
|
drawable_private = (GdkDrawablePrivate*) drawable;
|
1999-03-05 19:53:56 +00:00
|
|
|
gc_private = (GdkGCPrivate*) gc;
|
|
|
|
|
|
|
|
hdc = gdk_gc_predraw (drawable_private, gc_private);
|
|
|
|
|
|
|
|
for (i = 0; i < nsegs; i++)
|
|
|
|
{
|
1999-03-07 22:25:54 +00:00
|
|
|
if (!MoveToEx (hdc, segs[i].x1, segs[i].y1, NULL))
|
|
|
|
g_warning ("gdk_draw_segments: MoveToEx failed");
|
1999-03-05 19:53:56 +00:00
|
|
|
if (!LineTo (hdc, segs[i].x2, segs[i].y2))
|
|
|
|
g_warning ("gdk_draw_segments: LineTo #1 failed");
|
|
|
|
|
|
|
|
/* Draw end pixel */
|
|
|
|
if (gc_private->pen_width == 1)
|
|
|
|
if (!LineTo (hdc, segs[i].x2 + 1, segs[i].y2))
|
|
|
|
g_warning ("gdk_draw_segments: LineTo #2 failed");
|
|
|
|
}
|
|
|
|
gdk_gc_postdraw (drawable_private, gc_private);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
gdk_draw_lines (GdkDrawable *drawable,
|
|
|
|
GdkGC *gc,
|
|
|
|
GdkPoint *points,
|
|
|
|
gint npoints)
|
|
|
|
{
|
1999-10-05 19:04:48 +00:00
|
|
|
GdkDrawablePrivate *drawable_private;
|
1999-03-05 19:53:56 +00:00
|
|
|
GdkGCPrivate *gc_private;
|
|
|
|
HDC hdc;
|
|
|
|
POINT *pts;
|
|
|
|
int i;
|
|
|
|
|
1999-07-10 00:26:54 +00:00
|
|
|
if (npoints < 2)
|
1999-03-05 19:53:56 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
g_return_if_fail (drawable != NULL);
|
|
|
|
g_return_if_fail (points != NULL);
|
|
|
|
g_return_if_fail (gc != NULL);
|
|
|
|
|
1999-10-05 19:04:48 +00:00
|
|
|
if (GDK_DRAWABLE_DESTROYED (drawable))
|
|
|
|
return;
|
|
|
|
drawable_private = (GdkDrawablePrivate*) drawable;
|
1999-03-05 19:53:56 +00:00
|
|
|
gc_private = (GdkGCPrivate*) gc;
|
|
|
|
|
|
|
|
hdc = gdk_gc_predraw (drawable_private, gc_private);
|
|
|
|
#if 1
|
|
|
|
pts = g_malloc (npoints * sizeof (POINT));
|
|
|
|
|
|
|
|
for (i = 0; i < npoints; i++)
|
|
|
|
{
|
|
|
|
pts[i].x = points[i].x;
|
|
|
|
pts[i].y = points[i].y;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!Polyline (hdc, pts, npoints))
|
1999-07-10 00:26:54 +00:00
|
|
|
g_warning ("gdk_draw_lines: Polyline(,,%d) failed", npoints);
|
1999-03-05 19:53:56 +00:00
|
|
|
|
|
|
|
g_free (pts);
|
|
|
|
|
|
|
|
/* Draw end pixel */
|
|
|
|
if (gc_private->pen_width == 1)
|
|
|
|
{
|
|
|
|
MoveToEx (hdc, points[npoints-1].x, points[npoints-1].y, NULL);
|
|
|
|
if (!LineTo (hdc, points[npoints-1].x + 1, points[npoints-1].y))
|
|
|
|
g_warning ("gdk_draw_lines: LineTo failed");
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
MoveToEx (hdc, points[0].x, points[0].y, NULL);
|
|
|
|
for (i = 1; i < npoints; i++)
|
|
|
|
if (!LineTo (hdc, points[i].x, points[i].y))
|
|
|
|
g_warning ("gdk_draw_lines: LineTo #1 failed");
|
|
|
|
|
|
|
|
/* Draw end pixel */
|
|
|
|
if (gc_private->pen_width == 1)
|
|
|
|
if (!LineTo (hdc, points[npoints-1].x + 1, points[npoints-1].y))
|
|
|
|
g_warning ("gdk_draw_lines: LineTo #2 failed");
|
|
|
|
#endif
|
|
|
|
gdk_gc_postdraw (drawable_private, gc_private);
|
|
|
|
}
|