diff options
Diffstat (limited to 'src/Windowmenu.cc')
-rw-r--r-- | src/Windowmenu.cc | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/Windowmenu.cc b/src/Windowmenu.cc index e154ea6..c776981 100644 --- a/src/Windowmenu.cc +++ b/src/Windowmenu.cc | |||
@@ -79,7 +79,7 @@ Windowmenu::Windowmenu(FluxboxWindow *win) : Basemenu(win->getScreen()) { | |||
79 | 0, 0, | 79 | 0, 0, |
80 | #endif // NLS | 80 | #endif // NLS |
81 | "Shade"), | 81 | "Shade"), |
82 | BScreen::WindowShade); | 82 | BScreen::WINDOWSHADE); |
83 | insert(i18n->getMessage( | 83 | insert(i18n->getMessage( |
84 | #ifdef NLS | 84 | #ifdef NLS |
85 | WindowmenuSet, WindowmenuIconify, | 85 | WindowmenuSet, WindowmenuIconify, |
@@ -87,7 +87,7 @@ Windowmenu::Windowmenu(FluxboxWindow *win) : Basemenu(win->getScreen()) { | |||
87 | 0, 0, | 87 | 0, 0, |
88 | #endif // NLS | 88 | #endif // NLS |
89 | "Iconify"), | 89 | "Iconify"), |
90 | BScreen::WindowIconify); | 90 | BScreen::WINDOWICONIFY); |
91 | insert(i18n->getMessage( | 91 | insert(i18n->getMessage( |
92 | #ifdef NLS | 92 | #ifdef NLS |
93 | WindowmenuSet, WindowmenuMaximize, | 93 | WindowmenuSet, WindowmenuMaximize, |
@@ -95,7 +95,7 @@ Windowmenu::Windowmenu(FluxboxWindow *win) : Basemenu(win->getScreen()) { | |||
95 | 0, 0, | 95 | 0, 0, |
96 | #endif // NLS | 96 | #endif // NLS |
97 | "Maximize"), | 97 | "Maximize"), |
98 | BScreen::WindowMaximize); | 98 | BScreen::WINDOWMAXIMIZE); |
99 | insert(i18n->getMessage( | 99 | insert(i18n->getMessage( |
100 | #ifdef NLS | 100 | #ifdef NLS |
101 | WindowmenuSet, WindowmenuRaise, | 101 | WindowmenuSet, WindowmenuRaise, |
@@ -103,7 +103,7 @@ Windowmenu::Windowmenu(FluxboxWindow *win) : Basemenu(win->getScreen()) { | |||
103 | 0, 0, | 103 | 0, 0, |
104 | #endif // NLS | 104 | #endif // NLS |
105 | "Raise"), | 105 | "Raise"), |
106 | BScreen::WindowRaise); | 106 | BScreen::WINDOWRAISE); |
107 | insert(i18n->getMessage( | 107 | insert(i18n->getMessage( |
108 | #ifdef NLS | 108 | #ifdef NLS |
109 | WindowmenuSet, WindowmenuLower, | 109 | WindowmenuSet, WindowmenuLower, |
@@ -111,7 +111,7 @@ Windowmenu::Windowmenu(FluxboxWindow *win) : Basemenu(win->getScreen()) { | |||
111 | 0, 0, | 111 | 0, 0, |
112 | #endif // NLS | 112 | #endif // NLS |
113 | "Lower"), | 113 | "Lower"), |
114 | BScreen::WindowLower); | 114 | BScreen::WINDOWLOWER); |
115 | insert(i18n->getMessage( | 115 | insert(i18n->getMessage( |
116 | #ifdef NLS | 116 | #ifdef NLS |
117 | WindowmenuSet, WindowmenuStick, | 117 | WindowmenuSet, WindowmenuStick, |
@@ -119,7 +119,7 @@ Windowmenu::Windowmenu(FluxboxWindow *win) : Basemenu(win->getScreen()) { | |||
119 | 0, 0, | 119 | 0, 0, |
120 | #endif // NLS | 120 | #endif // NLS |
121 | "Stick"), | 121 | "Stick"), |
122 | BScreen::WindowStick); | 122 | BScreen::WINDOWSTICK); |
123 | insert(i18n->getMessage( | 123 | insert(i18n->getMessage( |
124 | #ifdef NLS | 124 | #ifdef NLS |
125 | WindowmenuSet, WindowmenuKillClient, | 125 | WindowmenuSet, WindowmenuKillClient, |
@@ -127,7 +127,7 @@ Windowmenu::Windowmenu(FluxboxWindow *win) : Basemenu(win->getScreen()) { | |||
127 | 0, 0, | 127 | 0, 0, |
128 | #endif // NLS | 128 | #endif // NLS |
129 | "Kill Client"), | 129 | "Kill Client"), |
130 | BScreen::WindowKill); | 130 | BScreen::WINDOWKILL); |
131 | insert(i18n->getMessage( | 131 | insert(i18n->getMessage( |
132 | #ifdef NLS | 132 | #ifdef NLS |
133 | WindowmenuSet, WindowmenuClose, | 133 | WindowmenuSet, WindowmenuClose, |
@@ -135,7 +135,7 @@ Windowmenu::Windowmenu(FluxboxWindow *win) : Basemenu(win->getScreen()) { | |||
135 | 0, 0, | 135 | 0, 0, |
136 | #endif // NLS | 136 | #endif // NLS |
137 | "Close"), | 137 | "Close"), |
138 | BScreen::WindowClose); | 138 | BScreen::WINDOWCLOSE); |
139 | insert(i18n->getMessage( | 139 | insert(i18n->getMessage( |
140 | #ifdef NLS | 140 | #ifdef NLS |
141 | WindowmenuSet, WindowmenuTab, | 141 | WindowmenuSet, WindowmenuTab, |
@@ -143,7 +143,7 @@ Windowmenu::Windowmenu(FluxboxWindow *win) : Basemenu(win->getScreen()) { | |||
143 | 0, 0, | 143 | 0, 0, |
144 | #endif // NLS | 144 | #endif // NLS |
145 | "Tab"), | 145 | "Tab"), |
146 | BScreen::WindowTab); | 146 | BScreen::WINDOWTAB); |
147 | 147 | ||
148 | update(); | 148 | update(); |
149 | 149 | ||
@@ -175,7 +175,7 @@ void Windowmenu::itemSelected(int button, int index) { | |||
175 | BasemenuItem *item = find(index); | 175 | BasemenuItem *item = find(index); |
176 | 176 | ||
177 | switch (item->function()) { | 177 | switch (item->function()) { |
178 | case BScreen::WindowShade: | 178 | case BScreen::WINDOWSHADE: |
179 | hide(); | 179 | hide(); |
180 | 180 | ||
181 | window->shade(); | 181 | window->shade(); |
@@ -183,42 +183,42 @@ void Windowmenu::itemSelected(int button, int index) { | |||
183 | window->getTab()->shade(); | 183 | window->getTab()->shade(); |
184 | break; | 184 | break; |
185 | 185 | ||
186 | case BScreen::WindowIconify: | 186 | case BScreen::WINDOWICONIFY: |
187 | hide(); | 187 | hide(); |
188 | window->iconify(); | 188 | window->iconify(); |
189 | break; | 189 | break; |
190 | 190 | ||
191 | case BScreen::WindowMaximize: | 191 | case BScreen::WINDOWMAXIMIZE: |
192 | hide(); | 192 | hide(); |
193 | window->maximize((unsigned int) button); | 193 | window->maximize((unsigned int) button); |
194 | break; | 194 | break; |
195 | 195 | ||
196 | case BScreen::WindowClose: | 196 | case BScreen::WINDOWCLOSE: |
197 | hide(); | 197 | hide(); |
198 | window->close(); | 198 | window->close(); |
199 | break; | 199 | break; |
200 | 200 | ||
201 | case BScreen::WindowRaise: | 201 | case BScreen::WINDOWRAISE: |
202 | hide(); | 202 | hide(); |
203 | screen->getWorkspace(window->getWorkspaceNumber())->raiseWindow(window); | 203 | screen->getWorkspace(window->getWorkspaceNumber())->raiseWindow(window); |
204 | break; | 204 | break; |
205 | 205 | ||
206 | case BScreen::WindowLower: | 206 | case BScreen::WINDOWLOWER: |
207 | hide(); | 207 | hide(); |
208 | screen->getWorkspace(window->getWorkspaceNumber())->lowerWindow(window); | 208 | screen->getWorkspace(window->getWorkspaceNumber())->lowerWindow(window); |
209 | break; | 209 | break; |
210 | 210 | ||
211 | case BScreen::WindowStick: | 211 | case BScreen::WINDOWSTICK: |
212 | hide(); | 212 | hide(); |
213 | window->stick(); | 213 | window->stick(); |
214 | break; | 214 | break; |
215 | 215 | ||
216 | case BScreen::WindowKill: | 216 | case BScreen::WINDOWKILL: |
217 | hide(); | 217 | hide(); |
218 | XKillClient(screen->getBaseDisplay()->getXDisplay(), | 218 | XKillClient(screen->getBaseDisplay()->getXDisplay(), |
219 | window->getClientWindow()); | 219 | window->getClientWindow()); |
220 | break; | 220 | break; |
221 | case BScreen::WindowTab: | 221 | case BScreen::WINDOWTAB: |
222 | hide(); | 222 | hide(); |
223 | window->setTab(!window->hasTab()); | 223 | window->setTab(!window->hasTab()); |
224 | break; | 224 | break; |