# HG changeset patch
# User nenolod
# Date 1171087503 28800
# Node ID 2aeea41ef023013a8197d152f8105fddb2b8a878
# Parent  49e27e4d8426baea7acabb38d178e9cbb81285bd
[svn] - using ConfigureNotify for resizing is wrong per ICCCM guideline,
  handling resize independently of the WM is correct per ICCCM.

diff -r 49e27e4d8426 -r 2aeea41ef023 ChangeLog
--- a/ChangeLog	Fri Feb 09 03:04:35 2007 -0800
+++ b/ChangeLog	Fri Feb 09 22:05:03 2007 -0800
@@ -1,3 +1,11 @@
+2007-02-09 11:04:35 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
+  revision [3990]
+  - trying to open filebrowser when it is already open will raise the filebrowser.
+  
+  trunk/src/audacious/ui_fileopener.c |    4 +++-
+  1 file changed, 3 insertions(+), 1 deletion(-)
+
+
 2007-02-08 16:42:01 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
   revision [3988]
   - revise r3986 to only override tuple->track_name on lengthless streams
diff -r 49e27e4d8426 -r 2aeea41ef023 src/audacious/build_stamp.c
--- a/src/audacious/build_stamp.c	Fri Feb 09 03:04:35 2007 -0800
+++ b/src/audacious/build_stamp.c	Fri Feb 09 22:05:03 2007 -0800
@@ -1,2 +1,2 @@
 #include <glib.h>
-const gchar *svn_stamp = "20070208-3988";
+const gchar *svn_stamp = "20070209-3990";
diff -r 49e27e4d8426 -r 2aeea41ef023 src/audacious/ui_playlist.c
--- a/src/audacious/ui_playlist.c	Fri Feb 09 03:04:35 2007 -0800
+++ b/src/audacious/ui_playlist.c	Fri Feb 09 22:05:03 2007 -0800
@@ -61,8 +61,6 @@
 PlayList_List *playlistwin_list = NULL;
 PButton *playlistwin_shade, *playlistwin_close;
 
-static gboolean playlistwin_resizing = FALSE;
-
 static GdkPixmap *playlistwin_bg;
 static GdkBitmap *playlistwin_mask = NULL;
 static GdkGC *playlistwin_gc;
@@ -91,6 +89,8 @@
 
 static gboolean playlistwin_fileinfopopup_probe(gpointer * filepopup_win);
 
+static gboolean playlistwin_resizing = FALSE;
+static gint playlistwin_resize_x, playlistwin_resize_y;
 
 gboolean
 playlistwin_is_shaded(void)
@@ -617,16 +617,31 @@
 static void
 playlistwin_resize(gint width, gint height)
 {
+    gint tx, ty;
     gboolean redraw;
 
     g_return_if_fail(width > 0 && height > 0);
 
-    cfg.playlist_width = width;
+    tx = (width - PLAYLISTWIN_MIN_WIDTH) / PLAYLISTWIN_WIDTH_SNAP;
+    tx = (tx * PLAYLISTWIN_WIDTH_SNAP) + PLAYLISTWIN_MIN_WIDTH;
+    if (tx < PLAYLISTWIN_MIN_WIDTH)
+        tx = PLAYLISTWIN_MIN_WIDTH;
 
     if (!cfg.playlist_shaded)
-        cfg.playlist_height = height;
+    {
+        ty = (height - PLAYLISTWIN_MIN_HEIGHT) / PLAYLISTWIN_HEIGHT_SNAP;
+        ty = (ty * PLAYLISTWIN_HEIGHT_SNAP) + PLAYLISTWIN_MIN_HEIGHT;
+        if (ty < PLAYLISTWIN_MIN_HEIGHT)
+            ty = PLAYLISTWIN_MIN_HEIGHT;
+    }
     else
-        height = cfg.playlist_height;
+        ty = cfg.playlist_height;
+
+    if (tx == cfg.playlist_width && ty == cfg.playlist_height)
+        return;
+
+    cfg.playlist_width = width = tx;
+    cfg.playlist_height = height = ty;
 
     /* FIXME: why the fsck are we doing this manually? */
     /* adjust widget positions and sizes */
@@ -679,10 +694,25 @@
 {
     GdkEvent *gevent;
 
-    if (dock_is_moving(GTK_WINDOW(playlistwin))) {
+    /*
+     * GDK2's resize is broken and doesn't really play nice, so we have
+     * to do all of this stuff by hand.
+     */
+    if (playlistwin_resizing == TRUE)
+    {
+        if (event->x + playlistwin_resize_x != playlistwin_get_width() ||
+            event->y + playlistwin_resize_y != playlistwin_get_height())
+        {
+            playlistwin_resize(event->x + playlistwin_resize_x,
+  		 	       event->y + playlistwin_resize_y);
+        }
+        gdk_window_resize(playlistwin->window,
+	    cfg.playlist_width, cfg.playlist_height);
+    }
+    else if (dock_is_moving(GTK_WINDOW(playlistwin)))
         dock_move_motion(GTK_WINDOW(playlistwin), event);
-    }
-    else {
+    else
+    {
         handle_motion_cb(playlistwin_wlist, widget, event);
         draw_playlist_window(FALSE);
     }
@@ -1014,6 +1044,10 @@
           event->x >= playlistwin_get_width() - 31 &&
           event->x < playlistwin_get_width() - 22))) {
 
+        /* This code is disabled because gtk_window_begin_resize_drag is
+         * highly broken. --nenolod
+         */
+#if 0
         /* NOTE: Workaround for bug #214 */
         if (event->type != GDK_2BUTTON_PRESS && 
             event->type != GDK_3BUTTON_PRESS) {
@@ -1025,7 +1059,10 @@
                                          event->x + xpos, event->y + ypos,
                                          event->time);
         }
-        grab = FALSE;
+#endif
+        playlistwin_resizing = TRUE;
+        playlistwin_resize_x = cfg.playlist_width - event->x;
+        playlistwin_resize_y = cfg.playlist_height - event->y;
     }
     else if (event->button == 1 && REGION_L(12, 37, 29, 11)) {
         /* ADD button menu */
@@ -1164,24 +1201,6 @@
     return FALSE;
 }
 
-static gboolean
-playlistwin_configure(GtkWidget * window,
-                      GdkEventConfigure * event, gpointer data)
-{
-    if (!GTK_WIDGET_VISIBLE(window))
-        return FALSE;
-
-    cfg.playlist_x = event->x;
-    cfg.playlist_y = event->y;
-
-    if (playlistwin_resizing) {
-        if (event->width != playlistwin_get_width() ||
-            event->height != playlistwin_get_height())
-            playlistwin_resize(event->width, event->height);
-    }
-    return TRUE;
-}
-
 void
 playlistwin_set_back_pixmap(void)
 {
@@ -1702,8 +1721,6 @@
                            G_CALLBACK(playlistwin_focus_in), NULL);
     g_signal_connect_after(playlistwin, "focus_out_event",
                            G_CALLBACK(playlistwin_focus_out), NULL);
-    g_signal_connect(playlistwin, "configure_event",
-                     G_CALLBACK(playlistwin_configure), NULL);
     g_signal_connect(playlistwin, "style_set",
                      G_CALLBACK(playlistwin_set_back_pixmap), NULL);