mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-11-18 17:30:10 +00:00
e96a41be45
2002-11-12 Tor Lillqvist <tml@iki.fi> * gdk/win32/gdkprivate-win32.h * gdk/win32/*.c: Rename all global variables and functions to start with underscore. Merge from stable: More work on the Win32 backend. The cause of some scrolling problems was that SetWindowPos() and ScrollWindowEx() don't blit those parts of the window they think are invalid. As we didn't keep Windows's update region in synch with GDK's, Windows thought those areas that in fact had been updated were invalid. Calling ValidateRgn() in _gdk_windowing_window_queue_antiexpose() seems to be an elegant and efficient solution, removing from Windows's update region those areas we are about to repaint proactively. In some cases garbage leftover values were used for the clip origin in GdkGCWin32. This showed up as odd blank areas around the pixmaps included in the Text Widget in gtk-demo. Having the clip region either as a GdkRegion or a HRGN in GdkGCWin32 was unnecessary, it's better to just use a HRGN. The translation and antiexpose queue handling in gdkgeometry-win32.c seems unnecessary (and not implementable in the same way as on X11 anyway, no serial numbers) on Windows, ifdeffed out. Don't (try to) do guffaw scrolling as there is no static window gravity on Windows. Guffaw scrolling would be unnecessary anyway, as there is the ScrollWindow() API. This improves the behaviour of the Text Widget demo in gtk-demo a lot. But I have no idea how the lack of static win gravity should be handled in other places where the X11 code uses it. Especially _gdk_window_move_resize_child(). There is still some problem in expose handling. By moving an obscuring window back and forth over testgtk's main window, for instance, every now and then you typically get narrow vertical or horizontal strips of pixels that haven't been properly redrawn after being exposed. A fencepost error somewhere? Otherwise, all of testgtk and gtk-demo except "big windows" now seem to work pretty well. Bug #79720 should be fixed now. * gdk/win32/gdkcolor-win32.c (gdk_win32_color_to_string, gdk_win32_print_paletteentries, gdk_win32_print_system_palette, gdk_win32_print_hpalette) * gdk/win32/gdkdrawable-win32.c (gdk_win32_drawable_description) * gdk/win32/gdkevents-win32.c (gdk_win32_message_name): Move all debugging helper functions to gdkmain-win32.c. * gdk/win32/gdkdrawable-win32.c (_gdk_win32_draw_tiles): Rewrite. Make static. Must take tile origin parameters, too. (gdk_win32_draw_rectangle): Pass the tile/stipple origin to _gdk_win32_draw_tiles(). Remove #if 0 code. (blit_inside_window): Don't call ScrollDC(), that didn't work at all like I thought. A simple call to BitBlt() is enough. * gdk/win32/gdkevents-win32.c (gdk_event_translate) Remove unused latin_locale_loaded variable. (_gdk_win32_get_next_tick): New function. Used to make sure timestamps of events are always increasing, both in events generated from the window procedure and in events gotten via PeekMessage(). Not sure whether this is actually useful, but it seemed as a good idea. (real_window_procedure): Don't use a local GdkEventPrivate variable. Don't attempt any compression of configure or expose events here, handled elsewhere. (erase_background): Accumulate window offsets when traversing up the parent chain for GDK_PARENT_RELATIVE_BG, in order to get correct alignment of background pixmaps. Don't fill with BLACK_BRUSH if GDK_NO_BG. (gdk_event_get_graphics_expose): A bit more verbose debugging output. (gdk_event_translate): Use _gdk_win32_get_next_tick(). In the WM_PAINT handler, don't check for empty update rect. When we get a WM_PAINT, the update region isn't empty. And if it for some strange reason is, that will be handled later anyway. Call GetUpdateRgn() before calling BeginPaint() and EndPaint() (which empty the update region). * gdk/win32/gdkdnd-win32.c * gdk/win32/gdkinput-win32.c: Use _gdk_win32_get_next_tick(). * gdk/win32/gdkfont-win32.c: Use %p to print HFONTs. (gdk_text_size): Remove, unused. * gdk/win32/gdkgc-win32.c: Set clip origins to zero when appropriate. (gdk_gc_copy): Increase refcount on colormap if present. (gdk_win32_hdc_get): Handle just hcliprgn. If we have a stipple, combine it with clip region after selecting into the DC. (_gdk_win32_bitmap_to_hrgn): Rename from _gdk_win32_bitmap_to_region. (_gdk_win3_gdkregion_to_hrgn): New function, code snippet extracted from gdk_win32_hdc_get(). * gdk/win32/gdkgeometry-win32.c: Ifdef out the translate_queue handling. (gdk_window_copy_area_scroll): Increase clipRect to avoid ScrollWindowEx() not scrolling pixels it thinks are invalid. Scroll also children with the ScrollWindowEx() call. No need to call gdk_window_move() on the children. (gdk_window_scroll): Don't do guffaw scrolling. (gdk_window_compute_position): Fix typo, used win32_y where x was intended. (gdk_window_premove, gdk_window_postmove, gdk_window_clip_changed): Add debugging output. (_gdk_windowing_window_queue_antiexpose): Just call ValidateRgn() on the region. (_gdk_window_process_expose): No use for the serial number parameter now. Instead of a rectangle, take a region parameter, as Windows gives us one in WM_PAINT. * gdk/win32/gdkmain-win32.c (_gdk_win32_lbstyle_to_string, _gdk_win32_pstype_to_string, _gdk_win32_psstyle_to_string, _gdk_win32_psendcap_to_string, _gdk_win32_psjoin_to_string, _gdk_win32_rect_to_string, _gdk_win32_gdkrectangle_to_string, _gdk_win32_gdkregion_to_string): New debugging functions. (static_printf): Helper function for the above. sprintfs into a static circular buffer, return value should be used "soon". * gdk/win32/gdkwindow-win32.c (gdk_propagate_shapes): Plug memory leak, free list after use. (gdk_window_gravity_works): Remove, we know that there is no such thing on Windows. (gdk_window_set_static_bit_gravity, gdk_window_set_static_win_gravity): Ditto, remove, they didn't do anything anyway. (_gdk_windowing_window_init, gdk_window_foreign_new): Call _gdk_window_init_position() like in the X11 backend. (gdk_window_reparent): Don't call the now nonexistent gdk_window_set_static_win_gravity(). No idea what should be done instead. (gdk_window_get_geometry): The returned x and y should be relative to parent. Used to be always zero.. (gdk_window_set_static_gravities): Return FALSE if trying to set static gravity. * gdk/win32/gdkprivate-win32.h: Drop the clip_region field from GdkGCWin32. Only use the HRGN hcliprgn. Declare new functions. * gdk/win32/*.c: Use new debugging functions. * gdk/win32/rc/gdk.rc.in: Update copyright year.
315 lines
8.4 KiB
C
315 lines
8.4 KiB
C
/* GDK - The GIMP Drawing Kit
|
|
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
|
|
* Copyright (C) 1998-2002 Tor Lillqvist
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
* Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
#include "gdkdisplay.h"
|
|
#include "gdkcursor.h"
|
|
#include "gdkprivate-win32.h"
|
|
|
|
#include "xcursors.h"
|
|
|
|
static HCURSOR
|
|
_gdk_win32_data_to_wcursor (GdkCursorType cursor_type)
|
|
{
|
|
gint i, j, x, y, ofs;
|
|
HCURSOR rv = NULL;
|
|
gint w, h;
|
|
guchar *and_plane, *xor_plane;
|
|
|
|
for (i = 0; i < G_N_ELEMENTS (cursors); i++)
|
|
if (cursors[i].type == cursor_type)
|
|
break;
|
|
|
|
if (i >= G_N_ELEMENTS (cursors) || !cursors[i].name)
|
|
return NULL;
|
|
|
|
w = GetSystemMetrics (SM_CXCURSOR);
|
|
h = GetSystemMetrics (SM_CYCURSOR);
|
|
|
|
and_plane = g_malloc ((w/8) * h);
|
|
memset (and_plane, 0xff, (w/8) * h);
|
|
xor_plane = g_malloc ((w/8) * h);
|
|
memset (xor_plane, 0, (w/8) * h);
|
|
|
|
#define SET_BIT(v,b) (v |= (1 << b))
|
|
#define RESET_BIT(v,b) (v &= ~(1 << b))
|
|
|
|
for (j = 0, y = 0; y < cursors[i].height && y < h ; y++)
|
|
{
|
|
ofs = (y * w) / 8;
|
|
j = y * cursors[i].width;
|
|
|
|
for (x = 0; x < cursors[i].width && x < w ; x++, j++)
|
|
{
|
|
gint pofs = ofs + x / 8;
|
|
guchar data = (cursors[i].data[j/4] & (0xc0 >> (2 * (j%4)))) >> (2 * (3 - (j%4)));
|
|
gint bit = 7 - (j % cursors[i].width) % 8;
|
|
|
|
if (data)
|
|
{
|
|
RESET_BIT (and_plane[pofs], bit);
|
|
if (data == 1)
|
|
SET_BIT (xor_plane[pofs], bit);
|
|
}
|
|
}
|
|
}
|
|
|
|
#undef SET_BIT
|
|
#undef RESET_BIT
|
|
|
|
rv = CreateCursor (_gdk_app_hmodule, cursors[i].hotx, cursors[i].hoty,
|
|
w, h, and_plane, xor_plane);
|
|
if (rv == NULL)
|
|
WIN32_API_FAILED ("CreateCursor");
|
|
g_free (and_plane);
|
|
g_free (xor_plane);
|
|
|
|
return rv;
|
|
}
|
|
|
|
GdkCursor*
|
|
gdk_cursor_new_for_display (GdkDisplay *display,
|
|
GdkCursorType cursor_type)
|
|
{
|
|
GdkCursorPrivate *private;
|
|
GdkCursor *cursor;
|
|
HCURSOR hcursor;
|
|
|
|
g_return_val_if_fail (display == gdk_display_get_default (), NULL);
|
|
|
|
hcursor = _gdk_win32_data_to_wcursor (cursor_type);
|
|
|
|
if (hcursor == NULL)
|
|
g_warning ("gdk_cursor_new: no cursor %d found", cursor_type);
|
|
else
|
|
GDK_NOTE (MISC, g_print ("gdk_cursor_new: %d: %#x\n",
|
|
cursor_type, (guint) hcursor));
|
|
|
|
private = g_new (GdkCursorPrivate, 1);
|
|
private->hcursor = hcursor;
|
|
cursor = (GdkCursor*) private;
|
|
cursor->type = cursor_type;
|
|
cursor->ref_count = 1;
|
|
|
|
return cursor;
|
|
}
|
|
|
|
static gboolean
|
|
color_is_white (GdkColor *color)
|
|
{
|
|
return (color->red == 0xFFFF
|
|
&& color->green == 0xFFFF
|
|
&& color->blue == 0xFFFF);
|
|
}
|
|
|
|
GdkCursor*
|
|
gdk_cursor_new_from_pixmap (GdkPixmap *source,
|
|
GdkPixmap *mask,
|
|
GdkColor *fg,
|
|
GdkColor *bg,
|
|
gint x,
|
|
gint y)
|
|
{
|
|
GdkCursorPrivate *private;
|
|
GdkCursor *cursor;
|
|
GdkPixmapImplWin32 *source_impl, *mask_impl;
|
|
GdkImage *source_image, *mask_image;
|
|
HCURSOR hcursor;
|
|
guchar *p, *q, *xor_mask, *and_mask;
|
|
gint width, height, cursor_width, cursor_height;
|
|
guchar residue;
|
|
gint ix, iy;
|
|
const gboolean bg_is_white = color_is_white (bg);
|
|
|
|
g_return_val_if_fail (GDK_IS_PIXMAP (source), NULL);
|
|
g_return_val_if_fail (GDK_IS_PIXMAP (mask), NULL);
|
|
g_return_val_if_fail (fg != NULL, NULL);
|
|
g_return_val_if_fail (bg != NULL, NULL);
|
|
|
|
source_impl = GDK_PIXMAP_IMPL_WIN32 (GDK_PIXMAP_OBJECT (source)->impl);
|
|
mask_impl = GDK_PIXMAP_IMPL_WIN32 (GDK_PIXMAP_OBJECT (mask)->impl);
|
|
|
|
g_return_val_if_fail (source_impl->width == mask_impl->width
|
|
&& source_impl->height == mask_impl->height,
|
|
NULL);
|
|
width = source_impl->width;
|
|
height = source_impl->height;
|
|
cursor_width = GetSystemMetrics (SM_CXCURSOR);
|
|
cursor_height = GetSystemMetrics (SM_CYCURSOR);
|
|
|
|
g_return_val_if_fail (width <= cursor_width && height <= cursor_height,
|
|
NULL);
|
|
|
|
residue = (1 << ((8-(width%8))%8)) - 1;
|
|
|
|
source_image = source_impl->image;
|
|
mask_image = mask_impl->image;
|
|
|
|
g_return_val_if_fail (source_image->depth == 1 && mask_image->depth == 1,
|
|
NULL);
|
|
|
|
#ifdef G_ENABLE_DEBUG
|
|
if (_gdk_debug_flags & GDK_DEBUG_CURSOR)
|
|
{
|
|
g_print ("gdk_cursor_new_from_pixmap: source=%p:\n",
|
|
source_impl->parent_instance.handle);
|
|
for (iy = 0; iy < height; iy++)
|
|
{
|
|
if (iy == 16)
|
|
break;
|
|
|
|
p = (guchar *) source_image->mem + iy*source_image->bpl;
|
|
for (ix = 0; ix < width; ix++)
|
|
{
|
|
if (ix == 79)
|
|
break;
|
|
g_print ("%c", ".X"[((*p)>>(7-(ix%8)))&1]);
|
|
if ((ix%8) == 7)
|
|
p++;
|
|
}
|
|
g_print ("\n");
|
|
}
|
|
g_print ("...mask=%p:\n", mask_impl->parent_instance.handle);
|
|
for (iy = 0; iy < height; iy++)
|
|
{
|
|
if (iy == 16)
|
|
break;
|
|
|
|
p = (guchar *) mask_image->mem + iy*source_image->bpl;
|
|
for (ix = 0; ix < width; ix++)
|
|
{
|
|
if (ix == 79)
|
|
break;
|
|
g_print ("%c", ".X"[((*p)>>(7-(ix%8)))&1]);
|
|
if ((ix%8) == 7)
|
|
p++;
|
|
}
|
|
g_print ("\n");
|
|
}
|
|
}
|
|
#endif
|
|
|
|
/* Such complex bit manipulation for this simple task, sigh.
|
|
* The X cursor and Windows cursor concepts are quite different.
|
|
* We assume here that we are always called with fg == black and
|
|
* bg == white, *or* the other way around. Random colours won't work.
|
|
* (Well, you will get a cursor, but not in those colours.)
|
|
*/
|
|
|
|
/* Note: The comments below refer to the case fg==black and
|
|
* bg==white, as that was what was implemented first. The fg==white
|
|
* (the "if (fg->pixel)" branches) case was added later.
|
|
*/
|
|
|
|
/* First set masked-out source bits, as all source bits matter on Windoze.
|
|
* As we invert them below, they will be clear in the final xor_mask.
|
|
*/
|
|
for (iy = 0; iy < height; iy++)
|
|
{
|
|
p = (guchar *) source_image->mem + iy*source_image->bpl;
|
|
q = (guchar *) mask_image->mem + iy*mask_image->bpl;
|
|
|
|
for (ix = 0; ix < ((width-1)/8+1); ix++)
|
|
if (bg_is_white)
|
|
*p++ |= ~(*q++);
|
|
else
|
|
*p++ &= *q++;
|
|
}
|
|
|
|
/* XOR mask is initialized to zero */
|
|
xor_mask = g_malloc0 (cursor_width/8 * cursor_height);
|
|
|
|
for (iy = 0; iy < height; iy++)
|
|
{
|
|
p = (guchar *) source_image->mem + iy*source_image->bpl;
|
|
q = xor_mask + iy*cursor_width/8;
|
|
|
|
for (ix = 0; ix < ((width-1)/8+1); ix++)
|
|
if (bg_is_white)
|
|
*q++ = ~(*p++);
|
|
else
|
|
*q++ = *p++;
|
|
|
|
q[-1] &= ~residue; /* Clear left-over bits */
|
|
}
|
|
|
|
/* AND mask is initialized to ones */
|
|
and_mask = g_malloc (cursor_width/8 * cursor_height);
|
|
memset (and_mask, 0xFF, cursor_width/8 * cursor_height);
|
|
|
|
for (iy = 0; iy < height; iy++)
|
|
{
|
|
p = (guchar *) mask_image->mem + iy*mask_image->bpl;
|
|
q = and_mask + iy*cursor_width/8;
|
|
|
|
for (ix = 0; ix < ((width-1)/8+1); ix++)
|
|
*q++ = ~(*p++);
|
|
|
|
q[-1] |= residue; /* Set left-over bits */
|
|
}
|
|
|
|
hcursor = CreateCursor (_gdk_app_hmodule, x, y, cursor_width, cursor_height,
|
|
and_mask, xor_mask);
|
|
|
|
GDK_NOTE (MISC, g_print ("gdk_cursor_new_from_pixmap: "
|
|
"%#x (%dx%d) %#x (%dx%d) = %#x (%dx%d)\n",
|
|
(guint) GDK_PIXMAP_HBITMAP (source),
|
|
source_impl->width, source_impl->height,
|
|
(guint) GDK_PIXMAP_HBITMAP (mask),
|
|
mask_impl->width, mask_impl->height,
|
|
(guint) hcursor, cursor_width, cursor_height));
|
|
|
|
g_free (xor_mask);
|
|
g_free (and_mask);
|
|
|
|
private = g_new (GdkCursorPrivate, 1);
|
|
private->hcursor = hcursor;
|
|
cursor = (GdkCursor*) private;
|
|
cursor->type = GDK_CURSOR_IS_PIXMAP;
|
|
cursor->ref_count = 1;
|
|
|
|
return cursor;
|
|
}
|
|
|
|
void
|
|
_gdk_cursor_destroy (GdkCursor *cursor)
|
|
{
|
|
GdkCursorPrivate *private;
|
|
|
|
g_return_if_fail (cursor != NULL);
|
|
private = (GdkCursorPrivate *) cursor;
|
|
|
|
GDK_NOTE (MISC, g_print ("_gdk_cursor_destroy: %#x\n",
|
|
(cursor->type == GDK_CURSOR_IS_PIXMAP) ? (guint) private->hcursor : 0));
|
|
|
|
if (GetCursor() == private->hcursor)
|
|
SetCursor(NULL);
|
|
|
|
if (!DestroyCursor (private->hcursor))
|
|
WIN32_API_FAILED ("DestroyCursor");
|
|
|
|
g_free (private);
|
|
}
|
|
|
|
GdkDisplay *
|
|
gdk_cursor_get_display (GdkCursor *cursor)
|
|
{
|
|
return gdk_display_get_default ();
|
|
}
|