comparison audacious/playlist_list.c @ 324:fbafca56b6a8 trunk

[svn] playlist window truncation fixes provided by external contributor: Tim Yamin <plasmaroo -at- gentoo.org>.

323:f61c05314118

                          gint line,
                          gint width,
                          const gchar * text,
                          guint ppos)
{

    gint len;
    gint len_pixmap;
    guint plist_length_int;
    PangoLayout *layout;
    gchar *text_clipped;

    REQUIRE_STATIC_LOCK(playlist);

    len = g_utf8_strlen(text, -1);
    len_pixmap = (width_approx_letters * len);

    while (len_pixmap > width && len > 4) {
        len--;
        len_pixmap -= width_approx_letters;
    }

    /* FIXME: Is it possible to overflow text_clipped when text is non
       UTF-8? - descender */

    text_clipped = g_new0(gchar, strlen(text)+1);
    g_utf8_strncpy(text_clipped, text, len);

    if (cfg.show_numbers_in_pl) {
        gchar *pos_string = g_strdup_printf("%d", ppos);
        plist_length_int =
            gint_count_digits(playlist_get_length_nolock()) + 1;

        g_free(pos_string);
        g_object_unref(layout);
    }
    else {
        padding = 3;
    }

    layout = gtk_widget_create_pango_layout(playlistwin, text_clipped);

    pango_layout_set_font_description(layout, playlist_list_font);

            max_time_len = MAX(max_time_len, tail_len);

            /* FIXME: This is just an approximate alignment, maybe
               something still fast, but exact could be done */

            tail_width = width - (tail_len * width_approx_digits) +
                (width_approx_digits_half) - 3;

            if (i == playlist_get_position_nolock())
                gdk_gc_set_foreground(gc,
                                      skin_get_color(bmp_active_skin,
                                                     SKIN_PLEDIT_CURRENT));
            else

324:fbafca56b6a8

                          gint line,
                          gint width,
                          const gchar * text,
                          guint ppos)
{
    gint len;
    guint plist_length_int;

    gchar *text_clipped;
    PangoLayout *layout;
    PangoRectangle rect;

    REQUIRE_STATIC_LOCK(playlist);

    if (cfg.show_numbers_in_pl) {
        gchar *pos_string = g_strdup_printf("%d", ppos);
        plist_length_int =
            gint_count_digits(playlist_get_length_nolock()) + 1;

        g_free(pos_string);
        g_object_unref(layout);
    }
    else {
        padding = 3;
    }

    /* FIXME: Is it possible to overflow text_clipped when text is non
       UTF-8? - descender */
    text_clipped = g_new0(gchar, strlen(text)+1);
    len = g_utf8_strlen(text, -1);
    g_utf8_strncpy(text_clipped, text, len);

    width -= padding;
    layout = gtk_widget_create_pango_layout(playlistwin, text);
    pango_layout_set_font_description(layout, playlist_list_font);
    pango_layout_get_pixel_extents(layout, &rect, NULL);
    if (rect.width > width)
    {
      while (rect.width > width && len > 4) {
	len--;
	g_utf8_strncpy(text_clipped, text_clipped, len); 

	layout = gtk_widget_create_pango_layout(playlistwin, text_clipped);
	pango_layout_set_font_description(layout, playlist_list_font);
	pango_layout_get_pixel_extents(layout, &rect, NULL);
      }

      /* Add dots */
      layout = gtk_widget_create_pango_layout(playlistwin, " ...");
      pango_layout_set_font_description(layout, playlist_list_font);
      pango_layout_get_pixel_extents(layout, &rect, NULL);

      g_utf8_strncpy(text_clipped, text, len - (rect.width / width_approx_letters));

      /* If we have whitespace on the end strip off some more... */
      while (text_clipped[len] == ' ' && len > 4) {
	len--;
	g_utf8_strncpy(text_clipped, text_clipped, len);
      }
      text_clipped = g_strconcat(text_clipped, "...", NULL);
    }

    layout = gtk_widget_create_pango_layout(playlistwin, text_clipped);

    pango_layout_set_font_description(layout, playlist_list_font);

            max_time_len = MAX(max_time_len, tail_len);

            /* FIXME: This is just an approximate alignment, maybe
               something still fast, but exact could be done */

            tail_width = width - (width_approx_digits * 6) - 5;
            if (i == playlist_get_position_nolock())
                gdk_gc_set_foreground(gc,
                                      skin_get_color(bmp_active_skin,
                                                     SKIN_PLEDIT_CURRENT));
            else