Merge from stable:

2003-12-14  Tor Lillqvist  <tml@iki.fi>

	Merge from stable:

	* gdk/gdkdisplaymanager.c: Mark default_display static.

	* gdk/win32/gdkdnd-win32.c: Mark current_dest_drag static.

	* gdk/win32/gdkkeys-win32.c: Disable some overly verbose debugging
	output.

	* gdk/win32/gdkevents-win32.c: Clean up the debugging output from
	--gdk-debug=events. In general, output just one line of debugging
	output for each Windows message, plus one line for each GDK event
	generated. Indent all lines according to window procedure nesting
	level.

	(inner_window_procedure): Rename from real_window_procedure.

	(find_real_window_for_grabbed_mouse_event): Don't get misled when
	the point is in the non-client (decoration) area of the window
	returned by WindowFromPoint(). Return the root window in that
	case.

	(build_pointer_event_state): Test also MK_XBUTTON1 and
	MK_XBUTTON2 (buttons 4 and 5).

	(synthesize_enter_event): Track the mouse leaving the window in
	the event being generated, not the one mentioned in the Windows
	message.

	(propagate): Test for NULL parent earlier. Improves event
	generation from a grabbed pointer. Part of fix for #107320.

	(handle_stuff_while_moving_or_resizing): New function, to
	dispatch the main loop (once).

	(resize_timer_proc): New function, set to be called by an inerval
	timer during resizes/moves. Calls handle_stuff_while_moving_or_resizing().

	(gdk_event_translate): Drop unused return_exposes parameter.

	Handle WM_XBUTTONDOWN and UP messages (buttons 4 and 5).

	On WM_SYSKEYUP, generate a key release event also for just the Alt
	key.

	On WM_MOUSELEAVE, generate a leave event of type
	GDK_NOTIFY_ANCESTOR (and not UNKNOWN) if the mouse left a
	top-level window, and left the app completely.

	On WM_ENTERSIZEMOVE, set a flag, and start an interval timer that
	calls resize_timer_proc() at regular intervals. On
	WM_EXITSIZEMOVE, kill the timer.

	On WM_WINDOWPOSCHANGED, generate a configure event if necessary,
	and dispatch the main loop (by calling
	handle_stuff_while_moving_or_resizing()). Fixes #99540, idea by
	Herman Bloggs.

	* gdk/win32/gdkmain-win32.c (_gdk_win32_message_to_string): Handle
	also wintab messages.

	* gdk/win32/gdkwindow-win32.c (gdk_window_set_skip_taskbar_hint):
	Instead of using WS_EX_TOOLWINDOW, implement by setting/unsetting
	the window's owner. Fixes #118093, reported by Maxime Romano.

ChangeLog

@@ -1,3 +1,70 @@
+2003-12-14  Tor Lillqvist  <tml@iki.fi>
+
+	Merge from stable:
+
+	* gdk/gdkdisplaymanager.c: Mark default_display static.
+
+	* gdk/win32/gdkdnd-win32.c: Mark current_dest_drag static.
+
+	* gdk/win32/gdkkeys-win32.c: Disable some overly verbose debugging
+	output.
+
+	* gdk/win32/gdkevents-win32.c: Clean up the debugging output from
+	--gdk-debug=events. In general, output just one line of debugging
+	output for each Windows message, plus one line for each GDK event
+	generated. Indent all lines according to window procedure nesting
+	level.
+
+	(inner_window_procedure): Rename from real_window_procedure.
+
+	(find_real_window_for_grabbed_mouse_event): Don't get misled when
+	the point is in the non-client (decoration) area of the window
+	returned by WindowFromPoint(). Return the root window in that
+	case.
+
+	(build_pointer_event_state): Test also MK_XBUTTON1 and
+	MK_XBUTTON2 (buttons 4 and 5).
+
+	(synthesize_enter_event): Track the mouse leaving the window in
+	the event being generated, not the one mentioned in the Windows
+	message.
+
+	(propagate): Test for NULL parent earlier. Improves event
+	generation from a grabbed pointer. Part of fix for #107320.
+
+	(handle_stuff_while_moving_or_resizing): New function, to
+	dispatch the main loop (once).
+
+	(resize_timer_proc): New function, set to be called by an inerval
+	timer during resizes/moves. Calls handle_stuff_while_moving_or_resizing().
+
+	(gdk_event_translate): Drop unused return_exposes parameter.
+
+	Handle WM_XBUTTONDOWN and UP messages (buttons 4 and 5).
+
+	On WM_SYSKEYUP, generate a key release event also for just the Alt
+	key.
+
+	On WM_MOUSELEAVE, generate a leave event of type
+	GDK_NOTIFY_ANCESTOR (and not UNKNOWN) if the mouse left a
+	top-level window, and left the app completely.
+
+	On WM_ENTERSIZEMOVE, set a flag, and start an interval timer that
+	calls resize_timer_proc() at regular intervals. On
+	WM_EXITSIZEMOVE, kill the timer.
+
+	On WM_WINDOWPOSCHANGED, generate a configure event if necessary,
+	and dispatch the main loop (by calling
+	handle_stuff_while_moving_or_resizing()). Fixes #99540, idea by
+	Herman Bloggs.
+
+	* gdk/win32/gdkmain-win32.c (_gdk_win32_message_to_string): Handle
+	also wintab messages.
+
+	* gdk/win32/gdkwindow-win32.c (gdk_window_set_skip_taskbar_hint):
+	Instead of using WS_EX_TOOLWINDOW, implement by setting/unsetting
+	the window's owner. Fixes #118093, reported by Maxime Romano.
+
 Tue Dec  8 09:41:00 2003  Tim Evans  <t.evans@aranz.com>
 
 	* gdk/win32/gdkwindow-win32.[ch]: Implement

ChangeLog.pre-2-10

@@ -1,3 +1,70 @@
+2003-12-14  Tor Lillqvist  <tml@iki.fi>
+
+	Merge from stable:
+
+	* gdk/gdkdisplaymanager.c: Mark default_display static.
+
+	* gdk/win32/gdkdnd-win32.c: Mark current_dest_drag static.
+
+	* gdk/win32/gdkkeys-win32.c: Disable some overly verbose debugging
+	output.
+
+	* gdk/win32/gdkevents-win32.c: Clean up the debugging output from
+	--gdk-debug=events. In general, output just one line of debugging
+	output for each Windows message, plus one line for each GDK event
+	generated. Indent all lines according to window procedure nesting
+	level.
+
+	(inner_window_procedure): Rename from real_window_procedure.
+
+	(find_real_window_for_grabbed_mouse_event): Don't get misled when
+	the point is in the non-client (decoration) area of the window
+	returned by WindowFromPoint(). Return the root window in that
+	case.
+
+	(build_pointer_event_state): Test also MK_XBUTTON1 and
+	MK_XBUTTON2 (buttons 4 and 5).
+
+	(synthesize_enter_event): Track the mouse leaving the window in
+	the event being generated, not the one mentioned in the Windows
+	message.
+
+	(propagate): Test for NULL parent earlier. Improves event
+	generation from a grabbed pointer. Part of fix for #107320.
+
+	(handle_stuff_while_moving_or_resizing): New function, to
+	dispatch the main loop (once).
+
+	(resize_timer_proc): New function, set to be called by an inerval
+	timer during resizes/moves. Calls handle_stuff_while_moving_or_resizing().
+
+	(gdk_event_translate): Drop unused return_exposes parameter.
+
+	Handle WM_XBUTTONDOWN and UP messages (buttons 4 and 5).
+
+	On WM_SYSKEYUP, generate a key release event also for just the Alt
+	key.
+
+	On WM_MOUSELEAVE, generate a leave event of type
+	GDK_NOTIFY_ANCESTOR (and not UNKNOWN) if the mouse left a
+	top-level window, and left the app completely.
+
+	On WM_ENTERSIZEMOVE, set a flag, and start an interval timer that
+	calls resize_timer_proc() at regular intervals. On
+	WM_EXITSIZEMOVE, kill the timer.
+
+	On WM_WINDOWPOSCHANGED, generate a configure event if necessary,
+	and dispatch the main loop (by calling
+	handle_stuff_while_moving_or_resizing()). Fixes #99540, idea by
+	Herman Bloggs.
+
+	* gdk/win32/gdkmain-win32.c (_gdk_win32_message_to_string): Handle
+	also wintab messages.
+
+	* gdk/win32/gdkwindow-win32.c (gdk_window_set_skip_taskbar_hint):
+	Instead of using WS_EX_TOOLWINDOW, implement by setting/unsetting
+	the window's owner. Fixes #118093, reported by Maxime Romano.
+
 Tue Dec  8 09:41:00 2003  Tim Evans  <t.evans@aranz.com>
 
 	* gdk/win32/gdkwindow-win32.[ch]: Implement

ChangeLog.pre-2-4

@@ -1,3 +1,70 @@
+2003-12-14  Tor Lillqvist  <tml@iki.fi>
+
+	Merge from stable:
+
+	* gdk/gdkdisplaymanager.c: Mark default_display static.
+
+	* gdk/win32/gdkdnd-win32.c: Mark current_dest_drag static.
+
+	* gdk/win32/gdkkeys-win32.c: Disable some overly verbose debugging
+	output.
+
+	* gdk/win32/gdkevents-win32.c: Clean up the debugging output from
+	--gdk-debug=events. In general, output just one line of debugging
+	output for each Windows message, plus one line for each GDK event
+	generated. Indent all lines according to window procedure nesting
+	level.
+
+	(inner_window_procedure): Rename from real_window_procedure.
+
+	(find_real_window_for_grabbed_mouse_event): Don't get misled when
+	the point is in the non-client (decoration) area of the window
+	returned by WindowFromPoint(). Return the root window in that
+	case.
+
+	(build_pointer_event_state): Test also MK_XBUTTON1 and
+	MK_XBUTTON2 (buttons 4 and 5).
+
+	(synthesize_enter_event): Track the mouse leaving the window in
+	the event being generated, not the one mentioned in the Windows
+	message.
+
+	(propagate): Test for NULL parent earlier. Improves event
+	generation from a grabbed pointer. Part of fix for #107320.
+
+	(handle_stuff_while_moving_or_resizing): New function, to
+	dispatch the main loop (once).
+
+	(resize_timer_proc): New function, set to be called by an inerval
+	timer during resizes/moves. Calls handle_stuff_while_moving_or_resizing().
+
+	(gdk_event_translate): Drop unused return_exposes parameter.
+
+	Handle WM_XBUTTONDOWN and UP messages (buttons 4 and 5).
+
+	On WM_SYSKEYUP, generate a key release event also for just the Alt
+	key.
+
+	On WM_MOUSELEAVE, generate a leave event of type
+	GDK_NOTIFY_ANCESTOR (and not UNKNOWN) if the mouse left a
+	top-level window, and left the app completely.
+
+	On WM_ENTERSIZEMOVE, set a flag, and start an interval timer that
+	calls resize_timer_proc() at regular intervals. On
+	WM_EXITSIZEMOVE, kill the timer.
+
+	On WM_WINDOWPOSCHANGED, generate a configure event if necessary,
+	and dispatch the main loop (by calling
+	handle_stuff_while_moving_or_resizing()). Fixes #99540, idea by
+	Herman Bloggs.
+
+	* gdk/win32/gdkmain-win32.c (_gdk_win32_message_to_string): Handle
+	also wintab messages.
+
+	* gdk/win32/gdkwindow-win32.c (gdk_window_set_skip_taskbar_hint):
+	Instead of using WS_EX_TOOLWINDOW, implement by setting/unsetting
+	the window's owner. Fixes #118093, reported by Maxime Romano.
+
 Tue Dec  8 09:41:00 2003  Tim Evans  <t.evans@aranz.com>
 
 	* gdk/win32/gdkwindow-win32.[ch]: Implement

ChangeLog.pre-2-6

@@ -1,3 +1,70 @@
+2003-12-14  Tor Lillqvist  <tml@iki.fi>
+
+	Merge from stable:
+
+	* gdk/gdkdisplaymanager.c: Mark default_display static.
+
+	* gdk/win32/gdkdnd-win32.c: Mark current_dest_drag static.
+
+	* gdk/win32/gdkkeys-win32.c: Disable some overly verbose debugging
+	output.
+
+	* gdk/win32/gdkevents-win32.c: Clean up the debugging output from
+	--gdk-debug=events. In general, output just one line of debugging
+	output for each Windows message, plus one line for each GDK event
+	generated. Indent all lines according to window procedure nesting
+	level.
+
+	(inner_window_procedure): Rename from real_window_procedure.
+
+	(find_real_window_for_grabbed_mouse_event): Don't get misled when
+	the point is in the non-client (decoration) area of the window
+	returned by WindowFromPoint(). Return the root window in that
+	case.
+
+	(build_pointer_event_state): Test also MK_XBUTTON1 and
+	MK_XBUTTON2 (buttons 4 and 5).
+
+	(synthesize_enter_event): Track the mouse leaving the window in
+	the event being generated, not the one mentioned in the Windows
+	message.
+
+	(propagate): Test for NULL parent earlier. Improves event
+	generation from a grabbed pointer. Part of fix for #107320.
+
+	(handle_stuff_while_moving_or_resizing): New function, to
+	dispatch the main loop (once).
+
+	(resize_timer_proc): New function, set to be called by an inerval
+	timer during resizes/moves. Calls handle_stuff_while_moving_or_resizing().
+
+	(gdk_event_translate): Drop unused return_exposes parameter.
+
+	Handle WM_XBUTTONDOWN and UP messages (buttons 4 and 5).
+
+	On WM_SYSKEYUP, generate a key release event also for just the Alt
+	key.
+
+	On WM_MOUSELEAVE, generate a leave event of type
+	GDK_NOTIFY_ANCESTOR (and not UNKNOWN) if the mouse left a
+	top-level window, and left the app completely.
+
+	On WM_ENTERSIZEMOVE, set a flag, and start an interval timer that
+	calls resize_timer_proc() at regular intervals. On
+	WM_EXITSIZEMOVE, kill the timer.
+
+	On WM_WINDOWPOSCHANGED, generate a configure event if necessary,
+	and dispatch the main loop (by calling
+	handle_stuff_while_moving_or_resizing()). Fixes #99540, idea by
+	Herman Bloggs.
+
+	* gdk/win32/gdkmain-win32.c (_gdk_win32_message_to_string): Handle
+	also wintab messages.
+
+	* gdk/win32/gdkwindow-win32.c (gdk_window_set_skip_taskbar_hint):
+	Instead of using WS_EX_TOOLWINDOW, implement by setting/unsetting
+	the window's owner. Fixes #118093, reported by Maxime Romano.
+
 Tue Dec  8 09:41:00 2003  Tim Evans  <t.evans@aranz.com>
 
 	* gdk/win32/gdkwindow-win32.[ch]: Implement

ChangeLog.pre-2-8

@@ -1,3 +1,70 @@
+2003-12-14  Tor Lillqvist  <tml@iki.fi>
+
+	Merge from stable:
+
+	* gdk/gdkdisplaymanager.c: Mark default_display static.
+
+	* gdk/win32/gdkdnd-win32.c: Mark current_dest_drag static.
+
+	* gdk/win32/gdkkeys-win32.c: Disable some overly verbose debugging
+	output.
+
+	* gdk/win32/gdkevents-win32.c: Clean up the debugging output from
+	--gdk-debug=events. In general, output just one line of debugging
+	output for each Windows message, plus one line for each GDK event
+	generated. Indent all lines according to window procedure nesting
+	level.
+
+	(inner_window_procedure): Rename from real_window_procedure.
+
+	(find_real_window_for_grabbed_mouse_event): Don't get misled when
+	the point is in the non-client (decoration) area of the window
+	returned by WindowFromPoint(). Return the root window in that
+	case.
+
+	(build_pointer_event_state): Test also MK_XBUTTON1 and
+	MK_XBUTTON2 (buttons 4 and 5).
+
+	(synthesize_enter_event): Track the mouse leaving the window in
+	the event being generated, not the one mentioned in the Windows
+	message.
+
+	(propagate): Test for NULL parent earlier. Improves event
+	generation from a grabbed pointer. Part of fix for #107320.
+
+	(handle_stuff_while_moving_or_resizing): New function, to
+	dispatch the main loop (once).
+
+	(resize_timer_proc): New function, set to be called by an inerval
+	timer during resizes/moves. Calls handle_stuff_while_moving_or_resizing().
+
+	(gdk_event_translate): Drop unused return_exposes parameter.
+
+	Handle WM_XBUTTONDOWN and UP messages (buttons 4 and 5).
+
+	On WM_SYSKEYUP, generate a key release event also for just the Alt
+	key.
+
+	On WM_MOUSELEAVE, generate a leave event of type
+	GDK_NOTIFY_ANCESTOR (and not UNKNOWN) if the mouse left a
+	top-level window, and left the app completely.
+
+	On WM_ENTERSIZEMOVE, set a flag, and start an interval timer that
+	calls resize_timer_proc() at regular intervals. On
+	WM_EXITSIZEMOVE, kill the timer.
+
+	On WM_WINDOWPOSCHANGED, generate a configure event if necessary,
+	and dispatch the main loop (by calling
+	handle_stuff_while_moving_or_resizing()). Fixes #99540, idea by
+	Herman Bloggs.
+
+	* gdk/win32/gdkmain-win32.c (_gdk_win32_message_to_string): Handle
+	also wintab messages.
+
+	* gdk/win32/gdkwindow-win32.c (gdk_window_set_skip_taskbar_hint):
+	Instead of using WS_EX_TOOLWINDOW, implement by setting/unsetting
+	the window's owner. Fixes #118093, reported by Maxime Romano.
+
 Tue Dec  8 09:41:00 2003  Tim Evans  <t.evans@aranz.com>
 
 	* gdk/win32/gdkwindow-win32.[ch]: Implement

gdk/gdkdisplaymanager.c

@@ -62,7 +62,7 @@ static void gdk_display_manager_get_property (GObject                *object,
 
 static guint signals[LAST_SIGNAL] = { 0 };
 
-GdkDisplay *default_display = NULL;
+static GdkDisplay *default_display = NULL;
 
 GType
 gdk_display_manager_get_type (void)

gdk/win32/gdkdnd-win32.c

@@ -97,7 +97,7 @@ struct _GdkDragContextPrivateWin32 {
 
 #define GDK_DRAG_CONTEXT_PRIVATE_DATA(context) ((GdkDragContextPrivateWin32 *) GDK_DRAG_CONTEXT (context)->windowing_data)
 
-GdkDragContext *current_dest_drag = NULL;
+static GdkDragContext *current_dest_drag = NULL;
 
 static void gdk_drag_context_init       (GdkDragContext      *dragcontext);
 static void gdk_drag_context_class_init (GdkDragContextClass *klass);

gdk/win32/gdkkeys-win32.c

@@ -370,11 +370,13 @@ update_keymap (void)
 		    }
 		  else
 		    {
+#if 0
 		      GDK_NOTE (EVENTS, g_print ("ToAsciiEx returns %d "
 						 "for vk:%02x, sc:%02x%s%s\n",
 						 k, vk, scancode,
 						 (shift&0x1 ? " shift" : ""),
 						 (shift&0x2 ? " altgr" : "")));
+#endif
 		    }
 		}
 	      if (*ksymp == 0)
@@ -642,9 +644,10 @@ gdk_keymap_translate_keyboard_state (GdkKeymap       *keymap,
   g_return_val_if_fail (keymap == NULL || GDK_IS_KEYMAP (keymap), FALSE);
   g_return_val_if_fail (group < 4, FALSE);
   
+#if 0
   GDK_NOTE (EVENTS, g_print ("gdk_keymap_translate_keyboard_state: keycode=%#x state=%#x group=%d\n",
 			     hardware_keycode, state, group));
-
+#endif
   if (keyval)
     *keyval = 0;
   if (effective_group)
@@ -738,8 +741,10 @@ gdk_keymap_translate_keyboard_state (GdkKeymap       *keymap,
   if (keyval)
     *keyval = tmp_keyval;
 
+#if 0
   GDK_NOTE (EVENTS, g_print ("...group=%d level=%d cmods=%#x keyval=%s\n",
 			     group, shift_level, tmp_modifiers, gdk_keyval_name (tmp_keyval)));
+#endif
 
   return tmp_keyval != GDK_VoidSymbol;
 }

gdk/win32/gdkmain-win32.c

@@ -876,6 +876,11 @@ _gdk_win32_message_to_string (UINT msg)
       CASE (WM_PENWINFIRST);
       CASE (WM_PENWINLAST);
       CASE (WM_APP);
+#ifdef HAVE_WINTAB
+      CASE (WT_PACKET);
+      CASE (WT_CSRCHANGE);
+      CASE (WT_PROXIMITY);
+#endif
 #undef CASE
     default:
       if (msg >= WM_HANDHELDFIRST && msg <= WM_HANDHELDLAST)
@@ -923,7 +928,6 @@ _gdk_win32_gdkregion_to_string (const GdkRegion *rgn)
 gchar *
 _gdk_win32_drawable_description (GdkDrawable *d)
 {
-  GdkVisual *v;
   gint width, height, depth;
 
   gdk_drawable_get_size (d, &width, &height);

gdk/win32/gdkwindow-win32.c

@@ -3026,7 +3026,8 @@ void
 gdk_window_set_skip_taskbar_hint (GdkWindow *window,
 				  gboolean   skips_taskbar)
 {
-  LONG extended_style;
+  static GdkWindow *owner = NULL;
+  GdkWindowAttr wa;
 
   g_return_if_fail (GDK_IS_WINDOW (window));
 
@@ -3034,14 +3035,32 @@ gdk_window_set_skip_taskbar_hint (GdkWindow *window,
 			   GDK_WINDOW_HWND (window),
 			   skips_taskbar ? "TRUE" : "FALSE"));
 
-  extended_style = GetWindowLong (GDK_WINDOW_HWND (window), GWL_EXSTYLE);
-
   if (skips_taskbar)
-    extended_style |= WS_EX_TOOLWINDOW;
-  else
-    extended_style &= ~WS_EX_TOOLWINDOW;
+    {
+      if (owner == NULL)
+	{
+	  wa.window_type = GDK_WINDOW_TEMP;
+	  wa.wclass = GDK_INPUT_OUTPUT;
+	  wa.width = wa.height = 1;
+	  wa.event_mask = 0;
+	  owner = gdk_window_new (NULL, &wa, 0);
+	}
 
-  SetWindowLong (GDK_WINDOW_HWND (window), GWL_EXSTYLE, extended_style);
+      SetWindowLong (GDK_WINDOW_HWND (window), GWL_HWNDPARENT,
+		     (long) GDK_WINDOW_HWND (owner));
+
+#if 0 /* Should we also turn off the minimize and maximize buttons? */
+      SetWindowLong (GDK_WINDOW_HWND (window), GWL_STYLE,
+		     GetWindowLong (GDK_WINDOW_HWND (window), GWL_STYLE) & ~(WS_MINIMIZEBOX|WS_MAXIMIZEBOX|WS_SYSMENU));
+      SetWindowPos (GDK_WINDOW_HWND (window), NULL, 0, 0, 0, 0,
+		    SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOMOVE |
+		    SWP_NOREPOSITION | SWP_NOSIZE | SWP_NOZORDER);
+#endif
+    }
+  else
+    {
+      SetWindowLong (GDK_WINDOW_HWND (window), GWL_HWNDPARENT, 0);
+    }
 }
 
 void