X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=libs%2Fgtkutil%2Fclipboard.cpp;h=fd36f39e547b951336a61036bc3b778936135366;hb=e9bb12b9916f5cdc3834e83a8e0b2569545630cb;hp=26c35924ef845ff555b8d882f82911b69d6b3635;hpb=9dfae1c9b270ee369c6362903a9205b30751b95f;p=xonotic%2Fnetradiant.git

diff --git a/libs/gtkutil/clipboard.cpp b/libs/gtkutil/clipboard.cpp
index 26c35924..fd36f39e 100644
--- a/libs/gtkutil/clipboard.cpp
+++ b/libs/gtkutil/clipboard.cpp
@@ -36,119 +36,112 @@ const char* c_clipboard_format = "RadiantClippings";
 #include <windows.h>
 
 void clipboard_copy( ClipboardCopyFunc copy ){
-    BufferOutputStream ostream;
-    copy( ostream );
-
-    bool bClipped = false;
-    UINT nClipboard = ::RegisterClipboardFormat( c_clipboard_format );
-    if ( nClipboard > 0 ) {
-        if ( ::OpenClipboard( 0 ) ) {
-            EmptyClipboard();
-            std::size_t length = ostream.size();
-            HANDLE h = ::GlobalAlloc( GMEM_ZEROINIT | GMEM_MOVEABLE | GMEM_DDESHARE, length + sizeof( std::size_t ) );
-            if ( h != 0 ) {
-                char *buffer = reinterpret_cast<char*>( ::GlobalLock( h ) );
-                *reinterpret_cast<std::size_t*>( buffer ) = length;
-                buffer += sizeof( std::size_t );
-                memcpy( buffer, ostream.data(), length );
-                ::GlobalUnlock( h );
-                ::SetClipboardData( nClipboard, h );
-                ::CloseClipboard();
-                bClipped = true;
-            }
-        }
-    }
-
-    if ( !bClipped ) {
-        globalOutputStream() << "Unable to register Windows clipboard formats, copy/paste between editors will not be possible\n";
-    }
+	BufferOutputStream ostream;
+	copy( ostream );
+
+	bool bClipped = false;
+	UINT nClipboard = ::RegisterClipboardFormat( c_clipboard_format );
+	if ( nClipboard > 0 ) {
+		if ( ::OpenClipboard( 0 ) ) {
+			EmptyClipboard();
+			std::size_t length = ostream.size();
+			HANDLE h = ::GlobalAlloc( GMEM_ZEROINIT | GMEM_MOVEABLE | GMEM_DDESHARE, length + sizeof( std::size_t ) );
+			if ( h != 0 ) {
+				char *buffer = reinterpret_cast<char*>( ::GlobalLock( h ) );
+				*reinterpret_cast<std::size_t*>( buffer ) = length;
+				buffer += sizeof( std::size_t );
+				memcpy( buffer, ostream.data(), length );
+				::GlobalUnlock( h );
+				::SetClipboardData( nClipboard, h );
+				::CloseClipboard();
+				bClipped = true;
+			}
+		}
+	}
+
+	if ( !bClipped ) {
+		globalOutputStream() << "Unable to register Windows clipboard formats, copy/paste between editors will not be possible\n";
+	}
 }
 
 void clipboard_paste( ClipboardPasteFunc paste ){
-    UINT nClipboard = ::RegisterClipboardFormat( c_clipboard_format );
-    if ( nClipboard > 0 && ::OpenClipboard( 0 ) ) {
-        if ( IsClipboardFormatAvailable( nClipboard ) ) {
-            HANDLE h = ::GetClipboardData( nClipboard );
-            if ( h ) {
-                const char *buffer = reinterpret_cast<const char*>( ::GlobalLock( h ) );
-                std::size_t length = *reinterpret_cast<const std::size_t*>( buffer );
-                buffer += sizeof( std::size_t );
-                BufferInputStream istream( buffer, length );
-                paste( istream );
-                ::GlobalUnlock( h );
-            }
-        }
-        ::CloseClipboard();
-    }
+	UINT nClipboard = ::RegisterClipboardFormat( c_clipboard_format );
+	if ( nClipboard > 0 && ::OpenClipboard( 0 ) ) {
+		if ( IsClipboardFormatAvailable( nClipboard ) ) {
+			HANDLE h = ::GetClipboardData( nClipboard );
+			if ( h ) {
+				const char *buffer = reinterpret_cast<const char*>( ::GlobalLock( h ) );
+				std::size_t length = *reinterpret_cast<const std::size_t*>( buffer );
+				buffer += sizeof( std::size_t );
+				BufferInputStream istream( buffer, length );
+				paste( istream );
+				::GlobalUnlock( h );
+			}
+		}
+		::CloseClipboard();
+	}
 }
 
 #else
 
 #include <gtk/gtk.h>
 
-enum {
-    RADIANT_CLIPPINGS = 23,
+enum
+{
+	RADIANT_CLIPPINGS = 23,
 };
 
 static char RADIANT_CLIPPINGS_STR[] = "RADIANT_CLIPPINGS";
 
 static const GtkTargetEntry clipboard_targets[] = {
-        {RADIANT_CLIPPINGS_STR, 0, RADIANT_CLIPPINGS,},
+	{RADIANT_CLIPPINGS_STR, 0, RADIANT_CLIPPINGS, },
 };
 
-static void clipboard_get(GtkClipboard *clipboard, GtkSelectionData *selection_data, guint info, gpointer data)
-{
-    std::size_t len = *reinterpret_cast<std::size_t *>( data );
-    const char *buffer = (len != 0) ? reinterpret_cast<const char *>( data ) + sizeof(std::size_t) : 0;
+static void clipboard_get( GtkClipboard *clipboard, GtkSelectionData *selection_data, guint info, gpointer data ){
+	std::size_t len = *reinterpret_cast<std::size_t*>( data );
+	const char* buffer = ( len != 0 ) ? reinterpret_cast<const char*>( data ) + sizeof( std::size_t ) : 0;
 
-    GdkAtom type = GDK_NONE;
-    if (info == clipboard_targets[0].info) {
-        type = gdk_atom_intern(clipboard_targets[0].target, FALSE);
-    }
+	GdkAtom type = GDK_NONE;
+	if ( info == clipboard_targets[0].info ) {
+		type = gdk_atom_intern( clipboard_targets[0].target, FALSE );
+	}
 
-    gtk_selection_data_set(selection_data, type, 8, reinterpret_cast<const guchar *>( buffer ),
-                           static_cast<gint>( len ));
+	gtk_selection_data_set( selection_data, type, 8, reinterpret_cast<const guchar*>( buffer ), static_cast<gint>( len ) );
 }
 
-static void clipboard_clear(GtkClipboard *clipboard, gpointer data)
-{
-    delete[] reinterpret_cast<const char *>( data );
+static void clipboard_clear( GtkClipboard *clipboard, gpointer data ){
+	delete [] reinterpret_cast<const char*>( data );
 }
 
-static void clipboard_received(GtkClipboard *clipboard, GtkSelectionData *data, gpointer user_data)
-{
-    if (gtk_selection_data_get_length(data) < 0) {
-        globalErrorStream() << "Error retrieving selection\n";
-    } else if (strcmp(gdk_atom_name(gtk_selection_data_get_data_type(data)), clipboard_targets[0].target) == 0) {
-        BufferInputStream istream(reinterpret_cast<const char *>( gtk_selection_data_get_data(data)),
-                                  gtk_selection_data_get_length(data));
-        (*reinterpret_cast<ClipboardPasteFunc *>( user_data ))(istream);
-    }
+static void clipboard_received( GtkClipboard *clipboard, GtkSelectionData *data, gpointer user_data ){
+	if ( gtk_selection_data_get_length(data) < 0 ) {
+		globalErrorStream() << "Error retrieving selection\n";
+	}
+	else if ( strcmp( gdk_atom_name( gtk_selection_data_get_data_type(data) ), clipboard_targets[0].target ) == 0 ) {
+		BufferInputStream istream( reinterpret_cast<const char*>( gtk_selection_data_get_data(data) ), gtk_selection_data_get_length(data) );
+		( *reinterpret_cast<ClipboardPasteFunc*>( user_data ) )( istream );
+	}
 }
 
-void clipboard_copy(ClipboardCopyFunc copy)
-{
-    GtkClipboard *clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
+void clipboard_copy( ClipboardCopyFunc copy ){
+	GtkClipboard* clipboard = gtk_clipboard_get( GDK_SELECTION_CLIPBOARD );
 
-    BufferOutputStream ostream;
-    copy(ostream);
-    std::size_t length = ostream.size();
-    char *data = new char[length + sizeof(std::size_t)];
-    *reinterpret_cast<std::size_t *>( data ) = length;
-    memcpy(data + sizeof(std::size_t), ostream.data(), length);
+	BufferOutputStream ostream;
+	copy( ostream );
+	std::size_t length = ostream.size();
+	char* data = new char[length + sizeof( std::size_t )];
+	*reinterpret_cast<std::size_t*>( data ) = length;
+	memcpy( data + sizeof( std::size_t ), ostream.data(), length );
 
-    gtk_clipboard_set_with_data(clipboard, clipboard_targets, 1, clipboard_get, clipboard_clear, data);
+	gtk_clipboard_set_with_data( clipboard, clipboard_targets, 1, clipboard_get, clipboard_clear, data );
 }
 
 ClipboardPasteFunc g_clipboardPasteFunc = 0;
+void clipboard_paste( ClipboardPasteFunc paste ){
+	GtkClipboard* clipboard = gtk_clipboard_get( GDK_SELECTION_CLIPBOARD );
 
-void clipboard_paste(ClipboardPasteFunc paste)
-{
-    GtkClipboard *clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
-
-    g_clipboardPasteFunc = paste;
-    gtk_clipboard_request_contents(clipboard, gdk_atom_intern(clipboard_targets[0].target, FALSE), clipboard_received,
-                                   &g_clipboardPasteFunc);
+	g_clipboardPasteFunc = paste;
+	gtk_clipboard_request_contents( clipboard, gdk_atom_intern( clipboard_targets[0].target, FALSE ), clipboard_received, &g_clipboardPasteFunc );
 }