summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/view/autoDrawer.c10
-rw-r--r--src/view/ovBox.c45
-rw-r--r--src/virt-gtk-compat.h12
-rw-r--r--src/virt-viewer-display.c96
-rw-r--r--src/virt-viewer-window.c10
5 files changed, 0 insertions, 173 deletions
diff --git a/src/view/autoDrawer.c b/src/view/autoDrawer.c
index cbf92de..2ae106c 100644
--- a/src/view/autoDrawer.c
+++ b/src/view/autoDrawer.c
@@ -218,7 +218,6 @@ ViewAutoDrawerUpdate(ViewAutoDrawer *that, // IN
if (gtk_widget_get_window(priv->evBox)) {
int x;
int y;
-#if GTK_CHECK_VERSION(3, 0, 0)
GdkDevice *dev;
GdkDeviceManager *devmgr;
@@ -227,9 +226,6 @@ ViewAutoDrawerUpdate(ViewAutoDrawer *that, // IN
gdk_window_get_device_position(gtk_widget_get_window(priv->evBox),
dev, &x, &y, NULL);
-#else
- gtk_widget_get_pointer(priv->evBox, &x, &y);
-#endif
gtk_widget_get_allocation(priv->evBox, &allocation);
g_assert(gtk_container_get_border_width( GTK_CONTAINER(priv->evBox))
@@ -262,16 +258,10 @@ ViewAutoDrawerUpdate(ViewAutoDrawer *that, // IN
if (!priv->inputUngrabbed) {
GtkWidget *grabbed = NULL;
-#if GTK_CHECK_VERSION(3, 0, 0)
if (gtk_window_has_group (window)) {
GtkWindowGroup *group = gtk_window_get_group (window);
grabbed = gtk_window_group_get_current_grab (group);
}
-#else
- if (window->group && window->group->grabs) {
- grabbed = GTK_WIDGET(window->group->grabs->data);
- }
-#endif
if (!grabbed) {
grabbed = gtk_grab_get_current();
}
diff --git a/src/view/ovBox.c b/src/view/ovBox.c
index 185b0b7..fa56fd5 100644
--- a/src/view/ovBox.c
+++ b/src/view/ovBox.c
@@ -76,13 +76,6 @@
#include "ovBox.h"
-#if ! GTK_CHECK_VERSION(3, 0, 0)
-#define gtk_widget_set_realized(widget, val) \
- GTK_WIDGET_SET_FLAGS(widget, GTK_REALIZED)
-#define gtk_widget_get_realized(widget) \
- GTK_WIDGET_REALIZED(widget)
-#endif
-
struct _ViewOvBoxPrivate
{
GdkWindow *underWin;
@@ -338,22 +331,12 @@ static void
ViewOvBoxSetBackground(ViewOvBox *that) // IN
{
GtkWidget *widget = GTK_WIDGET(that);
-
-#if GTK_CHECK_VERSION(3, 0, 0)
GtkStyleContext *stylecontext;
stylecontext = gtk_widget_get_style_context(widget);
gtk_style_context_set_background(stylecontext, gtk_widget_get_window(widget));
gtk_style_context_set_background(stylecontext, that->priv->underWin);
gtk_style_context_set_background(stylecontext, that->priv->overWin);
-#else
- GtkStyle *style;
-
- style = gtk_widget_get_style (widget);
- gtk_style_set_background(style, gtk_widget_get_window(widget), GTK_STATE_NORMAL);
- gtk_style_set_background(style, that->priv->underWin, GTK_STATE_NORMAL);
- gtk_style_set_background(style, that->priv->overWin, GTK_STATE_NORMAL);
-#endif
}
@@ -403,9 +386,6 @@ ViewOvBoxRealize(GtkWidget *widget) // IN
&attributes, mask);
gtk_widget_set_window(widget, window);
gdk_window_set_user_data(window, that);
-#if !GTK_CHECK_VERSION(3, 0, 0)
- gtk_widget_set_style(widget, gtk_style_attach(gtk_widget_get_style(widget), window));
-#endif
/*
* The order in which we create the children X window matters: the child
@@ -508,11 +488,7 @@ ViewOvBoxRealSizeRequest(GtkWidget *widget, // IN
that = VIEW_OV_BOX(widget);
priv = that->priv;
-#if GTK_CHECK_VERSION(3, 0, 0)
gtk_widget_get_preferred_size(priv->over, NULL, &priv->overR);
-#else
- gtk_widget_size_request(priv->over, &priv->overR);
-#endif
gtk_container_child_get(GTK_CONTAINER(that), priv->over,
"expand", &expand,
@@ -534,7 +510,6 @@ ViewOvBoxRealSizeRequest(GtkWidget *widget, // IN
}
}
-#if GTK_CHECK_VERSION(3, 0, 0)
static void
ViewOvBox_get_preferred_width (GtkWidget *widget,
gint *minimal_width,
@@ -567,22 +542,6 @@ ViewOvBox_get_preferred_height (GtkWidget *widget,
*natural_height = nat_out.height;
}
-#else
-
-static void
-ViewOvBoxSizeRequest(GtkWidget *widget, // IN
- GtkRequisition *requisition) // OUT
-{
- ViewOvBoxPrivate *priv = VIEW_OV_BOX(widget)->priv;
- GtkRequisition min;
-
- gtk_widget_size_request(priv->under, &min);
-
- ViewOvBoxRealSizeRequest(widget, &min, NULL, requisition, NULL);
-}
-#endif
-
-
/*
*-----------------------------------------------------------------------------
*
@@ -760,12 +719,8 @@ ViewOvBoxClassInit(ViewOvBoxClass *klass) // IN
widgetClass->unmap = ViewOvBoxUnmap;
widgetClass->realize = ViewOvBoxRealize;
widgetClass->unrealize = ViewOvBoxUnrealize;
-#if GTK_CHECK_VERSION(3, 0, 0)
widgetClass->get_preferred_width = ViewOvBox_get_preferred_width;
widgetClass->get_preferred_height = ViewOvBox_get_preferred_height;
-#else
- widgetClass->size_request = ViewOvBoxSizeRequest;
-#endif
widgetClass->size_allocate = ViewOvBoxSizeAllocate;
widgetClass->style_set = ViewOvBoxStyleSet;
diff --git a/src/virt-gtk-compat.h b/src/virt-gtk-compat.h
index 110c17a..ea31bda 100644
--- a/src/virt-gtk-compat.h
+++ b/src/virt-gtk-compat.h
@@ -29,11 +29,6 @@
G_BEGIN_DECLS
-#if !GTK_CHECK_VERSION(2, 20, 0)
-#define gtk_widget_get_mapped(w) GTK_WIDGET_MAPPED(w)
-#endif
-
-#if GTK_CHECK_VERSION(3, 0, 0)
#define GDK_Shift_L GDK_KEY_Shift_L
#define GDK_VoidSymbol GDK_KEY_VoidSymbol
#define GDK_Control_L GDK_KEY_Control_L
@@ -57,13 +52,6 @@ G_BEGIN_DECLS
#define GDK_0 GDK_KEY_0
#define GDK_plus GDK_KEY_plus
#define GDK_minus GDK_KEY_minus
-#endif
-
-#if !GTK_CHECK_VERSION(3, 0, 0)
-#define gtk_widget_get_realized(widget) \
- GTK_WIDGET_REALIZED(widget)
-#endif
-
G_END_DECLS
diff --git a/src/virt-viewer-display.c b/src/virt-viewer-display.c
index d8b3312..d7ef3c3 100644
--- a/src/virt-viewer-display.c
+++ b/src/virt-viewer-display.c
@@ -36,10 +36,6 @@
struct _VirtViewerDisplayPrivate
{
-#if !GTK_CHECK_VERSION(3, 0, 0)
- gboolean dirty;
- gboolean size_request_once;
-#endif
guint desktopWidth;
guint desktopHeight;
guint zoom_level;
@@ -51,17 +47,12 @@ struct _VirtViewerDisplayPrivate
gboolean fullscreen;
};
-#if !GTK_CHECK_VERSION(3, 0, 0)
-static void virt_viewer_display_size_request(GtkWidget *widget,
- GtkRequisition *requisition);
-#else
static void virt_viewer_display_get_preferred_width(GtkWidget *widget,
int *minwidth,
int *defwidth);
static void virt_viewer_display_get_preferred_height(GtkWidget *widget,
int *minheight,
int *defheight);
-#endif
static void virt_viewer_display_size_allocate(GtkWidget *widget,
GtkAllocation *allocation);
static void virt_viewer_display_set_property(GObject *object,
@@ -100,12 +91,8 @@ virt_viewer_display_class_init(VirtViewerDisplayClass *class)
object_class->set_property = virt_viewer_display_set_property;
object_class->get_property = virt_viewer_display_get_property;
-#if GTK_CHECK_VERSION(3, 0, 0)
widget_class->get_preferred_width = virt_viewer_display_get_preferred_width;
widget_class->get_preferred_height = virt_viewer_display_get_preferred_height;
-#else
- widget_class->size_request = virt_viewer_display_size_request;
-#endif
widget_class->size_allocate = virt_viewer_display_size_allocate;
widget_class->grab_focus = virt_viewer_display_grab_focus;
@@ -278,10 +265,6 @@ virt_viewer_display_init(VirtViewerDisplay *display)
display->priv->desktopHeight = 100;
display->priv->zoom_level = NORMAL_ZOOM_LEVEL;
display->priv->zoom = TRUE;
-#if !GTK_CHECK_VERSION(3, 0, 0)
- display->priv->dirty = TRUE;
- display->priv->size_request_once = FALSE;
-#endif
}
GtkWidget*
@@ -383,75 +366,10 @@ virt_viewer_display_grab_focus(GtkWidget *widget)
void virt_viewer_display_get_preferred_size(VirtViewerDisplay *self,
GtkRequisition *requisition)
{
-#if GTK_CHECK_VERSION(3, 0, 0)
gtk_widget_get_preferred_size(GTK_WIDGET(self), NULL, requisition);
-#else
- VirtViewerDisplayPrivate *priv = self->priv;
- int border_width = gtk_container_get_border_width(GTK_CONTAINER(self));
-
- requisition->width = border_width * 2;
- requisition->height = border_width * 2;
-
- if (priv->zoom) {
- requisition->width += round(priv->desktopWidth * priv->zoom_level / (double) NORMAL_ZOOM_LEVEL);
- requisition->height += round(priv->desktopHeight * priv->zoom_level / (double) NORMAL_ZOOM_LEVEL);
- } else {
- requisition->width += priv->desktopWidth;
- requisition->height += priv->desktopHeight;
- }
-#endif
}
-#if !GTK_CHECK_VERSION(3, 0, 0)
-static gboolean
-virt_viewer_display_idle(gpointer opaque)
-{
- VirtViewerDisplay *display = opaque;
- VirtViewerDisplayPrivate *priv = display->priv;
- if (!priv->dirty)
- gtk_widget_queue_resize_no_redraw(GTK_WIDGET(display));
- return FALSE;
-}
-
-
-static void
-virt_viewer_display_size_request(GtkWidget *widget,
- GtkRequisition *requisition)
-{
- VirtViewerDisplay *display = VIRT_VIEWER_DISPLAY(widget);
- VirtViewerDisplayPrivate *priv = display->priv;
-
- if (priv->dirty || !priv->size_request_once) {
- virt_viewer_display_get_preferred_size(display, requisition);
- } else {
- requisition->width = MIN_DISPLAY_WIDTH;
- requisition->height = MIN_DISPLAY_HEIGHT;
- }
-
- priv->size_request_once = TRUE;
- g_debug("Display size request %dx%d (desktop %dx%d)",
- requisition->width, requisition->height,
- priv->desktopWidth, priv->desktopHeight);
-}
-
-static void
-virt_viewer_display_make_resizable(VirtViewerDisplay *self)
-{
- VirtViewerDisplayPrivate *priv = self->priv;
-
- /* This unsets the size request, so that the user can
- * manually resize the window smaller again
- */
- if (priv->dirty) {
- g_idle_add(virt_viewer_display_idle, GTK_WIDGET(self));
- if (gtk_widget_get_mapped(GTK_WIDGET(self)))
- priv->dirty = FALSE;
- }
-}
-
-#else
-
static void virt_viewer_display_get_preferred_width(GtkWidget *widget,
int *minwidth,
int *defwidth)
@@ -488,8 +406,6 @@ static void virt_viewer_display_get_preferred_height(GtkWidget *widget,
*defheight = priv->desktopHeight + 2 * border_height;
}
}
-#endif
-
static void
virt_viewer_display_size_allocate(GtkWidget *widget,
@@ -510,11 +426,7 @@ virt_viewer_display_size_allocate(GtkWidget *widget,
if (priv->desktopWidth == 0 ||
priv->desktopHeight == 0)
-#if !GTK_CHECK_VERSION(3, 0, 0)
- goto end;
-#else
return;
-#endif
desktopAspect = (double)priv->desktopWidth / (double)priv->desktopHeight;
@@ -539,11 +451,6 @@ virt_viewer_display_size_allocate(GtkWidget *widget,
g_debug("Child allocate %dx%d", child_allocation.width, child_allocation.height);
gtk_widget_size_allocate(child, &child_allocation);
}
-
-#if !GTK_CHECK_VERSION(3, 0, 0)
-end:
- virt_viewer_display_make_resizable(VIRT_VIEWER_DISPLAY(widget));
-#endif
}
@@ -581,9 +488,6 @@ void virt_viewer_display_queue_resize(VirtViewerDisplay *display)
GtkWidget *child = gtk_bin_get_child(GTK_BIN(display));
if (child && gtk_widget_get_visible(child)) {
-#if !GTK_CHECK_VERSION(3, 0, 0)
- display->priv->dirty = TRUE;
-#endif
gtk_widget_queue_resize(GTK_WIDGET(display));
}
}
diff --git a/src/virt-viewer-window.c b/src/virt-viewer-window.c
index a1b9940..3a958f0 100644
--- a/src/virt-viewer-window.c
+++ b/src/virt-viewer-window.c
@@ -343,9 +343,7 @@ virt_viewer_window_init (VirtViewerWindow *self)
virt_viewer_window_update_title(self);
gtk_window_set_resizable(GTK_WINDOW(priv->window), TRUE);
-#if GTK_CHECK_VERSION(3, 0, 0)
gtk_window_set_has_resize_grip(GTK_WINDOW(priv->window), FALSE);
-#endif
priv->accel_enabled = TRUE;
accels = gtk_accel_groups_from_object(G_OBJECT(priv->window));
@@ -408,15 +406,11 @@ static void
virt_viewer_window_queue_resize(VirtViewerWindow *self)
{
VirtViewerWindowPrivate *priv = self->priv;
-#if GTK_CHECK_VERSION(3, 0, 0)
GtkRequisition nat;
gtk_window_set_default_size(GTK_WINDOW(priv->window), -1, -1);
gtk_widget_get_preferred_size(GTK_WIDGET(priv->window), NULL, &nat);
gtk_window_resize(GTK_WINDOW(priv->window), nat.width, nat.height);
-#else
- gtk_window_resize(GTK_WINDOW(priv->window), 1, 1);
-#endif
}
static void
@@ -1477,11 +1471,7 @@ virt_viewer_window_get_minimal_dimensions(VirtViewerWindow *self,
GtkWidget *top_menu;
top_menu = GTK_WIDGET(gtk_builder_get_object(virt_viewer_window_get_builder(self), "top-menu"));
-#if !GTK_CHECK_VERSION(3, 0, 0)
- gtk_widget_get_child_requisition(top_menu, &req);
-#else
gtk_widget_get_preferred_size(top_menu, &req, NULL);
-#endif
/* minimal dimensions of the window are the maximum of dimensions of the top-menu
* and minimal dimension of the display
*/
generated by cgit (git 2.34.1) at 2025-07-09 15:07:24 +0000