Reverted visual bell patch, #99886

2002-12-19  Havoc Pennington  <hp@pobox.com>

	* Reverted visual bell patch, #99886

ChangeLog

@@ -1,3 +1,7 @@
+2002-12-19  Havoc Pennington  <hp@pobox.com>
+
+	* Reverted visual bell patch, #99886
+
 2002-12-19  Yanko Kaneti <yaneti@declera.com>
 
 	* configure.in: (ALL_LINGUAS) Added Bulgarian (bg).

configure.in

@@ -221,17 +221,6 @@ if test "x$found_shape" = "xyes"; then
    AC_DEFINE(HAVE_SHAPE, , [Have the shape extension library])
 fi
 
-found_xkb=no
-AC_CHECK_LIB(X11, XkbQueryExtension,
-               [AC_CHECK_HEADER(X11/XKBlib.h,
-                                found_xkb=yes)],
-	, $ALL_X_LIBS)
-
-if test "x$found_xkb" = "xyes"; then
-   AC_DEFINE(HAVE_XKB, , [Have keyboard extension library])
-fi
-
-
 RANDR_LIBS=
 found_randr=no
 AC_CHECK_LIB(Xrandr, XRRUpdateConfiguration,

src/Makefile.am

@@ -11,8 +11,6 @@ EGGFILES=			\
 metacity_SOURCES= 				\
 	async-getprop.c				\
 	async-getprop.h				\
-	bell.h					\
-	bell.c					\
 	common.h				\
 	core.c					\
 	core.h					\

src/common.h

@@ -42,8 +42,7 @@ typedef enum
   META_FRAME_MAXIMIZED                = 1 << 9,
   META_FRAME_ALLOWS_SHADE             = 1 << 10,
   META_FRAME_ALLOWS_MOVE              = 1 << 11,
-  META_FRAME_FULLSCREEN               = 1 << 12,
+  META_FRAME_FULLSCREEN               = 1 << 12
-  META_FRAME_IS_FLASHING              = 1 << 13
 } MetaFrameFlags;
 
 typedef enum

src/display.c

@@ -34,7 +34,6 @@
 #include "prefs.h"
 #include "resizepopup.h"
 #include "workspace.h"
-#include "bell.h"
 #include <X11/Xatom.h>
 #include <X11/cursorfont.h>
 #ifdef HAVE_SOLARIS_XINERAMA
@@ -43,9 +42,6 @@
 #ifdef HAVE_XFREE_XINERAMA
 #include <X11/extensions/Xinerama.h>
 #endif
-#ifdef HAVE_XKB
-#include <X11/XKBlib.h>
-#endif
 #include <string.h>
 
 #define USE_GDK_DISPLAY
@@ -309,8 +305,6 @@ meta_display_open (const char *name)
   /* we have to go ahead and do this so error handlers work */
   all_displays = g_slist_prepend (all_displays, display);
 
-  meta_bell_init (display);
-
   meta_display_init_keys (display);
 
   update_window_grab_modifiers (display);
@@ -1828,19 +1822,6 @@ event_callback (XEvent   *event,
       }
       break;
     default:
-#ifdef HAVE_XKB
-      if (event->type == display->xkb_base_event_type) 
-	{
-	  XkbAnyEvent *xkb_ev = (XkbAnyEvent *) event;
-	  
-	  switch (xkb_ev->xkb_type)
-	    {
-	    case XkbBellNotify:
-	      meta_bell_notify (display, xkb_ev);
-	      break;
-	    }
-	}
-#endif
       break;
     }
 
@@ -3865,9 +3846,4 @@ prefs_changed_callback (MetaPreference pref,
 
       g_slist_free (windows);
     }
-  else if (pref == META_PREF_AUDIBLE_BELL)
-    {
-      MetaDisplay *display = data;
-      meta_bell_set_audible (display, meta_prefs_bell_is_audible ());
-    }
 }

src/display.h

@@ -245,9 +245,6 @@ struct _MetaDisplay
   MetaRectangle grab_current_window_pos;
   MetaResizePopup *grab_resize_popup;
   GTimeVal    grab_last_moveresize_time;
-#ifdef HAVE_XKB
-  int         xkb_base_event_type;
-#endif
 #ifdef HAVE_XSYNC
   /* alarm monitoring client's _METACITY_UPDATE_COUNTER */
   XSyncAlarm  grab_update_alarm;

src/frame.c

@@ -21,7 +21,6 @@
 
 #include <config.h>
 #include "frame.h"
-#include "bell.h"
 #include "errors.h"
 #include "keybindings.h"
 
@@ -59,7 +58,6 @@ meta_window_ensure_frame (MetaWindow *window)
   frame->current_cursor = 0;
 
   frame->mapped = FALSE;
-  frame->is_flashing = FALSE;
   
   attrs.event_mask = EVENT_MASK;
 
@@ -161,7 +159,6 @@ meta_window_destroy_frame (MetaWindow *window)
 
   frame = window->frame;
   
-  meta_bell_notify_frame_destroy (frame);
   meta_ui_remove_frame (window->screen->ui, frame->xwindow);
   
   /* Unparent the client window; it may be destroyed,
@@ -258,9 +255,6 @@ meta_frame_get_flags (MetaFrame *frame)
   if (frame->window->fullscreen)
     flags |= META_FRAME_FULLSCREEN;
 
-  if (frame->is_flashing)
-    flags |= META_FRAME_IS_FLASHING;
-
   return flags;
 }
 

src/frame.h

@@ -57,7 +57,6 @@ struct _MetaFrame
   int bottom_height;
 
   guint mapped : 1;
-  guint is_flashing : 1; /* used by the visual bell flash */
 };
 
 void     meta_window_ensure_frame           (MetaWindow *window);

src/metacity.schemas.in

@@ -177,57 +177,6 @@
       </locale>
     </schema>
 
-    <schema>
-      <key>/apps/metacity/visual_bell</key>
-      <applyto>/apps/metacity/general/visual_bell</applyto>      
-      <owner>metacity</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-         <short>Enable Visual Bell</short>
-         <long>Turns on a visual indication when an application or the system
-	issues a 'bell' or 'beep'; useful for the hard-of-hearing and for use
-	in noisy environments, or when 'audible bell' is off.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/metacity/general/audible_bell</key>
-      <applyto>/apps/metacity/general/audible_bell</applyto>      
-      <owner>metacity</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>System Bell is Audible</short>
-         <long>Determines whether applications or the system can generate audible 
-	'beeps'; may be used in conjunction with 'visual bell' to 
-	allow silent 'beeps'.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/metacity/general/visual_bell_type</key>
-      <applyto>/apps/metacity/general/visual_bell_type</applyto>      
-      <owner>metacity</owner>
-      <type>string</type>
-      <default>fullscreen</default>
-      <locale name="C">
-         <short>Visual Bell Type</short>
-         <long>
-	Tells Metacity how to implement the visual indication that
-	the system bell or another application 'bell' indicator has
-	been rung.  Currently there are two valid values, "fullscreen",
-	which causes a fullscreen white-black flash, and "frame_flash" which
-	causes the titlebar of the application which sent the bell signal to
-	flash.  If the application which sent the bell is unknown (as is
-	usually the case for the default "system beep"), the currently
-	focused window's titlebar is flashed.
-         </long>
-      </locale>
-    </schema>
-
     <schema>
       <key>/schemas/apps/metacity/workspace_names/name</key>
       <applyto>/apps/metacity/workspace_names/name_1</applyto>

src/prefs.c

@@ -54,10 +54,6 @@
 
 #define KEY_WORKSPACE_NAME_PREFIX "/apps/metacity/workspace_names/name_"
 
-#define KEY_VISUAL_BELL "/apps/metacity/general/visual_bell"
-#define KEY_AUDIBLE_BELL "/apps/metacity/general/audible_bell"
-#define KEY_VISUAL_BELL_TYPE "/apps/metacity/general/visual_bell_type"
-
 #ifdef HAVE_GCONF
 static GConfClient *default_client = NULL;
 static GList *changes = NULL;
@@ -77,9 +73,6 @@ static gboolean application_based = FALSE;
 static gboolean disable_workarounds = FALSE;
 static gboolean auto_raise = FALSE;
 static gboolean auto_raise_delay = 500;
-static gboolean provide_visual_bell = TRUE;
-static gboolean bell_is_audible = TRUE;
-static MetaVisualBellType visual_bell_type = META_VISUAL_BELL_INVALID;
 static MetaButtonLayout button_layout = {
   {
     META_BUTTON_FUNCTION_MENU,
@@ -105,8 +98,6 @@ static gboolean update_titlebar_font      (const char *value);
 static gboolean update_mouse_button_mods  (const char *value);
 static gboolean update_focus_mode         (const char *value);
 static gboolean update_theme              (const char *value);
-static gboolean update_visual_bell        (gboolean v1, gboolean v2);
-static gboolean update_visual_bell_type   (const char *value);
 static gboolean update_num_workspaces     (int         value);
 static gboolean update_application_based  (gboolean    value);
 static gboolean update_disable_workarounds (gboolean   value);
@@ -282,7 +273,7 @@ meta_prefs_init (void)
   GError *err = NULL;
   char *str_val;
   int int_val;
-  gboolean bool_val, bool_val_2;
+  gboolean bool_val;
   
   if (default_client != NULL)
     return;
@@ -369,20 +360,6 @@ meta_prefs_init (void)
   g_free (str_val);
 #endif /* HAVE_GCONF */
   
-  bool_val = gconf_client_get_bool (default_client, KEY_VISUAL_BELL,
-                                    &err);
-  cleanup_error (&err);
-  bool_val_2 = gconf_client_get_bool (default_client, KEY_AUDIBLE_BELL,
-                                    &err);
-  cleanup_error (&err);
-  update_visual_bell (bool_val, bool_val_2);
-
-  str_val = gconf_client_get_string (default_client, KEY_VISUAL_BELL_TYPE,
-                                     &err);
-  cleanup_error (&err);
-  update_visual_bell_type (str_val);
-  g_free (str_val);
-
   /* Load keybindings prefs */
   init_bindings ();
 
@@ -697,37 +674,6 @@ change_notify (GConfClient    *client,
       if (update_button_layout (str))
         queue_changed (META_PREF_BUTTON_LAYOUT);
     }
-  else if (strcmp (key, KEY_VISUAL_BELL) == 0)
-    {
-      gboolean b;
-
-      b = value ? gconf_value_get_bool (value) : provide_visual_bell;      
-      if (update_visual_bell (b, bell_is_audible))
-	queue_changed (META_PREF_VISUAL_BELL);	    
-    }
-  else if (strcmp (key, KEY_AUDIBLE_BELL) == 0)
-    {
-      gboolean b;
-
-      b = value ? gconf_value_get_bool (value) : bell_is_audible;      
-      if (update_visual_bell (provide_visual_bell, b))
-	queue_changed (META_PREF_AUDIBLE_BELL);
-    }
-  else if (strcmp (key, KEY_VISUAL_BELL_TYPE) == 0)
-    {
-      const char * str;
-
-      if (value && value->type != GCONF_VALUE_STRING)
-        {
-          meta_warning (_("GConf key \"%s\" is set to an invalid type\n"),
-                        KEY_VISUAL_BELL_TYPE);
-          goto out;
-        }
-      
-      str = value ? gconf_value_get_string (value) : NULL;
-      if (update_visual_bell_type (str))
-	queue_changed (META_PREF_VISUAL_BELL_TYPE);
-    }
   else
     {
       meta_topic (META_DEBUG_PREFS, "Key %s doesn't mean anything to Metacity\n",
@@ -857,48 +803,8 @@ update_use_system_font (gboolean value)
 
   return old != value;
 }
-
-static MetaVisualBellType
-visual_bell_type_from_string (const char *value)
-{
-  if (!strcmp (value, "fullscreen")) 
-    {
-      return META_VISUAL_BELL_FULLSCREEN_FLASH;
-    }
-  else if (!strcmp (value, "frame_flash"))
-    {
-      return META_VISUAL_BELL_FRAME_FLASH;
-    }
-  return META_VISUAL_BELL_FULLSCREEN_FLASH;
-}
-
-static gboolean
-update_visual_bell_type (const char *value)
-{
-  MetaVisualBellType old_bell_type;
-
-  old_bell_type = visual_bell_type;
-  visual_bell_type = visual_bell_type_from_string (value);
-
-  return (visual_bell_type != old_bell_type);
-}
 #endif /* HAVE_GCONF */
 
-static gboolean
-update_visual_bell (gboolean visual_bell, gboolean audible_bell)
-{
-  gboolean old_visual = provide_visual_bell;
-  gboolean old_audible = bell_is_audible;
-  gboolean has_changed;
-
-  provide_visual_bell = visual_bell;
-  bell_is_audible = audible_bell;
-  has_changed = (old_visual != provide_visual_bell) || 
-    (old_audible != bell_is_audible);
-
-  return has_changed;
-}
-
 #ifdef HAVE_GCONF
 static gboolean
 update_titlebar_font (const char *value)
@@ -1280,18 +1186,6 @@ meta_preference_to_string (MetaPreference pref)
     case META_PREF_WORKSPACE_NAMES:
       return "WORKSPACE_NAMES";
       break;
-
-    case META_PREF_VISUAL_BELL:
-      return "VISUAL_BELL";
-      break;
-
-    case META_PREF_AUDIBLE_BELL:
-      return "AUDIBLE_BELL";
-      break;
-
-    case META_PREF_VISUAL_BELL_TYPE:
-      return "VISUAL_BELL_TYPE";
-      break;
     }
 
   return "(unknown)";
@@ -1856,24 +1750,6 @@ meta_prefs_get_button_layout (MetaButtonLayout *button_layout_p)
   *button_layout_p = button_layout;
 }
 
-gboolean
-meta_prefs_get_visual_bell ()
-{
-  return provide_visual_bell;
-}
-
-gboolean
-meta_prefs_bell_is_audible ()
-{
-  return bell_is_audible;
-}
-
-MetaVisualBellType
-meta_prefs_get_visual_bell_type ()
-{
-  return visual_bell_type;
-}
-
 void
 meta_prefs_get_screen_bindings (const MetaKeyPref **bindings,
                                 int                *n_bindings)

src/prefs.h

@@ -42,10 +42,7 @@ typedef enum
   META_PREF_DISABLE_WORKAROUNDS,
   META_PREF_COMMANDS,
   META_PREF_BUTTON_LAYOUT,
-  META_PREF_WORKSPACE_NAMES,
+  META_PREF_WORKSPACE_NAMES
-  META_PREF_VISUAL_BELL,
-  META_PREF_AUDIBLE_BELL,
-  META_PREF_VISUAL_BELL_TYPE
 } MetaPreference;
 
 typedef void (* MetaPrefsChangedFunc) (MetaPreference pref,
@@ -216,18 +213,6 @@ void meta_prefs_get_window_binding (const char          *name,
                                     unsigned int        *keysym,
                                     MetaVirtualModifier *modifiers);
 
-typedef enum
-{
-  META_VISUAL_BELL_INVALID = 0,
-  META_VISUAL_BELL_FULLSCREEN_FLASH,
-  META_VISUAL_BELL_FRAME_FLASH
-
-} MetaVisualBellType;
-
-gboolean           meta_prefs_get_visual_bell      (void);
-gboolean           meta_prefs_bell_is_audible      (void);
-MetaVisualBellType meta_prefs_get_visual_bell_type (void);
-
 #endif
 
 

src/screen.c

@@ -523,7 +523,6 @@ meta_screen_new (MetaDisplay *display,
   screen->current_cursor = -1; /* invalid/unset */
   screen->default_xvisual = DefaultVisualOfScreen (screen->xscreen);
   screen->default_depth = DefaultDepthOfScreen (screen->xscreen);
-  screen->flash_window = None;
 
   screen->wm_sn_selection_window = new_wm_sn_owner;
   screen->wm_sn_atom = wm_sn_atom;

src/screen.h

@@ -70,8 +70,6 @@ struct _MetaScreen
 
   MetaCursor current_cursor;
 
-  Window flash_window;
-
   Window wm_sn_selection_window;
   Atom wm_sn_atom;
   Time wm_sn_timestamp;

src/theme.c

@@ -4761,9 +4761,7 @@ theme_get_style (MetaTheme     *theme,
       break;
     }
 
-  /* re invert the styles used for focus/unfocussed while flashing a frame */
+  if (flags & META_FRAME_HAS_FOCUS)
-  if (((flags & META_FRAME_HAS_FOCUS) && !(flags & META_FRAME_IS_FLASHING))
-      || (!(flags & META_FRAME_HAS_FOCUS) && (flags & META_FRAME_IS_FLASHING)))
     focus = META_FRAME_FOCUS_YES;
   else
     focus = META_FRAME_FOCUS_NO;