[maemo-commits] [maemo-commits] r9190 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . docs/reference docs/reference/gdk gdk gdk/directfb gdk/quartz gdk/win32 gdk/x11

[From: subversion at stage.maemo.org]

Author: mitch
Date: 2007-01-19 14:39:18 +0200 (Fri, 19 Jan 2007)
New Revision: 9190

Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/docs/reference/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/docs/reference/gdk/gdk-sections.txt
   projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/directfb/gdkwindow-directfb.c
   projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/gdk.symbols
   projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/gdkwindow.h
   projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/quartz/gdkwindow-quartz.c
   projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/win32/gdkwindow-win32.c
   projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/x11/gdkwindow-x11.c
Log:
2007-01-19  Michael Natterer  <mitch at imendio.com>

	Backport gdk_window_beep() from upstream trunk, needed
	for the keynav_failed() backport:

    2006-09-13 Michael Emmel <mike.emmel at gmail.com>

	* gdk/directfb/gdkwindow-directfb.c fixed beep compile error

    2006-09-03  Tor Lillqvist  <tml at novell.com>

	* gdk/win32/gdkwindow-win32.c (gdk_window_beep): No
	GDK_WINDOW_DISPLAY in the Win32 backend.

    2006-08-31  Michael Natterer  <mitch at imendio.com>

	* gdk/x11/gdkwindow-x11.c (gdk_window_beep): Fix build.

    2006-08-30  Richard Hult  <richard at imendio.com>

	* gdk/quartz/gdkwindow-quartz.c (gdk_window_beep): Fix build.

    2006-08-30  Matthias Clasen  <mclasen at redhat.com>

	* gdk/x11/gdkwindow-x11.c (gdk_window_beep): Only use XKB
	for beeping if we are using XKB.  

    2006-08-29  Matthias Clasen  <mclasen at redhat.com>

	* gdk/gdkwindow.h: 
	* gdk/gdk.symbols: 
	* gdk/directfb/gdkwindow-directfb.c (gdk_window_beep): 
	* gdk/win32/gdkwindow-win32.c (gdk_window_beep): 
	* gdk/quartz/gdkwindow-quartz.c (gdk_window_beep): 
	* gdk/x11/gdkwindow-x11.c (gdk_window_beep): Add a function
	to beep on a window. For X11, implement this with
	XkbBell.  (#353455, Mariano Su?\195?\161rez-Alvarez)



Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-01-19 12:13:36 UTC (rev 9189)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-01-19 12:39:18 UTC (rev 9190)
@@ -1,3 +1,41 @@
+2007-01-19  Michael Natterer  <mitch at imendio.com>
+
+	Backport gdk_window_beep() from upstream trunk, needed
+	for the keynav_failed() backport:
+
+    2006-09-13 Michael Emmel <mike.emmel at gmail.com>
+
+	* gdk/directfb/gdkwindow-directfb.c fixed beep compile error
+
+    2006-09-03  Tor Lillqvist  <tml at novell.com>
+
+	* gdk/win32/gdkwindow-win32.c (gdk_window_beep): No
+	GDK_WINDOW_DISPLAY in the Win32 backend.
+
+    2006-08-31  Michael Natterer  <mitch at imendio.com>
+
+	* gdk/x11/gdkwindow-x11.c (gdk_window_beep): Fix build.
+
+    2006-08-30  Richard Hult  <richard at imendio.com>
+
+	* gdk/quartz/gdkwindow-quartz.c (gdk_window_beep): Fix build.
+
+    2006-08-30  Matthias Clasen  <mclasen at redhat.com>
+
+	* gdk/x11/gdkwindow-x11.c (gdk_window_beep): Only use XKB
+	for beeping if we are using XKB.  
+
+    2006-08-29  Matthias Clasen  <mclasen at redhat.com>
+
+	* gdk/gdkwindow.h: 
+	* gdk/gdk.symbols: 
+	* gdk/directfb/gdkwindow-directfb.c (gdk_window_beep): 
+	* gdk/win32/gdkwindow-win32.c (gdk_window_beep): 
+	* gdk/quartz/gdkwindow-quartz.c (gdk_window_beep): 
+	* gdk/x11/gdkwindow-x11.c (gdk_window_beep): Add a function
+	to beep on a window. For X11, implement this with
+	XkbBell.  (#353455, Mariano Suárez-Alvarez)
+
 2007-01-19  Kristian Rietveld  <kris at imendio.com>
 
 	* gtk/gtktreeview.c (gtk_tree_view_motion_bin_window),

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/docs/reference/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/docs/reference/ChangeLog	2007-01-19 12:13:36 UTC (rev 9189)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/docs/reference/ChangeLog	2007-01-19 12:39:18 UTC (rev 9190)
@@ -1,3 +1,11 @@
+2007-01-19  Michael Natterer  <mitch at imendio.com>
+
+	Backport gdk_window_beep():
+
+    2006-08-29  Matthias Clasen  <mclasen at redhat.com>
+
+	* gdk/gdk-sections.txt: Add gdk_window_beep
+
 2006-10-03  Matthias Clasen  <mclasen at redhat.com>
 
 	* === Released 2.10.6 ===

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/docs/reference/gdk/gdk-sections.txt
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/docs/reference/gdk/gdk-sections.txt	2007-01-19 12:13:36 UTC (rev 9189)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/docs/reference/gdk/gdk-sections.txt	2007-01-19 12:39:18 UTC (rev 9190)
@@ -665,6 +665,7 @@
 gdk_window_begin_resize_drag
 gdk_window_begin_move_drag
 gdk_window_constrain_size
+gdk_window_beep
 
 <SUBSECTION>
 gdk_window_begin_paint_rect

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/directfb/gdkwindow-directfb.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/directfb/gdkwindow-directfb.c	2007-01-19 12:13:36 UTC (rev 9189)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/directfb/gdkwindow-directfb.c	2007-01-19 12:39:18 UTC (rev 9190)
@@ -2990,6 +2990,12 @@
   iface->process_updates = gdk_window_impl_directfb_process_updates;
 }
 
+void
+gdk_window_beep (GdkWindow *window)
+{
+  gdk_display_beep (gdk_display_get_default());
+}
+
 #define __GDK_WINDOW_X11_C__
 #include "gdkaliasdef.c"
 

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/gdk.symbols
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/gdk.symbols	2007-01-19 12:13:36 UTC (rev 9189)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/gdk.symbols	2007-01-19 12:39:18 UTC (rev 9190)
@@ -732,6 +732,7 @@
 gdk_window_set_icon_list
 gdk_window_set_icon
 gdk_window_set_icon_name
+gdk_window_beep
 gdk_window_iconify
 gdk_window_deiconify
 gdk_window_stick

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/gdkwindow.h
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/gdkwindow.h	2007-01-19 12:13:36 UTC (rev 9189)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/gdkwindow.h	2007-01-19 12:39:18 UTC (rev 9190)
@@ -555,6 +555,7 @@
 GList *       gdk_window_get_toplevels   (void);
 #endif
 
+void          gdk_window_beep            (GdkWindow       *window);
 void          gdk_window_iconify         (GdkWindow       *window);
 void          gdk_window_deiconify       (GdkWindow       *window);
 void          gdk_window_stick           (GdkWindow       *window);

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/quartz/gdkwindow-quartz.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/quartz/gdkwindow-quartz.c	2007-01-19 12:13:36 UTC (rev 9189)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/quartz/gdkwindow-quartz.c	2007-01-19 12:39:18 UTC (rev 9190)
@@ -1993,3 +1993,9 @@
    * -[GdkQuartzView dealloc], although I suspect that currently they leak
    * anyway. */
 }
+
+void 
+gdk_window_beep (GdkWindow *window)
+{
+  gdk_display_beep (_gdk_display);
+}

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/win32/gdkwindow-win32.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/win32/gdkwindow-win32.c	2007-01-19 12:13:36 UTC (rev 9189)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/win32/gdkwindow-win32.c	2007-01-19 12:39:18 UTC (rev 9190)
@@ -3400,3 +3400,9 @@
 {
   g_return_if_fail (GDK_IS_WINDOW (window));
 }
+
+void
+gdk_window_beep (GdkWindow *window)
+{
+  gdk_display_beep (_gdk_display);
+}

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/x11/gdkwindow-x11.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/x11/gdkwindow-x11.c	2007-01-19 12:13:36 UTC (rev 9189)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/x11/gdkwindow-x11.c	2007-01-19 12:39:18 UTC (rev 9190)
@@ -29,6 +29,11 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
+
+#ifdef HAVE_XKB
+#include <X11/XKBlib.h>
+#endif
+
 #include <netinet/in.h>
 #include <unistd.h>
 
@@ -6351,5 +6356,33 @@
 #endif
 }
 
+/**
+ * gdk_window_beep:
+ * @window: a toplevel #GdkWindow
+ *
+ * Emits a short beep associated to @window in the appropriate
+ * display, if supported. Otherwise, emits a short beep on
+ * the display just as gdk_display_beep().
+ *
+ * Since: 2.12
+ **/
+void
+gdk_window_beep (GdkWindow *window)
+{
+  GdkDisplay *display;
+
+  display = GDK_WINDOW_DISPLAY (window);
+
+#ifdef HAVE_XKB
+  if (GDK_DISPLAY_X11 (display)->use_xkb)
+    XkbBell (GDK_DISPLAY_XDISPLAY (display),
+	     GDK_WINDOW_XID (window),
+	     0,
+	     None);
+  else
+#endif
+    gdk_display_beep (display);
+}
+
 #define __GDK_WINDOW_X11_C__
 #include "gdkaliasdef.c"