• R/O
  • SSH
  • HTTPS

qrobosdk: コミット


コミットメタ情報

リビジョン1791 (tree)
日時2010-04-18 18:35:59
作者satofumi

ログメッセージ

added Utf8::c_str()

変更サマリ

差分

--- trunk/scripts/createHistory.rb (revision 1790)
+++ trunk/scripts/createHistory.rb (revision 1791)
@@ -1,4 +1,5 @@
11 #!/usr/bin/ruby
2+# -*- coding: utf-8 -*-
23 # 更新履歴、および RSS を生成するスクリプト
34 # Satofumi KAMIMURA
45 #
@@ -125,17 +126,17 @@
125126 if n > contents_items.size
126127 n = contents_items.size
127128 end
128-
129+
129130 for i in 0 ... n
130131 item = contents_items[i]
131132
132133 date = item['date']
133134 if date != pre_date
134- replace += ' <dt>' + date + "</dt>\n"
135+ replace += ' <dt>' + date + "</dt>\n"
135136 end
136137 pre_date = date;
137138
138- replace += ' <dd>' + item['description'] + "</dd>\n"
139+ replace += ' <dd>' + item['description'] + "</dd>\n"
139140 end
140141
141142 replace = "<dl>\n" + replace + "</dl>\n"
--- trunk/libs/lua/luabindInput.cpp (revision 1790)
+++ trunk/libs/lua/luabindInput.cpp (revision 1791)
@@ -10,6 +10,7 @@
1010 #include "luabindInput.h"
1111 #include "convertToRoman.h"
1212 #include "convertToJp.h"
13+#include "Utf8.h"
1314 #include <luabind/luabind.hpp>
1415
1516 using namespace qrk;
@@ -20,6 +21,11 @@
2021 {
2122 module(L)
2223 [
24+ class_<Utf8>("Utf8")
25+ .def(constructor<const char*>())
26+ .def("c_str", &Utf8::c_str)
27+ .def("pop_back", &Utf8::pop_back),
28+
2329 def("convertToRoman", &convertToRoman),
2430 def("convertToJp", &convertToJp)
2531 ];
--- trunk/libs/lua/luabindGui.cpp (revision 1790)
+++ trunk/libs/lua/luabindGui.cpp (revision 1791)
@@ -148,7 +148,8 @@
148148 class_<Label, Component>("Label")
149149 .def(constructor<Surface&>())
150150 .def("setPosition", &Label::setPosition)
151- .def("position", &Label::position),
151+ .def("position", &Label::position)
152+ .def("rect", &Label::rect),
152153
153154 class_<Button, Component>("Button")
154155 .def(constructor<Surface&, Surface&, Surface&>()),
@@ -206,10 +207,12 @@
206207 LuaHandler::registerValue(L, "SDLK_ESCAPE", SDLK_ESCAPE);
207208 LuaHandler::registerValue(L, "SDLK_RETURN", SDLK_RETURN);
208209 LuaHandler::registerValue(L, "SDLK_F4", SDLK_F4);
209- LuaHandler::registerValue(L, "SDLK_q", SDLK_q);
210210 LuaHandler::registerValue(L, "SDLK_LEFT", SDLK_LEFT);
211211 LuaHandler::registerValue(L, "SDLK_RIGHT", SDLK_RIGHT);
212212
213+ LuaHandler::registerValue(L, "SDLK_h", SDLK_h);
214+ LuaHandler::registerValue(L, "SDLK_q", SDLK_q);
215+
213216 LuaHandler::registerValue(L, "SDL_KEYDOWN", SDL_KEYDOWN);
214217 LuaHandler::registerValue(L, "SDL_KEYUP", SDL_KEYUP);
215218
@@ -218,4 +221,5 @@
218221 LuaHandler::registerValue(L, "KMOD_RCTRL", KMOD_RCTRL);
219222 LuaHandler::registerValue(L, "KMOD_LALT", KMOD_LALT);
220223 LuaHandler::registerValue(L, "KMOD_RALT", KMOD_RALT);
224+
221225 }
--- trunk/libs/lua/Makefile (revision 1790)
+++ trunk/libs/lua/Makefile (revision 1791)
@@ -91,7 +91,7 @@
9191 luabindGui.o: ../gui/ChatMessage.h ../gui/CallbackEvent.h ../gui/AlignUtils.h
9292 luabindInit.o: luabindInit.h LuaHandler.h ../system/log_printf.h
9393 luabindInput.o: luabindInput.h ../input/convertToRoman.h
94-luabindInput.o: ../input/roman_table.h ../input/convertToJp.h
94+luabindInput.o: ../input/roman_table.h ../input/convertToJp.h ../input/Utf8.h
9595 luabindNetwork.o: luabindNetwork.h
9696 luabindRangeFinder.o: luabindRangeFinder.h ../monitoring/mUrgDevice.h
9797 luabindRangeFinder.o: ../range_finder/UrgDevice.h ../coordinate/Coordinate.h
--- trunk/Makefile (revision 1790)
+++ trunk/Makefile (revision 1791)
@@ -2,7 +2,7 @@
22 # Satofumi KAMIMURA
33 # $Id$
44
5-all : test samples libs
5+all : libs test samples
66 cd libs/packages/urg/vc8/c && $(MAKE)
77 cd libs/packages/urg/vc8/cpp && $(MAKE)
88 cd libs/packages/urg_c/vc8 && $(MAKE)
@@ -36,5 +36,5 @@
3636 cd libs/ && $(MAKE) test
3737 cd tools/ && $(MAKE) test
3838
39-.PHONY : all clean samples
39+.PHONY : all clean samples libs
4040 ######################################################################
旧リポジトリブラウザで表示