Commit b5a719d0 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Merge branch 'mwmhints2' of github.com:rephorm/feh into rephorm-mwmhints2

parents 2987b1b4 adf901a3

src/winwidget.c

+2 −2
Original line number Diff line number Diff line
@@ -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,

src/winwidget.h

+5 −5
Original line number Diff line number Diff line
@@ -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 {