From 8bf679ab31bc2d7cd00c0589b80bcddbffcb471e Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Thu, 27 Apr 2006 09:50:43 +0000 Subject: [PATCH] remove checks for fb-level support Remove the brightness keybindings 2006-04-27 Bastien Nocera * configure.in: remove checks for fb-level support * schemas/apps_gnome_settings_daemon_keybindings.schemas.in: Remove the brightness keybindings (Closes: #339857) 2006-04-27 Bastien Nocera * gnome-keybinding-properties.c: remove brightness keybindings, as they duplicate with gnome-power-manager's (greater) functionality (Closes: #339857) 2006-04-27 Bastien Nocera * actions/Makefile.am: * actions/acme-brightness.png: * actions/acme-fb-level.c: * actions/acme-fb-level.h: * actions/acme.h: * gnome-settings-multimedia-keys.c: (do_action), (acme_filter_events), (gnome_settings_multimedia_keys_load): Remove references to the brightness controls, we have moved the functionality (and enhanced it!) to gnome-power-manager (Closes: #339857) --- ChangeLog | 6 + capplets/keybindings/ChangeLog | 6 + .../keybindings/gnome-keybinding-properties.c | 10 - configure.in | 16 -- gnome-settings-daemon/ChangeLog | 13 ++ gnome-settings-daemon/actions/Makefile.am | 8 +- .../actions/acme-brightness.png | Bin 4377 -> 0 bytes gnome-settings-daemon/actions/acme-fb-level.c | 201 ------------------ gnome-settings-daemon/actions/acme-fb-level.h | 65 ------ gnome-settings-daemon/actions/acme.h | 8 - .../gnome-settings-multimedia-keys.c | 73 ------- ...ome_settings_daemon_keybindings.schemas.in | 24 --- 12 files changed, 26 insertions(+), 404 deletions(-) delete mode 100644 gnome-settings-daemon/actions/acme-brightness.png delete mode 100644 gnome-settings-daemon/actions/acme-fb-level.c delete mode 100644 gnome-settings-daemon/actions/acme-fb-level.h diff --git a/ChangeLog b/ChangeLog index 352da3983..ee8ae82d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-04-27 Bastien Nocera + + * configure.in: remove checks for fb-level support + * schemas/apps_gnome_settings_daemon_keybindings.schemas.in: + Remove the brightness keybindings (Closes: #339857) + 2006-04-20 Sergey Udaltsov * configure.in: diff --git a/capplets/keybindings/ChangeLog b/capplets/keybindings/ChangeLog index 52ee4a4e0..56cc90ac4 100644 --- a/capplets/keybindings/ChangeLog +++ b/capplets/keybindings/ChangeLog @@ -1,3 +1,9 @@ +2006-04-27 Bastien Nocera + + * gnome-keybinding-properties.c: remove brightness keybindings, as + they duplicate with gnome-power-manager's (greater) functionality + (Closes: #339857) + 2006-01-30 Rodrigo Moya * actions/acme.h: diff --git a/capplets/keybindings/gnome-keybinding-properties.c b/capplets/keybindings/gnome-keybinding-properties.c index 085972c33..101699739 100644 --- a/capplets/keybindings/gnome-keybinding-properties.c +++ b/capplets/keybindings/gnome-keybinding-properties.c @@ -20,12 +20,6 @@ #define LABEL_DATA "gnome-keybinding-properties-label" #define MAX_ELEMENTS_BEFORE_SCROLLING 10 -#if defined(__powerpc__) && defined (__linux__) -#define USE_FBLEVEL -#else -#undef USE_FBLEVEL -#endif - typedef enum { ALWAYS_VISIBLE, N_WORKSPACES_GT @@ -53,10 +47,6 @@ static const KeyListEntry desktop_key_list[] = { "/apps/metacity/global_keybindings/run_command_screenshot", ALWAYS_VISIBLE, 0 }, { "/apps/metacity/global_keybindings/run_command_window_screenshot", ALWAYS_VISIBLE, 0 }, { "/apps/metacity/global_keybindings/run_command_terminal", ALWAYS_VISIBLE, 0 }, -#ifdef USE_FBLEVEL - { "/apps/gnome_settings_daemon/keybindings/brightness_down", ALWAYS_VISIBLE, 0 }, - { "/apps/gnome_settings_daemon/keybindings/brightness_up", ALWAYS_VISIBLE, 0 }, -#endif { NULL } }; static const KeyListEntry sounds_key_list[] = diff --git a/configure.in b/configure.in index e4e36ceca..549413109 100644 --- a/configure.in +++ b/configure.in @@ -513,22 +513,6 @@ AM_CONDITIONAL(HAVE_GST10, test x"$GST_MAJORMINOR" = "x0.10") AC_SUBST(GST_LIBS) AC_SUBST(GST_CFLAGS) -dnl ============================================== -dnl FB Level section -dnl ============================================== -have_fb=no -AC_TRY_COMPILE([ - #include - #include - ],[ - int arg = 0; - ],[ - have_fb=yes -]) -AC_MSG_CHECKING(for Brightness control support) -AC_MSG_RESULT($have_fb) -AM_CONDITIONAL(HAVE_FB, test x"$have_fb" = "xyes") - dnl ============================================== dnl Define the main variables dnl ============================================== diff --git a/gnome-settings-daemon/ChangeLog b/gnome-settings-daemon/ChangeLog index 8d0e68c9a..f5a919241 100644 --- a/gnome-settings-daemon/ChangeLog +++ b/gnome-settings-daemon/ChangeLog @@ -1,3 +1,16 @@ +2006-04-27 Bastien Nocera + + * actions/Makefile.am: + * actions/acme-brightness.png: + * actions/acme-fb-level.c: + * actions/acme-fb-level.h: + * actions/acme.h: + * gnome-settings-multimedia-keys.c: (do_action), + (acme_filter_events), (gnome_settings_multimedia_keys_load): + Remove references to the brightness controls, we have moved the + functionality (and enhanced it!) to gnome-power-manager + (Closes: #339857) + 2006-04-20 Sergey Udaltsov * gnome-settings-keyboard-xkb.c: fixed the libxklavier engine diff --git a/gnome-settings-daemon/actions/Makefile.am b/gnome-settings-daemon/actions/Makefile.am index 6f2388559..98bdfd2cc 100644 --- a/gnome-settings-daemon/actions/Makefile.am +++ b/gnome-settings-daemon/actions/Makefile.am @@ -28,22 +28,16 @@ endif # HAVE_OSS endif # HAVE_ALSA endif # HAVE_GSTREAMER -if HAVE_FB -INCLUDES += -DHAVE_FB -libacme_la_SOURCES += acme-fb-level.c acme-fb-level.h -endif - Datadir = $(datadir)/control-center-2.0/interfaces/ Data_DATA = acme.glade pixmapsdir = $(GNOMECC_PIXMAPS_DIR) -pixmaps_DATA = acme-brightness.png acme-eject.png gnome-speakernotes-muted.png gnome-speakernotes.png +pixmaps_DATA = acme-eject.png gnome-speakernotes-muted.png gnome-speakernotes.png EXTRA_DIST = \ acme-volume-alsa.c acme-volume-alsa.h \ acme-volume-gstreamer.c acme-volume-gstreamer.h \ acme-volume-oss.c acme-volume-oss.h \ - acme-fb-level.c acme-fb-level.h \ acme.h \ acme.glade \ $(pixmaps_DATA) diff --git a/gnome-settings-daemon/actions/acme-brightness.png b/gnome-settings-daemon/actions/acme-brightness.png deleted file mode 100644 index 19577b1b7d62c1f0de8948aaf12ba374156d5dd6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4377 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 - */ - -#include "config.h" -#include "acme-fb-level.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifndef FBIOBLANK -#define FBIOBLANK 0x4611 /* 0 or vesa-level+1 */ -#endif - -#ifndef PMU_IOC_GRAB_BACKLIGHT -#define PMU_IOC_GRAB_BACKLIGHT _IOR('B', 6, 0) -#endif - -G_DEFINE_TYPE (AcmeFblevel, acme_fblevel, G_TYPE_OBJECT) - -struct AcmeFblevelPrivate { - int pmu_fd; - int saved_level; -}; - -static GObjectClass *parent_class = NULL; - -static void -acme_fblevel_finalize (GObject *obj_self) -{ - AcmeFblevel *self = ACME_FBLEVEL (obj_self); - gpointer priv = self->_priv; - - if (G_OBJECT_CLASS(parent_class)->finalize) - (* G_OBJECT_CLASS(parent_class)->finalize)(obj_self); - g_free (priv); - - return; -} - -static void -acme_fblevel_class_init (AcmeFblevelClass *klass) -{ - GObjectClass *g_object_class = (GObjectClass*) klass; - parent_class = g_type_class_ref (G_TYPE_OBJECT); - g_object_class->finalize = acme_fblevel_finalize; - - return; -} - -static void -acme_fblevel_init (AcmeFblevel *fblevel) -{ - fblevel->_priv = g_new0 (AcmeFblevelPrivate, 1); - fblevel->level = 0; - fblevel->dim = FALSE; - fblevel->_priv->pmu_fd = -1; - fblevel->_priv->saved_level = 0; - - return; -} - -GQuark -acme_fblevel_error_quark (void) -{ - static GQuark quark = 0; - - if (quark == 0) - quark = g_quark_from_string ("acme-fblevel-quark"); - - return quark; -} - -int -acme_fblevel_get_level (AcmeFblevel *self) -{ - int level; - ioctl (self->_priv->pmu_fd, - PMU_IOC_GET_BACKLIGHT, &level); - return level; -} - -void -acme_fblevel_set_level (AcmeFblevel *self, int val) -{ - int level; - - level = CLAMP (val, 0, 15); - - ioctl (self->_priv->pmu_fd, - PMU_IOC_SET_BACKLIGHT, &level); - self->level = level; -} - -gboolean -acme_fblevel_get_dim (AcmeFblevel *self) -{ - return self->dim; -} - -void -acme_fblevel_set_dim (AcmeFblevel *self, gboolean val) -{ - if (self->dim == FALSE && val == TRUE) - { - self->_priv->saved_level = acme_fblevel_get_level(self); - acme_fblevel_set_level (self, 1); - self->dim = TRUE; - } else if (self->dim == TRUE && val == FALSE) { - acme_fblevel_set_level (self, self->_priv->saved_level); - self->dim = FALSE; - } -} - -AcmeFblevel * -acme_fblevel_new (GError **error) -{ - AcmeFblevel *self; - int fd, foo; - - if (g_file_test ("/dev/pmu", G_FILE_TEST_EXISTS) == FALSE) { - *error = g_error_new_literal (ACME_FBLEVEL_ERROR, - ACME_FBLEVEL_ERROR_NO_PMU_DEVICE, - _("No '/dev/pmu' device found")); - return NULL; - } - - if (acme_fblevel_is_powerbook () == FALSE) { - *error = g_error_new_literal (ACME_FBLEVEL_ERROR, - ACME_FBLEVEL_ERROR_NO_POWERBOOK, - _("Not a powerbook")); - return NULL; - } - - self = ACME_FBLEVEL (g_object_new (ACME_TYPE_FBLEVEL, NULL)); - /* This function switches the kernel backlight control off. - * This is part of the PPC kernel branch since version - * 2.4.18-rc2-benh. It does nothing with older kernels. - * For those kernels a separate kernel patch is nessecary to - * get backlight control in user space. - * - * Notice nicked from pbbuttons*/ - fd = open ("/dev/pmu", O_RDWR); - /* We can't emit the signal yet, the signal isn't connected! */ - if (fd < 0) { - *error = g_error_new_literal (ACME_FBLEVEL_ERROR, - ACME_FBLEVEL_ERROR_WRONG_PERMS, - _("Wrong permission for '/dev/pmu' device")); - return NULL; - } - - foo = ioctl(fd, PMU_IOC_GRAB_BACKLIGHT, 0); - self->_priv->pmu_fd = fd; - return self; -} - -gboolean -acme_fblevel_is_powerbook (void) -{ - FILE *fd; - char str[2048]; - gboolean found = FALSE; - - fd = fopen ("/proc/cpuinfo", "r"); - while (!feof (fd) && found == FALSE) - { - fread (str, 1, 2048, fd); - if (strstr (str, "PowerBook") != NULL) - found = TRUE; - } - - fclose (fd); - - return found; -} - diff --git a/gnome-settings-daemon/actions/acme-fb-level.h b/gnome-settings-daemon/actions/acme-fb-level.h deleted file mode 100644 index 4ec711c85..000000000 --- a/gnome-settings-daemon/actions/acme-fb-level.h +++ /dev/null @@ -1,65 +0,0 @@ -/* acme-fb-level.c - - Copyright (C) 2002, 2003 Bastien Nocera - - The Gnome Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The Gnome Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the Gnome Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - - Author: Bastien Nocera - */ - -#include -#include - -#define ACME_TYPE_FBLEVEL (acme_fblevel_get_type ()) -#define ACME_FBLEVEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ACME_TYPE_FBLEVEL, AcmeFblevel)) -#define ACME_FBLEVEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ACME_TYPE_FBLEVEL, AcmeFblevelClass)) -#define ACME_IS_FBLEVEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ACME_TYPE_FBLEVEL)) -#define ACME_FBLEVEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ACME_TYPE_FBLEVEL, AcmeFblevelClass)) - -#define ACME_FBLEVEL_ERROR (acme_fblevel_error_quark ()) - -typedef struct AcmeFblevelPrivate AcmeFblevelPrivate; -typedef struct AcmeFblevel AcmeFblevel; -typedef struct AcmeFblevelClass AcmeFblevelClass; -typedef enum AcmeFblevelError AcmeFblevelError; - -struct AcmeFblevel { - GObject parent; - int level; - gboolean dim; - AcmeFblevelPrivate *_priv; -}; - -struct AcmeFblevelClass { - GObjectClass parent; -}; - -enum AcmeFblevelError { - ACME_FBLEVEL_ERROR_NO_PMU_DEVICE, - ACME_FBLEVEL_ERROR_NO_POWERBOOK, - ACME_FBLEVEL_ERROR_WRONG_PERMS -}; - -GType acme_fblevel_get_type (void); -GQuark acme_fblevel_error_quark (void); -int acme_fblevel_get_level (AcmeFblevel *self); -void acme_fblevel_set_level (AcmeFblevel *self, int val); -gboolean acme_fblevel_get_dim (AcmeFblevel *self); -void acme_fblevel_set_dim (AcmeFblevel *self, - gboolean val); -AcmeFblevel *acme_fblevel_new (GError **error); -gboolean acme_fblevel_is_powerbook (void); - diff --git a/gnome-settings-daemon/actions/acme.h b/gnome-settings-daemon/actions/acme.h index 05a5e2182..13370036f 100644 --- a/gnome-settings-daemon/actions/acme.h +++ b/gnome-settings-daemon/actions/acme.h @@ -38,10 +38,6 @@ enum { SCREENSAVER_KEY, HELP_KEY, WWW_KEY, -#ifdef USE_FBLEVEL - BRIGHT_DOWN_KEY, - BRIGHT_UP_KEY, -#endif PLAY_KEY, PAUSE_KEY, STOP_KEY, @@ -73,10 +69,6 @@ static struct { { SCREENSAVER_KEY, GCONF_BINDING_DIR "/screensaver", NULL }, { HELP_KEY, GCONF_BINDING_DIR "/help", NULL }, { WWW_KEY, GCONF_BINDING_DIR "/www", NULL }, -#ifdef USE_FBLEVEL - { BRIGHT_DOWN_KEY, GCONF_BINDING_DIR "/brightness_down", NULL }, - { BRIGHT_UP_KEY, GCONF_BINDING_DIR "/brightness_up", NULL }, -#endif { PLAY_KEY, GCONF_BINDING_DIR "/play", NULL }, { PAUSE_KEY, GCONF_BINDING_DIR "/pause", NULL }, { STOP_KEY, GCONF_BINDING_DIR "/stop", NULL }, diff --git a/gnome-settings-daemon/gnome-settings-multimedia-keys.c b/gnome-settings-daemon/gnome-settings-multimedia-keys.c index 6431439c6..a752ea664 100644 --- a/gnome-settings-daemon/gnome-settings-multimedia-keys.c +++ b/gnome-settings-daemon/gnome-settings-multimedia-keys.c @@ -35,13 +35,6 @@ #include "eggaccelerators.h" -#if defined(__powerpc__) && defined (__linux__) -#define USE_FBLEVEL -#include "actions/acme-fb-level.h" -#else -#undef USE_FBLEVEL -#endif - #include "actions/acme.h" #include "actions/acme-volume.h" @@ -59,9 +52,6 @@ typedef struct { AcmeVolume *volobj; -#ifdef USE_FBLEVEL - AcmeFblevel *levobj; -#endif GladeXML *xml; GtkWidget *dialog; GConfClient *conf_client; @@ -75,7 +65,6 @@ typedef struct { enum { ICON_MUTED, ICON_LOUD, - ICON_BRIGHT, ICON_EJECT, }; @@ -151,7 +140,6 @@ do_sleep_action (char *cmd1, char *cmd2) static char *images[] = { PIXMAPSDIR "/gnome-speakernotes-muted.png", PIXMAPSDIR "/gnome-speakernotes.png", - PIXMAPSDIR "/acme-brightness.png", PIXMAPSDIR "/acme-eject.png", }; @@ -674,46 +662,6 @@ do_eject_action (Acme *acme) gtk_widget_set_sensitive (progress, TRUE); } -#ifdef USE_FBLEVEL -static void -do_brightness_action (Acme *acme, int type) -{ - GtkWidget *progress; - int level; - - if (acme->levobj == NULL) - return; - - if (acme->dialog_timeout != 0) - { - gtk_timeout_remove (acme->dialog_timeout); - acme->dialog_timeout = 0; - } - - level = acme_fblevel_get_level (acme->levobj); - - dialog_init (acme); - acme_image_set (acme, ICON_BRIGHT); - - switch (type) { - case BRIGHT_DOWN_KEY: - acme_fblevel_set_level (acme->levobj, level - 1); - break; - case BRIGHT_UP_KEY: - acme_fblevel_set_level (acme->levobj, level + 1); - break; - } - - level = acme_fblevel_get_level (acme->levobj); - - progress = glade_xml_get_widget (acme->xml, "progressbar"); - gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress), - (double) level / 15); - - dialog_show (acme); -} -#endif - static void do_sound_action (Acme *acme, int type) { @@ -818,12 +766,6 @@ do_action (Acme *acme, int type) case WWW_KEY: do_www_action (acme, NULL); break; -#ifdef USE_FBLEVEL - case BRIGHT_DOWN_KEY: - case BRIGHT_UP_KEY: - do_brightness_action (acme, type); - break; -#endif default: g_assert_not_reached (); } @@ -874,10 +816,6 @@ acme_filter_events (GdkXEvent *xevent, GdkEvent *event, gpointer data) switch (keys[i].key_type) { case VOLUME_DOWN_KEY: case VOLUME_UP_KEY: -#ifdef USE_FBLEVEL - case BRIGHT_DOWN_KEY: - case BRIGHT_UP_KEY: -#endif /* auto-repeatable keys */ if (xev->type != KeyPress) return GDK_FILTER_CONTINUE; @@ -925,17 +863,6 @@ gnome_settings_multimedia_keys_load (GConfClient *client) /* initialise Volume handler */ acme->volobj = acme_volume_new(); -#ifdef USE_FBLEVEL - /* initialise Frame Buffer level handler */ - acme->levobj = acme_fblevel_new (&err); - if (acme->levobj == NULL && err != NULL) { - if (!g_error_matches (err, ACME_FBLEVEL_ERROR, - ACME_FBLEVEL_ERROR_NO_POWERBOOK)) - acme_error (err->message); - g_error_free (err); - } -#endif - /* Start filtering the events */ for (l = acme->screens; l != NULL; l = l->next) gdk_window_add_filter (gdk_screen_get_root_window (l->data), diff --git a/schemas/apps_gnome_settings_daemon_keybindings.schemas.in b/schemas/apps_gnome_settings_daemon_keybindings.schemas.in index 2a45562ac..439dd4d56 100644 --- a/schemas/apps_gnome_settings_daemon_keybindings.schemas.in +++ b/schemas/apps_gnome_settings_daemon_keybindings.schemas.in @@ -157,30 +157,6 @@ - - /schemas/apps/gnome_settings_daemon/keybindings/brightness_down - /apps/gnome_settings_daemon/keybindings/brightness_down - string - - - Brightness down - Brightness down's shortcut. - - - - - - /schemas/apps/gnome_settings_daemon/keybindings/brightness_up - /apps/gnome_settings_daemon/keybindings/brightness_up - string - - - Brightness up - Brightness up's shortcut. - - - - /schemas/apps/gnome_settings_daemon/keybindings/play /apps/gnome_settings_daemon/keybindings/play