X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fotk_test.cc;h=fb4db8352df5e40f379fc06af9365340ffa4b384;hb=dddac554808d7352a06733938cfddc19839b99d0;hp=ccef19fa1b31e0f8eb1f749e993a5d9ebbac6fca;hpb=e8b74211e7dcf08701809f657afa08df55dec218;p=chaz%2Fopenbox

diff --git a/otk/otk_test.cc b/otk/otk_test.cc
index ccef19fa..fb4db835 100644
--- a/otk/otk_test.cc
+++ b/otk/otk_test.cc
@@ -1,108 +1,83 @@
-#include "focuswidget.hh"
-#include "button.hh"
-#include "display.hh"
-#include "configuration.hh"
-#include "timerqueuemanager.hh"
-#include "image.hh"
-#include "style.hh"
-#include <iostream>
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
-int main(void) {
-  otk::OBDisplay::initialize(NULL);
-  otk::Configuration style_conf(False);
-  otk::OBTimerQueueManager *tm = new otk::OBTimerQueueManager();
-  const otk::ScreenInfo *s_info =
-    otk::OBDisplay::screenInfo(DefaultScreen(otk::OBDisplay::display));
-  otk::BImageControl *ctrl = new otk::BImageControl(tm, s_info, True, 4, 5, 200);
+#ifdef HAVE_CONFIG_H
+# include "../config.h"
+#endif
 
-  otk::Style *my_style = new otk::Style(ctrl);
-
-  style_conf.setFile("/usr/local/share/openbox/styles/artwiz");
-  style_conf.load();
+#include "application.hh"
+#include "focuswidget.hh"
+#include "appwidget.hh"
+#include "button.hh"
 
-  my_style->load(style_conf);
+int main(int argc, char **argv) {
+  otk::Application app(argc, argv);
 
-  otk::OtkFocusWidget foo(my_style);
+  otk::AppWidget foo(&app);
 
   foo.resize(600, 500);
-  foo.setTexture(my_style->getTitleFocus());
-  foo.setUnfocusTexture(my_style->getTitleUnfocus());
+  foo.setTexture(app.getStyle()->titlebarFocusBackground());
+//  foo.setUnfocusTexture(app.getStyle()->titlebarUnfocusBackground());
 
   foo.setBevelWidth(2);
-  foo.setDirection(otk::OtkWidget::Horizontal);
+  foo.setDirection(otk::Widget::Horizontal);
 
-  otk::OtkFocusWidget left(&foo);
-  otk::OtkFocusWidget right(&foo);
+  otk::FocusWidget left(&foo);
+  otk::FocusWidget right(&foo);
 
-  left.setDirection(otk::OtkWidget::Horizontal);
+  left.setDirection(otk::Widget::Horizontal);
   left.setStretchableVert(true);
   left.setStretchableHorz(true);
-  left.setTexture(my_style->getTitleFocus());
-  left.setUnfocusTexture(my_style->getTitleUnfocus());
+  left.setTexture(app.getStyle()->titlebarFocusBackground());
+  left.setUnfocusTexture(app.getStyle()->titlebarUnfocusBackground());
  
-  right.setDirection(otk::OtkWidget::Vertical);
+  right.setDirection(otk::Widget::Vertical);
   right.setBevelWidth(10);
   right.setStretchableVert(true);
   right.setWidth(300);
-  right.setTexture(my_style->getTitleFocus());
-  right.setUnfocusTexture(my_style->getTitleUnfocus());
-
-  otk::OtkButton iconb(&left);
-  otk::OtkFocusWidget label(&left);
-  otk::OtkButton maxb(&left);
-  otk::OtkButton closeb(&left);
+  right.setTexture(app.getStyle()->titlebarFocusBackground());
+  right.setUnfocusTexture(app.getStyle()->titlebarUnfocusBackground());
+  otk::Button iconb(&left);
+  iconb.resize(40,20);
+
+/*  otk::FocusWidget label(&left);
+  otk::Button maxb(&left);
+  otk::Button closeb(&left);
   
   // fixed size
   iconb.setText("foo");
-  iconb.press();
+  iconb.press(Button1);
 
   // fix width to 60 and let the height be calculated by its parent
   //label.setHeight(20);
   label.setStretchableVert(true);
   label.setStretchableHorz(true);
-  label.setTexture(my_style->getLabelFocus());
-  label.setUnfocusTexture(my_style->getLabelUnfocus());
+  label.setTexture(app.getStyle()->labelFocusBackground());
+  label.setUnfocusTexture(app.getStyle()->labelUnfocusBackground());
 
   // fixed size
   maxb.setText("bar");
 
   // fixed size
   closeb.setText("fuubar");
-
-  otk::OtkFocusWidget rblef(&right);
-  otk::OtkButton rbutt1(&right);
-  otk::OtkButton rbutt2(&right);
+*/
+  otk::FocusWidget rblef(&right);
+  otk::Button rbutt1(&right);
+  otk::Button rbutt2(&right);
 
   rblef.setStretchableHorz(true);
   rblef.setHeight(50);
-  rblef.setTexture(my_style->getHandleFocus());
-  rblef.setUnfocusTexture(my_style->getHandleUnfocus());
+  rblef.setTexture(app.getStyle()->handleFocusBackground());
+  rblef.setUnfocusTexture(app.getStyle()->handleUnfocusBackground());
   
   rbutt1.setText("this is fucking tight");
   rbutt2.setText("heh, WOOP");
 
   // will recursively unfocus its children
   //foo.unfocus();
-  foo.update();
+
   foo.show();
 
-  while (1) {
-    if (XPending(otk::OBDisplay::display)) {
-      XEvent e;
-      XNextEvent(otk::OBDisplay::display, &e);
-      if (e.type == Expose) {
-        foo.expose(e.xexpose);
-      } else if (e.type == ConfigureNotify) {
-        foo.configure(e.xconfigure);
-      }
-    } 
-  }
-
-  delete my_style;
-  delete tm;
-  delete ctrl;
-
-  otk::OBDisplay::destroy();
+  app.run();
 
   return 0;
 }