[beryl-commits] r2277 - branches/beryl-plugins/group-tabbed

[marex at server.beryl-project.org]

Author: marex
Date: 2007-01-02 14:08:54 +0000 (Tue, 02 Jan 2007)
New Revision: 2277

Modified:
   branches/beryl-plugins/group-tabbed/paint.c
Log:
group-tab-branch: Now much better performance for hover because of a simple check...


Modified: branches/beryl-plugins/group-tabbed/paint.c
===================================================================
--- branches/beryl-plugins/group-tabbed/paint.c	2007-01-02 13:56:18 UTC (rev 2276)
+++ branches/beryl-plugins/group-tabbed/paint.c	2007-01-02 14:08:54 UTC (rev 2277)
@@ -311,19 +311,23 @@
 
 		groupGetCurrentMousePosition(s->display, &mouseX, &mouseY);
 
-		for (slot = group->tabBar->slots; slot; slot = slot->next) {
-			if (XPointInRegion(slot->region, mouseX, mouseY)) {
-				hasText = TRUE;
-				if (slot != group->tabBar->lastHoveredSlot) {
-					group->tabBar->lastHoveredSlot = slot;
+		if (!(group->tabBar->lastHoveredSlot &&
+			XPointInRegion(group->tabBar->lastHoveredSlot->region, mouseX, mouseY)))
+		{
+			for (slot = group->tabBar->slots; slot; slot = slot->next) {
+				if (XPointInRegion(slot->region, mouseX, mouseY)) {
+					hasText = TRUE;
+					if (slot != group->tabBar->lastHoveredSlot) {
+						group->tabBar->lastHoveredSlot = slot;
+						groupRenderWindowTitle(s, group);
+						break;
+					}
+				}
+				if (!hasText && group->tabBar->lastHoveredSlot) {
+					group->tabBar->lastHoveredSlot = NULL;
 					groupRenderWindowTitle(s, group);
-					break;
-			    	}
+				}
 			}
-			if (!hasText && group->tabBar->lastHoveredSlot) {
-				group->tabBar->lastHoveredSlot = NULL;
-				groupRenderWindowTitle(s, group);
-			}
 		}
 	}
 #endif		
@@ -747,8 +751,8 @@
 				wAttrib.brightness = BRIGHT;
 
 				glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-
-				glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+				glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+				//glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 				glColor4us(gw->group->color[0], gw->group->color[1],
 					gw->group->color[2], attrib->opacity);