From: Emmanuele Bassi Date: Sat, 19 Feb 2011 16:44:38 +0000 (+0000) Subject: x11: Remove unused variables X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f99d2336f0ae99bb3faf25031b3df082680755bd;p=profile%2Fivi%2Fclutter.git x11: Remove unused variables --- diff --git a/clutter/x11/clutter-device-manager-core-x11.c b/clutter/x11/clutter-device-manager-core-x11.c index 6f96ea2..8303b3b 100644 --- a/clutter/x11/clutter-device-manager-core-x11.c +++ b/clutter/x11/clutter-device-manager-core-x11.c @@ -295,15 +295,16 @@ clutter_device_manager_x11_translate_event (ClutterEventTranslator *translator, { ClutterDeviceManagerX11 *manager_x11; ClutterBackendX11 *backend_x11; - ClutterInputDevice *device; ClutterStageX11 *stage_x11; ClutterTranslateReturn res; ClutterStage *stage; XEvent *xevent; +#ifdef HAVE_XINPUT + ClutterInputDevice *device; +#endif manager_x11 = CLUTTER_DEVICE_MANAGER_X11 (translator); backend_x11 = CLUTTER_BACKEND_X11 (clutter_get_default_backend ()); - device = NULL; xevent = native; @@ -535,19 +536,19 @@ clutter_device_manager_x11_constructed (GObject *gobject) { ClutterDeviceManagerX11 *manager_x11; ClutterBackendX11 *backend_x11; - ClutterDeviceManager *manager; #ifdef HAVE_XINPUT + ClutterDeviceManager *manager; XDeviceInfo *x_devices = NULL; int i, n_devices; #endif /* HAVE_XINPUT */ - manager = CLUTTER_DEVICE_MANAGER (gobject); manager_x11 = CLUTTER_DEVICE_MANAGER_X11 (gobject); g_object_get (gobject, "backend", &backend_x11, NULL); g_assert (backend_x11 != NULL); #ifdef HAVE_XINPUT + manager = CLUTTER_DEVICE_MANAGER (gobject); x_devices = XListInputDevices (backend_x11->xdpy, &n_devices); if (n_devices == 0) { diff --git a/clutter/x11/clutter-device-manager-xi2.c b/clutter/x11/clutter-device-manager-xi2.c index 76937a4..d1cddfe 100644 --- a/clutter/x11/clutter-device-manager-xi2.c +++ b/clutter/x11/clutter-device-manager-xi2.c @@ -327,7 +327,6 @@ translate_hierarchy_event (ClutterBackendX11 *backend_x11, ClutterDeviceManagerXI2 *manager_xi2, XIHierarchyEvent *ev) { - ClutterInputDevice *device; int i; for (i = 0; i < ev->num_info; i++) @@ -342,7 +341,7 @@ translate_hierarchy_event (ClutterBackendX11 *backend_x11, info = XIQueryDevice (backend_x11->xdpy, ev->info[i].deviceid, &n_devices); - device = add_device (manager_xi2, backend_x11, &info[0], FALSE); + add_device (manager_xi2, backend_x11, &info[0], FALSE); } else if (ev->info[i].flags & XIDeviceDisabled) { @@ -1044,9 +1043,8 @@ clutter_device_manager_xi2_constructed (GObject *gobject) for (i = 0; i < n_devices; i++) { XIDeviceInfo *xi_device = &info[i]; - ClutterInputDevice *device; - device = add_device (manager_xi2, backend_x11, xi_device, TRUE); + add_device (manager_xi2, backend_x11, xi_device, TRUE); if (xi_device->use == XIMasterPointer || xi_device->use == XIMasterKeyboard) diff --git a/clutter/x11/clutter-keymap-x11.c b/clutter/x11/clutter-keymap-x11.c index 8534c62..6eb555c 100644 --- a/clutter/x11/clutter-keymap-x11.c +++ b/clutter/x11/clutter-keymap-x11.c @@ -189,10 +189,12 @@ static void update_locked_mods (ClutterKeymapX11 *keymap_x11, gint locked_mods) { +#if 0 gboolean old_caps_lock_state, old_num_lock_state; old_caps_lock_state = keymap_x11->caps_lock_state; old_num_lock_state = keymap_x11->num_lock_state; +#endif keymap_x11->caps_lock_state = (locked_mods & CLUTTER_LOCK_MASK) != 0; keymap_x11->num_lock_state = (locked_mods & keymap_x11->num_lock_mask) != 0; diff --git a/clutter/x11/clutter-stage-x11.c b/clutter/x11/clutter-stage-x11.c index d3928c9..d13bbd7 100644 --- a/clutter/x11/clutter-stage-x11.c +++ b/clutter/x11/clutter-stage-x11.c @@ -220,7 +220,6 @@ clutter_stage_x11_resize (ClutterStageWindow *stage_window, { ClutterStageX11 *stage_x11 = CLUTTER_STAGE_X11 (stage_window); ClutterBackendX11 *backend_x11 = stage_x11->backend; - gboolean resize; if (stage_x11->is_foreign_xwin) { @@ -238,8 +237,6 @@ clutter_stage_x11_resize (ClutterStageWindow *stage_window, if (stage_x11->fullscreening) return; - resize = clutter_stage_get_user_resizable (stage_x11->wrapper); - if (width == 0 || height == 0) { /* Should not happen, if this turns up we need to debug it and @@ -465,6 +462,7 @@ clutter_stage_x11_set_fullscreen (ClutterStageWindow *stage_window, if (is_fullscreen) { +#if 0 int width, height; /* FIXME: this will do the wrong thing for dual-headed @@ -474,6 +472,7 @@ clutter_stage_x11_set_fullscreen (ClutterStageWindow *stage_window, until the ConfigureNotify for the correct size is received */ width = DisplayWidth (backend_x11->xdpy, backend_x11->xscreen_num); height = DisplayHeight (backend_x11->xdpy, backend_x11->xscreen_num); +#endif /* Set the fullscreen hint so we can retain the old size of the window. */ stage_x11->fullscreening = TRUE; diff --git a/clutter/x11/clutter-x11-texture-pixmap.c b/clutter/x11/clutter-x11-texture-pixmap.c index 3acadce..eda6b0c 100644 --- a/clutter/x11/clutter-x11-texture-pixmap.c +++ b/clutter/x11/clutter-x11-texture-pixmap.c @@ -139,19 +139,15 @@ G_DEFINE_TYPE (ClutterX11TexturePixmap, static gboolean check_extensions (ClutterX11TexturePixmap *texture) { - int damage_error; - ClutterX11TexturePixmapPrivate *priv; - Display *dpy; - - priv = texture->priv; + int damage_error; + Display *dpy; if (_damage_event_base) return TRUE; dpy = clutter_x11_get_default_display(); - if (!XDamageQueryExtension (dpy, - &_damage_event_base, &damage_error)) + if (!XDamageQueryExtension (dpy, &_damage_event_base, &damage_error)) { g_warning ("No Damage extension"); return FALSE; @@ -164,10 +160,6 @@ static void process_damage_event (ClutterX11TexturePixmap *texture, XDamageNotifyEvent *damage_event) { - Display *dpy; - - dpy = clutter_x11_get_default_display(); - /* Cogl will deal with updating the texture and subtracting from the damage region so we only need to queue a redraw */ g_signal_emit (texture, signals[QUEUE_DAMAGE_REDRAW], @@ -1255,7 +1247,6 @@ clutter_x11_texture_pixmap_set_automatic (ClutterX11TexturePixmap *texture, gboolean setting) { ClutterX11TexturePixmapPrivate *priv; - Display *dpy; g_return_if_fail (CLUTTER_X11_IS_TEXTURE_PIXMAP (texture)); @@ -1265,8 +1256,6 @@ clutter_x11_texture_pixmap_set_automatic (ClutterX11TexturePixmap *texture, if (setting == priv->automatic_updates) return; - dpy = clutter_x11_get_default_display(); - if (setting) create_damage_resources (texture); else