X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=util%2Fepist%2Factions.cc;h=e37ff2470602338e445b40ed65d9dac5510e61cc;hb=97019b8b77f7e6450d87b057bcb6eae43e9f3e2b;hp=118719508b85174570a0900f160ef13b312364bd;hpb=b0239459c3486c9f5b4913b6071245265e6a19a2;p=chaz%2Fopenbox diff --git a/util/epist/actions.cc b/util/epist/actions.cc index 11871950..e37ff247 100644 --- a/util/epist/actions.cc +++ b/util/epist/actions.cc @@ -1,5 +1,5 @@ // -*- mode: C++; indent-tabs-mode: nil; -*- -// actions.cc for Epistophy - a key handler for NETWM/EWMH window managers. +// actions.cc for Epistrophy - a key handler for NETWM/EWMH window managers. // Copyright (c) 2002 - 2002 Ben Jansens // // Permission is hereby granted, free of charge, to any person obtaining a @@ -39,19 +39,14 @@ Action::Action(enum ActionType type, KeyCode keycode, unsigned int modifierMask, for (int i = 0; str_types[i] != noaction; ++i) { if (type == str_types[i]) { - // the first and last characters of the string are quotes, and we need to - // get rid of them - assert(str.size() >= 2); - assert(str[0] == '"'); - assert(str[str.size() - 1] == '"'); - - _stringParam = str.substr(1, str.size() - 2); + _stringParam = str; return; } } - + _numberParam = atoi( str.c_str() ); - if (type == changeWorkspace) // workspace 1 to the user is workspace 0 to us + // workspace 1 to the user is workspace 0 to us + if (type == changeWorkspace || type == sendToWorkspace) _numberParam--; }