Merge commit 'ff48e71434a414958e6e56628ccf04284d030784' into master-merge

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

diff --git a/libs/gtkutil/xorrectangle.cpp b/libs/gtkutil/xorrectangle.cpp
index 56ae908a2e911c3ab7e65b6220d18dc6eed2e684..17d48bf9d097d3e103c6dd12866dc88a3d20be6e 100644 (file)
--- a/libs/gtkutil/xorrectangle.cpp
+++ b/libs/gtkutil/xorrectangle.cpp
@@ -2,6 +2,13 @@
 
 #include <gtk/gtk.h>
 
+#include "gtkutil/glwidget.h"
+#include "igl.h"
+
+#include <gtk/gtkglwidget.h>
+
+//#include "stream/stringstream.h"
+
 bool XORRectangle::initialised() const
 {
     return !!cr;
@@ -46,9 +53,51 @@ XORRectangle::~XORRectangle()
 void XORRectangle::set(rectangle_t rectangle)
 {
     if (gtk_widget_get_realized(m_widget)) {
-        lazy_init();
-        draw();
-        m_rectangle = rectangle;
-        draw();
+               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 );
+                               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;
     }
 }