diff options
Diffstat (limited to 'src/Gnome.cc')
-rw-r--r-- | src/Gnome.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/Gnome.cc b/src/Gnome.cc index f90fa9e..11cce0d 100644 --- a/src/Gnome.cc +++ b/src/Gnome.cc | |||
@@ -19,7 +19,7 @@ | |||
19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 | // DEALINGS IN THE SOFTWARE. | 20 | // DEALINGS IN THE SOFTWARE. |
21 | 21 | ||
22 | // $Id: Gnome.cc,v 1.19 2003/05/08 02:50:38 rathnor Exp $ | 22 | // $Id: Gnome.cc,v 1.20 2003/05/10 22:57:37 fluxgen Exp $ |
23 | 23 | ||
24 | #include "Gnome.hh" | 24 | #include "Gnome.hh" |
25 | 25 | ||
@@ -51,9 +51,9 @@ void Gnome::initForScreen(BScreen &screen) { | |||
51 | Display *disp = FbTk::App::instance()->display(); | 51 | Display *disp = FbTk::App::instance()->display(); |
52 | // create the GNOME window | 52 | // create the GNOME window |
53 | Window gnome_win = XCreateSimpleWindow(disp, | 53 | Window gnome_win = XCreateSimpleWindow(disp, |
54 | screen.getRootWindow(), 0, 0, 5, 5, 0, 0, 0); | 54 | screen.rootWindow().window(), 0, 0, 5, 5, 0, 0, 0); |
55 | // supported WM check | 55 | // supported WM check |
56 | XChangeProperty(disp, screen.getRootWindow(), | 56 | XChangeProperty(disp, screen.rootWindow().window(), |
57 | m_gnome_wm_supporting_wm_check, | 57 | m_gnome_wm_supporting_wm_check, |
58 | XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &gnome_win, 1); | 58 | XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &gnome_win, 1); |
59 | 59 | ||
@@ -71,7 +71,7 @@ void Gnome::initForScreen(BScreen &screen) { | |||
71 | }; | 71 | }; |
72 | 72 | ||
73 | //list atoms that we support | 73 | //list atoms that we support |
74 | XChangeProperty(disp, screen.getRootWindow(), | 74 | XChangeProperty(disp, screen.rootWindow().window(), |
75 | m_gnome_wm_prot, XA_ATOM, 32, PropModeReplace, | 75 | m_gnome_wm_prot, XA_ATOM, 32, PropModeReplace, |
76 | (unsigned char *)gnomeatomlist, (sizeof gnomeatomlist)/sizeof gnomeatomlist[0]); | 76 | (unsigned char *)gnomeatomlist, (sizeof gnomeatomlist)/sizeof gnomeatomlist[0]); |
77 | 77 | ||
@@ -173,7 +173,7 @@ void Gnome::updateClientList(BScreen &screen) { | |||
173 | //number of windows to show in client list | 173 | //number of windows to show in client list |
174 | num = win; | 174 | num = win; |
175 | XChangeProperty(FbTk::App::instance()->display(), | 175 | XChangeProperty(FbTk::App::instance()->display(), |
176 | screen.getRootWindow(), | 176 | screen.rootWindow().window(), |
177 | m_gnome_wm_win_client_list, | 177 | m_gnome_wm_win_client_list, |
178 | XA_CARDINAL, 32, | 178 | XA_CARDINAL, 32, |
179 | PropModeReplace, (unsigned char *)wl, num); | 179 | PropModeReplace, (unsigned char *)wl, num); |
@@ -195,7 +195,7 @@ void Gnome::updateWorkspaceNames(BScreen &screen) { | |||
195 | } | 195 | } |
196 | 196 | ||
197 | if (XStringListToTextProperty(names, number_of_desks, &text)) { | 197 | if (XStringListToTextProperty(names, number_of_desks, &text)) { |
198 | XSetTextProperty(FbTk::App::instance()->display(), screen.getRootWindow(), | 198 | XSetTextProperty(FbTk::App::instance()->display(), screen.rootWindow().window(), |
199 | &text, m_gnome_wm_win_workspace_names); | 199 | &text, m_gnome_wm_win_workspace_names); |
200 | XFree(text.value); | 200 | XFree(text.value); |
201 | } | 201 | } |
@@ -207,7 +207,7 @@ void Gnome::updateWorkspaceNames(BScreen &screen) { | |||
207 | void Gnome::updateCurrentWorkspace(BScreen &screen) { | 207 | void Gnome::updateCurrentWorkspace(BScreen &screen) { |
208 | int workspace = screen.getCurrentWorkspaceID(); | 208 | int workspace = screen.getCurrentWorkspaceID(); |
209 | XChangeProperty(FbTk::App::instance()->display(), | 209 | XChangeProperty(FbTk::App::instance()->display(), |
210 | screen.getRootWindow(), | 210 | screen.rootWindow().window(), |
211 | m_gnome_wm_win_workspace, XA_CARDINAL, 32, PropModeReplace, | 211 | m_gnome_wm_win_workspace, XA_CARDINAL, 32, PropModeReplace, |
212 | (unsigned char *)&workspace, 1); | 212 | (unsigned char *)&workspace, 1); |
213 | 213 | ||
@@ -216,7 +216,7 @@ void Gnome::updateCurrentWorkspace(BScreen &screen) { | |||
216 | 216 | ||
217 | void Gnome::updateWorkspaceCount(BScreen &screen) { | 217 | void Gnome::updateWorkspaceCount(BScreen &screen) { |
218 | int numworkspaces = screen.getCount(); | 218 | int numworkspaces = screen.getCount(); |
219 | XChangeProperty(FbTk::App::instance()->display(), screen.getRootWindow(), | 219 | XChangeProperty(FbTk::App::instance()->display(), screen.rootWindow().window(), |
220 | m_gnome_wm_win_workspace_count, XA_CARDINAL, 32, PropModeReplace, | 220 | m_gnome_wm_win_workspace_count, XA_CARDINAL, 32, PropModeReplace, |
221 | (unsigned char *)&numworkspaces, 1); | 221 | (unsigned char *)&numworkspaces, 1); |
222 | } | 222 | } |