diff options
Diffstat (limited to 'src/drivers')
6 files changed, 14 insertions, 14 deletions
diff --git a/src/drivers/GDI/Fl_GDI_Image_Surface_Driver.cxx b/src/drivers/GDI/Fl_GDI_Image_Surface_Driver.cxx index 7e1c2f24e..a14524ee2 100644 --- a/src/drivers/GDI/Fl_GDI_Image_Surface_Driver.cxx +++ b/src/drivers/GDI/Fl_GDI_Image_Surface_Driver.cxx @@ -96,7 +96,7 @@ Fl_RGB_Image* Fl_GDI_Image_Surface_Driver::image() bmi.bmiHeader.biBitCount = 24; GetDIBits(gc, (HBITMAP)offscreen, 0, H, dib_src, &bmi, DIB_RGB_COLORS); - + // draw above the secondary offscreen the main offscreen masked by shape_data_->mask GdiFlush(); Fl_Image_Surface_Driver::copy_with_mask(shape_data_->mask, shape_data_->vBits, dib_src, ((3*W+3)/4) * 4, true); @@ -141,9 +141,9 @@ void Fl_GDI_Image_Surface_Driver::mask(const Fl_RGB_Image *mask) { GetDIBits(gc, (HBITMAP)offscreen, 0, 0, NULL, &bmi, DIB_RGB_COLORS); int W = bmi.bmiHeader.biWidth; int H = bmi.bmiHeader.biHeight; - + shape_data_->mask = Fl_Image_Surface_Driver::RGB3_to_RGB1(mask, W, H); - + // duplicate current offscreen content to new offscreen int line_size = ((3*W+3)/4) * 4; uchar *dib = new uchar[line_size * H]; // create temporary buffer to read DIB @@ -151,11 +151,11 @@ void Fl_GDI_Image_Surface_Driver::mask(const Fl_RGB_Image *mask) { bmi.bmiHeader.biHeight = H; bmi.bmiHeader.biCompression = BI_RGB; bmi.bmiHeader.biBitCount = 24; - + GetDIBits(gc, (HBITMAP)offscreen, 0, H, dib, &bmi, DIB_RGB_COLORS); - + HDC background_gc = CreateCompatibleDC(gc); - shape_data_->background = + shape_data_->background = CreateDIBSection(background_gc, &bmi, DIB_RGB_COLORS, (void**)&shape_data_->vBits, NULL, 0); if (!shape_data_->background) { diff --git a/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.cxx b/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.cxx index fb522745a..00fc63150 100644 --- a/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.cxx +++ b/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.cxx @@ -65,7 +65,7 @@ Fl_Quartz_Image_Surface_Driver::~Fl_Quartz_Image_Surface_Driver() { } delete driver(); } - + void Fl_Quartz_Image_Surface_Driver::set_current() { Fl_Surface_Device::set_current(); @@ -155,7 +155,7 @@ void Fl_Quartz_Image_Surface_Driver::mask(const Fl_RGB_Image *img) { img = copy; using_copy = true; } - + int i, d = img->d(), w = img->data_w(), h = img->data_h(); // reverse top and bottom and convert to gray scale if img->d() == 3 and complement bits int bytes_per_row = (img->ld() ? img->ld() : w * d); diff --git a/src/drivers/Wayland/Fl_Wayland_Image_Surface_Driver.cxx b/src/drivers/Wayland/Fl_Wayland_Image_Surface_Driver.cxx index f25fe025d..de72e175a 100644 --- a/src/drivers/Wayland/Fl_Wayland_Image_Surface_Driver.cxx +++ b/src/drivers/Wayland/Fl_Wayland_Image_Surface_Driver.cxx @@ -132,7 +132,7 @@ Fl_RGB_Image* Fl_Wayland_Image_Surface_Driver::image() { free(shape_data_); shape_data_ = NULL; } - + // Convert depth-4 image in draw_buffer to a depth-3 image while exchanging R and B colors struct Fl_Wayland_Graphics_Driver::draw_buffer *off_buf = Fl_Wayland_Graphics_Driver::offscreen_buffer(offscreen); diff --git a/src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx b/src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx index eb6b6c396..6507b0b41 100644 --- a/src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx +++ b/src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx @@ -275,7 +275,7 @@ static void pointer_button(void *data, (struct Fl_Wayland_Screen_Driver::seat*)data; if (gtk_shell_surface && state == WL_POINTER_BUTTON_STATE_PRESSED && button == BTN_MIDDLE) { - struct gtk_surface1 *gtk_surface = gtk_shell1_get_gtk_surface(gtk_shell, + struct gtk_surface1 *gtk_surface = gtk_shell1_get_gtk_surface(gtk_shell, gtk_shell_surface); gtk_surface1_titlebar_gesture(gtk_surface, serial, seat->wl_seat, GTK_SURFACE1_GESTURE_MIDDLE_CLICK); diff --git a/src/drivers/X11/Fl_X11_Gl_Window_Driver.cxx b/src/drivers/X11/Fl_X11_Gl_Window_Driver.cxx index 000c522ac..985978c1f 100644 --- a/src/drivers/X11/Fl_X11_Gl_Window_Driver.cxx +++ b/src/drivers/X11/Fl_X11_Gl_Window_Driver.cxx @@ -445,11 +445,11 @@ void Fl_X11_Gl_Window_Driver::swap_interval(int interval) { if (fl_glXSwapInterval.EXT) fl_glXSwapInterval.EXT(fl_display, fl_xid(pWindow), interval); break; - case 2: + case 2: if (fl_glXSwapInterval.MESA) fl_glXSwapInterval.MESA((unsigned int)interval); break; - case 3: + case 3: if (fl_glXSwapInterval.SGI) fl_glXSwapInterval.SGI(interval); break; @@ -468,7 +468,7 @@ int Fl_X11_Gl_Window_Driver::swap_interval() const { glXQueryDrawable(fl_display, fl_xid(pWindow), 0x20F1 /*GLX_SWAP_INTERVAL_EXT*/, &val); interval = (int)val; break; } - case 2: + case 2: if (fl_glXGetSwapIntervalMESA) interval = fl_glXGetSwapIntervalMESA(); break; diff --git a/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx b/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx index 87e55b417..2660dcda7 100644 --- a/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx @@ -137,7 +137,7 @@ Fl_RGB_Image* Fl_Xlib_Image_Surface_Driver::image() fl_window = shape_data_->background; // temporary change Fl_RGB_Image *img_background = Fl::screen_driver()->read_win_rectangle(0, 0, w, h, 0); fl_window = offscreen; - Fl_Image_Surface_Driver::copy_with_mask(shape_data_->mask, + Fl_Image_Surface_Driver::copy_with_mask(shape_data_->mask, (uchar*)img_background->array, (uchar*)img_main->array, 3 * shape_data_->mask->w(), false); |