nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added menu icon

Browse source
This commit is contained in:
fluxgen 2004-06-10 11:42:35 +00:00
parent 80ba32fb2d
commit d2e0aea0ae
2 changed files with 13 additions and 3 deletions

12
src/FbMenuParser.cc
View file

@ -20,7 +20,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: FbMenuParser.cc,v 1.1 2004/05/02 21:02:26 fluxgen Exp $ // $Id: FbMenuParser.cc,v 1.2 2004/06/10 11:42:35 fluxgen Exp $
#include "FbMenuParser.hh" #include "FbMenuParser.hh"
@ -59,6 +59,10 @@ Parser &FbMenuParser::operator >> (Parser::Item &out) {
first = '{'; first = '{';
second = '}'; second = '}';
break; break;
case ICON:
first = '<';
second = '>';
break;
case DONE: // get new line and call this again case DONE: // get new line and call this again
if (!nextLine()) { if (!nextLine()) {
out = Parser::s_empty_item; out = Parser::s_empty_item;
@ -78,6 +82,8 @@ Parser &FbMenuParser::operator >> (Parser::Item &out) {
else if (m_curr_token == NAME) else if (m_curr_token == NAME)
m_curr_token = ARGUMENT; m_curr_token = ARGUMENT;
else if (m_curr_token == ARGUMENT) else if (m_curr_token == ARGUMENT)
m_curr_token = ICON;
else if (m_curr_token == ICON)
m_curr_token = DONE; m_curr_token = DONE;
out = Parser::s_empty_item; out = Parser::s_empty_item;
@ -101,6 +107,10 @@ Parser &FbMenuParser::operator >> (Parser::Item &out) {
break; break;
case ARGUMENT: case ARGUMENT:
out.first = "ARGUMENT"; out.first = "ARGUMENT";
m_curr_token = ICON;
break;
case ICON:
out.first = "ICON";
m_curr_token = DONE; m_curr_token = DONE;
break; break;
case DONE: case DONE:

4
src/FbMenuParser.hh
View file

@ -20,7 +20,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: FbMenuParser.hh,v 1.1 2004/05/02 21:02:26 fluxgen Exp $ // $Id: FbMenuParser.hh,v 1.2 2004/06/10 11:42:35 fluxgen Exp $
#ifndef FBMENUPARSER_HH #ifndef FBMENUPARSER_HH
#define FBMENUPARSER_HH #define FBMENUPARSER_HH
@ -52,7 +52,7 @@ private:
int m_row; int m_row;
int m_curr_pos; int m_curr_pos;
std::string m_curr_line; std::string m_curr_line;
enum Object {TYPE, NAME, ARGUMENT, DONE} m_curr_token; enum Object {TYPE, NAME, ARGUMENT, ICON, DONE} m_curr_token;
}; };
#endif // FBMENUPARSER_HH #endif // FBMENUPARSER_HH