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

fix some compiler warnings in gcc 4.1

Browse source
This commit is contained in:
markt 2006-08-08 19:25:48 +00:00
parent e2c31b7285
commit 9b9d5a9617
7 changed files with 41 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
(Format: Year/Month/Day) (Format: Year/Month/Day)
Changes for 1.0rc3: Changes for 1.0rc3:
*06/08/08:
* Fix some warnings in gcc 4.1 (Mark)
FbTk/FbPixmap.cc Screen.cc Window.cc WinClient.cc Ewmh.cc Gnome.cc
*06/08/07: *06/08/07:
* Documented background style option (Mark) * Documented background style option (Mark)
doc/asciidoc/fluxstyle.txt doc/asciidoc/fluxstyle.txt

4
src/Ewmh.cc
View file

@ -1138,10 +1138,10 @@ void Ewmh::updateStrut(WinClient &winclient) {
Atom ret_type = 0; Atom ret_type = 0;
int fmt = 0; int fmt = 0;
unsigned long nitems = 0, bytes_after = 0; unsigned long nitems = 0, bytes_after = 0;
long *data = 0; unsigned char *data = 0;
if (winclient.property(m_net_wm_strut, 0, 4, False, XA_CARDINAL, if (winclient.property(m_net_wm_strut, 0, 4, False, XA_CARDINAL,
&ret_type, &fmt, &nitems, &bytes_after, &ret_type, &fmt, &nitems, &bytes_after,
(unsigned char **) &data) && data) { &data) && data) {
int head = winclient.screen().getHead(winclient); int head = winclient.screen().getHead(winclient);
winclient.setStrut(winclient.screen().requestStrut(head, winclient.setStrut(winclient.screen().requestStrut(head,

8
src/FbTk/FbPixmap.cc
View file

@ -359,7 +359,7 @@ void FbPixmap::rootwinPropertyNotify(int screen_num, Atom atom) {
Atom real_type; Atom real_type;
int real_format; int real_format;
unsigned long items_read, items_left; unsigned long items_read, items_left;
unsigned long *data; unsigned char *data;
if (XGetWindowProperty(display(), if (XGetWindowProperty(display(),
RootWindow(display(), screen_num), RootWindow(display(), screen_num),
@ -368,7 +368,7 @@ void FbPixmap::rootwinPropertyNotify(int screen_num, Atom atom) {
False, XA_PIXMAP, False, XA_PIXMAP,
&real_type, &real_format, &real_type, &real_format,
&items_read, &items_left, &items_read, &items_left,
(unsigned char **) &data) == Success) { &data) == Success) {
if (real_format == 32 && items_read == 1) { if (real_format == 32 && items_read == 1) {
root_pm = (Pixmap) (*data); root_pm = (Pixmap) (*data);
} }
@ -410,7 +410,7 @@ Pixmap FbPixmap::getRootPixmap(int screen_num, bool force_update) {
Atom real_type; Atom real_type;
int real_format; int real_format;
unsigned long items_read, items_left; unsigned long items_read, items_left;
unsigned long *data; unsigned char *data;
unsigned int prop = 0; unsigned int prop = 0;
@ -435,7 +435,7 @@ Pixmap FbPixmap::getRootPixmap(int screen_num, bool force_update) {
False, XA_PIXMAP, False, XA_PIXMAP,
&real_type, &real_format, &real_type, &real_format,
&items_read, &items_left, &items_read, &items_left,
(unsigned char **) &data) == Success) { &data) == Success) {
if (real_format == 32 && items_read == 1) { if (real_format == 32 && items_read == 1) {
if (print_error && strcmp(root_prop_ids[prop], "_XSETROOT_ID") == 0) { if (print_error && strcmp(root_prop_ids[prop], "_XSETROOT_ID") == 0) {
cerr<<error_message; cerr<<error_message;

9
src/Gnome.cc
View file

@ -93,11 +93,12 @@ void Gnome::setupFrame(FluxboxWindow &win) {
Atom ret_type; Atom ret_type;
int fmt; int fmt;
unsigned long nitems, bytes_after; unsigned long nitems, bytes_after;
long flags, *data = 0; long flags;
unsigned char *data = 0;
if (win.winClient().property(m_gnome_wm_win_state, 0, 1, False, XA_CARDINAL, if (win.winClient().property(m_gnome_wm_win_state, 0, 1, False, XA_CARDINAL,
&ret_type, &fmt, &nitems, &bytes_after, &ret_type, &fmt, &nitems, &bytes_after,
(unsigned char **) &data) && data) { &data) && data) {
flags = *data; flags = *data;
setState(&win, flags); setState(&win, flags);
XFree (data); XFree (data);
@ -108,7 +109,7 @@ void Gnome::setupFrame(FluxboxWindow &win) {
// load gnome layer atom // load gnome layer atom
if (win.winClient().property(m_gnome_wm_win_layer, 0, 1, False, XA_CARDINAL, if (win.winClient().property(m_gnome_wm_win_layer, 0, 1, False, XA_CARDINAL,
&ret_type, &fmt, &nitems, &bytes_after, &ret_type, &fmt, &nitems, &bytes_after,
(unsigned char **) &data) && data) { &data) && data) {
flags = *data; flags = *data;
setLayer(&win, flags); setLayer(&win, flags);
XFree (data); XFree (data);
@ -119,7 +120,7 @@ void Gnome::setupFrame(FluxboxWindow &win) {
// load gnome workspace atom // load gnome workspace atom
if (win.winClient().property(m_gnome_wm_win_workspace, 0, 1, False, XA_CARDINAL, if (win.winClient().property(m_gnome_wm_win_workspace, 0, 1, False, XA_CARDINAL,
&ret_type, &fmt, &nitems, &bytes_after, &ret_type, &fmt, &nitems, &bytes_after,
(unsigned char **) &data) && data) { &data) && data) {
unsigned int workspace_num = *data; unsigned int workspace_num = *data;
if (win.workspaceNumber() != workspace_num) if (win.workspaceNumber() != workspace_num)
win.setWorkspace(workspace_num); win.setWorkspace(workspace_num);

7
src/Screen.cc
View file

@ -1281,7 +1281,8 @@ bool BScreen::isKdeDockapp(Window client) const {
bool iskdedockapp = false; bool iskdedockapp = false;
Atom ajunk; Atom ajunk;
int ijunk; int ijunk;
unsigned long *data = 0, uljunk; unsigned char *data = 0;
unsigned long uljunk;
Display *disp = FbTk::App::instance()->display(); Display *disp = FbTk::App::instance()->display();
// Check if KDE v2.x dock applet // Check if KDE v2.x dock applet
if (XGetWindowProperty(disp, client, if (XGetWindowProperty(disp, client,
@ -1289,7 +1290,7 @@ bool BScreen::isKdeDockapp(Window client) const {
"_KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR", False), "_KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR", False),
0l, 1l, False, 0l, 1l, False,
XA_WINDOW, &ajunk, &ijunk, &uljunk, XA_WINDOW, &ajunk, &ijunk, &uljunk,
&uljunk, (unsigned char **) &data) == Success) { &uljunk, &data) == Success) {
if (data) if (data)
iskdedockapp = true; iskdedockapp = true;
@ -1304,7 +1305,7 @@ bool BScreen::isKdeDockapp(Window client) const {
if (XGetWindowProperty(disp, client, if (XGetWindowProperty(disp, client,
kwm1, 0l, 1l, False, kwm1, 0l, 1l, False,
kwm1, &ajunk, &ijunk, &uljunk, kwm1, &ajunk, &ijunk, &uljunk,
&uljunk, (unsigned char **) &data) == Success && data) { &uljunk, &data) == Success && data) {
iskdedockapp = (data && data[0] != 0); iskdedockapp = (data && data[0] != 0);
XFree((void *) data); XFree((void *) data);
data = 0; data = 0;

24
src/WinClient.cc
View file

@ -411,6 +411,7 @@ void WinClient::updateBlackboxHints() {
int format; int format;
Atom atom_return; Atom atom_return;
unsigned long num, len; unsigned long num, len;
unsigned char *data;
FbAtoms *atoms = FbAtoms::instance(); FbAtoms *atoms = FbAtoms::instance();
if (m_blackbox_hint) { if (m_blackbox_hint) {
@ -422,19 +423,21 @@ void WinClient::updateBlackboxHints() {
PropBlackboxHintsElements, False, PropBlackboxHintsElements, False,
atoms->getFluxboxHintsAtom(), &atom_return, atoms->getFluxboxHintsAtom(), &atom_return,
&format, &num, &len, &format, &num, &len,
(unsigned char **) &m_blackbox_hint) && &data) &&
m_blackbox_hint) { data) {
if (num != (unsigned)PropBlackboxHintsElements) { if (num != (unsigned)PropBlackboxHintsElements) {
XFree(m_blackbox_hint); XFree(data);
m_blackbox_hint = 0; m_blackbox_hint = 0;
} } else
m_blackbox_hint = (FluxboxWindow::BlackboxHints *) data;
} }
} }
void WinClient::updateMWMHints() { void WinClient::updateMWMHints() {
int format; int format;
Atom atom_return; Atom atom_return;
unsigned char *data;
unsigned long num = 0, len = 0; unsigned long num = 0, len = 0;
if (m_mwm_hint) { if (m_mwm_hint) {
@ -447,13 +450,14 @@ void WinClient::updateMWMHints() {
PropMwmHintsElements, false, PropMwmHintsElements, false,
motif_wm_hints, &atom_return, motif_wm_hints, &atom_return,
&format, &num, &len, &format, &num, &len,
(unsigned char **) &m_mwm_hint) && &data) &&
m_mwm_hint)) { data)) {
if (num != static_cast<unsigned int>(PropMwmHintsElements)) { if (num != static_cast<unsigned int>(PropMwmHintsElements)) {
XFree(m_mwm_hint); XFree(m_mwm_hint);
m_mwm_hint = 0; m_mwm_hint = 0;
return; return;
} }
m_mwm_hint = (MwmHints *) data;
} }
} }
@ -602,12 +606,12 @@ Window WinClient::getGroupLeftWindow() const {
unsigned long num = 0, len = 0; unsigned long num = 0, len = 0;
Atom group_left_hint = XInternAtom(display(), "_FLUXBOX_GROUP_LEFT", False); Atom group_left_hint = XInternAtom(display(), "_FLUXBOX_GROUP_LEFT", False);
Window *data = 0; unsigned char *data = 0;
if (property(group_left_hint, 0, if (property(group_left_hint, 0,
1, false, 1, false,
XA_WINDOW, &atom_return, XA_WINDOW, &atom_return,
&format, &num, &len, &format, &num, &len,
(unsigned char **) &data) && &data) &&
data) { data) {
if (num != 1) { if (num != 1) {
XFree(data); XFree(data);
@ -638,12 +642,12 @@ bool WinClient::hasGroupLeftWindow() const {
unsigned long num = 0, len = 0; unsigned long num = 0, len = 0;
Atom group_left_hint = XInternAtom(display(), "_FLUXBOX_GROUP_LEFT", False); Atom group_left_hint = XInternAtom(display(), "_FLUXBOX_GROUP_LEFT", False);
Window *data = 0; unsigned char *data = 0;
if (property(group_left_hint, 0, if (property(group_left_hint, 0,
1, false, 1, false,
XA_WINDOW, &atom_return, XA_WINDOW, &atom_return,
&format, &num, &len, &format, &num, &len,
(unsigned char **) &data) && &data) &&
data) { data) {
XFree(data); XFree(data);
if (num != 1) if (num != 1)

15
src/Window.cc
View file

@ -2207,11 +2207,12 @@ bool FluxboxWindow::getState() {
Atom atom_return; Atom atom_return;
bool ret = false; bool ret = false;
int foo; int foo;
unsigned long *state, ulfoo, nitems; unsigned char *state;
unsigned long ulfoo, nitems;
if (!m_client->property(FbAtoms::instance()->getWMStateAtom(), if (!m_client->property(FbAtoms::instance()->getWMStateAtom(),
0l, 2l, false, FbAtoms::instance()->getWMStateAtom(), 0l, 2l, false, FbAtoms::instance()->getWMStateAtom(),
&atom_return, &foo, &nitems, &ulfoo, &atom_return, &foo, &nitems, &ulfoo,
(unsigned char **) &state) || !state) &state) || !state)
return false; return false;
if (nitems >= 1) { if (nitems >= 1) {
@ -2239,18 +2240,20 @@ void FluxboxWindow::restoreAttributes() {
Atom atom_return; Atom atom_return;
int foo; int foo;
unsigned long ulfoo, nitems; unsigned long ulfoo, nitems;
unsigned char *data;
FbAtoms *fbatoms = FbAtoms::instance(); FbAtoms *fbatoms = FbAtoms::instance();
BlackboxAttributes *net; BlackboxAttributes *net;
if (m_client->property(fbatoms->getFluxboxAttributesAtom(), 0l, if (m_client->property(fbatoms->getFluxboxAttributesAtom(), 0l,
PropBlackboxAttributesElements, false, PropBlackboxAttributesElements, false,
fbatoms->getFluxboxAttributesAtom(), &atom_return, &foo, fbatoms->getFluxboxAttributesAtom(), &atom_return, &foo,
&nitems, &ulfoo, (unsigned char **) &net) && &nitems, &ulfoo, &data) &&
net) { data) {
if (nitems != (unsigned)PropBlackboxAttributesElements) { if (nitems != (unsigned)PropBlackboxAttributesElements) {
XFree(net); XFree(data);
return; return;
} }
net = (BlackboxAttributes *) data;
m_blackbox_attrib.flags = net->flags; m_blackbox_attrib.flags = net->flags;
m_blackbox_attrib.attrib = net->attrib; m_blackbox_attrib.attrib = net->attrib;
m_blackbox_attrib.workspace = net->workspace; m_blackbox_attrib.workspace = net->workspace;
@ -2260,7 +2263,7 @@ void FluxboxWindow::restoreAttributes() {
m_blackbox_attrib.premax_w = net->premax_w; m_blackbox_attrib.premax_w = net->premax_w;
m_blackbox_attrib.premax_h = net->premax_h; m_blackbox_attrib.premax_h = net->premax_h;
XFree(static_cast<void *>(net)); XFree(data);
} else } else
return; return;