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

removed deps for BaseDisplay and using FbTk App instead

Browse source
This commit is contained in:
fluxgen 2002-11-26 17:04:23 +00:00
parent c600fd4dca
commit 02ceeb2dd1
1 changed files with 15 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
util/fbrun/main.cc
View file

@ -19,10 +19,10 @@
// 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: main.cc,v 1.5 2002/11/15 14:00:45 fluxgen Exp $ // $Id: main.cc,v 1.6 2002/11/26 17:04:23 fluxgen Exp $
#include "FbRun.hh" #include "FbRun.hh"
#include "BaseDisplay.hh" #include "App.hh"
#include "StringUtil.hh" #include "StringUtil.hh"
#include <string> #include <string>
@ -30,21 +30,8 @@
using namespace std; using namespace std;
class App:public BaseDisplay {
public:
App(const char *displaystr):BaseDisplay("FbRun", displaystr) { }
FbRun &fbrun() { return m_fbrun; }
void handleEvent(XEvent * const ev) {
m_fbrun.handleEvent(ev);
if (m_fbrun.end())
shutdown();
}
private:
FbRun m_fbrun;
};
void showUsage(const char *progname) { void showUsage(const char *progname) {
cerr<<"fbrun 1.1.1 : (c) 2002 Henrik Kinnunen"<<endl; cerr<<"fbrun 1.1.2 : (c) 2002 Henrik Kinnunen"<<endl;
cerr<<"Usage: "<< cerr<<"Usage: "<<
progname<<" [arguments]"<<endl<< progname<<" [arguments]"<<endl<<
"Arguments: "<<endl<< "Arguments: "<<endl<<
@ -117,10 +104,11 @@ int main(int argc, char **argv) {
try { try {
App application(display_name.c_str()); FbTk::App application(display_name.c_str());
Display *disp = application.getXDisplay(); Display *disp = application.display();
FbRun &fbrun = application.fbrun(); FbRun fbrun;
if (fontname.size() != 0) { if (fontname.size() != 0) {
if (!fbrun.loadFont(fontname.c_str())) { if (!fbrun.loadFont(fontname.c_str())) {
cerr<<"Failed to load font: "<<fontname<<endl; cerr<<"Failed to load font: "<<fontname<<endl;
@ -167,8 +155,14 @@ int main(int argc, char **argv) {
if (set_pos) if (set_pos)
fbrun.move(x, y); fbrun.move(x, y);
application.eventLoop(); XEvent ev;
// main loop
while (!fbrun.end()) {
XNextEvent(disp, &ev);
fbrun.handleEvent(&ev);
}
} catch (string errstr) { } catch (string errstr) {
cerr<<"Error: "<<errstr<<endl; cerr<<"Error: "<<errstr<<endl;