diff options
-rw-r--r-- | src/Screen.cc | 39 | ||||
-rw-r--r-- | src/Screen.hh | 5 |
2 files changed, 14 insertions, 30 deletions
diff --git a/src/Screen.cc b/src/Screen.cc index 9f5b07e..e06d071 100644 --- a/src/Screen.cc +++ b/src/Screen.cc | |||
@@ -22,7 +22,7 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: Screen.cc,v 1.292 2004/09/12 14:56:18 rathnor Exp $ | 25 | // $Id: Screen.cc,v 1.293 2004/09/16 10:10:36 fluxgen Exp $ |
26 | 26 | ||
27 | 27 | ||
28 | #include "Screen.hh" | 28 | #include "Screen.hh" |
@@ -226,6 +226,14 @@ BScreen::BScreen(FbTk::ResourceManager &rm, | |||
226 | RootTheme(scrn, | 226 | RootTheme(scrn, |
227 | *resource.rootcommand)), | 227 | *resource.rootcommand)), |
228 | m_root_window(scrn), | 228 | m_root_window(scrn), |
229 | m_geom_window(m_root_window, | ||
230 | 0, 0, 10, 10, | ||
231 | false, // override redirect | ||
232 | true), // save under | ||
233 | m_pos_window(m_root_window, | ||
234 | 0, 0, 10, 10, | ||
235 | false, // override redirect | ||
236 | true), // save under | ||
229 | resource(rm, screenname, altscreenname), | 237 | resource(rm, screenname, altscreenname), |
230 | m_name(screenname), | 238 | m_name(screenname), |
231 | m_altname(altscreenname), | 239 | m_altname(altscreenname), |
@@ -307,40 +315,15 @@ BScreen::BScreen(FbTk::ResourceManager &rm, | |||
307 | menuTheme().frameFont().setAntialias(*resource.antialias); | 315 | menuTheme().frameFont().setAntialias(*resource.antialias); |
308 | 316 | ||
309 | 317 | ||
310 | // create geometry window | ||
311 | |||
312 | int geom_h = 10; | ||
313 | int geom_w = 100; // just initial, will be fixed in render | ||
314 | |||
315 | // create geometry window | ||
316 | |||
317 | int pos_h = 10; | ||
318 | int pos_w = 100; // just initial, will be fixed in render | ||
319 | |||
320 | XSetWindowAttributes attrib; | ||
321 | unsigned long mask = CWBorderPixel | CWColormap | CWSaveUnder; | ||
322 | attrib.border_pixel = winFrameTheme().border().color().pixel(); | ||
323 | attrib.colormap = rootWindow().colormap(); | ||
324 | attrib.save_under = true; | ||
325 | |||
326 | winFrameTheme().reconfigSig().attach(this);// for geom window | 318 | winFrameTheme().reconfigSig().attach(this);// for geom window |
327 | 319 | ||
328 | m_geom_window = | 320 | |
329 | XCreateWindow(disp, rootWindow().window(), | ||
330 | 0, 0, geom_w, geom_h, winFrameTheme().border().width(), rootWindow().depth(), | ||
331 | InputOutput, rootWindow().visual(), mask, &attrib); | ||
332 | geom_visible = false; | 321 | geom_visible = false; |
333 | geom_pixmap = 0; | 322 | geom_pixmap = 0; |
334 | |||
335 | renderGeomWindow(); | ||
336 | |||
337 | m_pos_window = | ||
338 | XCreateWindow(disp, rootWindow().window(), | ||
339 | 0, 0, pos_w, pos_h, winFrameTheme().border().width(), rootWindow().depth(), | ||
340 | InputOutput, rootWindow().visual(), mask, &attrib); | ||
341 | pos_visible = false; | 323 | pos_visible = false; |
342 | pos_pixmap = 0; | 324 | pos_pixmap = 0; |
343 | 325 | ||
326 | renderGeomWindow(); | ||
344 | renderPosWindow(); | 327 | renderPosWindow(); |
345 | 328 | ||
346 | // setup workspaces and workspace menu | 329 | // setup workspaces and workspace menu |
diff --git a/src/Screen.hh b/src/Screen.hh index 2cfbe73..039f9f3 100644 --- a/src/Screen.hh +++ b/src/Screen.hh | |||
@@ -22,7 +22,7 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: Screen.hh,v 1.146 2004/09/12 14:56:19 rathnor Exp $ | 25 | // $Id: Screen.hh,v 1.147 2004/09/16 10:10:37 fluxgen Exp $ |
26 | 26 | ||
27 | #ifndef SCREEN_HH | 27 | #ifndef SCREEN_HH |
28 | #define SCREEN_HH | 28 | #define SCREEN_HH |
@@ -385,7 +385,7 @@ private: | |||
385 | GC opGC; | 385 | GC opGC; |
386 | Pixmap geom_pixmap, pos_pixmap; | 386 | Pixmap geom_pixmap, pos_pixmap; |
387 | 387 | ||
388 | FbTk::FbWindow m_geom_window, m_pos_window; | 388 | |
389 | 389 | ||
390 | std::auto_ptr<FbTk::ImageControl> m_image_control; | 390 | std::auto_ptr<FbTk::ImageControl> m_image_control; |
391 | std::auto_ptr<FbTk::Menu> m_configmenu, m_rootmenu, m_workspacemenu; | 391 | std::auto_ptr<FbTk::Menu> m_configmenu, m_rootmenu, m_workspacemenu; |
@@ -419,6 +419,7 @@ private: | |||
419 | std::auto_ptr<RootTheme> m_root_theme; | 419 | std::auto_ptr<RootTheme> m_root_theme; |
420 | 420 | ||
421 | FbRootWindow m_root_window; | 421 | FbRootWindow m_root_window; |
422 | FbTk::FbWindow m_geom_window, m_pos_window; | ||
422 | 423 | ||
423 | struct ScreenResource { | 424 | struct ScreenResource { |
424 | ScreenResource(FbTk::ResourceManager &rm, const std::string &scrname, | 425 | ScreenResource(FbTk::ResourceManager &rm, const std::string &scrname, |