[cairo-commit] roadster/src mainwindow.c, 1.22, 1.23 map.c, 1.21, 1.22 util.h, 1.4, 1.5

[Ian McIntosh]

Committed by: ian

Update of /cvs/cairo/roadster/src
In directory gabe:/tmp/cvs-serv8934/src

Modified Files:
	mainwindow.c map.c util.h 
Log Message:
	* src/map.c: Commented out scenemanager demo (rectangle).


Index: mainwindow.c
===================================================================
RCS file: /cvs/cairo/roadster/src/mainwindow.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- mainwindow.c	10 Mar 2005 06:12:03 -0000	1.22
+++ mainwindow.c	10 Mar 2005 19:18:09 -0000	1.23
@@ -58,7 +58,7 @@
 
 #define DRAW_PRETTY_TIMEOUT_MS		(180)	// how long after stopping various movements should we redraw in high-quality mode
 #define SCROLL_TIMEOUT_MS		(100)	// how often (in MS) to move (SHORTER THAN ABOVE TIME)
-#define SCROLL_DISTANCE_IN_PIXELS	(100)	// how far to move every (above) MS
+#define SCROLL_DISTANCE_IN_PIXELS	(80)	// how far to move every (above) MS
 #define BORDER_SCROLL_CLICK_TARGET_SIZE	(20)	// the size of the click target (distance from edge of map view) to begin scrolling
 
 // Layerlist columns

Index: map.c
===================================================================
RCS file: /cvs/cairo/roadster/src/map.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- map.c	10 Mar 2005 11:01:05 -0000	1.21
+++ map.c	10 Mar 2005 19:18:09 -0000	1.22
@@ -183,8 +183,8 @@
 	gint nRenderMode = RENDERMODE_FAST;
 
 	// XXX test
-	GdkRectangle rect = {200,200,100,100};
-	scenemanager_claim_rectangle(pMap->m_pSceneManager, &rect);
+//         GdkRectangle rect = {200,200,100,100};
+//         scenemanager_claim_rectangle(pMap->m_pSceneManager, &rect);
 
 	if(nRenderMode == RENDERMODE_FAST) {
 		if(nDrawFlags & DRAWFLAG_GEOMETRY) {
@@ -199,8 +199,8 @@
 	}
 	
 	// XXX test
-	gdk_draw_rectangle(pMap->m_pPixmap, pMap->m_pTargetWidget->style->fg_gc[GTK_WIDGET_STATE(pMap->m_pTargetWidget)],
-			FALSE, 200,200, 100, 100);
+//         gdk_draw_rectangle(pMap->m_pPixmap, pMap->m_pTargetWidget->style->fg_gc[GTK_WIDGET_STATE(pMap->m_pTargetWidget)],
+//                         FALSE, 200,200, 100, 100);
 
 	gtk_widget_queue_draw(pMap->m_pTargetWidget);
 }

Index: util.h
===================================================================
RCS file: /cvs/cairo/roadster/src/util.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- util.h	4 Mar 2005 09:27:26 -0000	1.4
+++ util.h	10 Mar 2005 19:18:09 -0000	1.5
@@ -28,6 +28,8 @@
 
 #define NUM_ELEMS(a) (sizeof(a) / sizeof(a[0]))
 
+#define SWAP(x, y)                   { (x) ^= (y) ^= (x) ^= (y); }
+
 void util_random_color(void* pColor);
 
 //#define ENABLE_TIMING