aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-01-10 12:54:27 (GMT)
committerfluxgen <fluxgen>2002-01-10 12:54:27 (GMT)
commitbdac72d061d7dc6742daf99e87aae96b6d3fe376 (patch)
treea903f0e6465f7ff839b2988b4fc19dbdcfba4cba
parent9fec9c3ef2b88d0cacc56ac9dd91a69d987cc21a (diff)
downloadfluxbox_pavel-bdac72d061d7dc6742daf99e87aae96b6d3fe376.zip
fluxbox_pavel-bdac72d061d7dc6742daf99e87aae96b6d3fe376.tar.bz2
Clean up in GNOME and fixed withdrawnstate
-rw-r--r--src/Window.cc29
1 files changed, 11 insertions, 18 deletions
diff --git a/src/Window.cc b/src/Window.cc
index fe7f601..2827fb1 100644
--- a/src/Window.cc
+++ b/src/Window.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: Window.cc,v 1.16 2002/01/09 19:28:35 fluxgen Exp $ 25// $Id: Window.cc,v 1.17 2002/01/10 12:54:27 fluxgen Exp $
26 26
27// stupid macros needed to access some functions in version 2 of the GNU C 27// stupid macros needed to access some functions in version 2 of the GNU C
28// library 28// library
@@ -426,25 +426,17 @@ FluxboxWindow::FluxboxWindow(Window w, BScreen *s) {
426 } 426 }
427 427
428 setFocusFlag(false); 428 setFocusFlag(false);
429/* 429
430#ifdef GNOME
431 //tell the creator of this window that we are a gnome compilant windowmanager
432 {
433 XChangeProperty(display, screen->getRootWindow(),
434 screen->getBaseDisplay()->getGnomeSupportingWMCheckAtom(),
435 XA_CARDINAL, 32,
436 PropModeReplace, (unsigned char *)&client.window, 1);
437 XChangeProperty(display, client.window,
438 screen->getBaseDisplay()->getGnomeSupportingWMCheckAtom(),
439 XA_CARDINAL, 32, PropModeReplace,
440 (unsigned char *)&client.window, 1);
441 }
442#endif
443*/
444 fluxbox->ungrab(); 430 fluxbox->ungrab();
445 #ifdef DEBUG 431 #ifdef DEBUG
446 fprintf(stderr, "%s(%d): FluxboxWindow(this=%p)\n", __FILE__, __LINE__, this); 432 fprintf(stderr, "%s(%d): FluxboxWindow(this=%p)\n", __FILE__, __LINE__, this);
447 #endif 433 #endif
434 //TODO move this
435 #ifdef GNOME
436 int val = workspace_number;
437 XChangeProperty(display, client.window, screen->getBaseDisplay()->getGnomeWorkspaceAtom(), XA_CARDINAL, 32,
438 PropModeReplace, (unsigned char *)&val, 1);
439 #endif
448} 440}
449 441
450 442
@@ -1801,8 +1793,9 @@ void FluxboxWindow::close(void) {
1801void FluxboxWindow::withdraw(void) { 1793void FluxboxWindow::withdraw(void) {
1802 visible = false; 1794 visible = false;
1803 iconic = false; 1795 iconic = false;
1804 1796//
1805 setState(WithdrawnState); 1797// setState(WithdrawnState);
1798//
1806 XUnmapWindow(display, frame.window); 1799 XUnmapWindow(display, frame.window);
1807 1800
1808 XSelectInput(display, client.window, NoEventMask); 1801 XSelectInput(display, client.window, NoEventMask);