summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2013-12-04 19:19:30 +0100
committerDaniel Friesel <derf@finalrewind.org>2013-12-04 19:19:30 +0100
commitb5a719d0dc475066eafc5810c2bdc49bca18713a (patch)
treede38172d7102ef48d65e98dd733b65ebd0f9aba3
parent2987b1b4407a076a14bd3d40be7080c9527f6541 (diff)
parentadf901a3374bf316b217a46e04de76e1a52a4131 (diff)
Merge branch 'mwmhints2' of github.com:rephorm/feh into rephorm-mwmhints2
-rw-r--r--src/winwidget.c4
-rw-r--r--src/winwidget.h10
2 files changed, 7 insertions, 7 deletions
diff --git a/src/winwidget.c b/src/winwidget.c
index 1f4fbc0..133aa89 100644
--- a/src/winwidget.c
+++ b/src/winwidget.c
@@ -228,6 +228,7 @@ void winwidget_create_window(winwidget ret, int w, int h)
KeyPressMask | KeyReleaseMask | ButtonMotionMask | ExposureMask
| FocusChangeMask | PropertyChangeMask | VisibilityChangeMask;
+ memset(&mwmhints, 0, sizeof(mwmhints));
if (opt.borderless || ret->full_screen) {
prop = XInternAtom(disp, "_MOTIF_WM_HINTS", True);
if (prop == None) {
@@ -240,8 +241,7 @@ void winwidget_create_window(winwidget ret, int w, int h)
mwmhints.flags = MWM_HINTS_DECORATIONS;
mwmhints.decorations = 0;
}
- } else
- mwmhints.flags = 0;
+ }
ret->win =
XCreateWindow(disp, DefaultRootWindow(disp), x, y, w, h, 0,
diff --git a/src/winwidget.h b/src/winwidget.h
index be5a761..89d5bcd 100644
--- a/src/winwidget.h
+++ b/src/winwidget.h
@@ -61,11 +61,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
/* Motif window hints */
typedef struct _mwmhints {
- CARD32 flags;
- CARD32 functions;
- CARD32 decorations;
- INT32 input_mode;
- CARD32 status;
+ unsigned long flags;
+ unsigned long functions;
+ unsigned long decorations;
+ long input_mode;
+ unsigned long status;
} MWMHints;
enum win_type {