dwindows: gtk3/dw.c comparison

comparison gtk3/dw.c @ 1929:25da63f0eddc

Updates for supporting newer versions of GTK3.... Removes lots of warnings, but we are still using some deprecated funtions for the moment while I decide how to proceed.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Fri, 02 Jun 2017 22:49:09 +0000
parents	3c60066cb16f
children	fe04bcfd5b65

comparison

equal deleted inserted replaced

-:e07a1e176995
+:25da63f0eddc
 case GDK_BUTTON_PRESS:
 if (child->state == CHILD_MAXIMIZED)
 return FALSE;
 if (mdi->drag_button < 0)
 {
+#if GTK_CHECK_VERSION(3,20,0)
+if (gdk_seat_grab (gdk_event_get_seat(event),
+event->button.window,
+GDK_SEAT_CAPABILITY_ALL_POINTING,
+FALSE, NULL, event, NULL, NULL) != GDK_GRAB_SUCCESS)
+#else
 if (gdk_device_grab (gdk_event_get_device(event),
 event->button.window,
 GDK_OWNERSHIP_WINDOW,
 FALSE,
 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |
 GDK_BUTTON_RELEASE_MASK,
 NULL,
 event->button.time) != GDK_GRAB_SUCCESS)
+#endif
 return FALSE;
 mdi->drag_button = event->button.button;
 mdi->drag_start.x = event->button.x;
 if (mdi->drag_button == event->button.button)
 {
 int x, y;
+#if GTK_CHECK_VERSION(3,20,0)
+gdk_seat_ungrab (gdk_event_get_seat(event));
+#else
 gdk_device_ungrab (gdk_event_get_device(event), event->button.time);
+#endif
 mdi->drag_button = -1;
 x = event->button.x + child->x - mdi->drag_start.x;
 y = event->button.y + child->y - mdi->drag_start.y;
 switch (event->type)
 {
 case GDK_BUTTON_PRESS:
 if (mdi->drag_button < 0)
 {
+#if GTK_CHECK_VERSION(3,20,0)
+if (gdk_seat_grab (gdk_event_get_seat(event),
+event->button.window,
+GDK_SEAT_CAPABILITY_ALL_POINTING,
+FALSE, NULL, event, NULL, NULL) != GDK_GRAB_SUCCESS)
+#else
 if (gdk_device_grab (gdk_event_get_device(event),
 event->button.window,
 GDK_OWNERSHIP_WINDOW,
 FALSE,
 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |
 GDK_BUTTON_RELEASE_MASK,
 NULL,
 event->button.time) != GDK_GRAB_SUCCESS)
+#endif
 return FALSE;
 mdi->drag_button = event->button.button;
 if ((child->state == CHILD_MAXIMIZED) || (child->state == CHILD_ICONIFIED))
 {
 if (mdi->drag_button == event->button.button)
 {
 int width, height;
 GtkAllocation allocation;
+#if GTK_CHECK_VERSION(3,20,0)
+gdk_seat_ungrab (gdk_event_get_seat(event));
+#else
 gdk_device_ungrab (gdk_event_get_device(event), event->button.time);
+#endif
 mdi->drag_button = -1;
 gtk_widget_get_allocation(widget, &allocation);
 width = event->button.x + allocation.x;
 height = event->button.y + allocation.y;
 {
 /* TODO */
 return 0;
 }
-static GdkDeviceManager *manager = NULL;
+#if GTK_CHECK_VERSION(3,20,0)
+static GdkSeat *_dw_grab_seat = NULL;
+#else
+static GdkDeviceManager *_dw_grab_manager = NULL;
+#endif
 /*
 * Captures the mouse input to this window.
 * Parameters:
 *       handle: Handle to receive mouse input.
 void dw_window_capture(HWND handle)
 {
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
-manager = gdk_display_get_device_manager(gtk_widget_get_display(handle));
+#if GTK_CHECK_VERSION(3,20,0)
+_dw_grab_seat = gdk_display_get_default_seat(gtk_widget_get_display(handle));
+gdk_seat_grab (_dw_grab_seat,
+gtk_widget_get_window(handle),
+GDK_SEAT_CAPABILITY_ALL_POINTING,
+FALSE, NULL, NULL, NULL, NULL);
+#else
+_dw_grab_manager = gdk_display_get_device_manager(gtk_widget_get_display(handle));
 gdk_device_grab(gdk_device_manager_get_client_pointer(manager),
 gtk_widget_get_window(handle),
 GDK_OWNERSHIP_WINDOW,
 FALSE,
 GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK,
 NULL,
 GDK_CURRENT_TIME);
+#endif
 DW_MUTEX_UNLOCK;
 }
 /*
 * Changes the appearance of the mouse pointer.
 void dw_window_release(void)
 {
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
+#if GTK_CHECK_VERSION(3,20,0)
+if(_dw_grab_seat)
+gdk_seat_ungrab(_dw_grab_seat);
+_dw_grab_seat = NULL;
+#else
 gdk_device_ungrab(gdk_device_manager_get_client_pointer(manager), GDK_CURRENT_TIME);
 manager = NULL;
+#endif
 DW_MUTEX_UNLOCK;
 }
 /*
 * Create a new Window Frame.
 return;
 popup = parent;
 DW_MUTEX_LOCK;
+#if GTK_CHECK_VERSION(3,22,0)
+GdkRectangle rc = { x, y, 1, 1 };
+gtk_menu_popup_at_rect(GTK_MENU(*menu), gtk_widget_get_window(parent),
+&rc, GDK_GRAVITY_CENTER, GDK_GRAVITY_CENTER, NULL);
+#else
 gtk_menu_popup(GTK_MENU(*menu), NULL, NULL, NULL, NULL, 1, GDK_CURRENT_TIME);
+#endif
 *menu = NULL;
 DW_MUTEX_UNLOCK;
 }
 {
 GdkModifierType state = 0;
 int gx, gy;
 int _locked_by_me = FALSE;
 GdkDisplay *display;
+GdkDevice *device;
+#if GTK_CHECK_VERSION(3,20,0)
+GdkSeat *seat;
+#else
 GdkDeviceManager *manager;
+#endif
 DW_MUTEX_LOCK;
 #ifdef GDK_WINDOWING_X11
 display = gdk_display_get_default();
+#if GTK_CHECK_VERSION(3,20,0)
+seat = gdk_display_get_default_seat(display);
+device = gdk_seat_get_pointer(seat);
+#else
 manager = gdk_display_get_device_manager(display);
-gdk_window_get_device_position (gdk_x11_window_lookup_for_display(display, GDK_ROOT_WINDOW()),
+device = gdk_device_manager_get_client_pointer(manager);
-gdk_device_manager_get_client_pointer(manager), &gx, &gy, &state);
+#endif
+gdk_window_get_device_position(gdk_x11_window_lookup_for_display(display, GDK_ROOT_WINDOW()),
+device, &gx, &gy, &state);
 #endif
 if(x)
 *x = gx;
 if(y)
 *y = gy;
 */
 void dw_pointer_set_pos(long x, long y)
 {
 int _locked_by_me = FALSE;
 GdkDisplay *display;
+GdkDevice *device;
+#if GTK_CHECK_VERSION(3,20,0)
+GdkSeat *seat;
+#else
 GdkDeviceManager *manager;
+#endif
 DW_MUTEX_LOCK;
 #ifdef GDK_WINDOWING_X11
 display = gdk_display_get_default();
+#if GTK_CHECK_VERSION(3,20,0)
+seat = gdk_display_get_default_seat(display);
+device = gdk_seat_get_pointer(seat);
+#else
 manager = gdk_display_get_device_manager(display);
-gdk_device_warp( gdk_device_manager_get_client_pointer(manager), gdk_screen_get_default(), x, y );
+device = gdk_device_manager_get_client_pointer(manager);
+#endif
+gdk_device_warp(device, gdk_screen_get_default(), x, y);
 #endif
 DW_MUTEX_UNLOCK;
 }
 #define _DW_TREE_CONTAINER 1
 */
 void dw_draw_point(HWND handle, HPIXMAP pixmap, int x, int y)
 {
 int _locked_by_me = FALSE;
 cairo_t *cr = NULL;
+#if GTK_CHECK_VERSION(3,22,0)
+GdkDrawingContext *dc = NULL;
+#endif
 DW_MUTEX_LOCK;
 if(handle)
 {
 GdkWindow *window = gtk_widget_get_window(handle);
 if(!window || !GDK_IS_WINDOW(window))
 {
 DW_MUTEX_UNLOCK;
 return;
 }
+#if GTK_CHECK_VERSION(3,22,0)
+dc = gdk_window_begin_draw_frame(window, NULL);
+cr = gdk_drawing_context_get_cairo_context(dc);
+#else
 cr = gdk_cairo_create(window);
+#endif
 }
 else if(pixmap)
 cr = cairo_create(pixmap->image);
 if(cr)
 {
 gdk_cairo_set_source_rgba(cr, foreground);
 cairo_set_line_width(cr, 1);
 cairo_move_to(cr, x, y);
 cairo_stroke(cr);
+#if GTK_CHECK_VERSION(3,22,0)
+/* If we are using a drawing context...
+* we don't own the cairo context so don't destroy it.
+*/
+if(!dc)
+#endif
 cairo_destroy(cr);
 }
 DW_MUTEX_UNLOCK;
 }
 */
 void dw_draw_line(HWND handle, HPIXMAP pixmap, int x1, int y1, int x2, int y2)
 {
 int _locked_by_me = FALSE;
 cairo_t *cr = NULL;
+#if GTK_CHECK_VERSION(3,22,0)
+GdkDrawingContext *dc = NULL;
+#endif
 DW_MUTEX_LOCK;
 if(handle)
 {
 GdkWindow *window = gtk_widget_get_window(handle);
 if(!window || !GDK_IS_WINDOW(window))
 {
 DW_MUTEX_UNLOCK;
 return;
 }
+#if GTK_CHECK_VERSION(3,22,0)
+dc = gdk_window_begin_draw_frame(window, NULL);
+cr = gdk_drawing_context_get_cairo_context(dc);
+#else
 cr = gdk_cairo_create(window);
+#endif
 }
 else if(pixmap)
 cr = cairo_create(pixmap->image);
 if(cr)
 {
 gdk_cairo_set_source_rgba(cr, foreground);
 cairo_set_line_width(cr, 1);
 cairo_move_to(cr, x1, y1);
 cairo_line_to(cr, x2, y2);
 cairo_stroke(cr);
+#if GTK_CHECK_VERSION(3,22,0)
+/* If we are using a drawing context...
+* we don't own the cairo context so don't destroy it.
+*/
+if(!dc)
+#endif
 cairo_destroy(cr);
 }
 DW_MUTEX_UNLOCK;
 }
 void dw_draw_polygon(HWND handle, HPIXMAP pixmap, int flags, int npoints, int *x, int *y)
 {
 int _locked_by_me = FALSE;
 cairo_t *cr = NULL;
 int z;
+#if GTK_CHECK_VERSION(3,22,0)
+GdkDrawingContext *dc = NULL;
+#endif
 DW_MUTEX_LOCK;
 if(handle)
 {
 GdkWindow *window = gtk_widget_get_window(handle);
 if(!window || !GDK_IS_WINDOW(window))
 {
 DW_MUTEX_UNLOCK;
 return;
 }
+#if GTK_CHECK_VERSION(3,22,0)
+dc = gdk_window_begin_draw_frame(window, NULL);
+cr = gdk_drawing_context_get_cairo_context(dc);
+#else
 cr = gdk_cairo_create(window);
+#endif
 }
 else if(pixmap)
 cr = cairo_create(pixmap->image);
 if(cr)
 {
 cairo_line_to(cr, x[z], y[z]);
 }
 if(flags & DW_DRAW_FILL)
 cairo_fill(cr);
 cairo_stroke(cr);
+#if GTK_CHECK_VERSION(3,22,0)
+/* If we are using a drawing context...
+* we don't own the cairo context so don't destroy it.
+*/
+if(!dc)
+#endif
 cairo_destroy(cr);
 }
 DW_MUTEX_UNLOCK;
 }
 */
 void dw_draw_rect(HWND handle, HPIXMAP pixmap, int flags, int x, int y, int width, int height)
 {
 int _locked_by_me = FALSE;
 cairo_t *cr = NULL;
+#if GTK_CHECK_VERSION(3,22,0)
+GdkDrawingContext *dc = NULL;
+#endif
 DW_MUTEX_LOCK;
 if(handle)
 {
 GdkWindow *window = gtk_widget_get_window(handle);
 if(!window || !GDK_IS_WINDOW(window))
 {
 DW_MUTEX_UNLOCK;
 return;
 }
+#if GTK_CHECK_VERSION(3,22,0)
+dc = gdk_window_begin_draw_frame(window, NULL);
+cr = gdk_drawing_context_get_cairo_context(dc);
+#else
 cr = gdk_cairo_create(window);
+#endif
 }
 else if(pixmap)
 cr = cairo_create(pixmap->image);
 if(cr)
 {
 cairo_line_to(cr, x + width, y + height);
 cairo_line_to(cr, x + width, y);
 if(flags & DW_DRAW_FILL)
 cairo_fill(cr);
 cairo_stroke(cr);
+#if GTK_CHECK_VERSION(3,22,0)
+/* If we are using a drawing context...
+* we don't own the cairo context so don't destroy it.
+*/
+if(!dc)
+#endif
 cairo_destroy(cr);
 }
 DW_MUTEX_UNLOCK;
 }
 */
 void API dw_draw_arc(HWND handle, HPIXMAP pixmap, int flags, int xorigin, int yorigin, int x1, int y1, int x2, int y2)
 {
 int _locked_by_me = FALSE;
 cairo_t *cr = NULL;
+#if GTK_CHECK_VERSION(3,22,0)
+GdkDrawingContext *dc = NULL;
+#endif
 DW_MUTEX_LOCK;
 if(handle)
 {
 GdkWindow *window = gtk_widget_get_window(handle);
 if(!window || !GDK_IS_WINDOW(window))
 {
 DW_MUTEX_UNLOCK;
 return;
 }
+#if GTK_CHECK_VERSION(3,22,0)
+dc = gdk_window_begin_draw_frame(window, NULL);
+cr = gdk_drawing_context_get_cairo_context(dc);
+#else
 cr = gdk_cairo_create(window);
+#endif
 }
 else if(pixmap)
 cr = cairo_create(pixmap->image);
 if(cr)
 {
 cairo_arc(cr, xorigin, yorigin, r, a1, a2);
 }
 if(flags & DW_DRAW_FILL)
 cairo_fill(cr);
 cairo_stroke(cr);
+#if GTK_CHECK_VERSION(3,22,0)
+/* If we are using a drawing context...
+* we don't own the cairo context so don't destroy it.
+*/
+if(!dc)
+#endif
 cairo_destroy(cr);
 }
 DW_MUTEX_UNLOCK;
 }
 {
 int _locked_by_me = FALSE;
 cairo_t *cr = NULL;
 PangoFontDescription *font;
 char *tmpname, *fontname = "monospace 10";
+#if GTK_CHECK_VERSION(3,22,0)
+GdkDrawingContext *dc = NULL;
+#endif
 if(!text)
 return;
 DW_MUTEX_LOCK;
 if(!window || !GDK_IS_WINDOW(window))
 {
 DW_MUTEX_UNLOCK;
 return;
 }
+#if GTK_CHECK_VERSION(3,22,0)
+dc = gdk_window_begin_draw_frame(window, NULL);
+cr = gdk_drawing_context_get_cairo_context(dc);
+#else
 cr = gdk_cairo_create(window);
+#endif
 if((tmpname = (char *)g_object_get_data(G_OBJECT(handle), "_dw_fontname")))
 fontname = tmpname;
 }
 else if(pixmap)
 {
 }
 g_object_unref(context);
 }
 pango_font_description_free(font);
 }
+#if GTK_CHECK_VERSION(3,22,0)
+/* If we are using a drawing context...
+* we don't own the cairo context so don't destroy it.
+*/
+if(!dc)
+#endif
 cairo_destroy(cr);
 }
 DW_MUTEX_UNLOCK;
 }
 int API dw_pixmap_stretch_bitblt(HWND dest, HPIXMAP destp, int xdest, int ydest, int width, int height, HWND src, HPIXMAP srcp, int xsrc, int ysrc, int srcwidth, int srcheight)
 {
 int _locked_by_me = FALSE;
 cairo_t *cr = NULL;
 int retval = DW_ERROR_GENERAL;
+#if GTK_CHECK_VERSION(3,22,0)
+GdkDrawingContext *dc = NULL;
+#endif
 if((!dest && (!destp || !destp->image)) || (!src && (!srcp || !srcp->image)))
 return retval;
 DW_MUTEX_LOCK;
 if(!window || !GDK_IS_WINDOW(window))
 {
 DW_MUTEX_UNLOCK;
 return retval;
 }
+#if GTK_CHECK_VERSION(3,22,0)
+dc = gdk_window_begin_draw_frame(window, NULL);
+cr = gdk_drawing_context_get_cairo_context(dc);
+#else
 cr = gdk_cairo_create(window);
+#endif
 }
 else if(destp)
 cr = cairo_create(destp->image);
 if(cr)
 else if(srcp)
 cairo_set_source_surface (cr, srcp->image, (xdest + xsrc) / xscale, (ydest + ysrc) / yscale);
 cairo_rectangle(cr, xdest / xscale, ydest / yscale, width, height);
 cairo_fill(cr);
+#if GTK_CHECK_VERSION(3,22,0)
+/* If we are using a drawing context...
+* we don't own the cairo context so don't destroy it.
+*/
+if(!dc)
+#endif
 cairo_destroy(cr);
 retval = DW_ERROR_NONE;
 }
 DW_MUTEX_UNLOCK;
 return retval;
 gtk_widget_get_preferred_height(handle, NULL, height);
 }
 DW_MUTEX_UNLOCK;
 }
+/* Internal version to simplify the code with multiple versions of GTK */
+int _dw_screen_width(void)
+{
+#if GTK_CHECK_VERSION(3,22,0)
+{
+GdkDisplay *display = gdk_display_get_default();
+if(display)
+{
+GdkMonitor *monitor = gdk_display_get_primary_monitor(display);
+if(monitor)
+{
+GdkRectangle rc = { 0, 0, 0 ,0 };
+gdk_monitor_get_geometry(monitor, &rc);
+return rc.width;
+}
+}
+}
+return 0;
+#else
+return gdk_screen_width();
+#endif
+}
 /*
 * Returns the width of the screen.
 */
 int dw_screen_width(void)
 {
+int retval = 0;
+int _locked_by_me = FALSE;
+DW_MUTEX_LOCK;
+retval = _dw_screen_width();
+DW_MUTEX_UNLOCK;
+return retval;
+}
+/* Internal version to simplify the code with multiple versions of GTK */
+int _dw_screen_height(void)
+{
+#if GTK_CHECK_VERSION(3,22,0)
+{
+GdkDisplay *display = gdk_display_get_default();
+if(display)
+{
+GdkMonitor *monitor = gdk_display_get_primary_monitor(display);
+if(monitor)
+{
+GdkRectangle rc = { 0, 0, 0 ,0 };
+gdk_monitor_get_geometry(monitor, &rc);
+return rc.height;
+}
+}
+}
+return 0;
+#else
+return gdk_screen_height();
+#endif
+}
+/*
+* Returns the height of the screen.
+*/
+int dw_screen_height(void)
+{
 int retval;
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
-retval = gdk_screen_width();
+retval = _dw_screen_height();
-DW_MUTEX_UNLOCK;
-return retval;
-}
-/*
-* Returns the height of the screen.
-*/
-int dw_screen_height(void)
-{
-int retval;
-int _locked_by_me = FALSE;
-DW_MUTEX_UNLOCK;
-retval = gdk_screen_height();
 DW_MUTEX_UNLOCK;
 return retval;
 }
 /* This should return the current color depth */
 {
 int retval;
 GdkVisual *vis;
 int _locked_by_me = FALSE;
-DW_MUTEX_UNLOCK;
+DW_MUTEX_LOCK;
+#if GTK_CHECK_VERSION(3,22,0)
+vis = gdk_screen_get_system_visual(gdk_screen_get_default());
+#else
 vis = gdk_visual_get_system();
+#endif
 retval = gdk_visual_get_depth(vis);
 DW_MUTEX_UNLOCK;
 return retval;
 }
 /* Do any gravity calculations */
 if(horz || vert)
 {
 /* Handle horizontal center gravity */
 if((horz & 0xf) == DW_GRAV_CENTER)
-newx += ((gdk_screen_width() / 2) - (width / 2));
+newx += ((_dw_screen_width() / 2) - (width / 2));
 /* Handle right gravity */
 else if((horz & 0xf) == DW_GRAV_RIGHT)
-newx = gdk_screen_width() - width - x;
+newx = _dw_screen_width() - width - x;
 /* Handle vertical center gravity */
 if((vert & 0xf) == DW_GRAV_CENTER)
-newy += ((gdk_screen_height() / 2) - (height / 2));
+newy += ((_dw_screen_height() / 2) - (height / 2));
 else if((vert & 0xf) == DW_GRAV_BOTTOM)
-newy = gdk_screen_height() - height - y;
+newy = _dw_screen_height() - height - y;
 #if GTK_CHECK_VERSION(3,3,8)
 /* Adjust the values to avoid Gnome bar if requested */
 if((horz | vert) & DW_GRAV_OBSTACLES)
 {
-GdkRectangle rect;
+GdkRectangle rect = { 0, 0, 0, 0 };
+#if GTK_CHECK_VERSION(3,22,0)
+GdkDisplay *display = gdk_display_get_default();
+if(display)
+{
+GdkMonitor *monitor = gdk_display_get_primary_monitor(display);
+if(monitor)
+gdk_monitor_get_workarea(monitor, &rect);
+}
+#else
 GdkScreen *screen = gdk_screen_get_default();
 gdk_screen_get_monitor_workarea(screen, 0, &rect);
+#endif
 if(horz & DW_GRAV_OBSTACLES)
 {
 if((horz & 0xf) == DW_GRAV_LEFT)
 newx += rect.x;
 else if((horz & 0xf) == DW_GRAV_RIGHT)
-newx -= dw_screen_width() - (rect.x + rect.width);
+newx -= _dw_screen_width() - (rect.x + rect.width);
 }
 if(vert & DW_GRAV_OBSTACLES)
 {
 if((vert & 0xf) == DW_GRAV_TOP)
 newy += rect.y;
 else if((vert & 0xf) == DW_GRAV_BOTTOM)
-newy -= dw_screen_height() - (rect.y + rect.height);
+newy -= _dw_screen_height() - (rect.y + rect.height);
 }
 }
 #endif
 }
 /* Finally move the window into place */

Mercurial > dwindows

comparison gtk3/dw.c @ 1929:25da63f0eddc