nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

using desktop names

Browse source
This commit is contained in:
fluxgen 2003-06-12 14:28:00 +00:00
parent 603b784efd
commit e9ae291109
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/Gnome.cc
View file

@ -19,7 +19,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Gnome.cc,v 1.25 2003/05/19 22:40:40 fluxgen Exp $ // $Id: Gnome.cc,v 1.26 2003/06/12 14:28:00 fluxgen Exp $
#include "Gnome.hh" #include "Gnome.hh"
@ -61,6 +61,7 @@ void Gnome::initForScreen(BScreen &screen) {
m_gnome_wm_supporting_wm_check, m_gnome_wm_supporting_wm_check,
XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &gnome_win, 1); XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &gnome_win, 1);
// supported gnome atoms
Atom gnomeatomlist[] = { Atom gnomeatomlist[] = {
m_gnome_wm_supporting_wm_check, m_gnome_wm_supporting_wm_check,
m_gnome_wm_win_workspace_names, m_gnome_wm_win_workspace_names,
@ -69,7 +70,6 @@ void Gnome::initForScreen(BScreen &screen) {
m_gnome_wm_win_hints, m_gnome_wm_win_hints,
m_gnome_wm_win_layer m_gnome_wm_win_layer
}; };
//list atoms that we support //list atoms that we support
screen.rootWindow().changeProperty(m_gnome_wm_prot, screen.rootWindow().changeProperty(m_gnome_wm_prot,
XA_ATOM, 32, PropModeReplace, XA_ATOM, 32, PropModeReplace,
@ -143,7 +143,7 @@ void Gnome::updateClientList(BScreen &screen) {
Window *wl = new (nothrow) Window[num]; Window *wl = new (nothrow) Window[num];
if (wl == 0) { if (wl == 0) {
cerr<<"Fatal: Out of memory, can't allocate for gnome client list"<<endl; cerr<<"Fatal: Out of memory, can't allocate ("<<num*sizeof (Window)<<") for gnome client list"<<endl;
return; return;
} }
@ -180,24 +180,25 @@ void Gnome::updateClientList(BScreen &screen) {
} }
void Gnome::updateWorkspaceNames(BScreen &screen) { void Gnome::updateWorkspaceNames(BScreen &screen) {
XTextProperty text;
int number_of_desks = screen.getWorkspaceNames().size(); int number_of_desks = screen.getWorkspaceNames().size();
const BScreen::WorkspaceNames &workspace_names = screen.getWorkspaceNames();
char s[1024]; // convert our desktop names to a char * so we can send it
char *names[number_of_desks]; char *names[number_of_desks];
for (int i = 0; i < number_of_desks; i++) { for (int i = 0; i < number_of_desks; i++) {
sprintf(s, "Desktop %i", i); names[i] = new char[workspace_names[i].size() + 1];
names[i] = new char[strlen(s) + 1]; strcpy(names[i], workspace_names[i].c_str());
strcpy(names[i], s);
} }
XTextProperty text;
if (XStringListToTextProperty(names, number_of_desks, &text)) { if (XStringListToTextProperty(names, number_of_desks, &text)) {
XSetTextProperty(FbTk::App::instance()->display(), screen.rootWindow().window(), XSetTextProperty(FbTk::App::instance()->display(), screen.rootWindow().window(),
&text, m_gnome_wm_win_workspace_names); &text, m_gnome_wm_win_workspace_names);
XFree(text.value); XFree(text.value);
} }
// destroy name buffers
for (int i = 0; i < number_of_desks; i++) for (int i = 0; i < number_of_desks; i++)
delete [] names[i]; delete [] names[i];
} }