[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14011] trunk/blender: Changed getClipbaord and putClipboard functions to be more ghost like

Ricki Myers antihc3 at gmail.com
Sat Mar 8 05:22:53 CET 2008


Revision: 14011
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14011
Author:   themyers
Date:     2008-03-08 05:22:52 +0100 (Sat, 08 Mar 2008)

Log Message:
-----------
Changed getClipbaord and putClipboard functions to be more ghost like
Changed getClipboard to GHOST_getClipboard and putClipboard to GHOST_putClipboard

Removed ghost calls from blender and added the calls to winlay.h and ghostwinlay.c
This cleand up casts in drawtext.c

Modified Paths:
--------------
    trunk/blender/intern/ghost/GHOST_C-api.h
    trunk/blender/intern/ghost/intern/GHOST_C-api.cpp
    trunk/blender/source/blender/src/drawtext.c
    trunk/blender/source/blender/src/ghostwinlay.c
    trunk/blender/source/blender/src/winlay.h

Modified: trunk/blender/intern/ghost/GHOST_C-api.h
===================================================================
--- trunk/blender/intern/ghost/GHOST_C-api.h	2008-03-08 03:02:36 UTC (rev 14010)
+++ trunk/blender/intern/ghost/GHOST_C-api.h	2008-03-08 04:22:52 UTC (rev 14011)
@@ -763,12 +763,12 @@
  * Return the data from the clipboad
  * @return clipboard data
  */
-extern GHOST_TUns8* getClipboard(int flag);
+extern GHOST_TUns8* GHOST_getClipboard(int flag);
 
 /**
  * Put data to the Clipboard
  */
-extern void putClipboard(GHOST_TInt8 *buffer, int flag);
+extern void GHOST_putClipboard(GHOST_TInt8 *buffer, int flag);
 
 #ifdef __cplusplus
 }

Modified: trunk/blender/intern/ghost/intern/GHOST_C-api.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_C-api.cpp	2008-03-08 03:02:36 UTC (rev 14010)
+++ trunk/blender/intern/ghost/intern/GHOST_C-api.cpp	2008-03-08 04:22:52 UTC (rev 14011)
@@ -803,13 +803,13 @@
 	return result;
 }
 
-GHOST_TUns8* getClipboard(int flag)
+GHOST_TUns8* GHOST_getClipboard(int flag)
 {
 	GHOST_ISystem* system = GHOST_ISystem::getSystem();
 	return system->getClipboard(flag);
 }
 
-void putClipboard(GHOST_TInt8 *buffer, int flag)
+void GHOST_putClipboard(GHOST_TInt8 *buffer, int flag)
 {
 	GHOST_ISystem* system = GHOST_ISystem::getSystem();
 	system->putClipboard(buffer, flag);

Modified: trunk/blender/source/blender/src/drawtext.c
===================================================================
--- trunk/blender/source/blender/src/drawtext.c	2008-03-08 03:02:36 UTC (rev 14010)
+++ trunk/blender/source/blender/src/drawtext.c	2008-03-08 04:22:52 UTC (rev 14011)
@@ -84,9 +84,8 @@
 
 #include "mydevice.h"
 #include "blendef.h" 
+#include "winlay.h"
 
-#include "GHOST_C-api.h"
-
 #define TEXTXLOC	38
 
 /* forward declarations */
@@ -1363,7 +1362,7 @@
 
 void get_selection_buffer(Text *text)
 {
-	char *buff = (char*)getClipboard(1);
+	char *buff = getClipboard(1);
 	txt_insert_buf(text, buff);
 }
 
@@ -1376,7 +1375,7 @@
 		copybuffer[bufferlength] = '\0';
 		temp = winNewLine(copybuffer);
 		
-		putClipboard((GHOST_TInt8*)temp, 0);
+		putClipboard(temp, 0);
 		MEM_freeN(temp);
 		MEM_freeN(copybuffer);
 		copybuffer= NULL;
@@ -1539,7 +1538,7 @@
 				do_selection(st, G.qual&LR_SHIFTKEY);
 				if (txt_has_sel(text)) {
 					buffer = txt_sel_to_buf(text);
-					putClipboard((GHOST_TInt8*)buffer, 1);
+					putClipboard(buffer, 1);
 					MEM_freeN(buffer);
 				}
 				do_draw= 1;

Modified: trunk/blender/source/blender/src/ghostwinlay.c
===================================================================
--- trunk/blender/source/blender/src/ghostwinlay.c	2008-03-08 03:02:36 UTC (rev 14010)
+++ trunk/blender/source/blender/src/ghostwinlay.c	2008-03-08 04:22:52 UTC (rev 14011)
@@ -833,3 +833,11 @@
 Window *winlay_get_active_window(void) {
 	return active_gl_window;
 }
+
+char *getClipboard(int flag) {
+	return (char*)GHOST_getClipboard(flag);
+}
+
+void putClipboard(char *buffer, int flag) {
+	GHOST_putClipboard((GHOST_TInt8*)buffer, flag);
+}

Modified: trunk/blender/source/blender/src/winlay.h
===================================================================
--- trunk/blender/source/blender/src/winlay.h	2008-03-08 03:02:36 UTC (rev 14010)
+++ trunk/blender/source/blender/src/winlay.h	2008-03-08 04:22:52 UTC (rev 14011)
@@ -86,3 +86,9 @@
 void	winlay_process_events	(int wait_for_event);
 
 void	winlay_get_screensize	(int *width_r, int *height_r);
+
+	/* Copy and paste functions in ghostwinlay.c */
+
+char *getClipboard(int flag);
+
+void putClipboard(char *buffer, int flag);





More information about the Bf-blender-cvs mailing list