X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fglhanoi.c;h=f9bc6fe0d2aef93a6194938d7dfdf0f681eb003c;hb=6afd6db0ae9396cd7ff897ade597cd5483f49b0e;hp=d8d3d2a2dd9428ca8d7fd4b60e3a3ab46955a9ec;hpb=5f9c47ca98dd43d8f59b7c27d3fde6edfde4fe21;p=xscreensaver

diff --git a/hacks/glx/glhanoi.c b/hacks/glx/glhanoi.c
index d8d3d2a2..f9bc6fe0 100644
--- a/hacks/glx/glhanoi.c
+++ b/hacks/glx/glhanoi.c
@@ -1666,7 +1666,6 @@ static void initTowers(glhcfg *glhanoi)
 		glPopMatrix();
 
 	}
-	glPopMatrix();
 	glEndList();
 }
 
@@ -1891,6 +1890,11 @@ ENTRYPOINT void init_glhanoi(ModeInfo * mi)
 		(int)((1 - sqrt(frand(1.0))) * (glhanoi->numberOfDisks - 1));
 	
 	glhanoi->wire = MI_IS_WIREFRAME(mi);
+
+# ifdef HAVE_JWZGLES /* #### glPolygonMode other than GL_FILL unimplemented */
+    glhanoi->wire = 0;
+# endif
+
 	glhanoi->light = light;
 	glhanoi->fog = fog;
 	glhanoi->texture = texture;
@@ -1959,6 +1963,7 @@ ENTRYPOINT void draw_glhanoi(ModeInfo * mi)
     mi->polygon_count = 0;
 
 	glLoadIdentity();
+    glRotatef(current_device_rotation(), 0, 0, 1);
 
 	update_glhanoi(glhanoi);
 	updateView(glhanoi);
@@ -2025,6 +2030,13 @@ ENTRYPOINT Bool glhanoi_handle_event(ModeInfo * mi, XEvent * event)
 
 		return True;
 	}
+#if 0 /* #### doesn't work */
+  else if (screenhack_event_helper (MI_DISPLAY(mi), MI_WINDOW(mi), event))
+    {
+      changeState(glhanoi, START);
+      return True;
+    }
+#endif
 	return False;
 }