summaryrefslogtreecommitdiff
path: root/wm
diff options
context:
space:
mode:
Diffstat (limited to 'wm')
-rw-r--r--wm/fluxbox/Makefile8
-rw-r--r--wm/fluxbox/PLIST11
-rw-r--r--wm/fluxbox/distinfo22
-rw-r--r--wm/fluxbox/patches/patch-aa25
-rw-r--r--wm/fluxbox/patches/patch-ac29
-rw-r--r--wm/fluxbox/patches/patch-bb24
-rw-r--r--wm/fluxbox/patches/patch-bc16
-rw-r--r--wm/fluxbox/patches/patch-be19
-rw-r--r--wm/fluxbox/patches/patch-bf29
-rw-r--r--wm/fluxbox/patches/patch-bh12
-rw-r--r--wm/fluxbox/patches/patch-bi12
-rw-r--r--wm/fluxbox/patches/patch-bk21
12 files changed, 57 insertions, 171 deletions
diff --git a/wm/fluxbox/Makefile b/wm/fluxbox/Makefile
index af92bcbe75b..4b473ed266e 100644
--- a/wm/fluxbox/Makefile
+++ b/wm/fluxbox/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.47 2008/06/12 02:14:54 joerg Exp $
+# $NetBSD: Makefile,v 1.48 2009/07/07 15:47:59 sborrill Exp $
#
-DISTNAME= fluxbox-1.0.0
-PKGREVISION= 2
+DISTNAME= fluxbox-1.1.1
CATEGORIES= wm x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fluxbox/}
EXTRACT_SUFX= .tar.bz2
-MAINTAINER= tonio@NetBSD.org
+MAINTAINER= sborrill@NetBSD.org
HOMEPAGE= http://fluxbox.sourceforge.net/
COMMENT= Window Manager for X based on Blackbox
@@ -43,6 +42,7 @@ BUILDLINK_DEPMETHOD.libXt?= build
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXinerama/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/fluxbox/PLIST b/wm/fluxbox/PLIST
index c787400c08d..2b594a51793 100644
--- a/wm/fluxbox/PLIST
+++ b/wm/fluxbox/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2009/06/14 18:18:58 joerg Exp $
+@comment $NetBSD: PLIST,v 1.19 2009/07/07 15:47:59 sborrill Exp $
bin/fbrun
bin/fbsetbg
bin/fbsetroot
@@ -11,11 +11,16 @@ man/man1/fbrun.1
man/man1/fbsetbg.1
man/man1/fbsetroot.1
man/man1/fluxbox.1
+man/man1/fluxbox-remote.1
man/man1/fluxstyle.1
man/man1/startfluxbox.1
+man/man5/fluxbox-keys.5
+share/fluxbox/apps
share/fluxbox/init
share/fluxbox/keys
share/fluxbox/menu
+share/fluxbox/overlay
+share/fluxbox/windowmenu
share/fluxbox/nls/C/fluxbox.cat
share/fluxbox/nls/be_BY.CP1251/fluxbox.cat
share/fluxbox/nls/be_BY.UTF-8/fluxbox.cat
@@ -56,6 +61,7 @@ share/fluxbox/nls/ko_KR.EUC-KR/fluxbox.cat
share/fluxbox/nls/ko_KR.UTF-8/fluxbox.cat
share/fluxbox/nls/lv_LV.ISO-8859-13/fluxbox.cat
share/fluxbox/nls/lv_LV.UTF-8/fluxbox.cat
+share/fluxbox/nls/mk_MK.UTF-8/fluxbox.cat
share/fluxbox/nls/nb_NO.UTF-8/fluxbox.cat
share/fluxbox/nls/nl_NL.ISO-8859-15/fluxbox.cat
share/fluxbox/nls/nl_NL.UTF-8/fluxbox.cat
@@ -75,7 +81,7 @@ share/fluxbox/nls/sl_SI.ISO-8859-2/fluxbox.cat
share/fluxbox/nls/sl_SI.UTF-8/fluxbox.cat
share/fluxbox/nls/sv_SE.ISO-8859-1/fluxbox.cat
share/fluxbox/nls/sv_SE.UTF-8/fluxbox.cat
-share/fluxbox/nls/tr_TR.ISO-8859-1/fluxbox.cat
+share/fluxbox/nls/tr_TR.ISO-8859-9/fluxbox.cat
share/fluxbox/nls/tr_TR.UTF-8/fluxbox.cat
share/fluxbox/nls/uk_UA.KOI8-U/fluxbox.cat
share/fluxbox/nls/uk_UA.UTF-8/fluxbox.cat
@@ -85,6 +91,7 @@ share/fluxbox/nls/zh_CN.GB18030/fluxbox.cat
share/fluxbox/nls/zh_CN.GB2312/fluxbox.cat
share/fluxbox/nls/zh_CN.GBK/fluxbox.cat
share/fluxbox/nls/zh_CN.UTF-8/fluxbox.cat
+share/fluxbox/nls/zh_TW.UTF-8/fluxbox.cat
share/fluxbox/styles/Artwiz
share/fluxbox/styles/BlueFlux/pixmaps/button_close_active.xpm
share/fluxbox/styles/BlueFlux/pixmaps/button_close_pressed.xpm
diff --git a/wm/fluxbox/distinfo b/wm/fluxbox/distinfo
index 070dec0a423..ae0c0cc781a 100644
--- a/wm/fluxbox/distinfo
+++ b/wm/fluxbox/distinfo
@@ -1,19 +1,15 @@
-$NetBSD: distinfo,v 1.27 2007/11/04 15:34:08 rillig Exp $
+$NetBSD: distinfo,v 1.28 2009/07/07 15:47:59 sborrill Exp $
-SHA1 (fluxbox-1.0.0.tar.bz2) = 7985e35fbb170fda24b9e04610690cd04c7a8748
-RMD160 (fluxbox-1.0.0.tar.bz2) = 320b11a1cf96a757da079886cd6496b9d84ab202
-Size (fluxbox-1.0.0.tar.bz2) = 767586 bytes
-SHA1 (patch-aa) = a7edf240ed45bc91431f86efdc371f4e9e2080aa
-SHA1 (patch-ac) = 467154bd1f43e68997bb368883016c65e1afd7b2
+SHA1 (fluxbox-1.1.1.tar.bz2) = 6d49deb6c4c7d73f7567e1cf7d2575c7edc4825f
+RMD160 (fluxbox-1.1.1.tar.bz2) = aabfdd10c835d0ef903885646a7f34f7df75af17
+Size (fluxbox-1.1.1.tar.bz2) = 777660 bytes
+SHA1 (patch-aa) = efc7dc56fcf34e337f2c65f7de4e3e8da2114787
+SHA1 (patch-ac) = c15ebee53312d2f18f8dac2e2ee221f9015d744e
SHA1 (patch-af) = 1cdde9aa6901e23ba42377d71cefb19f073445fa
SHA1 (patch-ba) = 27ecea84bfe459656f4ff5a09b4f24abf1519097
-SHA1 (patch-bb) = fc698dcb8c8592bbc46aa9d02dbbf8f9e870f700
-SHA1 (patch-bc) = f6cfcd5ef3db3a69504152cf9329110e63778693
SHA1 (patch-bd) = 6f57ed17a0d7330d3a3c0f246b1d69e2f61d8984
-SHA1 (patch-be) = 6dc8547ef5b5144e61fba02ccfb683853280d15e
-SHA1 (patch-bf) = b7c44cfbb1c3e5997bb5c499ae8a15f239f1bce7
+SHA1 (patch-be) = 0c8c0cfa12bbfeca28d76b12b488777b589bb43a
+SHA1 (patch-bf) = 365d372379ddbeb7ed930a6a953c0f245e2fec9e
SHA1 (patch-bg) = c6a1c79adb48c78a6ac6e5c57e1211d807eff2ce
-SHA1 (patch-bh) = f5c98c6eab9f5fd6de35b991a67273985e949648
-SHA1 (patch-bi) = 17c9f36b3beb12903dcdb4ab2ea98b2be0c72c46
SHA1 (patch-bj) = 24eb486f2414bd82bcb85e2ee86f87a061faaa16
-SHA1 (patch-bk) = 6e1319418c3f30dc06a9cdaa57086f90859859e7
+SHA1 (patch-bk) = ae0c9857dd0cd203c8ae3f4bf5a0c7126cf48c92
diff --git a/wm/fluxbox/patches/patch-aa b/wm/fluxbox/patches/patch-aa
index f9a9af02286..dffc18c52ba 100644
--- a/wm/fluxbox/patches/patch-aa
+++ b/wm/fluxbox/patches/patch-aa
@@ -1,20 +1,20 @@
-$NetBSD: patch-aa,v 1.10 2007/11/04 15:34:09 rillig Exp $
+$NetBSD: patch-aa,v 1.11 2009/07/07 15:47:59 sborrill Exp $
* "grep -q" doesn't work everywhere.
* Do not use the home directory of the user building the package.
---- util/fluxbox-generate_menu.in.orig 2007-10-08 18:49:08.000000000 +0000
-+++ util/fluxbox-generate_menu.in 2007-11-04 15:31:20.000000000 +0000
-@@ -51,7 +51,7 @@ WHOAMI=`whoami`
+--- util/fluxbox-generate_menu.in.orig 2009-07-06 11:35:35.000000000 +0100
++++ util/fluxbox-generate_menu.in 2009-07-06 11:38:59.000000000 +0100
+@@ -48,7 +48,7 @@
[ "$WHOAMI" = root ] && PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
# Check for Imlib2-support
--if fluxbox -info 2> /dev/null | grep -q "^IMLIB"; then
-+if fluxbox -info 2> /dev/null | grep "^IMLIB" > /dev/null; then
+-if @pkgprefix@fluxbox@pkgsuffix@ -info 2> /dev/null | grep -q "^IMLIB"; then
++if @pkgprefix@fluxbox@pkgsuffix@ -info 2> /dev/null | grep "^IMLIB" > /dev/null; then
PNG_ICONS="yes"
else
# better assume to assume "no"
-@@ -338,7 +338,7 @@ searchForIcon(){
+@@ -308,7 +308,7 @@
# echo "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>"
if [ -f "$entry_icon" ]; then
# if icon exists and entry does not already exists, add it
@@ -23,7 +23,7 @@ $NetBSD: patch-aa,v 1.10 2007/11/04 15:34:09 rillig Exp $
echo -e "\"${entry_exec}\" \t <${entry_icon}>" >> $ICONMAPPING
else
: echo "# mapping already exists for ${entry_exec}" >> $ICONMAPPING
-@@ -1210,7 +1210,7 @@ case ${LC_ALL} in
+@@ -1185,7 +1185,7 @@
esac
# Set Defaults
@@ -32,12 +32,3 @@ $NetBSD: patch-aa,v 1.10 2007/11/04 15:34:09 rillig Exp $
MENUFILENAME="${MENUFILENAME:=${USERFLUXDIR}/menu}"
MENUTITLE="${MENUTITLE:=Fluxbox}"
HOMEPAGE="${HOMEPAGE:=fluxbox.org}"
-@@ -1708,7 +1708,7 @@ append_submenu "${MULTIMEDIAMENU}"
- append_submenu "${XUTILSMENU}"
- normal_find xfontsel xman xload xbiff editres viewres xclock \
- xmag wmagnify gkrellm gkrellm2 vmware portagemaster agave
-- find_it xrdb append "[exec] (Reload .Xdefaults) {xrdb -load $HOME/.Xdefaults}"
-+ find_it xrdb append "[exec] (Reload .Xdefaults) {xrdb -load \$HOME/.Xdefaults}"
- append_menu_end
- append_menu_end
-
diff --git a/wm/fluxbox/patches/patch-ac b/wm/fluxbox/patches/patch-ac
index ac7d8d0c63a..29698befb13 100644
--- a/wm/fluxbox/patches/patch-ac
+++ b/wm/fluxbox/patches/patch-ac
@@ -1,34 +1,17 @@
-$NetBSD: patch-ac,v 1.9 2007/11/01 13:08:05 rillig Exp $
+$NetBSD: patch-ac,v 1.10 2009/07/07 15:47:59 sborrill Exp $
---- src/fluxbox.cc.orig 2007-03-19 20:57:09.000000000 +0100
-+++ src/fluxbox.cc 2007-10-31 00:54:40.610976000 +0100
-@@ -94,7 +94,8 @@ class Toolbar { };
+--- src/fluxbox.cc.orig 2009-07-06 12:28:48.000000000 +0100
++++ src/fluxbox.cc 2009-07-06 12:35:00.000000000 +0100
+@@ -84,7 +84,7 @@
#ifdef SHAPE
#include <X11/extensions/shape.h>
#endif // SHAPE
-#ifdef HAVE_RANDR
-+#undef HAVE_RANDR
-+#if defined(HAVE_RANDR) && !defined(__sun)
++#if !defined(__sun)
#include <X11/extensions/Xrandr.h>
#endif // HAVE_RANDR
-@@ -596,11 +597,11 @@ void Fluxbox::setupConfigFiles() {
-
- bool create_init = false, create_keys = false, create_menu = false;
-
-- string dirname = getenv("HOME") + string("/.") + m_RC_PATH + "/";
-+ string dirname = getenv("HOME") + string("/.") + m_RC_PATH;
- string init_file, keys_file, menu_file, slitlist_file;
-- init_file = dirname + m_RC_INIT_FILE;
-- keys_file = dirname + "keys";
-- menu_file = dirname + "menu";
-+ init_file = dirname + "/" + m_RC_INIT_FILE;
-+ keys_file = dirname + "/" + "keys";
-+ menu_file = dirname + "/" + "menu";
-
- struct stat buf;
-
-@@ -1349,7 +1350,7 @@ void Fluxbox::saveWindowSearchGroup(Wind
+@@ -1227,7 +1227,7 @@
}
void Fluxbox::saveGroupSearch(Window window, WinClient *data) {
diff --git a/wm/fluxbox/patches/patch-bb b/wm/fluxbox/patches/patch-bb
deleted file mode 100644
index 8aa49953846..00000000000
--- a/wm/fluxbox/patches/patch-bb
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-bb,v 1.1 2007/11/01 13:08:05 rillig Exp $
-
-Do not include files inside namespaces.
-
---- src/FbTk/Font.cc.orig 2007-03-19 20:57:07.000000000 +0100
-+++ src/FbTk/Font.cc 2007-10-30 16:53:50.021147000 +0100
-@@ -76,7 +76,7 @@ using std::string;
- using std::map;
- using std::list;
-
--namespace {
-+//namespace {
-
- #ifdef HAVE_SETLOCALE
- #include <locale.h>
-@@ -102,7 +102,7 @@ void resetEffects(FbTk::Font& font) {
- font.setShadowOffX(2);
- }
-
--}; // end nameless namespace
-+//}; // end nameless namespace
-
-
-
diff --git a/wm/fluxbox/patches/patch-bc b/wm/fluxbox/patches/patch-bc
deleted file mode 100644
index 8be04449956..00000000000
--- a/wm/fluxbox/patches/patch-bc
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-bc,v 1.1 2007/11/01 13:08:05 rillig Exp $
-
-sunpro doesn't know whether it should call abs(int) or abs(long), so we
-need to make it explicit.
-
---- src/FbTk/TextBox.cc.orig 2007-03-19 20:57:07.000000000 +0100
-+++ src/FbTk/TextBox.cc 2007-10-30 16:57:31.306492000 +0100
-@@ -193,7 +193,7 @@ void TextBox::buttonPressEvent(XButtonEv
- int delta = width();
- int tmp = 0;
- for(i = m_start_pos; i <= m_end_pos; i++) {
-- tmp = abs(event.x - font().textWidth(m_text.c_str() + m_start_pos, i - m_start_pos));
-+ tmp = abs((int)(event.x - font().textWidth(m_text.c_str() + m_start_pos, i - m_start_pos)));
-
- if (tmp < delta) {
- delta = tmp;
diff --git a/wm/fluxbox/patches/patch-be b/wm/fluxbox/patches/patch-be
index 49b242dd421..11648a70e0b 100644
--- a/wm/fluxbox/patches/patch-be
+++ b/wm/fluxbox/patches/patch-be
@@ -1,25 +1,16 @@
-$NetBSD: patch-be,v 1.1 2007/11/01 13:08:06 rillig Exp $
+$NetBSD: patch-be,v 1.2 2009/07/07 15:47:59 sborrill Exp $
sunpro couldn't resolve "find" without the prefix. Maybe there is some
method of that name?
---- src/Workspace.cc.orig 2007-03-19 20:57:09.000000000 +0100
-+++ src/Workspace.cc 2007-10-31 01:05:46.195938000 +0100
-@@ -167,7 +167,7 @@ Workspace::~Workspace() {
+--- src/Workspace.cc.orig 2008-01-15 09:50:53.000000000 +0000
++++ src/Workspace.cc 2009-07-06 12:47:47.000000000 +0100
+@@ -85,7 +85,7 @@
- void Workspace::addWindow(FluxboxWindow &w, bool place) {
+ void Workspace::addWindow(FluxboxWindow &w) {
// we don't need to add a window that already exist in our list
- if (find(m_windowlist.begin(), m_windowlist.end(), &w) != m_windowlist.end())
+ if (std::find(m_windowlist.begin(), m_windowlist.end(), &w) != m_windowlist.end())
return;
w.setWorkspace(m_id);
-@@ -207,7 +207,7 @@ int Workspace::removeWindow(FluxboxWindo
- FocusControl::unfocusWindow(w->winClient(), true, true);
-
- // we don't remove it from the layermanager, as it may be being moved
-- Windows::iterator erase_it = remove(m_windowlist.begin(),
-+ Windows::iterator erase_it = std::remove(m_windowlist.begin(),
- m_windowlist.end(), w);
- if (erase_it != m_windowlist.end())
- m_windowlist.erase(erase_it);
diff --git a/wm/fluxbox/patches/patch-bf b/wm/fluxbox/patches/patch-bf
index 5347e5026f4..e7512914944 100644
--- a/wm/fluxbox/patches/patch-bf
+++ b/wm/fluxbox/patches/patch-bf
@@ -1,37 +1,28 @@
-$NetBSD: patch-bf,v 1.1 2007/11/01 13:08:06 rillig Exp $
+$NetBSD: patch-bf,v 1.2 2009/07/07 15:47:59 sborrill Exp $
Adding "const" to a primitive type is useless. Sunpro doesn't like it.
---- src/CurrentWindowCmd.cc.orig 2007-03-19 20:57:09.000000000 +0100
-+++ src/CurrentWindowCmd.cc 2007-11-01 13:05:58.247018000 +0100
-@@ -111,7 +111,7 @@ FluxboxWindow &WindowHelperCmd::fbwindow
- return *FocusControl::focusedFbWindow();
- }
+--- src/CurrentWindowCmd.cc.orig 2008-09-01 16:59:05.000000000 +0100
++++ src/CurrentWindowCmd.cc 2009-07-06 12:50:49.000000000 +0100
+@@ -348,7 +348,7 @@
+ REGISTER_COMMAND_PARSER(moveup, MoveCmd::parse, void);
+ REGISTER_COMMAND_PARSER(movedown, MoveCmd::parse, void);
-MoveCmd::MoveCmd(const int step_size_x, const int step_size_y) :
+MoveCmd::MoveCmd(int step_size_x, int step_size_y) :
m_step_size_x(step_size_x), m_step_size_y(step_size_y) { }
void MoveCmd::real_execute() {
-@@ -120,7 +120,7 @@ void MoveCmd::real_execute() {
- fbwindow().y() + m_step_size_y);
- }
+@@ -379,7 +379,7 @@
+ REGISTER_COMMAND_PARSER(resizehorizontal, ResizeCmd::parse, void);
+ REGISTER_COMMAND_PARSER(resizevertical, ResizeCmd::parse, void);
-ResizeCmd::ResizeCmd(const int step_size_x, const int step_size_y) :
+ResizeCmd::ResizeCmd(int step_size_x, int step_size_y) :
m_step_size_x(step_size_x), m_step_size_y(step_size_y) { }
void ResizeCmd::real_execute() {
-@@ -134,7 +134,7 @@ void ResizeCmd::real_execute() {
- fbwindow().resize(w, h);
- }
-
--MoveToCmd::MoveToCmd(const int step_size_x, const int step_size_y, const unsigned int refc) :
-+MoveToCmd::MoveToCmd(int step_size_x, int step_size_y, unsigned int refc) :
- m_step_size_x(step_size_x), m_step_size_y(step_size_y), m_refc(refc) { }
-
- void MoveToCmd::real_execute() {
-@@ -161,7 +161,7 @@ void MoveToCmd::real_execute() {
+@@ -440,7 +440,7 @@
}
diff --git a/wm/fluxbox/patches/patch-bh b/wm/fluxbox/patches/patch-bh
deleted file mode 100644
index 31ec97adcd6..00000000000
--- a/wm/fluxbox/patches/patch-bh
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bh,v 1.1 2007/11/01 13:08:06 rillig Exp $
-
---- nls/fr_CH/Translation.m.orig 2007-11-01 13:29:28.791251000 +0100
-+++ nls/fr_CH/Translation.m 2007-11-01 13:29:21.380303000 +0100
-@@ -232,6 +232,7 @@ $set 19 #main
- 10 Enregistrement du journal vers
- 11 erreur: '-rc' nécessite un argument
- 12 erreur: 'screen' nécessite un argument
-+13 Fluxbox %s: (c) %s Henrik Kinnunen\n\n\
- Website: http://www.fluxbox.org/\n\n\
- -display <chaîne de caractere>\t\utilise la connexion sur le display\
- -screen <tous|entier,entier,entier>\tfonctionne uniquement sur un écran spécifique\
diff --git a/wm/fluxbox/patches/patch-bi b/wm/fluxbox/patches/patch-bi
deleted file mode 100644
index 485d20f7c55..00000000000
--- a/wm/fluxbox/patches/patch-bi
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bi,v 1.1 2007/11/01 13:08:06 rillig Exp $
-
---- nls/fr_FR/Translation.m.orig 2007-03-25 18:53:43.000000000 +0200
-+++ nls/fr_FR/Translation.m 2007-11-01 13:26:42.788210000 +0100
-@@ -232,6 +232,7 @@ $set 19 #main
- 10 Enregistrement du journal vers
- 11 erreur: '-rc' nécessite un argument
- 12 erreur: 'screen' nécessite un argument
-+13 Fluxbox %s: (c) %s Henrik Kinnunen\n\n\
- Website: http://www.fluxbox.org/\n\n\
- -display <chaîne de caractere>\t\utilise la connexion sur le display\
- -screen <tous|entier,entier,entier>\tfonctionne uniquement sur un écran spécifique\
diff --git a/wm/fluxbox/patches/patch-bk b/wm/fluxbox/patches/patch-bk
index d19fca825fa..762801e8aa1 100644
--- a/wm/fluxbox/patches/patch-bk
+++ b/wm/fluxbox/patches/patch-bk
@@ -1,22 +1,13 @@
-$NetBSD: patch-bk,v 1.1 2007/11/01 13:08:07 rillig Exp $
+$NetBSD: patch-bk,v 1.2 2009/07/07 15:47:59 sborrill Exp $
---- src/CurrentWindowCmd.hh.orig 2007-03-19 20:57:09.000000000 +0100
-+++ src/CurrentWindowCmd.hh 2007-11-01 13:47:51.707603000 +0100
-@@ -137,7 +137,7 @@ private:
+--- src/CurrentWindowCmd.hh.orig 2008-09-01 16:59:05.000000000 +0100
++++ src/CurrentWindowCmd.hh 2009-07-06 12:53:48.000000000 +0100
+@@ -144,7 +144,7 @@
// move cmd, relative position
class MoveCmd: public WindowHelperCmd {
public:
- explicit MoveCmd(const int step_size_x, const int step_size_y);
+ explicit MoveCmd(int step_size_x, int step_size_y);
+ static FbTk::Command<void> *parse(const std::string &command,
+ const std::string &args, bool trusted);
protected:
- void real_execute();
-
-@@ -170,7 +170,7 @@ public:
- IGNORE_X = 1 << 8,
- IGNORE_Y = 1 << 9
- };
-- explicit MoveToCmd(const int step_size_x, const int step_size_y, const unsigned int refc);
-+ explicit MoveToCmd(int step_size_x, int step_size_y, unsigned int refc);
- protected:
- void real_execute();
-