AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-12 20:00:09 +00:00
Code Issues Projects Releases Wiki Activity

GDK/Win32: Rename "window" in gdksurface-win32.* code

Browse Source 
In order to help us in our refactoring, make the distinction between Gdk
surfaces and native Win32 HWND clearer in terms of the variables that we
used, and in the comments in the code.

Also, group forward function prototype declarations in one place, and
drop some unneeded items in gdkprivate-win32.h to fold them into
gdksurface-win32.c, as they are only used there.
This commit is contained in:
Chun-wei Fan 2024-08-19 17:45:54 +08:00
parent ea8062e86a
commit 7e4fdea71b
3 changed files with 578 additions and 580 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gdk/win32/gdkprivate-win32.h
View File

@ -86,8 +86,6 @@ cairo_region_t *_gdk_win32_hrgn_to_region (HRGN hrgn,
void _gdk_win32_adjust_client_rect (GdkSurface *window,
RECT *RECT);
void _gdk_push_modal_window (GdkSurface *window);
void _gdk_remove_modal_window (GdkSurface *window);
GdkSurface *_gdk_modal_current (void);
gboolean _gdk_modal_blocked (GdkSurface *window);

1100
gdk/win32/gdksurface-win32.c
View File

File diff suppressed because it is too large Load Diff

56
gdk/win32/gdksurface-win32.h
View File

@ -104,8 +104,8 @@ typedef enum _GdkW32WindowDragOp GdkW32WindowDragOp;
struct _GdkW32DragMoveResizeContext
{
/* The window that is being moved/resized */
GdkSurface *window;
/* The surface that is being moved/resized */
GdkSurface *surface;
/* The kind of drag-operation going on. */
GdkW32WindowDragOp op;
@ -126,19 +126,19 @@ struct _GdkW32DragMoveResizeContext
/* Initial cursor position when the operation began.
* Current cursor position is subtracted from it to find how far
* to move window border(s).
* to move surface border(s).
*/
int start_root_x;
int start_root_y;
/* Last processed cursor position. Values are divided by the window
/* Last processed cursor position. Values are divided by the surface
* scale.
*/
int current_root_x;
int current_root_y;
/* Initial window rectangle (position and size).
* The window is resized/moved relative to this (see start_root_*).
/* Initial surface HWND rectangle (position and size).
* The surface is resized/moved relative to this (see start_root_*).
*/
RECT start_rect;
@ -146,17 +146,17 @@ struct _GdkW32DragMoveResizeContext
guint32 timestamp;
/* TRUE if during the next redraw we should call SetWindowPos() to push
* the window size and position to the native window.
* the surface size and position to the native HWND.
*/
gboolean native_move_resize_pending;
/* The cursor we should use while the operation is running. */
GdkCursor *cursor;
/* This window looks like an outline and is drawn under the window
* that is being dragged. It indicates the shape the dragged window
/* This HWND looks like an outline and is drawn under the surface
* that is being dragged. It indicates the shape the dragged surface
* will take if released at a particular point.
* Indicator window size always matches the target indicator shape,
* Indicator HWND size always matches the target indicator shape,
* the actual indicator drawn on it might not, depending on
* how much time elapsed since the animation started.
*/
@ -168,7 +168,7 @@ struct _GdkW32DragMoveResizeContext
int indicator_surface_height;
/* Size/position of shape_indicator */
GdkRectangle indicator_window_rect;
GdkRectangle indicator_surface_rect;
/* Indicator will animate to occupy this rectangle */
GdkRectangle indicator_target;
@ -239,16 +239,14 @@ struct _GdkWin32Surface
HICON hicon_big;
HICON hicon_small;
/* The cursor that GDK set for this window via GdkDevice */
/* The cursor that GDK set for this surface via GdkDevice */
GdkWin32HCursor *cursor;
/* Window size hints */
/* surface size hints */
int hint_flags;
GdkGeometry hints;
/* Non-NULL for any window that is registered as a drop target.
* For OLE2 protocol only.
*/
/* Non-NULL for any surface that is registered as a drop target */
drop_target_context *drop_target;
GdkSurface *transient_owner;
@ -259,7 +257,7 @@ struct _GdkWin32Surface
int initial_x;
int initial_y;
/* left/right/top/bottom width of the shadow/resize-grip around the window */
/* left/right/top/bottom width of the shadow/resize-grip around the surface HWND */
RECT shadow;
/* left+right and top+bottom from @shadow */
@ -273,11 +271,11 @@ struct _GdkWin32Surface
guint inhibit_configure : 1;
/* If TRUE, the @temp_styles is set to the styles that were temporarily
* added to this window.
* added to this surface.
*/
guint have_temp_styles : 1;
/* If TRUE, the window is in the process of being maximized.
/* If TRUE, the surface is in the process of being maximized.
* This is set by WM_SYSCOMMAND and by gdk_win32_surface_maximize (),
* and is unset when WM_WINDOWPOSCHANGING is handled.
*/
@ -287,16 +285,16 @@ struct _GdkWin32Surface
GdkW32DragMoveResizeContext drag_move_resize_context;
/* Remembers where the window was snapped.
/* Remembers where the surface was snapped.
* Some snap operations change their meaning if
* the window is already snapped.
* the surface is already snapped.
*/
GdkWin32AeroSnapState snap_state;
/* Remembers window position before it was snapped.
/* Remembers surface position before it was snapped.
* This is used to unsnap it.
* Position and size are percentages of the workarea
* of the monitor on which the window was before it was snapped.
* of the monitor on which the surface was before it was snapped.
*/
GdkRectangleDouble *snap_stash;
@ -306,13 +304,13 @@ struct _GdkWin32Surface
/* Enable all decorations? */
gboolean decorate_all;
/* Temporary styles that this window got for the purpose of
/* Temporary styles that this HWND got for the purpose of
* handling WM_SYSMENU.
* They are removed at the first opportunity (usually WM_INITMENU).
*/
LONG_PTR temp_styles;
/* scale of window on HiDPI */
/* scale of surface on HiDPI */
int surface_scale;
GdkToplevelLayout *toplevel_layout;
@ -338,11 +336,11 @@ struct _GdkWin32SurfaceClass
GType _gdk_win32_surface_get_type (void);
void _gdk_win32_surface_update_style_bits (GdkSurface *window);
void _gdk_win32_surface_update_style_bits (GdkSurface *surface);
int _gdk_win32_surface_get_scale_factor (GdkSurface *window);
int _gdk_win32_surface_get_scale_factor (GdkSurface *surface);
void _gdk_win32_get_window_client_area_rect (GdkSurface *window,
void _gdk_win32_get_window_client_area_rect (GdkSurface *surface,
int scale,
RECT *rect);
@ -350,7 +348,7 @@ void gdk_win32_surface_move (GdkSurface *surface,
int x,
int y);
void gdk_win32_surface_move_resize (GdkSurface *window,
void gdk_win32_surface_move_resize (GdkSurface *surface,
int x,
int y,
int width,