[teklib-general] changeset in /hg/teklib/current: merge

[Franciska Schulze]

changeset 65dd15959a30 in /hg/teklib/current
details: http://teklib.org:8001/hg/teklib/current?cmd=changeset;node=65dd15959a30
description:
	merge

diffs (76 lines):

diff -r 666b19d84def -r 65dd15959a30 src/visual/posix/visual_host.c
--- a/src/visual/posix/visual_host.c	Mon Sep 17 20:08:49 2007 +0200
+++ b/src/visual/posix/visual_host.c	Mon Sep 17 20:12:16 2007 +0200
@@ -1193,10 +1193,6 @@ vis_open(TMOD_VIS *mod)
 
 		if (getprops(mod, v) == TFALSE) break;
 
-		//v->fontwidth = XTextWidth(fn->font, " ", 1);
-		//v->fontheight = fn->font->ascent + fn->font->descent;
-		//if (v->fontwidth <= 0 || v->fontheight <= 0) break;
-
 		v->colormap = XCreateColormap(v->display,
 			RootWindow(v->display, v->screen), v->visual, AllocNone);
 		if (v->colormap == TNULL) break;
@@ -1268,15 +1264,6 @@ vis_open(TMOD_VIS *mod)
 
 		XMapWindow(v->display, v->window);
 
-		if (popup)
-		{
-			XGrabPointer(v->display, v->window,
-				True, 0xffffffff, GrabModeSync,
-				GrabModeSync, None, None, CurrentTime);
-// 				owner_events, event_mask, pointer_mode,
-// 				keyboard_mode, confine_to, cursor, time)
-		}
-
 		if (g->use_xft == TTRUE)
 		{
 			/* FIXME: quick hack! */
@@ -1296,8 +1283,6 @@ vis_open(TMOD_VIS *mod)
 #endif
 
 		v->base_mask = swa.event_mask;
-		//v->textwidth = v->winwidth / v->fontwidth;
-		//v->textheight = v->winheight / v->fontheight;
 		v->bgpen = (TVPEN) 0xffffffff;
 		v->fgpen = (TVPEN) 0xffffffff;
 
diff -r 666b19d84def -r 65dd15959a30 tek/mod/visual.h
--- a/tek/mod/visual.h	Mon Sep 17 20:08:49 2007 +0200
+++ b/tek/mod/visual.h	Mon Sep 17 20:12:16 2007 +0200
@@ -26,8 +26,8 @@ typedef TTAG TVPEN;
 #define TVISTAGS_					(TTAG_USER + 0x600)
 #define TVisual_PixWidth			(TVISTAGS_ + 0)
 #define TVisual_PixHeight			(TVISTAGS_ + 1)
-#define TVisual_TextWidth			(TVISTAGS_ + 2)
-#define TVisual_TextHeight			(TVISTAGS_ + 3)
+#define TVisual_WinLeft				(TVISTAGS_ + 2)
+#define TVisual_WinTop				(TVISTAGS_ + 3)
 #define TVisual_FontWidth			(TVISTAGS_ + 4)
 #define TVisual_FontHeight			(TVISTAGS_ + 5)
 #define TVisual_Title				(TVISTAGS_ + 6)
@@ -37,8 +37,6 @@ typedef TTAG TVPEN;
 #define TVisual_MaxWidth			(TVISTAGS_ + 10)
 #define TVisual_MaxHeight			(TVISTAGS_ + 11)
 #define TVisual_Open				(TVISTAGS_ + 12)
-#define TVisual_WinLeft				(TVISTAGS_ + 24)
-#define TVisual_WinTop				(TVISTAGS_ + 25)
 
 /*
 **	Tags for font handling
@@ -55,6 +53,13 @@ typedef TTAG TVPEN;
 #define	TVisual_FontUlPosition		(TVISTAGS_ + 21)
 #define	TVisual_FontUlThickness		(TVISTAGS_ + 22)
 #define TVisual_FontNumResults		(TVISTAGS_ + 23)
+
+/*
+**	Platform-specific / experimental tags
+*/
+
+#define TVisualHost_Grab			(TVISTAGS_ + 0x101)
+
 
 /*****************************************************************************/
 /*