aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsimonb <simonb>2005-05-06 15:24:53 (GMT)
committersimonb <simonb>2005-05-06 15:24:53 (GMT)
commit783a3903759117112e4120a5ff47b59f2a67cf06 (patch)
tree15f652658a5f2cf3ef5ffc40da834747c9dcfe21
parent90fcc93d6e87183c7d2956b4b1e067be25060169 (diff)
downloadfluxbox_pavel-783a3903759117112e4120a5ff47b59f2a67cf06.zip
fluxbox_pavel-783a3903759117112e4120a5ff47b59f2a67cf06.tar.bz2
fix wm_name for fluxbox
-rw-r--r--ChangeLog2
-rw-r--r--src/Ewmh.cc3
-rw-r--r--src/Ewmh.hh2
3 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7d70594..b8f55fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.13 2Changes for 0.9.13
3*05/05/06: 3*05/05/06:
4 * xrestop should now display "Fluxbox" (Simon)
5 Ewmh.hh/cc
4 * Fix potential segfault menu bug, thanks chenfeng (Simon) 6 * Fix potential segfault menu bug, thanks chenfeng (Simon)
5 Menu.cc 7 Menu.cc
6 * Added more KeyActions to TextBox (thanx to Vadim <suhanov_vadim@mail.ru> 8 * Added more KeyActions to TextBox (thanx to Vadim <suhanov_vadim@mail.ru>
diff --git a/src/Ewmh.cc b/src/Ewmh.cc
index d6ccf36..843b8d2 100644
--- a/src/Ewmh.cc
+++ b/src/Ewmh.cc
@@ -92,7 +92,7 @@ void Ewmh::initForScreen(BScreen &screen) {
92 XChangeProperty(disp, wincheck, m_net_supporting_wm_check, XA_WINDOW, 32, 92 XChangeProperty(disp, wincheck, m_net_supporting_wm_check, XA_WINDOW, 32,
93 PropModeReplace, (unsigned char *) &wincheck, 1); 93 PropModeReplace, (unsigned char *) &wincheck, 1);
94 94
95 XChangeProperty(disp, wincheck, m_net_wm_name, XA_STRING, 8, 95 XChangeProperty(disp, wincheck, m_net_wm_name, utf8_string, 8,
96 PropModeReplace, (unsigned char *) "Fluxbox", strlen("Fluxbox")); 96 PropModeReplace, (unsigned char *) "Fluxbox", strlen("Fluxbox"));
97 } 97 }
98 98
@@ -794,6 +794,7 @@ void Ewmh::createAtoms() {
794 m_net_wm_handled_icons = XInternAtom(disp, "_NET_WM_HANDLED_ICONS", False); 794 m_net_wm_handled_icons = XInternAtom(disp, "_NET_WM_HANDLED_ICONS", False);
795 795
796 m_net_wm_ping = XInternAtom(disp, "_NET_WM_PING", False); 796 m_net_wm_ping = XInternAtom(disp, "_NET_WM_PING", False);
797 utf8_string = XInternAtom(disp, "UTF8_STRING", False);
797} 798}
798 799
799 800
diff --git a/src/Ewmh.hh b/src/Ewmh.hh
index 61f0d10..b2b61b4 100644
--- a/src/Ewmh.hh
+++ b/src/Ewmh.hh
@@ -122,6 +122,8 @@ private:
122 // application protocols 122 // application protocols
123 Atom m_net_wm_ping; 123 Atom m_net_wm_ping;
124 124
125 Atom utf8_string;
126
125 std::vector<Window> m_windows; 127 std::vector<Window> m_windows;
126 typedef std::map<FluxboxWindow *, WindowState *> SavedState; 128 typedef std::map<FluxboxWindow *, WindowState *> SavedState;
127 SavedState m_savedstate; 129 SavedState m_savedstate;