Holiday coding log :)

Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability

Short list of main changes:

- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
  Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
  This allows keeping UI and data without actual saves, until you actually save.
  When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v). 
  Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards. 
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
  Old option is called "Save Startup File" the new one "Save User Settings".
  To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
  This also fixes "Continuous Grab" for OSX. (error since 2009)

7 files changed, 107 insertions, 83 deletions

diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c
index 381393eb725..e3078d3f72b 100644
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -123,10 +123,10 @@ static void node_socket_button_string(const bContext *C, uiBlock *block,
 		float slen;
 
 		UI_ThemeColor(TH_TEXT);
-		slen = (UI_GetStringWidth(ui_name) + NODE_MARGIN_X) * snode->aspect_sqrt;
+		slen = (UI_GetStringWidth(ui_name) + NODE_MARGIN_X) * snode->aspect;	/* XXX, check for dpis */
 		while (slen > (width * 0.5f) && *ui_name) {
 			ui_name = BLI_str_find_next_char_utf8(ui_name, NULL);
-			slen = (UI_GetStringWidth(ui_name) + NODE_MARGIN_X) * snode->aspect_sqrt;
+			slen = (UI_GetStringWidth(ui_name) + NODE_MARGIN_X) * snode->aspect;
 		}
 
 		RNA_pointer_create(&ntree->id, &RNA_NodeSocket, sock, &ptr);
@@ -229,19 +229,18 @@ static void node_draw_input_default(const bContext *C, uiBlock *block,
 		node_socket_button_label(C, block, ntree, node, sock, IFACE_(name), x, y, width);
 }
 
-static void node_draw_output_default(const bContext *C, uiBlock *block,
+static void node_draw_output_default(const bContext *UNUSED(C), uiBlock *block,
                                      bNodeTree *UNUSED(ntree), bNode *node, bNodeSocket *sock,
                                      const char *name, int UNUSED(x), int UNUSED(y), int UNUSED(width))
 {
-	SpaceNode *snode = CTX_wm_space_node(C);
 	const char *ui_name = IFACE_(name);
 	float slen;
 
 	UI_ThemeColor(TH_TEXT);
-	slen = (UI_GetStringWidth(ui_name) + NODE_MARGIN_X) * snode->aspect_sqrt;
-	while (slen > node->width && *ui_name) {
+	slen = (UI_GetStringWidth(ui_name) + NODE_MARGIN_X) ;
+	while (slen > NODE_WIDTH(node) && *ui_name) {
 		ui_name = BLI_str_find_next_char_utf8(ui_name, NULL);
-		slen = (UI_GetStringWidth(ui_name) + NODE_MARGIN_X) * snode->aspect_sqrt;
+		slen = (UI_GetStringWidth(ui_name) + NODE_MARGIN_X);
 	}
 	
 	if (*ui_name) {
@@ -509,14 +508,14 @@ static void node_update_group(const bContext *C, bNodeTree *ntree, bNode *gnode)
 		bNodeSocket *sock, *gsock;
 		float locx, locy;
 		rctf *rect = &gnode->totr;
-		const float dpi_fac = UI_DPI_ICON_FAC;
+		const float dpi_fac = UI_DPI_FAC;
 		const float node_group_frame = NODE_GROUP_FRAME * dpi_fac;
 		const float group_header = 26 * dpi_fac;
 		int counter;
 		int dy;
 		
 		/* get "global" coords */
-		nodeToView(gnode, 0.0f, 0.0f, &locx, &locy);
+		node_to_view(gnode, 0.0f, 0.0f, &locx, &locy);
 		
 		/* center them, is a bit of abuse of locx and locy though */
 		node_update_nodetree(C, ngroup, locx, locy);
@@ -688,7 +687,7 @@ static void draw_group_socket_name(SpaceNode *snode, bNode *gnode, bNodeSocket *
 static void draw_group_socket(const bContext *C, SpaceNode *snode, bNodeTree *ntree, bNode *gnode,
                               bNodeSocket *sock, bNodeSocket *gsock, int index, int in_out)
 {
-	const float dpi_fac = UI_DPI_ICON_FAC;
+	const float dpi_fac = 1.0f;
 	bNodeTree *ngroup = (bNodeTree *)gnode->id;
 	bNodeSocketType *stype = ntreeGetSocketType(gsock ? gsock->type : sock->type);
 	uiBut *bt;
@@ -800,7 +799,7 @@ static void node_draw_group(const bContext *C, ARegion *ar, SpaceNode *snode, bN
 		uiLayout *layout;
 		PointerRNA ptr;
 		rctf rect = gnode->totr;
-		const float dpi_fac = UI_DPI_ICON_FAC;
+		const float dpi_fac = 1.0f;
 		const float node_group_frame = NODE_GROUP_FRAME * dpi_fac;
 		const float group_header = 26 * dpi_fac;
 		
@@ -925,7 +924,7 @@ static void node_uifunc_group(uiLayout *layout, bContext *C, PointerRNA *ptr)
  */
 static void node_update_frame(const bContext *UNUSED(C), bNodeTree *ntree, bNode *node)
 {
-	const float margin = 30.0f;
+	const float margin = 1.5f * U.widget_unit;
 	NodeFrame *data = (NodeFrame *)node->storage;
 	int bbinit;
 	bNode *tnode;
@@ -933,8 +932,8 @@ static void node_update_frame(const bContext *UNUSED(C), bNodeTree *ntree, bNode
 	float xmax, ymax;
 	
 	/* init rect from current frame size */
-	nodeToView(node, node->offsetx, node->offsety, &rect.xmin, &rect.ymax);
-	nodeToView(node, node->offsetx + node->width, node->offsety - node->height, &rect.xmax, &rect.ymin);
+	node_to_view(node, node->offsetx, node->offsety, &rect.xmin, &rect.ymax);
+	node_to_view(node, node->offsetx + node->width, node->offsety - node->height, &rect.xmax, &rect.ymin);
 	
 	/* frame can be resized manually only if shrinking is disabled or no children are attached */
 	data->flag |= NODE_FRAME_RESIZEABLE;
@@ -963,8 +962,8 @@ static void node_update_frame(const bContext *UNUSED(C), bNodeTree *ntree, bNode
 	}
 	
 	/* now adjust the frame size from view-space bounding box */
-	nodeFromView(node, rect.xmin, rect.ymax, &node->offsetx, &node->offsety);
-	nodeFromView(node, rect.xmax, rect.ymin, &xmax, &ymax);
+	node_from_view(node, rect.xmin, rect.ymax, &node->offsetx, &node->offsety);
+	node_from_view(node, rect.xmax, rect.ymin, &xmax, &ymax);
 	node->width = xmax - node->offsetx;
 	node->height = -ymax + node->offsety;
 	
@@ -1101,7 +1100,7 @@ static void node_update_reroute(const bContext *UNUSED(C), bNodeTree *UNUSED(ntr
 	float size = NODE_REROUTE_SIZE;
 	
 	/* get "global" coords */
-	nodeToView(node, 0.0f, 0.0f, &locx, &locy);
+	node_to_view(node, 0.0f, 0.0f, &locx, &locy);
 	
 	/* reroute node has exactly one input and one output, both in the same place */
 	nsock = node->outputs.first;
@@ -3532,7 +3531,7 @@ void node_draw_link_bezier(View2D *v2d, SpaceNode *snode, bNodeLink *link,
 		glDisable(GL_LINE_SMOOTH);
 		
 		/* restore previuos linewidth */
-		glLineWidth(linew);
+		glLineWidth(1.0f);
 	}
 }
 
@@ -3618,7 +3617,7 @@ void node_draw_link_straight(View2D *v2d, SpaceNode *snode, bNodeLink *link,
 	glDisable(GL_LINE_SMOOTH);
 	
 	/* restore previuos linewidth */
-	glLineWidth(linew);
+	glLineWidth(1.0f);
 }
 #endif
 
diff --git a/source/blender/editors/space_node/node_add.c b/source/blender/editors/space_node/node_add.c
index 96ac716f383..509e326137b 100644
--- a/source/blender/editors/space_node/node_add.c
+++ b/source/blender/editors/space_node/node_add.c
@@ -76,10 +76,14 @@ bNode *node_add_node(SpaceNode *snode, Main *bmain, Scene *scene,
 	if (node) {
 		node_select(node);
 
+		/* node location is mapped */
+		locx /= UI_DPI_FAC;
+		locy /= UI_DPI_FAC;
+		
 		gnode = node_tree_get_editgroup(snode->nodetree);
 		// arbitrary y offset of 60 so its visible
 		if (gnode) {
-			nodeFromView(gnode, locx, locy + 60.0f, &node->locx, &node->locy);
+			node_from_view(gnode, locx, locy + 60.0f, &node->locx, &node->locy);
 		}
 		else {
 			node->locx = locx;
@@ -215,7 +219,7 @@ static bNodeSocketLink *add_reroute_do_socket_section(bContext *C, bNodeSocketLi
 		mul_v2_fl(insert_point, 1.0f / num_links);
 		
 		if (gnode) {
-			nodeFromView(gnode, insert_point[0], insert_point[1], &reroute_node->locx, &reroute_node->locy);
+			node_from_view(gnode, insert_point[0], insert_point[1], &reroute_node->locx, &reroute_node->locy);
 		}
 		else {
 			reroute_node->locx = insert_point[0];
diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c
index 72461cfb2a8..704bc70fa01 100644
--- a/source/blender/editors/space_node/node_draw.c
+++ b/source/blender/editors/space_node/node_draw.c
@@ -278,6 +278,21 @@ static void node_uiblocks_init(const bContext *C, bNodeTree *ntree)
 	}
 }
 
+void node_to_view(struct bNode *node, float x, float y, float *rx, float *ry)
+{
+	nodeToView(node, x, y, rx, ry);
+	*rx *= UI_DPI_FAC;
+	*ry *= UI_DPI_FAC;
+}
+
+void node_from_view(struct bNode *node, float x, float y, float *rx, float *ry)
+{
+	x /= UI_DPI_FAC;
+	y /= UI_DPI_FAC;
+	nodeFromView(node, x, y, rx, ry);
+}
+
+
 /* based on settings in node, sets drawing rect info. each redraw! */
 static void node_update_basis(const bContext *C, bNodeTree *ntree, bNode *node)
 {
@@ -289,7 +304,7 @@ static void node_update_basis(const bContext *C, bNodeTree *ntree, bNode *node)
 	int buty;
 	
 	/* get "global" coords */
-	nodeToView(node, 0.0f, 0.0f, &locx, &locy);
+	node_to_view(node, 0.0f, 0.0f, &locx, &locy);
 	dy = locy;
 	
 	/* header */
@@ -302,14 +317,14 @@ static void node_update_basis(const bContext *C, bNodeTree *ntree, bNode *node)
 	/* output sockets */
 	for (nsock = node->outputs.first; nsock; nsock = nsock->next) {
 		if (!nodeSocketIsHidden(nsock)) {
-			nsock->locx = locx + node->width;
+			nsock->locx = locx + NODE_WIDTH(node);
 			nsock->locy = dy - NODE_DYS;
 			dy -= NODE_DY;
 		}
 	}
 
 	node->prvr.xmin = locx + NODE_DYS;
-	node->prvr.xmax = locx + node->width - NODE_DYS;
+	node->prvr.xmax = locx + NODE_WIDTH(node) - NODE_DYS;
 
 	/* preview rect? */
 	if (node->flag & NODE_PREVIEW) {
@@ -323,12 +338,13 @@ static void node_update_basis(const bContext *C, bNodeTree *ntree, bNode *node)
 			node->prvr.ymax = dy;
 			
 			if (aspect <= 1.0f)
-				node->prvr.ymin = dy - aspect * (node->width - NODE_DY);
+				node->prvr.ymin = dy - aspect * (NODE_WIDTH(node) - NODE_DY);
 			else {
 				/* width correction of image */
-				float dx = (node->width - NODE_DYS) - (node->width - NODE_DYS) / aspect;
+				/* XXX huh? (ton) */
+				float dx = (NODE_WIDTH(node) - NODE_DYS) - (NODE_WIDTH(node) - NODE_DYS) / aspect;
 				
-				node->prvr.ymin = dy - (node->width - NODE_DY);
+				node->prvr.ymin = dy - (NODE_WIDTH(node) - NODE_DY);
 				
 				node->prvr.xmin += 0.5f * dx;
 				node->prvr.xmax -= 0.5f * dx;
@@ -343,7 +359,7 @@ static void node_update_basis(const bContext *C, bNodeTree *ntree, bNode *node)
 		else {
 			float oldh = BLI_rctf_size_y(&node->prvr);
 			if (oldh == 0.0f)
-				oldh = 0.6f * node->width - NODE_DY;
+				oldh = 0.6f * NODE_WIDTH(node) - NODE_DY;
 			dy -= NODE_DYS / 2;
 			node->prvr.ymax = dy;
 			node->prvr.ymin = dy - oldh;
@@ -357,21 +373,22 @@ static void node_update_basis(const bContext *C, bNodeTree *ntree, bNode *node)
 
 		/* set this for uifunc() that don't use layout engine yet */
 		node->butr.xmin = 0;
-		node->butr.xmax = node->width - 2 * NODE_DYS;
+		node->butr.xmax = NODE_WIDTH(node) - 2 * NODE_DYS;
 		node->butr.ymin = 0;
 		node->butr.ymax = 0;
 		
 		RNA_pointer_create(&ntree->id, &RNA_Node, node, &ptr);
 		
+			
 		layout = uiBlockLayout(node->block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL,
-		                       locx + NODE_DYS, dy, node->butr.xmax, NODE_DY, UI_GetStyle());
+		                       locx + NODE_DYS, dy, node->butr.xmax, 0, UI_GetStyle());
 		uiLayoutSetContextPointer(layout, "node", &ptr);
 		
 		node->typeinfo->uifunc(layout, (bContext *)C, &ptr);
 		
 		uiBlockEndAlign(node->block);
 		uiBlockLayoutResolve(node->block, NULL, &buty);
-		
+			
 		dy = buty - NODE_DYS / 2;
 	}
 
@@ -389,7 +406,7 @@ static void node_update_basis(const bContext *C, bNodeTree *ntree, bNode *node)
 		dy -= NODE_DYS / 2;
 
 	node->totr.xmin = locx;
-	node->totr.xmax = locx + node->width;
+	node->totr.xmax = locx + NODE_WIDTH(node);
 	node->totr.ymax = locy;
 	node->totr.ymin = min_ff(dy, locy - 2 * NODE_DY);
 	
@@ -412,7 +429,7 @@ static void node_update_hidden(bNode *node)
 	int totin = 0, totout = 0, tot;
 	
 	/* get "global" coords */
-	nodeToView(node, 0.0f, 0.0f, &locx, &locy);
+	node_to_view(node, 0.0f, 0.0f, &locx, &locy);
 
 	/* calculate minimal radius */
 	for (nsock = node->inputs.first; nsock; nsock = nsock->next)
@@ -700,7 +717,7 @@ static void node_draw_basis(const bContext *C, ARegion *ar, SpaceNode *snode, bN
 	uiRoundBox(rct->xmin, rct->ymax - NODE_DY, rct->xmax, rct->ymax, BASIS_RAD);
 	
 	/* show/hide icons */
-	iconofs = rct->xmax - 7.0f;
+	iconofs = rct->xmax - 0.35f * U.widget_unit;
 	
 	/* preview */
 	if (node->typeinfo->flag & NODE_PREVIEW) {
@@ -742,13 +759,13 @@ static void node_draw_basis(const bContext *C, ARegion *ar, SpaceNode *snode, bN
 		/* XXX button uses a custom triangle draw below, so make it invisible without icon */
 		uiBlockSetEmboss(node->block, UI_EMBOSSN);
 		but = uiDefBut(node->block, TOGBUT, B_REDR, "",
-		               rct->xmin + 10.0f - but_size / 2, rct->ymax - NODE_DY / 2.0f - but_size / 2,
+		               rct->xmin + 0.5f * U.widget_unit - but_size / 2, rct->ymax - NODE_DY / 2.0f - but_size / 2,
 		               but_size, but_size, NULL, 0, 0, 0, 0, "");
 		uiButSetFunc(but, node_toggle_button_cb, node, (void *)"NODE_OT_hide_toggle");
 		uiBlockSetEmboss(node->block, UI_EMBOSS);
 		
 		/* custom draw function for this button */
-		UI_DrawTriIcon(rct->xmin + 10.0f, rct->ymax - NODE_DY / 2.0f, 'v');
+		UI_DrawTriIcon(rct->xmin + 0.5f * U.widget_unit, rct->ymax - NODE_DY / 2.0f, 'v');
 	}
 	
 	/* this isn't doing anything for the label, so commenting out */
@@ -765,7 +782,7 @@ static void node_draw_basis(const bContext *C, ARegion *ar, SpaceNode *snode, bN
 	//	BLI_snprintf(showname, sizeof(showname), "[%s]", showname); /* XXX - don't print into self! */
 	
 	uiDefBut(node->block, LABEL, 0, showname,
-	         (int)(rct->xmin + (NODE_MARGIN_X / snode->aspect_sqrt)), (int)(rct->ymax - NODE_DY),
+	         (int)(rct->xmin + (NODE_MARGIN_X)), (int)(rct->ymax - NODE_DY),
 	         (short)(iconofs - rct->xmin - 18.0f), (short)NODE_DY,
 	         NULL, 0, 0, 0, 0, "");
 
@@ -808,8 +825,8 @@ static void node_draw_basis(const bContext *C, ARegion *ar, SpaceNode *snode, bN
 		node_socket_circle_draw(ntree, sock, NODE_SOCKSIZE, sock->flag & SELECT);
 		
 		node->typeinfo->drawinputfunc(C, node->block, ntree, node, sock, IFACE_(sock->name),
-		                              sock->locx + (NODE_DYS / snode->aspect_sqrt), sock->locy - NODE_DYS,
-		                              node->width - NODE_DY);
+		                              sock->locx + (NODE_DYS), sock->locy - NODE_DYS,
+		                              NODE_WIDTH(node) - NODE_DY);
 	}
 	
 	/* socket outputs */
@@ -820,8 +837,8 @@ static void node_draw_basis(const bContext *C, ARegion *ar, SpaceNode *snode, bN
 		node_socket_circle_draw(ntree, sock, NODE_SOCKSIZE, sock->flag & SELECT);
 		
 		node->typeinfo->drawoutputfunc(C, node->block, ntree, node, sock, IFACE_(sock->name),
-		                               sock->locx - node->width + (NODE_DYS / snode->aspect_sqrt), sock->locy - NODE_DYS,
-		                               node->width - NODE_DY);
+		                               sock->locx - NODE_WIDTH(node) + (NODE_DYS), sock->locy - NODE_DYS,
+		                               NODE_WIDTH(node) - NODE_DY);
 	}
 	
 	/* preview */
@@ -843,7 +860,7 @@ static void node_draw_hidden(const bContext *C, ARegion *ar, SpaceNode *snode, b
 	rctf *rct = &node->totr;
 	float dx, centy = BLI_rctf_cent_y(rct);
 	float hiddenrad = BLI_rctf_size_y(rct) / 2.0f;
-	float socket_size = NODE_SOCKSIZE * UI_DPI_ICON_FAC;
+	float socket_size = NODE_SOCKSIZE;
 	int color_id = node_get_colorid(node);
 	char showname[128]; /* 128 is used below */
 	
@@ -920,7 +937,7 @@ static void node_draw_hidden(const bContext *C, ARegion *ar, SpaceNode *snode, b
 		//	BLI_snprintf(showname, sizeof(showname), "[%s]", showname); /* XXX - don't print into self! */
 
 		uiDefBut(node->block, LABEL, 0, showname,
-		         (int)(rct->xmin + (NODE_MARGIN_X / snode->aspect_sqrt)), (int)(centy - 10),
+		         (int)(rct->xmin + (NODE_MARGIN_X)), (int)(centy - 10),
 		         (short)(BLI_rctf_size_x(rct) - 18.0f - 12.0f), (short)NODE_DY,
 		         NULL, 0, 0, 0, 0, "");
 	}
@@ -1011,7 +1028,7 @@ void node_update_nodetree(const bContext *C, bNodeTree *ntree, float offsetx, fl
 	
 	/* update nodes front to back, so children sizes get updated before parents */
 	for (node = ntree->nodes.last; node; node = node->prev) {
-		/* XXX little hack */
+		/* XXX little hack (not used anyore?) */
 		node->locx += offsetx;
 		node->locy += offsety;
 		
@@ -1082,7 +1099,7 @@ void drawnodespace(const bContext *C, ARegion *ar, View2D *v2d)
 	SpaceNode *snode = CTX_wm_space_node(C);
 	bNodeLinkDrag *nldrag;
 	LinkData *linkdata;
-	
+
 	UI_ThemeClearColor(TH_BACK);
 	glClear(GL_COLOR_BUFFER_BIT);
 
@@ -1098,11 +1115,10 @@ void drawnodespace(const bContext *C, ARegion *ar, View2D *v2d)
 
 	/* aspect+font, set each time */
 	snode->aspect = BLI_rctf_size_x(&v2d->cur) / (float)ar->winx;
-	snode->aspect_sqrt = sqrtf(snode->aspect);
 	// XXX snode->curfont = uiSetCurFont_ext(snode->aspect);
 
 	/* grid */
-	UI_view2d_multi_grid_draw(v2d, 25.0f, 5, 2);
+	UI_view2d_multi_grid_draw(v2d, U.widget_unit, 5, 2);
 
 	/* backdrop */
 	draw_nodespace_back_pix(C, ar, snode);
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c
index f757345bdcb..ae95d9ae074 100644
--- a/source/blender/editors/space_node/node_edit.c
+++ b/source/blender/editors/space_node/node_edit.c
@@ -874,8 +874,8 @@ static int node_resize_modal(bContext *C, wmOperator *op, wmEvent *event)
 		case MOUSEMOVE:
 			
 			UI_view2d_region_to_view(&ar->v2d, event->mval[0], event->mval[1], &mx, &my);
-			dx = mx - nsw->mxstart;
-			dy = my - nsw->mystart;
+			dx = (mx - nsw->mxstart) / UI_DPI_FAC;
+			dy = (my - nsw->mystart) / UI_DPI_FAC;
 			
 			if (node) {
 				if (node->flag & NODE_HIDDEN) {
@@ -894,8 +894,8 @@ static int node_resize_modal(bContext *C, wmOperator *op, wmEvent *event)
 					}
 				}
 				else {
-					float widthmin = UI_DPI_FAC * node->typeinfo->minwidth;
-					float widthmax = UI_DPI_FAC * node->typeinfo->maxwidth;
+					float widthmin = node->typeinfo->minwidth;
+					float widthmax = node->typeinfo->maxwidth;
 					if (nsw->directions & NODE_RESIZE_RIGHT) {
 						node->width = nsw->oldwidth + dx;
 						CLAMP(node->width, widthmin, widthmax);
@@ -1967,7 +1967,7 @@ static int node_clipboard_copy_exec(bContext *C, wmOperator *UNUSED(op))
 
 	/* get group node offset */
 	if (gnode)
-		nodeToView(gnode, 0.0f, 0.0f, &gnode_x, &gnode_y);
+		node_to_view(gnode, 0.0f, 0.0f, &gnode_x, &gnode_y);
 	
 	for (node = ntree->nodes.first; node; node = node->next) {
 		if (node->flag & SELECT) {
@@ -2080,7 +2080,7 @@ static int node_clipboard_paste_exec(bContext *C, wmOperator *op)
 
 	/* get group node offset */
 	if (gnode) {
-		nodeToView(gnode, 0.0f, 0.0f, &gnode_center[0], &gnode_center[1]);
+		node_to_view(gnode, 0.0f, 0.0f, &gnode_center[0], &gnode_center[1]);
 	}
 	else {
 		zero_v2(gnode_center);
diff --git a/source/blender/editors/space_node/node_intern.h b/source/blender/editors/space_node/node_intern.h
index 671c4fde709..e8dd1cf1528 100644
--- a/source/blender/editors/space_node/node_intern.h
+++ b/source/blender/editors/space_node/node_intern.h
@@ -48,6 +48,7 @@ struct bNode;
 struct bNodeSocket;
 struct bNodeLink;
 struct Main;
+struct wmKeyConfig;
 
 /* temp data to pass on to modal */
 typedef struct bNodeLinkDrag {
@@ -82,6 +83,9 @@ void node_draw_nodetree(const struct bContext *C, struct ARegion *ar, struct Spa
 void drawnodespace(const bContext *C, ARegion *ar, View2D *v2d);
 
 void node_set_cursor(struct wmWindow *win, struct SpaceNode *snode);
+	/* DPI scaled coords */
+void node_to_view(struct bNode *node, float x, float y, float *rx, float *ry);
+void node_from_view(struct bNode *node, float x, float y, float *rx, float *ry);
 
 /* node_buttons.c */
 void node_buttons_register(struct ARegionType *art);
@@ -93,7 +97,7 @@ void NODE_OT_toolbar(struct wmOperatorType *ot);
 
 /* node_ops.c */
 void node_operatortypes(void);
-void node_keymap(wmKeyConfig *keyconf);
+void node_keymap(struct wmKeyConfig *keyconf);
 
 /* node_select.c */
 void node_select(struct bNode *node);
@@ -108,14 +112,14 @@ int node_select_same_type_np(struct SpaceNode *snode, int dir);
 void node_select_single(struct bContext *C, struct bNode *node);
 
 void NODE_OT_select(struct wmOperatorType *ot);
-void NODE_OT_select_all(wmOperatorType *ot);
-void NODE_OT_select_linked_to(wmOperatorType *ot);
-void NODE_OT_select_linked_from(wmOperatorType *ot);
+void NODE_OT_select_all(struct wmOperatorType *ot);
+void NODE_OT_select_linked_to(struct wmOperatorType *ot);
+void NODE_OT_select_linked_from(struct wmOperatorType *ot);
 void NODE_OT_select_border(struct wmOperatorType *ot);
 void NODE_OT_select_lasso(struct wmOperatorType *ot);
 void NODE_OT_select_same_type(struct wmOperatorType *ot);
-void NODE_OT_select_same_type_next(wmOperatorType *ot);
-void NODE_OT_select_same_type_prev(wmOperatorType *ot);
+void NODE_OT_select_same_type_next(struct wmOperatorType *ot);
+void NODE_OT_select_same_type_prev(struct wmOperatorType *ot);
 
 /* node_view.c */
 void NODE_OT_view_all(struct wmOperatorType *ot);
@@ -123,14 +127,14 @@ void NODE_OT_view_selected(struct wmOperatorType *ot);
 
 void NODE_OT_backimage_move(struct wmOperatorType *ot);
 void NODE_OT_backimage_zoom(struct wmOperatorType *ot);
-void NODE_OT_backimage_sample(wmOperatorType *ot);
+void NODE_OT_backimage_sample(struct wmOperatorType *ot);
 
 /* drawnode.c */
-void node_draw_link(View2D *v2d, SpaceNode *snode, bNodeLink *link);
-void node_draw_link_bezier(View2D *v2d, SpaceNode *snode, bNodeLink *link, int th_col1, int do_shaded, int th_col2, int do_triple, int th_col3);
-int node_link_bezier_points(View2D * v2d, SpaceNode * snode, bNodeLink * link, float coord_array[][2], int resol);
+void node_draw_link(struct View2D *v2d, struct SpaceNode *snode, struct bNodeLink *link);
+void node_draw_link_bezier(struct View2D *v2d, struct SpaceNode *snode, struct bNodeLink *link, int th_col1, int do_shaded, int th_col2, int do_triple, int th_col3);
+int node_link_bezier_points(struct View2D * v2d, struct SpaceNode * snode, struct bNodeLink * link, float coord_array[][2], int resol);
 // void node_draw_link_straight(View2D *v2d, SpaceNode *snode, bNodeLink *link, int th_col1, int do_shaded, int th_col2, int do_triple, int th_col3 );
-void draw_nodespace_back_pix(const struct bContext *C, ARegion *ar, SpaceNode *snode);
+void draw_nodespace_back_pix(const struct bContext *C, struct ARegion *ar, struct SpaceNode *snode);
 
 
 /* node_add.c */
@@ -172,10 +176,10 @@ void NODE_OT_link_viewer(struct wmOperatorType *ot);
 
 /* node_edit.c */
 void node_tree_from_ID(ID *id, bNodeTree **ntree, bNodeTree **edittree, int *treetype);
-void snode_notify(bContext *C, SpaceNode *snode);
-void snode_dag_update(bContext *C, SpaceNode *snode);
-void snode_set_context(SpaceNode *snode, Scene *scene);
-void snode_make_group_editable(SpaceNode *snode, bNode *gnode);
+void snode_notify(struct bContext *C, struct SpaceNode *snode);
+void snode_dag_update(struct bContext *C, struct SpaceNode *snode);
+void snode_set_context(struct SpaceNode *snode, Scene *scene);
+void snode_make_group_editable(struct SpaceNode *snode, struct bNode *gnode);
 
 bNode *node_tree_get_editgroup(bNodeTree *ntree);
 void snode_update(struct SpaceNode *snode, struct bNode *node);
@@ -184,7 +188,7 @@ int composite_node_active(struct bContext *C);
 
 int node_has_hidden_sockets(bNode *node);
 void node_set_hidden_sockets(SpaceNode *snode, bNode *node, int set);
-int node_render_changed_exec(bContext *, wmOperator *);
+int node_render_changed_exec(bContext *, struct wmOperator *);
 int node_find_indicated_socket(struct SpaceNode *snode, struct bNode **nodep, struct bNodeSocket **sockp, int in_out);
 
 void NODE_OT_duplicate(struct wmOperatorType *ot);
@@ -217,13 +221,14 @@ extern const char *node_context_dir[];
 
 // XXXXXX
 
-// XXX from BSE_node.h
-#define HIDDEN_RAD      15.0f
-#define BASIS_RAD       8.0f
+// nodes draw without dpi - the view zoom is flexible
+#define HIDDEN_RAD      (0.75f * U.widget_unit)
+#define BASIS_RAD       (0.4f * U.widget_unit)
 #define NODE_DYS        (U.widget_unit / 2)
 #define NODE_DY         U.widget_unit
-#define NODE_MARGIN_X   15
-#define NODE_SOCKSIZE   5
+#define NODE_WIDTH(node)	(node->width * UI_DPI_FAC)
+#define NODE_MARGIN_X   (0.75f * U.widget_unit)
+#define NODE_SOCKSIZE   (0.25f * U.widget_unit)
 #define NODE_LINK_RESOL 12
 
 // XXX button events (butspace)
diff --git a/source/blender/editors/space_node/node_templates.c b/source/blender/editors/space_node/node_templates.c
index 23f4e948794..ca85415cb5a 100644
--- a/source/blender/editors/space_node/node_templates.c
+++ b/source/blender/editors/space_node/node_templates.c
@@ -30,6 +30,7 @@
 
 #include "DNA_node_types.h"
 #include "DNA_screen_types.h"
+#include "DNA_space_types.h"
 
 #include "BLI_listbase.h"
 #include "BLI_string.h"
@@ -52,6 +53,8 @@
 
 #include "ED_util.h"
 
+#include "node_intern.h"
+
 /************************* Node Socket Manipulation **************************/
 
 static void node_tag_recursive(bNode *node)
diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c
index 0e015a4477c..fe880a7592b 100644
--- a/source/blender/editors/space_node/space_node.c
+++ b/source/blender/editors/space_node/space_node.c
@@ -142,15 +142,12 @@ static SpaceLink *node_new(const bContext *UNUSED(C))
 	BLI_addtail(&snode->regionbase, ar);
 	ar->regiontype = RGN_TYPE_WINDOW;
 
-	ar->v2d.tot.xmin =  -256.0f;
-	ar->v2d.tot.ymin =  -256.0f;
-	ar->v2d.tot.xmax = 768.0f;
-	ar->v2d.tot.ymax = 768.0f;
-
-	ar->v2d.cur.xmin =  -256.0f;
-	ar->v2d.cur.ymin =  -256.0f;
-	ar->v2d.cur.xmax = 768.0f;
-	ar->v2d.cur.ymax = 768.0f;
+	ar->v2d.tot.xmin =  -12.8f * U.widget_unit;
+	ar->v2d.tot.ymin =  -12.8f * U.widget_unit;
+	ar->v2d.tot.xmax = 38.4f * U.widget_unit;
+	ar->v2d.tot.ymax = 38.4f * U.widget_unit;
+
+	ar->v2d.cur =  ar->v2d.tot;
 
 	ar->v2d.min[0] = 1.0f;
 	ar->v2d.min[1] = 1.0f;