X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbcdragwindow.C;h=8d70fb8f99e30355a8ad633f9b44b7c71e4bd8cf;hb=6338f0b010dfd93ae6a823970d853cfdd5279500;hp=16a38c4f0014441289155bfccb7566b0daa981e4;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/guicast/bcdragwindow.C b/cinelerra-5.1/guicast/bcdragwindow.C index 16a38c4f..8d70fb8f 100644 --- a/cinelerra-5.1/guicast/bcdragwindow.C +++ b/cinelerra-5.1/guicast/bcdragwindow.C @@ -2,21 +2,21 @@ /* * CINELERRA * Copyright (C) 2008 Adam Williams - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * */ #include "bcdragwindow.h" @@ -25,31 +25,14 @@ #include "vframe.h" #include -// Icon has to be offset so the cursor isn't directly over it. -// The cursor has to be over the target window for X to detect the right window. -#define DRAG_OFFSET_X 16 -#define DRAG_OFFSET_Y 16 - -BC_DragWindow::BC_DragWindow(BC_WindowBase *parent_window, - BC_Pixmap *pixmap /*, - int icon_x, - int icon_y */) - : BC_Popup(parent_window, -// icon_x, -// icon_y, - parent_window->get_abs_cursor_x(0) + DRAG_OFFSET_X, - parent_window->get_abs_cursor_y(0) + DRAG_OFFSET_Y, - pixmap->get_w(), - pixmap->get_h(), - -1, - 0, - pixmap) +BC_DragWindow::BC_DragWindow(BC_WindowBase *parent_window, + BC_Pixmap *pixmap, int icon_x, int icon_y) + : BC_Popup(parent_window, icon_x, icon_y, pixmap->get_w(), pixmap->get_h(), + -1, 0, pixmap) { - temp_frame = 0; -// init_x = icon_x; -// init_y = icon_y; - init_x = parent_window->get_abs_cursor_x(0) + DRAG_OFFSET_X; - init_y = parent_window->get_abs_cursor_y(0) + DRAG_OFFSET_Y; + drag_pixmap = 0; + init_x = icon_x; + init_y = icon_y; end_x = BC_INFINITY; end_y = BC_INFINITY; icon_offset_x = init_x - parent_window->get_abs_cursor_x(0); @@ -59,27 +42,13 @@ BC_DragWindow::BC_DragWindow(BC_WindowBase *parent_window, } -BC_DragWindow::BC_DragWindow(BC_WindowBase *parent_window, - VFrame *frame /*, - int icon_x, - int icon_y */) - : BC_Popup(parent_window, -// icon_x, -// icon_y, - parent_window->get_abs_cursor_x(0) + DRAG_OFFSET_X, - parent_window->get_abs_cursor_y(0) + DRAG_OFFSET_Y, - frame->get_w(), - frame->get_h(), - -1, - 0, - prepare_frame(frame, parent_window)) +BC_DragWindow::BC_DragWindow(BC_WindowBase *parent_window, + VFrame *frame, int icon_x, int icon_y) + : BC_Popup(parent_window, icon_x, icon_y, frame->get_w(), frame->get_h(), + -1, 0, prepare_frame(frame, parent_window)) { - delete temp_frame; // created in prepare_frame inside constructor - temp_frame = 0; -// init_x = icon_x; -// init_y = icon_y; - init_x = parent_window->get_abs_cursor_x(0) + DRAG_OFFSET_X; - init_y = parent_window->get_abs_cursor_y(0) + DRAG_OFFSET_Y; + init_x = icon_x; + init_y = icon_y; end_x = BC_INFINITY; end_y = BC_INFINITY; icon_offset_x = init_x - parent_window->get_abs_cursor_x(0); @@ -90,20 +59,16 @@ BC_DragWindow::BC_DragWindow(BC_WindowBase *parent_window, BC_DragWindow::~BC_DragWindow() { + delete drag_pixmap; } int BC_DragWindow::get_init_x(BC_WindowBase *parent_window, int icon_x) { int output_x, temp = 0; Window tempwin; - XTranslateCoordinates(parent_window->top_level->display, - parent_window->win, - parent_window->top_level->rootwin, - icon_x, - temp, - &output_x, - &temp, - &tempwin); + XTranslateCoordinates(parent_window->top_level->display, + parent_window->win, parent_window->top_level->rootwin, + icon_x, temp, &output_x, &temp, &tempwin); return output_x; } @@ -111,26 +76,26 @@ int BC_DragWindow::get_init_y(BC_WindowBase *parent_window, int icon_y) { int output_y, temp = 0; Window tempwin; - XTranslateCoordinates(parent_window->top_level->display, - parent_window->win, - parent_window->top_level->rootwin, - temp, - icon_y, - &temp, - &output_y, - &tempwin); + XTranslateCoordinates(parent_window->top_level->display, + parent_window->win, parent_window->top_level->rootwin, + temp, icon_y, &temp, &output_y, &tempwin); return output_y; } int BC_DragWindow::cursor_motion_event() { - reposition_window(get_abs_cursor_x(0) + icon_offset_x, - get_abs_cursor_y(0) + icon_offset_y, - get_w(), - get_h()); + int cx, cy; + get_abs_cursor(cx, cy); + reposition_window(cx + icon_offset_x, cy + icon_offset_y, get_w(), get_h()); flush(); return 1; } +int BC_DragWindow::button_release_event() +{ + cursor_motion_event(); + sync(); + return BC_WindowBase::button_release_event(); +} int BC_DragWindow::get_offset_x() { @@ -146,21 +111,16 @@ int BC_DragWindow::drag_failure_event() { if(!do_animation) return 0; - if(end_x == BC_INFINITY) - { + if(end_x == BC_INFINITY) { end_x = get_x(); end_y = get_y(); } - for(int i = 0; i < 10; i++) - { + for(int i = 0; i < 10; i++) { int new_x = end_x + (init_x - end_x) * i / 10; int new_y = end_y + (init_y - end_y) * i / 10; - reposition_window(new_x, - new_y, - get_w(), - get_h()); + reposition_window(new_x, new_y, get_w(), get_h()); flush(); usleep(1000); } @@ -174,39 +134,29 @@ void BC_DragWindow::set_animation(int value) BC_Pixmap *BC_DragWindow::prepare_frame(VFrame *frame, BC_WindowBase *parent_window) { - temp_frame = 0; - - if(frame->get_color_model() == BC_RGBA8888) - { - temp_frame = new VFrame(*frame); + VFrame *temp_frame = 0; + int tw = frame->get_w(), th = frame->get_h(); + + if( frame->get_color_model() != BC_RGBA8888 ) { + temp_frame = new VFrame(tw, th, BC_RGBA8888); + temp_frame->transfer_from(frame); } else - { - temp_frame = new VFrame; - temp_frame->set_use_shm(0); - temp_frame->reallocate(0, - -1, - 0, - 0, - 0, - frame->get_w(), - frame->get_h(), - BC_RGBA8888, - -1); - - BC_CModels::transfer(temp_frame->get_rows(), frame->get_rows(), - 0, 0, 0, 0, 0, 0, - 0, 0, frame->get_w(), frame->get_h(), - 0, 0, temp_frame->get_w(), temp_frame->get_h(), - frame->get_color_model(), temp_frame->get_color_model(), - 0, frame->get_w(), temp_frame->get_w()); + temp_frame = new VFrame(*frame); + + int tx = tw/2, ty = th/2, tx1 = tx-1, ty1 = ty-1, tx2 = tx+2, ty2 = ty+2; + int bpp = BC_CModels::calculate_pixelsize(temp_frame->get_color_model()); + unsigned char **rows = temp_frame->get_rows(); + for( int y=ty1; yget_rows()[(temp_frame->get_h() / 2)][(temp_frame->get_w() / 2) * 4 + 3] = 0; - my_pixmap = new BC_Pixmap(parent_window, - temp_frame, - PIXMAP_ALPHA); + drag_pixmap = new BC_Pixmap(parent_window, temp_frame, PIXMAP_ALPHA); - return (my_pixmap); + delete temp_frame; + return drag_pixmap; }