1
0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 20:38:08 +01:00

Fix enable-modelock warnings

Fix warnings that only show up when --enable-modelock is passed to
./configure.
This commit is contained in:
Brad Jorsch
2010-04-08 17:01:24 -04:00
committed by Carlos R. Mafra
parent ec7506e5e5
commit 65aa3ae9c8
4 changed files with 10 additions and 3 deletions

View File

@@ -124,6 +124,10 @@ static void handleVisibilityNotify(XEvent *event);
static void handleShapeNotify(XEvent *event); static void handleShapeNotify(XEvent *event);
#endif #endif
#ifdef KEEP_XKB_LOCK_STATUS
static void handleXkbIndicatorStateNotify(XEvent *event);
#endif
/* called from the signal handler */ /* called from the signal handler */
void NotifyDeadProcess(pid_t pid, unsigned char status); void NotifyDeadProcess(pid_t pid, unsigned char status);
@@ -1194,7 +1198,7 @@ static void handleShapeNotify(XEvent * event)
#ifdef KEEP_XKB_LOCK_STATUS #ifdef KEEP_XKB_LOCK_STATUS
/* please help ]d if you know what to do */ /* please help ]d if you know what to do */
handleXkbIndicatorStateNotify(XEvent * event) static void handleXkbIndicatorStateNotify(XEvent *event)
{ {
WWindow *wwin; WWindow *wwin;
WScreen *scr; WScreen *scr;

View File

@@ -146,13 +146,14 @@ void wFrameWindowUpdateBorders(WFrameWindow * fwin, int flags)
wCoreConfigure(fwin->left_button, 0, 0, bsize, bsize); wCoreConfigure(fwin->left_button, 0, 0, bsize, bsize);
} }
#ifdef XKB_BUTTON_HINT #ifdef XKB_BUTTON_HINT
if (fwin->language_button) if (fwin->language_button) {
if (fwin->flags.hide_left_button || !fwin->left_button if (fwin->flags.hide_left_button || !fwin->left_button
|| fwin->flags.lbutton_dont_fit) { || fwin->flags.lbutton_dont_fit) {
wCoreConfigure(fwin->language_button, 0, 0, bsize, bsize); wCoreConfigure(fwin->language_button, 0, 0, bsize, bsize);
} else { } else {
wCoreConfigure(fwin->language_button, bsize, 0, bsize, bsize); wCoreConfigure(fwin->language_button, bsize, 0, bsize, bsize);
} }
}
#endif #endif
if (fwin->right_button) { if (fwin->right_button) {

View File

@@ -42,6 +42,9 @@
#ifdef SHAPE #ifdef SHAPE
#include <X11/extensions/shape.h> #include <X11/extensions/shape.h>
#endif #endif
#ifdef KEEP_XKB_LOCK_STATUS
#include <X11/XKBlib.h>
#endif
#include "WindowMaker.h" #include "WindowMaker.h"
#include "GNUstep.h" #include "GNUstep.h"

View File

@@ -2980,7 +2980,6 @@ static void windowLanguageClick(WCoreWindow *sender, void *data, XEvent *event)
WWindow *wwin = data; WWindow *wwin = data;
WFrameWindow *fwin = wwin->frame; WFrameWindow *fwin = wwin->frame;
WScreen *scr = fwin->screen_ptr; WScreen *scr = fwin->screen_ptr;
XkbStateRec staterec;
int tl; int tl;
if (event->xbutton.button != Button1 && event->xbutton.button != Button3) if (event->xbutton.button != Button1 && event->xbutton.button != Button3)