Merge from stable:
2002-12-09 Tor Lillqvist <tml@iki.fi> Merge from stable: * gdk/win32/gdkdrawable-win32.c (generic_draw): Don't leak stipple_gc. More checks for errors. Use correct ternary ROP when blitting the foreground into the tile pixmap onto those pixels where the stipple is set. (I didn't notice that I had used the wrong one, as it didn't matter on Win2k, where DIB sections apparently are zeroed upon creation. But on Win98 they have random initial contents. Thanks to Hans Breuer for reporting this.) (gdk_win32_draw_rectangle, gdk_win32_draw_arc, gdk_win32_draw_polygon): Don't pass the LINE_ATTRIBUTES bits to generic_draw() if drawing a filled figure. * gdk/win32/gdkmain-win32.c (_gdk_win32_print_dc): Minor cosmetics. (_gdk_win32_gcvalues_mask_to_string): Initialize buffer as empty. (_gdk_win32_window_state_to_string): New debugging output helper function. * gdk/win32/gdkevents-win32.c: Minor debugging output changes. (gdk_event_translate): Ignore the WM_SHOWWINDOW/SW_OTHERUNZOOM or SW_OTHERZOOM messages. Do not generate a GDK_UNMAP event for WM_SIZE/SIZE_MINIMIZED messages, they do not really corrspond to unmapping on X11. Set window state correctly for all three of SIZE_{MINIMIZED,MAXIMIZED,RESTORED}. A maximized and then iconified ("minimized" in Windows terminology) window still has the "maximized" property, i.e. when deiconified, it will reappear as maximized. (#10557) * gdk/win32/gdkprivate-win32.h: Declare new function. (WIN32_API_FAILED, WIN32_GDI_FAILED, OTHER_API_FAILED): Don't use __PRETTY_FUNCTION__ if __GNUC__ >= 3, to avoid warning message. * gdk/win32/gdkwindow-win32.c (show_window_internal): Handle more situations. Add parameter to tell whether deiconifying. Code reorg: Return early when appropriate instead of using nested if statements. If just deiconifying without raising, restore active window. (#10557) (gdk_window_hide, gdk_window_withdraw, gdk_window_iconify, gdk_window_deiconify, gdk_window_maximize, gdk_window_unmaximize, gdk_window_focus): Use _gdk_win32_window_state_to_string() in debugging output. (gdk_window_iconify): Restore active window after calling ShowWindow(). Otherwise the "next" window gets activated. (gdk_window_stick, gdk_window_unstick): Don't output any warnings. (gdk_window_set_transient_for): Rewrite. Just call SetWindowLong() with GWL_HWNDPARENT, which despite its name sets the *owner* window, which should be exactly what we want. The PSDK documentation is said to be misleading. testgtk's modal window test now works much better. (#50586)
This commit is contained in:
Tor Lillqvist
committed by
Tor Lillqvist
Tor Lillqvist
parent
016d6fad3f
commit
af9b53fc58
@ -1009,17 +1009,6 @@ print_event_state (gint state)
|
||||
#undef CASE
|
||||
}
|
||||
|
||||
static void
|
||||
print_window_state (GdkWindowState state)
|
||||
{
|
||||
#define CASE(bit) if (state & GDK_WINDOW_STATE_ ## bit ) g_print (#bit " ");
|
||||
CASE (WITHDRAWN);
|
||||
CASE (ICONIFIED);
|
||||
CASE (MAXIMIZED);
|
||||
CASE (STICKY);
|
||||
#undef CASE
|
||||
}
|
||||
|
||||
static void
|
||||
print_event (GdkEvent *event)
|
||||
{
|
||||
@ -1127,8 +1116,9 @@ print_event (GdkEvent *event)
|
||||
print_event_state (event->scroll.state);
|
||||
break;
|
||||
case GDK_WINDOW_STATE:
|
||||
print_window_state (event->window_state.changed_mask);
|
||||
print_window_state (event->window_state.new_window_state);
|
||||
g_print ("%s: %s",
|
||||
_gdk_win32_window_state_to_string (event->window_state.changed_mask),
|
||||
_gdk_win32_window_state_to_string (event->window_state.new_window_state));
|
||||
default:
|
||||
/* Nothing */
|
||||
break;
|
||||
@ -2946,6 +2936,10 @@ gdk_event_translate (GdkDisplay *display,
|
||||
if (!(private->event_mask & GDK_STRUCTURE_MASK))
|
||||
break;
|
||||
|
||||
if (msg->lParam == SW_OTHERUNZOOM ||
|
||||
msg->lParam == SW_OTHERZOOM)
|
||||
break;
|
||||
|
||||
event->any.type = (msg->wParam ? GDK_MAP : GDK_UNMAP);
|
||||
event->any.window = window;
|
||||
|
||||
@ -2971,13 +2965,9 @@ gdk_event_translate (GdkDisplay *display,
|
||||
(msg->wParam == SIZE_RESTORED ? "RESTORED" : "?"))))),
|
||||
LOWORD (msg->lParam), HIWORD (msg->lParam)));
|
||||
|
||||
if (!(private->event_mask & GDK_STRUCTURE_MASK))
|
||||
break;
|
||||
|
||||
if (msg->wParam == SIZE_MINIMIZED)
|
||||
{
|
||||
event->any.type = GDK_UNMAP;
|
||||
event->any.window = window;
|
||||
/* Don't generate any GDK event. This is *not* an UNMAP. */
|
||||
|
||||
if (p_grab_window == window)
|
||||
gdk_pointer_ungrab (msg->time);
|
||||
@ -2985,12 +2975,9 @@ gdk_event_translate (GdkDisplay *display,
|
||||
if (k_grab_window == window)
|
||||
gdk_keyboard_ungrab (msg->time);
|
||||
|
||||
if (window && GDK_WINDOW_IS_MAPPED (window))
|
||||
gdk_synthesize_window_state (window,
|
||||
GDK_WINDOW_STATE_MAXIMIZED,
|
||||
GDK_WINDOW_STATE_ICONIFIED);
|
||||
|
||||
return_val = !GDK_WINDOW_DESTROYED (window);
|
||||
gdk_synthesize_window_state (window,
|
||||
GDK_WINDOW_STATE_WITHDRAWN,
|
||||
GDK_WINDOW_STATE_ICONIFIED);
|
||||
}
|
||||
else if ((msg->wParam == SIZE_RESTORED
|
||||
|| msg->wParam == SIZE_MAXIMIZED)
|
||||
@ -2999,6 +2986,9 @@ gdk_event_translate (GdkDisplay *display,
|
||||
#endif
|
||||
)
|
||||
{
|
||||
if (!(private->event_mask & GDK_STRUCTURE_MASK))
|
||||
break;
|
||||
|
||||
event->configure.type = GDK_CONFIGURE;
|
||||
event->configure.window = window;
|
||||
pt.x = 0;
|
||||
@ -3016,11 +3006,13 @@ gdk_event_translate (GdkDisplay *display,
|
||||
if (msg->wParam == SIZE_RESTORED)
|
||||
gdk_synthesize_window_state (window,
|
||||
GDK_WINDOW_STATE_ICONIFIED |
|
||||
GDK_WINDOW_STATE_MAXIMIZED,
|
||||
GDK_WINDOW_STATE_MAXIMIZED |
|
||||
GDK_WINDOW_STATE_WITHDRAWN,
|
||||
0);
|
||||
else if (msg->wParam == SIZE_MAXIMIZED)
|
||||
gdk_synthesize_window_state (window,
|
||||
GDK_WINDOW_STATE_ICONIFIED,
|
||||
GDK_WINDOW_STATE_ICONIFIED |
|
||||
GDK_WINDOW_STATE_WITHDRAWN,
|
||||
GDK_WINDOW_STATE_MAXIMIZED);
|
||||
|
||||
if (private->resize_count > 1)
|
||||
|
||||
Reference in New Issue
Block a user