Merge commit '61214e743288ffe8a58cf7876bd8f7f435397571' into master-merge

[xonotic/netradiant.git] / libs / gtkutil / xorrectangle.h

diff --git a/libs/gtkutil/xorrectangle.h b/libs/gtkutil/xorrectangle.h
index 03da93242dde0dea663ada67dd85442ebe4686c5..2341f1f0c5005165fef67275264a065ed4f6494a 100644 (file)
--- a/libs/gtkutil/xorrectangle.h
+++ b/libs/gtkutil/xorrectangle.h
@@ -22,18 +22,10 @@
 #if !defined ( INCLUDED_XORRECTANGLE_H )
 #define INCLUDED_XORRECTANGLE_H
 
-#include <gtk/gtkwidget.h>
+#include <cairo.h>
+#include <uilib/uilib.h>
 #include "math/vector.h"
 
-
-#include "gtkutil/glwidget.h"
-#include "igl.h"
-
-#include <gtk/gtkglwidget.h>
-
-//#include "stream/stringstream.h"
-
-
 class rectangle_t
 {
 public:
@@ -69,68 +61,20 @@ inline rectangle_t rectangle_from_area( const float min[2], const float max[2],
 
 class XORRectangle
 {
+
 rectangle_t m_rectangle;
-GtkWidget* m_widget;
+
+ui::GLArea m_widget;
+cairo_t *cr;
+
+bool initialised() const;
+void lazy_init();
+void draw() const;
 
 public:
-XORRectangle( GtkWidget* widget ) : m_widget( widget ){
-}
-~XORRectangle(){
-}
-void set( rectangle_t rectangle ){
-       if ( GTK_WIDGET_REALIZED( m_widget ) ) {
-               if( m_rectangle.w != rectangle.w || m_rectangle.h != rectangle.h ){
-               //if( !(m_rectangle.w == 0 && m_rectangle.h == 0 && rectangle.w == 0 && rectangle.h == 0) ){
-               //globalOutputStream() << "m_x" << m_rectangle.x << " m_y" << m_rectangle.y << " m_w" << m_rectangle.w << " m_h" << m_rectangle.h << "\n";
-               //globalOutputStream() << "__x" << rectangle.x << " __y" << rectangle.y << " __w" << rectangle.w << " __h" << rectangle.h << "\n";
-                       if ( glwidget_make_current( m_widget ) != FALSE ) {
-                               GlobalOpenGL_debugAssertNoErrors();
-
-                               gint width, height;
-                               gdk_gl_drawable_get_size( gtk_widget_get_gl_drawable( m_widget ), &width, &height );
-
-                               glViewport( 0, 0, width, height );
-                               glMatrixMode( GL_PROJECTION );
-                               glLoadIdentity();
-                               glOrtho( 0, width, 0, height, -100, 100 );
-
-                               glMatrixMode( GL_MODELVIEW );
-                               glLoadIdentity();
-
-                               glPolygonMode( GL_FRONT_AND_BACK, GL_FILL );
-                               glDisable( GL_DEPTH_TEST );
-
-                               glDrawBuffer( GL_FRONT );
-
-                               glEnable( GL_BLEND );
-                               glBlendFunc( GL_ONE_MINUS_DST_COLOR, GL_ZERO );
-
-                               glLineWidth( 2 );
-                               glColor3f( 1, 1, 1 );
-                               glDisable( GL_TEXTURE_2D );
-                               glBegin( GL_LINE_LOOP );
-                               glVertex2f( m_rectangle.x, m_rectangle.y + m_rectangle.h );
-                               glVertex2f( m_rectangle.x + m_rectangle.w, m_rectangle.y + m_rectangle.h );
-                               glVertex2f( m_rectangle.x + m_rectangle.w, m_rectangle.y );
-                               glVertex2f( m_rectangle.x, m_rectangle.y );
-                               glEnd();
-
-                               glBegin( GL_LINE_LOOP );
-                               glVertex2f( rectangle.x, rectangle.y + rectangle.h );
-                               glVertex2f( rectangle.x + rectangle.w, rectangle.y + rectangle.h );
-                               glVertex2f( rectangle.x + rectangle.w, rectangle.y );
-                               glVertex2f( rectangle.x, rectangle.y );
-                               glEnd();
-
-                               glDrawBuffer( GL_BACK );
-                               GlobalOpenGL_debugAssertNoErrors();
-                               //glwidget_swap_buffers( m_widget );
-                               glwidget_make_current( m_widget );
-                       }
-               }
-               m_rectangle = rectangle;
-       }
-}
+XORRectangle( ui::GLArea widget );
+~XORRectangle();
+void set( rectangle_t rectangle );
 };