Disable shaded, semi-solid, and translucent move/resize modes by default.
SVN revision: 47702
This commit is contained in:
parent
afb380eed5
commit
581f6cfd60
|
@ -359,6 +359,13 @@ if test "x$enable_dialogs" = "xyes"; then
|
|||
AC_DEFINE(ENABLE_DIALOGS, 1, [Configuration dialog support])
|
||||
fi
|
||||
|
||||
AC_ARG_ENABLE(oldmovres,
|
||||
[ --enable-oldmovres enable support for old move/resize modes @<:@default=no@:>@],,
|
||||
enable_oldmovres=no)
|
||||
if test "x$enable_oldmovres" = "xyes"; then
|
||||
AC_DEFINE(ENABLE_OLDMOVRES, 1, [Support old move/resize modes (shaded, semi-solid, translucent)])
|
||||
fi
|
||||
|
||||
AM_MISSING_PROG(XMLTO, xmlto)
|
||||
AC_ARG_ENABLE(mans,
|
||||
[ --enable-mans install man page @<:@default=yes@:>@],,
|
||||
|
@ -444,6 +451,7 @@ echo " Modules ...................... $enable_modules"
|
|||
echo " Visibility hiding ............ $enable_visibility_hiding (only useful with modules)"
|
||||
echo " Window mode helper library ... $enable_libhack"
|
||||
echo " Dialogs ...................... $enable_dialogs"
|
||||
echo " Old move/resize modes ........ $enable_oldmovres (shaded, semi-solid, translucent)"
|
||||
echo
|
||||
echo "Experimental options - DO NOT USE unless you know what you are doing"
|
||||
echo " Compile with ecore/ecore_x ... $enable_ecore"
|
||||
|
|
|
@ -28,8 +28,10 @@
|
|||
#include "piximg.h"
|
||||
#include "xwin.h"
|
||||
|
||||
#if ENABLE_OLDMOVRES
|
||||
#define ENABLE_MODE_34 1 /* Enable shaded/semi-solid modes */
|
||||
#define ENABLE_MODE_5 1 /* Enable translucent mode */
|
||||
#endif
|
||||
|
||||
#if ENABLE_MODE_34
|
||||
#if 0
|
||||
|
|
|
@ -35,6 +35,14 @@
|
|||
#include "xwin.h"
|
||||
#include <X11/keysym.h>
|
||||
|
||||
#if ENABLE_OLDMOVRES
|
||||
#define MODE_MOVE_MAX 5
|
||||
#define MOVE_SIZE_MAX 4
|
||||
#else
|
||||
#define MODE_MOVE_MAX 2
|
||||
#define MOVE_SIZE_MAX 2
|
||||
#endif
|
||||
|
||||
static struct {
|
||||
Win events;
|
||||
EWin *ewin;
|
||||
|
@ -115,11 +123,13 @@ MoveResizeMoveStart(EWin * ewin, int kbd, int constrained, int nogroup)
|
|||
gwins = ListWinGroupMembersForEwin(ewin, GROUP_ACTION_MOVE, nogroup
|
||||
|| Mode.move.swap, &num);
|
||||
|
||||
if (Conf.movres.mode_move < 0 || Conf.movres.mode_move > 5)
|
||||
if (Conf.movres.mode_move < 0 || Conf.movres.mode_move > MODE_MOVE_MAX)
|
||||
Conf.movres.mode_move = 0;
|
||||
Mode_mr.mode = Conf.movres.mode_move;
|
||||
#if ENABLE_OLDMOVRES
|
||||
if (num > 1 && Conf.movres.mode_move == 5)
|
||||
Mode_mr.mode = 0;
|
||||
#endif
|
||||
Mode_mr.grab_server = _NeedServerGrab(Mode_mr.mode);
|
||||
|
||||
for (i = 0; i < num; i++)
|
||||
|
@ -255,7 +265,11 @@ _MoveResizeMoveResume(void)
|
|||
|
||||
GrabPointerSet(Mode_mr.events, ECSR_ACT_MOVE, 1);
|
||||
|
||||
#if ENABLE_OLDMOVRES
|
||||
fl = (Mode_mr.mode == 5) ? 4 : 0;
|
||||
#else
|
||||
fl = 0;
|
||||
#endif
|
||||
if (Mode.mode == MODE_MOVE_PENDING)
|
||||
{
|
||||
Mode.mode = MODE_MOVE;
|
||||
|
@ -310,7 +324,7 @@ MoveResizeResizeStart(EWin * ewin, int kbd, int hv)
|
|||
|
||||
SoundPlay(SOUND_RESIZE_START);
|
||||
|
||||
if (Conf.movres.mode_resize < 0 || Conf.movres.mode_resize > 4)
|
||||
if (Conf.movres.mode_resize < 0 || Conf.movres.mode_resize > MOVE_SIZE_MAX)
|
||||
Conf.movres.mode_resize = 0;
|
||||
Mode_mr.mode = Conf.movres.mode_resize;
|
||||
Mode_mr.using_kbd = kbd;
|
||||
|
|
|
@ -21,8 +21,10 @@
|
|||
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
#include "E.h"
|
||||
#include "config.h"
|
||||
#if ENABLE_OLDMOVRES
|
||||
#include "piximg.h"
|
||||
#include "util.h"
|
||||
#include "xwin.h"
|
||||
#if USE_XRENDER
|
||||
#include <X11/extensions/Xrender.h>
|
||||
|
@ -626,3 +628,5 @@ PixImgBlend(PixImg * s1, PixImg * s2, PixImg * dst, Drawable draw,
|
|||
}
|
||||
|
||||
#endif /* USE_XRENDER */
|
||||
|
||||
#endif /* ENABLE_OLDMOVRES */
|
||||
|
|
|
@ -118,6 +118,7 @@ _DlgFillMoveResize(Dialog * d __UNUSED__, DItem * table, void *data __UNUSED__)
|
|||
DialogItemRadioButtonSetFirst(di, radio2);
|
||||
DialogItemRadioButtonGroupSetVal(di, 2);
|
||||
|
||||
#if ENABLE_OLDMOVRES
|
||||
di = DialogAddItem(table, DITEM_RADIOBUTTON);
|
||||
DialogItemSetText(di, _("Shaded"));
|
||||
DialogItemRadioButtonSetFirst(di, radio1);
|
||||
|
@ -146,6 +147,7 @@ _DlgFillMoveResize(Dialog * d __UNUSED__, DItem * table, void *data __UNUSED__)
|
|||
DialogItemRadioButtonGroupSetValPtr(radio1, &dd->move);
|
||||
|
||||
DialogAddItem(table, DITEM_NONE);
|
||||
#endif /* ENABLE_OLDMOVRES */
|
||||
|
||||
di = DialogAddItem(table, DITEM_CHECKBUTTON);
|
||||
DialogItemSetColSpan(di, 2);
|
||||
|
|
Loading…
Reference in New Issue