diff options
author | Mark Tiefenbruck <mark@fluxbox.org> | 2008-08-15 11:02:14 (GMT) |
---|---|---|
committer | Mark Tiefenbruck <mark@fluxbox.org> | 2008-08-15 11:02:14 (GMT) |
commit | 80059c6dae8de4962b14f08bd75f1c773e37a78d (patch) | |
tree | d94651987a6c9a25d87292c2c5d74018ba541473 /src/WinClient.hh | |
parent | 31b47e78147ca20803b123f392bfd2002b70e052 (diff) | |
download | fluxbox_pavel-80059c6dae8de4962b14f08bd75f1c773e37a78d.zip fluxbox_pavel-80059c6dae8de4962b14f08bd75f1c773e37a78d.tar.bz2 |
move size hints to a struct
Diffstat (limited to 'src/WinClient.hh')
-rw-r--r-- | src/WinClient.hh | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/src/WinClient.hh b/src/WinClient.hh index 51d5077..51d3b3e 100644 --- a/src/WinClient.hh +++ b/src/WinClient.hh | |||
@@ -43,6 +43,21 @@ public: | |||
43 | unsigned long decorations; // Motif wm decorations | 43 | unsigned long decorations; // Motif wm decorations |
44 | } MwmHints; | 44 | } MwmHints; |
45 | 45 | ||
46 | typedef struct SizeHints { | ||
47 | unsigned int min_width; | ||
48 | unsigned int max_width; | ||
49 | unsigned int min_height; | ||
50 | unsigned int max_height; | ||
51 | unsigned int width_inc; | ||
52 | unsigned int height_inc; | ||
53 | unsigned int min_aspect_x; | ||
54 | unsigned int max_aspect_x; | ||
55 | unsigned int min_aspect_y; | ||
56 | unsigned int max_aspect_y; | ||
57 | unsigned int base_width; | ||
58 | unsigned int base_height; | ||
59 | } SizeHints; | ||
60 | |||
46 | WinClient(Window win, BScreen &screen, FluxboxWindow *fbwin = 0); | 61 | WinClient(Window win, BScreen &screen, FluxboxWindow *fbwin = 0); |
47 | 62 | ||
48 | ~WinClient(); | 63 | ~WinClient(); |
@@ -129,8 +144,12 @@ public: | |||
129 | 144 | ||
130 | const MwmHints *getMwmHint() const { return m_mwm_hint; } | 145 | const MwmHints *getMwmHint() const { return m_mwm_hint; } |
131 | 146 | ||
132 | unsigned int maxWidth() const { return max_width; } | 147 | unsigned int minWidth() const { return m_size_hints.min_width; } |
133 | unsigned int maxHeight() const { return max_height; } | 148 | unsigned int minHeight() const { return m_size_hints.min_height; } |
149 | unsigned int maxWidth() const { return m_size_hints.max_width; } | ||
150 | unsigned int maxHeight() const { return m_size_hints.max_height; } | ||
151 | unsigned int widthInc() const { return m_size_hints.width_inc; } | ||
152 | unsigned int heightInc() const { return m_size_hints.height_inc; } | ||
134 | 153 | ||
135 | static const int PropMwmHintsElements = 3; | 154 | static const int PropMwmHintsElements = 3; |
136 | 155 | ||
@@ -145,10 +164,6 @@ public: | |||
145 | 164 | ||
146 | 165 | ||
147 | int x, y, old_bw; | 166 | int x, y, old_bw; |
148 | unsigned int | ||
149 | min_width, min_height, max_width, max_height, width_inc, height_inc, | ||
150 | min_aspect_x, min_aspect_y, max_aspect_x, max_aspect_y, | ||
151 | base_width, base_height; | ||
152 | unsigned long initial_state, normal_hint_flags, wm_hint_flags; | 167 | unsigned long initial_state, normal_hint_flags, wm_hint_flags; |
153 | 168 | ||
154 | private: | 169 | private: |
@@ -172,6 +187,7 @@ private: | |||
172 | 187 | ||
173 | Focusable::WindowType m_window_type; | 188 | Focusable::WindowType m_window_type; |
174 | MwmHints *m_mwm_hint; | 189 | MwmHints *m_mwm_hint; |
190 | SizeHints m_size_hints; | ||
175 | 191 | ||
176 | Strut *m_strut; | 192 | Strut *m_strut; |
177 | // map transient_for X window to winclient transient | 193 | // map transient_for X window to winclient transient |