aboutsummaryrefslogtreecommitdiff
path: root/src/BaseDisplay.cc
diff options
context:
space:
mode:
authorunknown <unknown>2002-01-11 11:59:54 (GMT)
committerunknown <unknown>2002-01-11 11:59:54 (GMT)
commit61661d638e34b3ce6c986d5a53b8c08c1051d422 (patch)
treef0b87676e95070afee163f76902efd0c4d5b5fe6 /src/BaseDisplay.cc
parentf98c3c9045397bd9497621deb55b310366f8a5de (diff)
parenta3d2a1cf0a5ab724e19a91915fe97842f52260d5 (diff)
downloadfluxbox_pavel-Release-0_1_6.zip
fluxbox_pavel-Release-0_1_6.tar.bz2
This commit was manufactured by cvs2svn to create tagRelease-0_1_6
'Release-0_1_6'.
Diffstat (limited to 'src/BaseDisplay.cc')
-rw-r--r--src/BaseDisplay.cc19
1 files changed, 6 insertions, 13 deletions
diff --git a/src/BaseDisplay.cc b/src/BaseDisplay.cc
index c91bb01..1f7b8a7 100644
--- a/src/BaseDisplay.cc
+++ b/src/BaseDisplay.cc
@@ -1,3 +1,6 @@
1// BaseDisplay.cc for Fluxbox Window manager
2// Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
3//
1// BaseDisplay.cc for Blackbox - an X11 Window manager 4// BaseDisplay.cc for Blackbox - an X11 Window manager
2// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) 5// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
3// 6//
@@ -19,9 +22,7 @@
19// 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
20// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
21 24
22// 25// $Id: BaseDisplay.cc,v 1.4 2002/01/09 14:11:20 fluxgen Exp $
23// Changes for Fluxbox made by Henrik Kinnunen (fluxgen@linuxmail.org)
24//
25 26
26// 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
27// library 28// library
@@ -218,14 +219,6 @@ void bexec(const char *command, char* displaystring) {
218#endif // !__EMX__ 219#endif // !__EMX__
219 220
220 221
221char *bstrdup(const char *s) {
222 int l = strlen(s) + 1;
223 char *n = new char[l];
224 strncpy(n, s, l);
225 return n;
226}
227
228
229BaseDisplay::BaseDisplay(char *app_name, char *dpy_name) { 222BaseDisplay::BaseDisplay(char *app_name, char *dpy_name) {
230 application_name = app_name; 223 application_name = app_name;
231 224
@@ -372,7 +365,7 @@ BaseDisplay::BaseDisplay(char *app_name, char *dpy_name) {
372#endif // NEWWMSPEC 365#endif // NEWWMSPEC
373 366
374#ifdef GNOME 367#ifdef GNOME
375 /* 368
376 gnome_wm_win_layer = XInternAtom(display, "_WIN_LAYER", False); 369 gnome_wm_win_layer = XInternAtom(display, "_WIN_LAYER", False);
377 gnome_wm_win_state = XInternAtom(display, "_WIN_STATE", False); 370 gnome_wm_win_state = XInternAtom(display, "_WIN_STATE", False);
378 gnome_wm_win_hints = XInternAtom(display, "_WIN_HINTS", False); 371 gnome_wm_win_hints = XInternAtom(display, "_WIN_HINTS", False);
@@ -385,7 +378,7 @@ BaseDisplay::BaseDisplay(char *app_name, char *dpy_name) {
385 gnome_wm_win_client_list = XInternAtom(display, "_WIN_CLIENT_LIST", False); 378 gnome_wm_win_client_list = XInternAtom(display, "_WIN_CLIENT_LIST", False);
386 gnome_wm_prot = XInternAtom(display, "_WIN_PROTOCOLS", False); 379 gnome_wm_prot = XInternAtom(display, "_WIN_PROTOCOLS", False);
387 gnome_wm_supporting_wm_check = XInternAtom(display, "_WIN_SUPPORTING_WM_CHECK", False); 380 gnome_wm_supporting_wm_check = XInternAtom(display, "_WIN_SUPPORTING_WM_CHECK", False);
388 */ 381
389#endif // GNOME 382#endif // GNOME
390 383
391 cursor.session = XCreateFontCursor(display, XC_left_ptr); 384 cursor.session = XCreateFontCursor(display, XC_left_ptr);