gdk/win32/gdkprivate-win32.h Rename all global variables and functions to

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.

1 files changed, 69 insertions, 61 deletions

diff --git a/gdk/win32/gdkprivate-win32.h b/gdk/win32/gdkprivate-win32.h
index a3120465bb..a6959c987d 100644
--- a/gdk/win32/gdkprivate-win32.h
+++ b/gdk/win32/gdkprivate-win32.h
@@ -263,11 +263,7 @@ struct _GdkGCWin32
    * window or pixmap. We thus keep all the necessary values in the
    * GdkGCWin32 object.
    */
-  HDC hdc;
-
-  int saved_dc;
 
-  GdkRegion *clip_region;
   HRGN hcliprgn;
 
   GdkGCValuesMask values_mask;
@@ -286,8 +282,13 @@ struct _GdkGCWin32
   DWORD pen_style;
   DWORD *pen_dashes;		/* use for PS_USERSTYLE or step-by-step rendering */
   gint pen_num_dashes;
-  HANDLE hwnd;			/* If a HDC is allocated, for which window,
-				 * or what bitmap is selected into it
+
+  /* Following fields are valid while the GC exists as a Windows DC */
+  HDC hdc;
+  int saved_dc;
+
+  HANDLE hwnd;			/* For which window, or what bitmap is
+				 * selected into it
 				 */
   HPALETTE holdpal;
 };
@@ -299,25 +300,16 @@ struct _GdkGCWin32Class
 
 GType _gdk_gc_win32_get_type (void);
 
-/* Routines from gdkgeometry-win32.c */
+gulong _gdk_win32_get_next_tick (gulong suggested_tick);
+
 void _gdk_window_init_position     (GdkWindow *window);
 void _gdk_window_move_resize_child (GdkWindow *window,
 				    gint       x,
 				    gint       y,
 				    gint       width,
 				    gint       height);
-void _gdk_window_process_expose    (GdkWindow     *window,
-                                    gulong         serial,
-                                    GdkRectangle  *area);
-
-/* gdkdrawable-win32.c, background draw helper */
-void _gdk_win32_draw_tiles (GdkDrawable *drawable,
-                            GdkGC       *gc,
-                            GdkPixmap   *tile,
-                            gint        x, 
-                            gint        y, 
-                            gint        width, 
-                            gint        height);
+void _gdk_window_process_expose    (GdkWindow *window,
+                                    GdkRegion *invalidate_region);
 
 void _gdk_win32_selection_init (void);
 void _gdk_win32_dnd_exit (void);
@@ -372,9 +364,11 @@ void      _gdk_win32_blit               (gboolean              use_fg_bg,
 COLORREF  _gdk_win32_colormap_color     (GdkColormap *colormap,
 				         gulong       pixel);
 
-HRGN	  _gdk_win32_bitmap_to_region   (GdkPixmap   *bitmap);
+HRGN	  _gdk_win32_bitmap_to_hrgn     (GdkPixmap   *bitmap);
 
-gchar     *gdk_font_full_name_get         (GdkFont     *font);
+HRGN	  _gdk_win32_gdkregion_to_hrgn  (GdkRegion   *region,
+					 gint         x_origin,
+					 gint         y_origin);
 
 void    _gdk_selection_property_store (GdkWindow *owner,
                                        GdkAtom    type,
@@ -404,48 +398,62 @@ void    _gdk_wchar_text_handle    (GdkFont       *font,
 				   void          *arg);
 
 #ifdef G_ENABLE_DEBUG
-gchar *gdk_win32_color_to_string      (const        GdkColor *color);
-gchar *gdk_win32_cap_style_to_string  (GdkCapStyle  cap_style);
-gchar *gdk_win32_fill_style_to_string (GdkFill      fill);
-gchar *gdk_win32_function_to_string   (GdkFunction  function);
-gchar *gdk_win32_join_style_to_string (GdkJoinStyle join_style);
-gchar *gdk_win32_line_style_to_string (GdkLineStyle line_style);
-gchar *gdk_win32_message_name         (UINT         msg);
-
-#define PING() printf(G_STRLOC),fflush(stdout)
-#else
-#define PING()
-#endif
-
-gchar  *gdk_win32_last_error_string (void);
-void    gdk_win32_api_failed        (const gchar *where,
+gchar *_gdk_win32_color_to_string      (const GdkColor *color);
+void   _gdk_win32_print_paletteentries (const PALETTEENTRY *pep,
+					const int           nentries);
+void   _gdk_win32_print_system_palette (void);
+void   _gdk_win32_print_hpalette       (HPALETTE     hpal);
+void   _gdk_win32_print_dc             (HDC          hdc);
+
+gchar *_gdk_win32_cap_style_to_string  (GdkCapStyle  cap_style);
+gchar *_gdk_win32_fill_style_to_string (GdkFill      fill);
+gchar *_gdk_win32_function_to_string   (GdkFunction  function);
+gchar *_gdk_win32_join_style_to_string (GdkJoinStyle join_style);
+gchar *_gdk_win32_line_style_to_string (GdkLineStyle line_style);
+gchar *_gdk_win32_drawable_description (GdkDrawable *d);
+
+gchar *_gdk_win32_lbstyle_to_string    (UINT         brush_style);
+gchar *_gdk_win32_pstype_to_string     (DWORD        pen_style);
+gchar *_gdk_win32_psstyle_to_string    (DWORD        pen_style);
+gchar *_gdk_win32_psendcap_to_string   (DWORD        pen_style);
+gchar *_gdk_win32_psjoin_to_string     (DWORD        pen_style);
+gchar *_gdk_win32_message_to_string    (UINT         msg);
+gchar *_gdk_win32_rect_to_string       (const RECT  *rect);
+
+gchar *_gdk_win32_gdkrectangle_to_string (const GdkRectangle *rect);
+gchar *_gdk_win32_gdkregion_to_string    (const GdkRegion    *box);
+
+#endif
+
+gchar  *_gdk_win32_last_error_string (void);
+void    _gdk_win32_api_failed        (const gchar *where,
 				     gint line,
 				     const gchar *api);
-void    gdk_other_api_failed        (const gchar *where,
+void    _gdk_other_api_failed        (const gchar *where,
 				     gint line,
 				     const gchar *api);
-void    gdk_win32_gdi_failed        (const gchar *where,
+void    _gdk_win32_gdi_failed        (const gchar *where,
 				     gint line,
 				     const gchar *api);
 
 #ifdef __GNUC__
-#define WIN32_API_FAILED(api) gdk_win32_api_failed (__FILE__ ":" __PRETTY_FUNCTION__, __LINE__, api)
-#define WIN32_GDI_FAILED(api) gdk_win32_gdi_failed (__FILE__ ":" __PRETTY_FUNCTION__, __LINE__, api)
-#define OTHER_API_FAILED(api) gdk_other_api_failed (__FILE__ ":" __PRETTY_FUNCTION__, __LINE__, api)
+#define WIN32_API_FAILED(api) _gdk_win32_api_failed (__FILE__ ":" __PRETTY_FUNCTION__, __LINE__, api)
+#define WIN32_GDI_FAILED(api) _gdk_win32_gdi_failed (__FILE__ ":" __PRETTY_FUNCTION__, __LINE__, api)
+#define OTHER_API_FAILED(api) _gdk_other_api_failed (__FILE__ ":" __PRETTY_FUNCTION__, __LINE__, api)
 #else
-#define WIN32_API_FAILED(api) gdk_win32_api_failed (__FILE__, __LINE__, api)
-#define WIN32_GDI_FAILED(api) gdk_win32_gdi_failed (__FILE__, __LINE__, api)
-#define OTHER_API_FAILED(api) gdk_other_api_failed (__FILE__, __LINE__, api)
+#define WIN32_API_FAILED(api) _gdk_win32_api_failed (__FILE__, __LINE__, api)
+#define WIN32_GDI_FAILED(api) _gdk_win32_gdi_failed (__FILE__, __LINE__, api)
+#define OTHER_API_FAILED(api) _gdk_other_api_failed (__FILE__, __LINE__, api)
 #endif
  
 extern LRESULT CALLBACK _gdk_win32_window_procedure (HWND, UINT, WPARAM, LPARAM);
 
-extern HWND		 gdk_root_window;
+extern HWND		 _gdk_root_window;
 extern GdkWindow        *_gdk_parent_root;
 
-extern HDC		 gdk_display_hdc;
-extern HINSTANCE	 gdk_dll_hinstance;
-extern HINSTANCE	 gdk_app_hmodule;
+extern HDC		 _gdk_display_hdc;
+extern HINSTANCE	 _gdk_dll_hinstance;
+extern HINSTANCE	 _gdk_app_hmodule;
 
 /* These are thread specific, but GDK/win32 works OK only when invoked
  * from a single thread anyway.
@@ -456,28 +464,28 @@ extern UINT		 _gdk_input_codepage;
 extern guint		 _gdk_keymap_serial;
 
 /* Registered clipboard formats */
-extern WORD		 cf_rtf;
-extern WORD		 cf_utf8_string;
+extern WORD		 _cf_rtf;
+extern WORD		 _cf_utf8_string;
 
 /* GdkAtoms: Targets */
-extern GdkAtom           utf8_string;
-extern GdkAtom		 compound_text;
-extern GdkAtom		 text_uri_list;
+extern GdkAtom           _utf8_string;
+extern GdkAtom		 _compound_text;
+extern GdkAtom		 _text_uri_list;
 
 /* DND selections */
-extern GdkAtom           local_dnd;
-extern GdkAtom		 gdk_win32_dropfiles;
-extern GdkAtom		 gdk_ole2_dnd;
+extern GdkAtom           _local_dnd;
+extern GdkAtom		 _gdk_win32_dropfiles;
+extern GdkAtom		 _gdk_ole2_dnd;
 
 extern GdkAtom		 _gdk_selection_property;
 
-extern DWORD		 windows_version;
-#define IS_WIN_NT()      (windows_version < 0x80000000)
+extern DWORD		 _windows_version;
+#define IS_WIN_NT()      (_windows_version < 0x80000000)
 
 /* Options */
-extern gboolean		 gdk_input_ignore_wintab;
-extern gboolean		 gdk_event_func_from_window_proc;
-extern gint		 gdk_max_colors;
+extern gboolean		 _gdk_input_ignore_wintab;
+extern gboolean		 _gdk_event_func_from_window_proc;
+extern gint		 _gdk_max_colors;
 
 #define GDK_WIN32_COLORMAP_DATA(cmap) ((GdkColormapPrivateWin32 *) GDK_COLORMAP (cmap)->windowing_data)