summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZeeshan Ali (Khattak) <zeeshanak@gnome.org>2011-05-10 18:48:30 +0200
committerMarc-André Lureau <marcandre.lureau@redhat.com>2011-05-10 18:49:03 +0200
commit8bcfbcaf6e0a0fcb25edaf8d2bdd3a50c6596f03 (patch)
tree581a59e8083d26f467174cfb66fef9c7055a79ab
parent64cae2b9b1ddd78f1a75b090a1d655b9cd0f2cf7 (diff)
gtk: some code cleanup
Diffstat
-rw-r--r--gtk/.gitignore7
-rw-r--r--gtk/channel-main.c6
-rw-r--r--gtk/decode-glz.c4
-rw-r--r--gtk/spice-widget.c45
-rw-r--r--gtk/spicy.c33
5 files changed, 21 insertions, 74 deletions
diff --git a/gtk/.gitignore b/gtk/.gitignore
index 673f528..428b8b7 100644
--- a/gtk/.gitignore
+++ b/gtk/.gitignore
@@ -18,9 +18,8 @@
/Makefile.in
/SpiceClientGLib-2.0.gir
/SpiceClientGLib-2.0.typelib
-/SpiceClientGtk-2.0.gir
-/SpiceClientGtk-2.0.typelib
-/SpiceClientGtk.la
+/SpiceClientGtk-3.0.gir
+/SpiceClientGtk-3.0.typelib
/TAGS
/_libs
/generated_demarshallers.c
@@ -28,7 +27,7 @@
/generated_marshallers.c
/generated_marshallers1.c
/libspice-client-glib-2.0.la
-/libspice-client-gtk-2.0.la
+/libspice-client-gtk-3.0.la
/snappy
/so_locations
/spice-client-gtk-module.defs.c
diff --git a/gtk/channel-main.c b/gtk/channel-main.c
index c33851c..6897a18 100644
--- a/gtk/channel-main.c
+++ b/gtk/channel-main.c
@@ -845,12 +845,6 @@ static void agent_display_config(SpiceMainChannel *channel)
config.depth = c->display_color_depth;
}
-#if 0 // TODO
- if (!_display_setting.is_empty()) {
- _agent_reply_wait_type = VD_AGENT_DISPLAY_CONFIG;
- }
-#endif
-
SPICE_DEBUG("display_config: flags: %u, depth: %u", config.flags, config.depth);
agent_msg_queue(channel, VD_AGENT_DISPLAY_CONFIG, sizeof(VDAgentDisplayConfig), &config);
diff --git a/gtk/decode-glz.c b/gtk/decode-glz.c
index 5a3e06a..f1dde6e 100644
--- a/gtk/decode-glz.c
+++ b/gtk/decode-glz.c
@@ -118,10 +118,6 @@ static void glz_decoder_window_add(SpiceGlzDecoderWindow *w,
slot = img->hdr.id % w->nimages;
}
-#if 0
- SPICE_DEBUG("%s: %d %" PRId64, __FUNCTION__, slot, img->hdr.id);
-#endif
-
w->images[slot] = img;
}
diff --git a/gtk/spice-widget.c b/gtk/spice-widget.c
index e2f63ea..9459743 100644
--- a/gtk/spice-widget.c
+++ b/gtk/spice-widget.c
@@ -611,14 +611,6 @@ static gboolean expose_event(GtkWidget *widget, GdkEventExpose *expose)
SpiceDisplay *display = SPICE_DISPLAY(widget);
spice_display *d = SPICE_DISPLAY_GET_PRIVATE(display);
-#if 0
- SPICE_DEBUG("%s: area %dx%d at %d,%d", __FUNCTION__,
- expose->area.width,
- expose->area.height,
- expose->area.x,
- expose->area.y);
-#endif
-
if (d->mark == 0 || d->data == NULL)
return false;
@@ -1971,13 +1963,29 @@ static guint32 get_keyboard_lock_modifiers(Display *x_display)
return modifiers;
}
+static void sync_keyboard_lock_modifiers(SpiceDisplay *display)
+{
+ Display *x_display;
+ spice_display *d = SPICE_DISPLAY_GET_PRIVATE(display);
+ guint32 modifiers;
+ GdkWindow *w;
+
+ w = gtk_widget_get_parent_window(GTK_WIDGET(display));
+ if (w == NULL) /* it can happen if the display is not yet shown */
+ return;
+
+ x_display = GDK_WINDOW_XDISPLAY(w);
+ modifiers = get_keyboard_lock_modifiers(x_display);
+ if (d->inputs)
+ spice_inputs_set_key_locks(d->inputs, modifiers);
+}
+
typedef enum SpiceLed {
CAPS_LOCK_LED = 1,
NUM_LOCK_LED,
SCROLL_LOCK_LED,
} SpiceLed;
-#if 0
static guint get_modifier_mask(Display *x_display, KeySym modifier)
{
int mask = 0;
@@ -2022,6 +2030,7 @@ static void set_keyboard_led(Display *x_display, SpiceLed led, int set)
}
}
+G_GNUC_UNUSED
static void spice_set_keyboard_lock_modifiers(SpiceDisplay *display, uint32_t modifiers)
{
Display *x_display;
@@ -2032,24 +2041,6 @@ static void spice_set_keyboard_lock_modifiers(SpiceDisplay *display, uint32_t mo
set_keyboard_led(x_display, NUM_LOCK_LED, !!(modifiers & SPICE_INPUTS_NUM_LOCK));
set_keyboard_led(x_display, SCROLL_LOCK_LED, !!(modifiers & SPICE_INPUTS_SCROLL_LOCK));
}
-#endif
-
-static void sync_keyboard_lock_modifiers(SpiceDisplay *display)
-{
- Display *x_display;
- spice_display *d = SPICE_DISPLAY_GET_PRIVATE(display);
- guint32 modifiers;
- GdkWindow *w;
-
- w = gtk_widget_get_parent_window(GTK_WIDGET(display));
- if (w == NULL) /* it can happen if the display is not yet shown */
- return;
-
- x_display = GDK_WINDOW_XDISPLAY(w);
- modifiers = get_keyboard_lock_modifiers(x_display);
- if (d->inputs)
- spice_inputs_set_key_locks(d->inputs, modifiers);
-}
#else
static void sync_keyboard_lock_modifiers(SpiceDisplay *display)
{
diff --git a/gtk/spicy.c b/gtk/spicy.c
index 7335c10..c3bb73b 100644
--- a/gtk/spicy.c
+++ b/gtk/spicy.c
@@ -402,17 +402,6 @@ static gboolean delete_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
return true;
}
-static void destroy_cb(GtkWidget *widget, gpointer data)
-{
-#if 0
- struct spice_window *win = data;
-
- if (win->id == 0) {
- g_main_loop_quit(mainloop);
- }
-#endif
-}
-
static gboolean window_state_cb(GtkWidget *widget, GdkEventWindowState *event,
gpointer data)
{
@@ -795,26 +784,6 @@ get_output_for_window(GnomeRRConfig *configuration, GdkWindow *window)
win_rect.y + win_rect.height / 2);
}
-#if 0
-static GnomeRROutputInfo *get_primary_output() {
- GnomeRROutputInfo **outputs;
- GnomeRROutputInfo *output;
- guint i;
-
- outputs = gnome_rr_config_get_outputs (rrcurrent);
- for (i = 0; outputs[i] != NULL; ++i) {
- output = outputs[i];
- if (!gnome_rr_output_info_is_connected (output))
- continue;
- if (gnome_rr_output_info_get_primary (output))
- break;
- }
- output = outputs[i];
- g_return_if_fail(output != NULL);
- return output;
-}
-#endif
-
static void
on_screen_changed(GnomeRRScreen *scr, gpointer data)
{
@@ -960,8 +929,6 @@ static spice_window *create_spice_window(spice_connection *conn, int id, SpiceCh
G_CALLBACK(window_state_cb), win);
g_signal_connect(G_OBJECT(win->toplevel), "delete-event",
G_CALLBACK(delete_cb), win);
- g_signal_connect(G_OBJECT(win->toplevel), "destroy",
- G_CALLBACK(destroy_cb), win);
/* menu + toolbar */
win->ui = gtk_ui_manager_new();
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-08 08:43:18 +0000