Ticket #7340: showimage-new-from-clipboard-001.diff

src/apps/showimage/ShowImageWindow.cpp

@@ -118 +118 @@
 
 
 ShowImageWindow::ShowImageWindow(BRect frame, const entry_ref& ref,
-    const BMessenger& trackerMessenger)
+    const BMessenger& trackerMessenger, bool fromClipboard)
     :
     BWindow(frame, "", B_DOCUMENT_WINDOW, 0),
     fNavigator(ref, trackerMessenger),
@@ -187 +187 @@
 
     SetSizeLimits(250, 100000, 100, 100000);
 
-    // finish creating the window
-    if (_LoadImage() != B_OK) {
+    if (fromClipboard) {
+printf("fromClipboard\n");
+        status_t status = B_ERROR;
+        //XXX: needs cleanup
+        BBitmap *bitmap = NULL;
+        if (be_clipboard->Lock()) {
+            BMessage *clip = be_clipboard->Data();
+            BMessage archivedBitmap;
+            if (clip->FindMessage("image/bitmap", &archivedBitmap) == B_OK
+                || clip->FindMessage("image/bitmap", &archivedBitmap) == B_OK) {
+                bitmap = new(std::nothrow) BBitmap(&archivedBitmap);
+printf("bitmap %p\n", bitmap);
+            }
+            be_clipboard->Unlock();
+        }
+        if (bitmap)
+            status = fImageView->SetImage(NULL, bitmap);
+printf("error 0x%08lx\n", status);
+        if (status != B_OK) {
+            //XXX
+            entry_ref ref;
+            _LoadError(ref);
+            Quit();
+            return;
+        }
+        fImageView->FitToBounds();
+        fImageView->MakeFocus(true);
+        SetTitle("Untitled");
+        Show();
+    } else if (_LoadImage() != B_OK) { // finish creating the window
         _LoadError(ref);
         Quit();
         return;
     }
+printf("done\n");
 
     // add View menu here so it can access ShowImageView methods
     BMenu* menu = new BMenu(B_TRANSLATE_WITH_CONTEXT("View", "Menus"));
@@ -211 +240 @@
     // and tell this window if it contains interesting data or not
     be_app_messenger.SendMessage(B_CLIPBOARD_CHANGED);
 
+printf("Run()\n");
     // The window will be shown on screen automatically
     Run();
 }
@@ -320 +350 @@
 {
     BMenu* menu = new BMenu(B_TRANSLATE("File"));
 
+    _AddItemMenu(menu, B_TRANSLATE("New from clipboard"), B_PASTE, 'N', 0, this);
     // Add recent files to "Open File" entry as sub-menu.
     BMenuItem* item = new BMenuItem(BRecentFilesList::NewFileListMenu(
         B_TRANSLATE("Open"B_UTF8_ELLIPSIS), NULL, NULL, be_app, 10, true,
@@ -711 +742 @@
             fImageView->CopySelectionToClipboard();
             break;
 
+        case B_PASTE:
+            be_app->PostMessage(message);
+            break;
+
         case MSG_SELECTION_MODE:
             fImageView->SetSelectionMode(_ToggleMenuItem(MSG_SELECTION_MODE));
             break;

src/apps/showimage/ShowImageWindow.h

@@ -47 +47 @@
 public:
                                 ShowImageWindow(BRect frame,
                                     const entry_ref& ref,
-                                    const BMessenger& trackerMessenger);
+                                    const BMessenger& trackerMessenger,
+                                    bool fromClipboard=false);
     virtual                     ~ShowImageWindow();
 
             void                BuildContextMenu(BMenu* menu);

src/apps/showimage/ShowImageApp.cpp

@@ -125 +125 @@
             _StartPulse();
             break;
 
+        case B_PASTE:
+            _CreateFromClipboard();
+            break;
+
         case B_CLIPBOARD_CHANGED:
             _CheckClipboard();
             break;
@@ -237 +241 @@
 
 
 void
+ShowImageApp::_CreateFromClipboard()
+{
+    fLastWindowFrame.OffsetBy(20, 20);
+    if (!BScreen(B_MAIN_SCREEN_ID).Frame().Contains(fLastWindowFrame))
+        fLastWindowFrame.OffsetTo(50, 50);
+    
+    entry_ref ref;
+    BMessenger messenger;
+    new ShowImageWindow(fLastWindowFrame, ref, messenger, true);
+}
+
+
+void
 ShowImageApp::_CheckClipboard()
 {
     // Determines if the contents of the clipboard contain

src/apps/showimage/ShowImageApp.h

@@ -43 +43 @@
             void                _Open(const entry_ref& ref,
                                     const BMessenger& trackerMessenger);
             void                _BroadcastToWindows(BMessage* message);
+            void                _CreateFromClipboard();
             void                _CheckClipboard();
             void                _UpdateLastWindowFrame();