Attachment #20015 for bug #32387

View | Details | Raw Unified | Return to bug 32387
Collapse All | Expand All

Lines 434-441 Link Here

(-)aterm-cvs/src/main.c (+26 lines)
434	Cursor cursor;	434	Cursor cursor;
435	XClassHint classHint;	435	XClassHint classHint;
436	XWMHints wmHint;	436	XWMHints wmHint;
		437	Atom prop = None;
437	int i, x, y, flags;	438	int i, x, y, flags;
438	unsigned int width, height;	439	unsigned int width, height;
		440	MWMHints mwmhints;
		441
439	#ifdef PREFER_24BIT	442	#ifdef PREFER_24BIT
440	XSetWindowAttributes attributes;	443	XSetWindowAttributes attributes;
441	XWindowAttributes gattr;	444	XWindowAttributes gattr;
Lines 464-469 Link Here
464	}	467	}
465	#endif	468	#endif
466		469
		470	if (Options & Opt_borderLess) {
		471	prop = XInternAtom(Xdisplay, "_MOTIF_WM_INFO", True);
		472	if (prop == None) {
		473	/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
		474	#ifdef PREFER_24BIT
		475	attributes.override_redirect = TRUE;
		476	#endif
		477	mwmhints.flags = 0;
		478	} else {
		479	mwmhints.flags = MWM_HINTS_DECORATIONS;
		480	mwmhints.decorations = 0;
		481	}
		482	} else {
		483	mwmhints.flags = 0;
		484	}
		485
		486
467	/*	487	/*
468	* grab colors before netscape does	488	* grab colors before netscape does
469	*/	489	*/
Lines 687-692 Link Here
687	(KeyPressMask \| FocusChangeMask \|	707	(KeyPressMask \| FocusChangeMask \|
688	StructureNotifyMask \| VisibilityChangeMask)	708	StructureNotifyMask \| VisibilityChangeMask)
689	);	709	);
		710
		711	if (mwmhints.flags) {
		712	prop = XInternAtom(Xdisplay, "_MOTIF_WM_HINTS", False);
		713	XChangeProperty(Xdisplay, TermWin.parent, prop, prop, 32, PropModeReplace, (unsigned char *) &mwmhints, PROP_MWM_HINTS_ELEMENTS);
		714	}
		715
690		716
691	/* vt cursor: Black-on-White is standard, but this is more popular */	717	/* vt cursor: Black-on-White is standard, but this is more popular */
692	TermWin_cursor = XCreateFontCursor(Xdisplay, XC_xterm);	718	TermWin_cursor = XCreateFontCursor(Xdisplay, XC_xterm);

Lines 140-145 Link Here

(-)aterm-cvs/src/rxvt.h (+38 lines)
140	#include <X11/Intrinsic.h> /* Xlib, Xutil, Xresource, Xfuncproto */	140	#include <X11/Intrinsic.h> /* Xlib, Xutil, Xresource, Xfuncproto */
141	#include <X11/cursorfont.h>	141	#include <X11/cursorfont.h>
142	#include <X11/keysym.h>	142	#include <X11/keysym.h>
		143	#include <X11/Xmd.h>
143		144
144	#include "libafterstep.h"	145	#include "libafterstep.h"
145		146
Lines 458-463 Link Here
458	(tmp) = (one); (one) = (two); (two) = (tmp); \	459	(tmp) = (one); (one) = (two); (two) = (tmp); \
459	} while (0)	460	} while (0)
460		461
		462	typedef struct _mwmhints {
		463	CARD32 flags;
		464	CARD32 functions;
		465	CARD32 decorations;
		466	INT32 input_mode;
		467	CARD32 status;
		468	} MWMHints;
		469
		470
461	/*	471	/*
462	*****************************************************************************	472	*****************************************************************************
463	* NORMAL DEFINES	473	* NORMAL DEFINES
Lines 690-695 Link Here
690	#define Opt_scrollKeypress (1LU<<12)	700	#define Opt_scrollKeypress (1LU<<12)
691	#define Opt_transparent (1LU<<13)	701	#define Opt_transparent (1LU<<13)
692	#define Opt_transparent_sb (1LU<<14)	702	#define Opt_transparent_sb (1LU<<14)
		703	#define Opt_borderLess (1LU<<15)
693		704
694	/* place holder used for parsing command-line options */	705	/* place holder used for parsing command-line options */
695	#define Opt_Boolean (1LU<<31)	706	#define Opt_Boolean (1LU<<31)
Lines 778-783 Link Here
778	* divisible by 4 (num rect)	789	* divisible by 4 (num rect)
779	*/	790	*/
780	#define NGRX_PTS 1000	791	#define NGRX_PTS 1000
		792
		793	/* Motif window hints */
		794	#define MWM_HINTS_FUNCTIONS (1L << 0)
		795	#define MWM_HINTS_DECORATIONS (1L << 1)
		796	#define MWM_HINTS_INPUT_MODE (1L << 2)
		797	#define MWM_HINTS_STATUS (1L << 3)
		798	/* bit definitions for MwmHints.functions */
		799	#define MWM_FUNC_ALL (1L << 0)
		800	#define MWM_FUNC_RESIZE (1L << 1)
		801	#define MWM_FUNC_MOVE (1L << 2)
		802	#define MWM_FUNC_MINIMIZE (1L << 3)
		803	#define MWM_FUNC_MAXIMIZE (1L << 4)
		804	#define MWM_FUNC_CLOSE (1L << 5)
		805	/* bit definitions for MwmHints.decorations */
		806	#define MWM_DECOR_ALL (1L << 0)
		807	#define MWM_DECOR_BORDER (1L << 1)
		808	#define MWM_DECOR_RESIZEH (1L << 2)
		809	#define MWM_DECOR_TITLE (1L << 3)
		810	#define MWM_DECOR_MENU (1L << 4)
		811	#define MWM_DECOR_MINIMIZE (1L << 5)
		812	#define MWM_DECOR_MAXIMIZE (1L << 6)
		813	/* bit definitions for MwmHints.inputMode */
		814	#define MWM_INPUT_MODELESS 0
		815	#define MWM_INPUT_PRIMARY_APPLICATION_MODAL 1
		816	#define MWM_INPUT_SYSTEM_MODAL 2
		817	#define MWM_INPUT_FULL_APPLICATION_MODAL 3
		818	#define PROP_MWM_HINTS_ELEMENTS 5
781		819
782	/*	820	/*
783	*****************************************************************************	821	*****************************************************************************

Lines 44-49 Link Here

(-)aterm-cvs/src/xdefaults.c (+2 lines)
44		44
45	/* local functions referenced */	45	/* local functions referenced */
46	/{{{ local variables /	46	/{{{ local variables /
		47	static const char *rs_borderLess = NULL;
47	static const char *rs_loginShell = NULL;	48	static const char *rs_loginShell = NULL;
48	static const char *rs_utmpInhibit = NULL;	49	static const char *rs_utmpInhibit = NULL;
49	static const char *rs_scrollBar = NULL;	50	static const char *rs_scrollBar = NULL;
Lines 299-304 Link Here
299	"width of border"),	300	"width of border"),
300	STRG(rs_color[Color_border], "borderColor", "bd", "color",	301	STRG(rs_color[Color_border], "borderColor", "bd", "color",
301	"border color"),	302	"border color"),
		303	BOOL(rs_borderLess, "borderLess", "bl", Opt_borderLess, "no decoration"),
302	BOOL(rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"),	304	BOOL(rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"),
303	BOOL(rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"),	305	BOOL(rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"),
304	BOOL(rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right,	306	BOOL(rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right,

Return to bug 32387