Mercurial > audlegacy
changeset 2915:8d35fb41459f trunk
Automated merge from ssh://hg.atheme.org//hg/audacious.
| author | William Pitcock <nenolod@atheme.org> |
|---|---|
| date | Fri, 29 Jun 2007 01:50:38 -0500 |
| parents | 22c940e0d2dc (current diff) 80c6a8fec3ba (diff) |
| children | 3ef909ed3056 |
| files | |
| diffstat | 7 files changed, 916 insertions(+), 38 deletions(-) [+] |
line wrap: on
line diff
--- a/src/audacious/Makefile Fri Jun 29 01:50:14 2007 -0500 +++ b/src/audacious/Makefile Fri Jun 29 01:50:38 2007 -0500 @@ -105,6 +105,7 @@ ui_skinned_cursor.c \ ui_skinned_window.c \ ui_skinned_button.c \ + ui_skinned_textbox.c \ ui_skinselector.c \ ui_urlopener.c \ urldecode.c \
--- a/src/audacious/ui_main.c Fri Jun 29 01:50:14 2007 -0500 +++ b/src/audacious/ui_main.c Fri Jun 29 01:50:38 2007 -0500 @@ -82,6 +82,7 @@ #include "ui_skinned_window.h" #include "ui_skinned_button.h" +#include "ui_skinned_textbox.h" #include "ui_jumptotrack.h" static GTimeVal cb_time; /* click delay for tristate is defined by TRISTATE_THRESHOLD */ @@ -136,7 +137,7 @@ static GtkWidget *mainwin_shuffle, *mainwin_repeat; GtkWidget *mainwin_eq, *mainwin_pl; -TextBox *mainwin_info; +GtkWidget *mainwin_info; TextBox *mainwin_stime_min, *mainwin_stime_sec; static TextBox *mainwin_rate_text, *mainwin_freq_text, @@ -225,7 +226,7 @@ mainwin_set_title_scroll(gboolean scroll) { cfg.autoscroll = scroll; - textbox_set_scroll(mainwin_info, cfg.autoscroll); + ui_skinned_textbox_set_scroll(mainwin_info, cfg.autoscroll); } @@ -280,7 +281,7 @@ gtk_widget_show(mainwin_sfwd); gtk_widget_show(mainwin_seject); - textbox_set_scroll(mainwin_info, FALSE); + ui_skinned_textbox_set_scroll(mainwin_info, FALSE); if (playback_get_playing()) { widget_show(WIDGET(mainwin_sposition)); @@ -315,7 +316,7 @@ widget_hide(WIDGET(mainwin_stime_sec)); widget_hide(WIDGET(mainwin_sposition)); - textbox_set_scroll(mainwin_info, cfg.autoscroll); + ui_skinned_textbox_set_scroll(mainwin_info, cfg.autoscroll); } draw_main_window(TRUE); @@ -582,11 +583,11 @@ return; if ((text = input_get_info_text()) != NULL) { - textbox_set_text(mainwin_info, text); + ui_skinned_textbox_set_text(mainwin_info, text); g_free(text); } else if ((text = playlist_get_info_text(playlist_get_active())) != NULL) { - textbox_set_text(mainwin_info, text); + ui_skinned_textbox_set_text(mainwin_info, text); g_free(text); } } @@ -598,11 +599,13 @@ { if (mainwin_info_text_locked != TRUE) mainwin_tb_old_text = g_strdup(bmp_active_skin->properties.mainwin_othertext_is_status ? - mainwin_othertext->tb_text : mainwin_info->tb_text); + mainwin_othertext->tb_text : UI_SKINNED_TEXTBOX(mainwin_info)->text); mainwin_info_text_locked = TRUE; - textbox_set_text(bmp_active_skin->properties.mainwin_othertext_is_status ? - mainwin_othertext : mainwin_info, text); + if (bmp_active_skin->properties.mainwin_othertext_is_status) + textbox_set_text(mainwin_othertext, text); + else + ui_skinned_textbox_set_text(mainwin_info, text); } void @@ -612,8 +615,10 @@ if (mainwin_tb_old_text != NULL) { - textbox_set_text(bmp_active_skin->properties.mainwin_othertext_is_status ? - mainwin_othertext : mainwin_info, mainwin_tb_old_text); + if (bmp_active_skin->properties.mainwin_othertext_is_status) + textbox_set_text(mainwin_othertext, mainwin_tb_old_text); + else + ui_skinned_textbox_set_text(mainwin_info, mainwin_tb_old_text); g_free(mainwin_tb_old_text); mainwin_tb_old_text = NULL; } @@ -671,12 +676,12 @@ mainwin_vis->vs_widget.height); if (bmp_active_skin->properties.mainwin_text_x && bmp_active_skin->properties.mainwin_text_y) - widget_move(WIDGET(mainwin_info), bmp_active_skin->properties.mainwin_text_x, + gtk_fixed_move(GTK_FIXED(SKINNED_WINDOW(mainwin)->fixed), GTK_WIDGET(mainwin_info), bmp_active_skin->properties.mainwin_text_x, bmp_active_skin->properties.mainwin_text_y); if (bmp_active_skin->properties.mainwin_text_width) - widget_resize(WIDGET(mainwin_info), bmp_active_skin->properties.mainwin_text_width, - mainwin_info->tb_widget.height); + gtk_widget_set_size_request(mainwin_info, bmp_active_skin->properties.mainwin_text_width*(1+cfg.doublesize), + UI_SKINNED_TEXTBOX(mainwin_info)->height*(1+cfg.doublesize)); if (bmp_active_skin->properties.mainwin_infobar_x && bmp_active_skin->properties.mainwin_infobar_y) widget_move(WIDGET(mainwin_othertext), bmp_active_skin->properties.mainwin_infobar_x, @@ -781,9 +786,9 @@ widget_hide(WIDGET(mainwin_menurow)); if (bmp_active_skin->properties.mainwin_text_visible) - widget_show(WIDGET(mainwin_info)); + gtk_widget_show(mainwin_info); else - widget_hide(WIDGET(mainwin_info)); + gtk_widget_hide(mainwin_info); if (bmp_active_skin->properties.mainwin_othertext_visible) widget_show(WIDGET(mainwin_othertext)); @@ -1121,10 +1126,6 @@ if (dock_is_moving(GTK_WINDOW(mainwin))) dock_move_release(GTK_WINDOW(mainwin)); } - else if (event->button == 1 && event->type == GDK_2BUTTON_PRESS && - widget_contains(WIDGET(mainwin_info), event->x, event->y)) { - playlist_fileinfo_current(playlist_get_active()); - } else { handle_press_cb(mainwin_wlist, widget, event); draw_main_window(FALSE); @@ -1143,13 +1144,7 @@ } if (event->button == 3) { - if (widget_contains(WIDGET(mainwin_info), event->x, event->y)) { - ui_manager_popup_menu_show(GTK_MENU(mainwin_songname_menu), - event->x_root, event->y_root, - 3, event->time); - grab = FALSE; - } - else if (widget_contains(WIDGET(mainwin_vis), event->x, event->y) || + if (widget_contains(WIDGET(mainwin_vis), event->x, event->y) || widget_contains(WIDGET(mainwin_svis), event->x, event->y)) { ui_manager_popup_menu_show(GTK_MENU(mainwin_visualization_menu), event->x_root, event->y_root, 3, event->time); @@ -2716,6 +2711,16 @@ } +static void mainwin_info_double_clicked_cb(void) { + playlist_fileinfo_current(playlist_get_active()); +} + +static void mainwin_info_right_clicked_cb(void) { + gint x, y; + gdk_window_get_pointer(NULL, &x, &y, NULL); + ui_manager_popup_menu_show(GTK_MENU(mainwin_songname_menu), x, y, 3, GDK_CURRENT_TIME); +} + static void mainwin_create_widgets(void) { @@ -2828,11 +2833,13 @@ g_signal_connect(mainwin_pl, "clicked", mainwin_playlist_pushed_cb, NULL); UI_SKINNED_BUTTON(mainwin_pl)->inside = cfg.playlist_visible; - mainwin_info = - create_textbox(&mainwin_wlist, mainwin_bg, SKINNED_WINDOW(mainwin)->gc, 112, 27, - 153, 1, SKIN_TEXT); - textbox_set_scroll(mainwin_info, cfg.autoscroll); - textbox_set_xfont(mainwin_info, cfg.mainwin_use_xfont, cfg.mainwin_font); + mainwin_info = ui_skinned_textbox_new(); + ui_skinned_textbox_setup(mainwin_info, SKINNED_WINDOW(mainwin)->fixed, mainwin_bg, SKINNED_WINDOW(mainwin)->gc, 112, 27, + 153, 1, SKIN_TEXT); + ui_skinned_textbox_set_scroll(mainwin_info, cfg.autoscroll); + ui_skinned_textbox_set_xfont(mainwin_info, cfg.mainwin_use_xfont, cfg.mainwin_font); + g_signal_connect(mainwin_info, "double-clicked", mainwin_info_double_clicked_cb, NULL); + g_signal_connect(mainwin_info, "right-clicked", mainwin_info_right_clicked_cb, NULL); mainwin_othertext = create_textbox(&mainwin_wlist, mainwin_bg, SKINNED_WINDOW(mainwin)->gc, 112, 43, @@ -2937,7 +2944,6 @@ /* XXX: eventually update widgetcore API to not need this */ - ui_skinned_window_widgetlist_associate(mainwin, WIDGET(mainwin_info)); ui_skinned_window_widgetlist_associate(mainwin, WIDGET(mainwin_othertext)); ui_skinned_window_widgetlist_associate(mainwin, WIDGET(mainwin_rate_text));
--- a/src/audacious/ui_main.h Fri Jun 29 01:50:14 2007 -0500 +++ b/src/audacious/ui_main.h Fri Jun 29 01:50:38 2007 -0500 @@ -99,9 +99,9 @@ extern GtkWidget *mainwin_jtf; extern GtkWidget *mainwin_eq, *mainwin_pl; +extern GtkWidget *mainwin_info; extern TextBox *mainwin_stime_min, *mainwin_stime_sec; -extern TextBox *mainwin_info; extern Vis *active_vis; extern Vis *mainwin_vis;
--- a/src/audacious/ui_preferences.c Fri Jun 29 01:50:14 2007 -0500 +++ b/src/audacious/ui_preferences.c Fri Jun 29 01:50:38 2007 -0500 @@ -48,6 +48,7 @@ #include "main.h" #include "widgets/widgetcore.h" +#include "ui_skinned_textbox.h" #include "urldecode.h" #include "strings.h" #include "util.h" @@ -887,7 +888,7 @@ g_free(cfg.mainwin_font); cfg.mainwin_font = g_strdup(gtk_font_button_get_font_name(button)); - textbox_set_xfont(mainwin_info, cfg.mainwin_use_xfont, cfg.mainwin_font); + ui_skinned_textbox_set_xfont(mainwin_info, cfg.mainwin_use_xfont, cfg.mainwin_font); mainwin_set_info_text(); draw_main_window(TRUE); } @@ -906,7 +907,7 @@ { gboolean useit = gtk_toggle_button_get_active(button); cfg.mainwin_use_xfont = useit != FALSE ? FALSE : TRUE; - textbox_set_xfont(mainwin_info, cfg.mainwin_use_xfont, cfg.mainwin_font); + ui_skinned_textbox_set_xfont(mainwin_info, cfg.mainwin_use_xfont, cfg.mainwin_font); playlistwin_set_sinfo_font(cfg.playlist_font); mainwin_set_info_text();
--- a/src/audacious/ui_skinned_button.c Fri Jun 29 01:50:14 2007 -0500 +++ b/src/audacious/ui_skinned_button.c Fri Jun 29 01:50:38 2007 -0500 @@ -311,6 +311,7 @@ static void ui_skinned_button_size_allocate(GtkWidget *widget, GtkAllocation *allocation) { UiSkinnedButton *button = UI_SKINNED_BUTTON (widget); + UiSkinnedButtonPrivate *priv = UI_SKINNED_BUTTON_GET_PRIVATE (button); GtkAllocation child_alloc; widget->allocation = *allocation; @@ -327,8 +328,8 @@ gdk_window_move_resize (button->event_window, widget->allocation.x, widget->allocation.y, widget->allocation.width, widget->allocation.height); - button->x = widget->allocation.x; - button->y = widget->allocation.y; + button->x = widget->allocation.x/(priv->double_size ? 2 : 1); + button->y = widget->allocation.y/(priv->double_size ? 2 : 1); } static void button_pressed(UiSkinnedButton *button) {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/audacious/ui_skinned_textbox.c Fri Jun 29 01:50:38 2007 -0500 @@ -0,0 +1,807 @@ +/* + * Audacious - a cross-platform multimedia player + * Copyright (c) 2007 Audacious development team. + * + * Based on: + * BMP - Cross-platform multimedia player + * Copyright (C) 2003-2004 BMP development team. + * XMMS: + * Copyright (C) 1998-2003 XMMS development team. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#include "widgets/widgetcore.h" +#include "ui_skinned_textbox.h" +#include "main.h" +#include "util.h" +#include "strings.h" +#include <string.h> +#include <ctype.h> +#include <gtk/gtkmain.h> +#include <gtk/gtkmarshal.h> +#include <gtk/gtkimage.h> + +#define UI_SKINNED_TEXTBOX_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), UI_TYPE_SKINNED_TEXTBOX, UiSkinnedTextboxPrivate)) +typedef struct _UiSkinnedTextboxPrivate UiSkinnedTextboxPrivate; + +enum { + DOUBLE_CLICKED, + RIGHT_CLICKED, + DOUBLED, + REDRAW, + LAST_SIGNAL +}; + +struct _UiSkinnedTextboxPrivate { + GtkWidget *image; + GdkGC *gc; + gint w; + SkinPixmapId skin_index; + GtkWidget *fixed; + gboolean double_size; + gboolean scroll_back; + gint nominal_y, nominal_height; + gint scroll_timeout; + gint font_ascent, font_descent; + PangoFontDescription *font; + gchar *fontname; + gchar *pixmap_text; + gint skin_id; + gint drag_x, drag_off, offset; + gboolean is_scrollable, is_dragging; + gint pixmap_width; + GdkPixmap *pixmap; + gboolean scroll_allowed, scroll_enabled; +}; + + +static GtkBinClass *parent_class = NULL; +static void ui_skinned_textbox_class_init(UiSkinnedTextboxClass *klass); +static void ui_skinned_textbox_init(UiSkinnedTextbox *textbox); +static GObject* ui_skinned_textbox_constructor(GType type, guint n_construct_properties, GObjectConstructParam *construct_params); +static void ui_skinned_textbox_destroy(GtkObject *object); +static void ui_skinned_textbox_realize(GtkWidget *widget); +static void ui_skinned_textbox_unrealize(GtkWidget *widget); +static void ui_skinned_textbox_map(GtkWidget *widget); +static void ui_skinned_textbox_unmap(GtkWidget *widget); +static gint ui_skinned_textbox_expose(GtkWidget *widget,GdkEventExpose *event); + +static void ui_skinned_textbox_size_allocate(GtkWidget *widget, GtkAllocation *allocation); + +static guint textbox_signals[LAST_SIGNAL] = { 0 }; +static gint ui_skinned_textbox_textbox_press(GtkWidget *widget, GdkEventButton *event); +static gint ui_skinned_textbox_textbox_release(GtkWidget *widget, GdkEventButton *event); + +static void ui_skinned_textbox_add(GtkContainer *container, GtkWidget *widget); +static void ui_skinned_textbox_toggle_doublesize(UiSkinnedTextbox *textbox); + +static gint ui_skinned_textbox_motion_notify(GtkWidget *widget, GdkEventMotion *event); +static void ui_skinned_textbox_paint(UiSkinnedTextbox *textbox); +static void ui_skinned_textbox_redraw(UiSkinnedTextbox *textbox); +static gboolean ui_skinned_textbox_should_scroll(UiSkinnedTextbox *textbox); +static void textbox_generate_xfont_pixmap(UiSkinnedTextbox *textbox, const gchar *pixmaptext); +static void textbox_generate_pixmap(UiSkinnedTextbox *textbox); +static void textbox_handle_special_char(gchar c, gint * x, gint * y); + +GType ui_skinned_textbox_get_type (void) { + static GType textbox_type = 0; + + if (!textbox_type) { + static const GTypeInfo textbox_info = { + sizeof (UiSkinnedTextboxClass), + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc) ui_skinned_textbox_class_init, + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof (UiSkinnedTextbox), + 16, /* n_preallocs */ + (GInstanceInitFunc) ui_skinned_textbox_init, + }; + + textbox_type = g_type_register_static (GTK_TYPE_BIN, "UiSkinnedTextbox", &textbox_info, 0); + } + return textbox_type; +} + +static void ui_skinned_textbox_class_init (UiSkinnedTextboxClass *klass) { + GObjectClass *gobject_class; + GtkObjectClass *object_class; + GtkWidgetClass *widget_class; + GtkContainerClass *container_class; + + gobject_class = G_OBJECT_CLASS(klass); + object_class = (GtkObjectClass*)klass; + widget_class = (GtkWidgetClass*)klass; + container_class = (GtkContainerClass*)klass; + + parent_class = g_type_class_peek_parent(klass); + gobject_class->constructor = ui_skinned_textbox_constructor; + object_class->destroy = ui_skinned_textbox_destroy; + + widget_class->realize = ui_skinned_textbox_realize; + widget_class->unrealize = ui_skinned_textbox_unrealize; + widget_class->map = ui_skinned_textbox_map; + widget_class->unmap = ui_skinned_textbox_unmap; + widget_class->size_allocate = ui_skinned_textbox_size_allocate; + widget_class->expose_event = ui_skinned_textbox_expose; + widget_class->button_press_event = ui_skinned_textbox_textbox_press; + widget_class->button_release_event = ui_skinned_textbox_textbox_release; + widget_class->motion_notify_event = ui_skinned_textbox_motion_notify; + + container_class->add = ui_skinned_textbox_add; + + klass->double_clicked = NULL; + klass->right_clicked = NULL; + klass->doubled = ui_skinned_textbox_toggle_doublesize; + klass->redraw = ui_skinned_textbox_redraw; + + textbox_signals[DOUBLE_CLICKED] = + g_signal_new ("double-clicked", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, + G_STRUCT_OFFSET (UiSkinnedTextboxClass, double_clicked), NULL, NULL, + gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); + + textbox_signals[RIGHT_CLICKED] = + g_signal_new ("right-clicked", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, + G_STRUCT_OFFSET (UiSkinnedTextboxClass, right_clicked), NULL, NULL, + gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); + + textbox_signals[DOUBLED] = + g_signal_new ("toggle-double-size", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, + G_STRUCT_OFFSET (UiSkinnedTextboxClass, doubled), NULL, NULL, + gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); + + textbox_signals[REDRAW] = + g_signal_new ("redraw", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, + G_STRUCT_OFFSET (UiSkinnedTextboxClass, redraw), NULL, NULL, + gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); + + g_type_class_add_private (gobject_class, sizeof (UiSkinnedTextboxPrivate)); +} + +static void ui_skinned_textbox_init (UiSkinnedTextbox *textbox) { + UiSkinnedTextboxPrivate *priv = UI_SKINNED_TEXTBOX_GET_PRIVATE (textbox); + priv->image = gtk_image_new(); + textbox->redraw = TRUE; + + g_object_set (priv->image, "visible", TRUE, NULL); + gtk_container_add(GTK_CONTAINER(GTK_WIDGET(textbox)), priv->image); + + GTK_WIDGET_SET_FLAGS (textbox, GTK_NO_WINDOW); +} + +static void ui_skinned_textbox_destroy (GtkObject *object) { + (*GTK_OBJECT_CLASS (parent_class)->destroy) (object); +} + +static GObject* ui_skinned_textbox_constructor(GType type, guint n_construct_properties, GObjectConstructParam *construct_params) { + GObject *object = (*G_OBJECT_CLASS (parent_class)->constructor)(type, n_construct_properties, construct_params); + + return object; +} + +static void ui_skinned_textbox_realize (GtkWidget *widget) { + UiSkinnedTextbox *textbox = UI_SKINNED_TEXTBOX (widget); + GdkWindowAttr attrib; + + GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED); + + attrib.window_type = GDK_WINDOW_CHILD; + attrib.x = widget->allocation.x; + attrib.y = widget->allocation.y; + attrib.width = widget->allocation.width; + attrib.height = widget->allocation.height; + attrib.wclass = GDK_INPUT_ONLY; + attrib.event_mask = gtk_widget_get_events (widget); + attrib.event_mask |= (GDK_BUTTON_PRESS_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_RELEASE_MASK); + + widget->window = gtk_widget_get_parent_window(widget); + g_object_ref(widget->window); + + textbox->event_window = gdk_window_new(gtk_widget_get_parent_window(widget), &attrib, GDK_WA_X | GDK_WA_Y); + gdk_window_set_user_data (textbox->event_window, textbox); +} + +static void ui_skinned_textbox_unrealize(GtkWidget *widget) { + UiSkinnedTextbox *textbox = UI_SKINNED_TEXTBOX (widget); + + if (textbox->event_window) { + gdk_window_set_user_data (textbox->event_window, NULL); + gdk_window_destroy (textbox->event_window); + textbox->event_window = NULL; + } + + GTK_WIDGET_CLASS (parent_class)->unrealize (widget); +} + +static void ui_skinned_textbox_map(GtkWidget *widget) { + UiSkinnedTextbox *textbox = UI_SKINNED_TEXTBOX (widget); + g_return_if_fail (UI_IS_SKINNED_TEXTBOX (widget)); + GTK_WIDGET_CLASS (parent_class)->map(widget); + gdk_window_show (textbox->event_window); +} + +static void ui_skinned_textbox_unmap (GtkWidget *widget) { + UiSkinnedTextbox *textbox = UI_SKINNED_TEXTBOX (widget); + g_return_if_fail (UI_IS_SKINNED_TEXTBOX(widget)); + + if (textbox->event_window) + gdk_window_hide (textbox->event_window); + + GTK_WIDGET_CLASS (parent_class)->unmap (widget); +} + +static gboolean ui_skinned_textbox_expose(GtkWidget *widget, GdkEventExpose *event) { + if (GTK_WIDGET_DRAWABLE (widget)) + (*GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event); + + return FALSE; +} + +GtkWidget* ui_skinned_textbox_new () { + return g_object_new (UI_TYPE_SKINNED_TEXTBOX, NULL); +} + +void ui_skinned_textbox_setup(GtkWidget *widget, GtkWidget *fixed,GdkPixmap * parent, GdkGC * gc, gint x, gint y, gint w, gboolean allow_scroll, SkinPixmapId si) { + + UiSkinnedTextbox *textbox = UI_SKINNED_TEXTBOX(widget); + UiSkinnedTextboxPrivate *priv = UI_SKINNED_TEXTBOX_GET_PRIVATE(textbox); + textbox->height = bmp_active_skin->properties.textbox_bitmap_font_height; + textbox->x = x; + textbox->y = y; + priv->gc = gc; + priv->w = w; + priv->scroll_allowed = allow_scroll; + priv->scroll_enabled = TRUE; + priv->skin_index = si; + priv->nominal_y = y; + priv->nominal_height = textbox->height; + priv->scroll_timeout = 0; + + priv->fixed = fixed; + priv->double_size = FALSE; + + gtk_widget_set_size_request(widget, priv->w, textbox->height); + gtk_fixed_put(GTK_FIXED(priv->fixed), widget, textbox->x, textbox->y); +} + +static void ui_skinned_textbox_size_allocate(GtkWidget *widget, GtkAllocation *allocation) { + UiSkinnedTextbox *textbox = UI_SKINNED_TEXTBOX (widget); + UiSkinnedTextboxPrivate *priv = UI_SKINNED_TEXTBOX_GET_PRIVATE (textbox); + GtkAllocation child_alloc; + + widget->allocation = *allocation; + if (GTK_BIN (textbox)->child) { //image should fill whole widget + child_alloc.x = widget->allocation.x; + child_alloc.y = widget->allocation.y; + child_alloc.width = MAX (1, widget->allocation.width); + child_alloc.height = MAX (1, widget->allocation.height); + + gtk_widget_size_allocate (GTK_BIN (textbox)->child, &child_alloc); + } + + if (GDK_IS_WINDOW(textbox->event_window)) + gdk_window_move_resize (textbox->event_window, widget->allocation.x, widget->allocation.y, + widget->allocation.width, widget->allocation.height); + + textbox->x = widget->allocation.x/(priv->double_size ? 2 : 1); + textbox->y = widget->allocation.y/(priv->double_size ? 2 : 1); +} + +static gboolean ui_skinned_textbox_textbox_press(GtkWidget *widget, GdkEventButton *event) { + UiSkinnedTextbox *textbox = UI_SKINNED_TEXTBOX(widget); + UiSkinnedTextboxPrivate *priv = UI_SKINNED_TEXTBOX_GET_PRIVATE (textbox); + + if (event->type == GDK_BUTTON_PRESS) { + textbox = UI_SKINNED_TEXTBOX(widget); + + if (event->button == 1) { + if (priv->scroll_allowed && (priv->pixmap_width > priv->w) && priv->is_scrollable) { + priv->is_dragging = TRUE; + textbox->redraw = TRUE; + priv->drag_off = priv->offset; + priv->drag_x = event->x; + } + } else if (event->button == 3) { + g_signal_emit(widget, textbox_signals[RIGHT_CLICKED], 0); + } + } else if (event->type == GDK_2BUTTON_PRESS) { + if (event->button == 1) { + g_signal_emit(widget, textbox_signals[DOUBLE_CLICKED], 0); + } + } + return TRUE; +} + +static gboolean ui_skinned_textbox_textbox_release(GtkWidget *widget, GdkEventButton *event) { + UiSkinnedTextbox *textbox = UI_SKINNED_TEXTBOX(widget); + UiSkinnedTextboxPrivate *priv = UI_SKINNED_TEXTBOX_GET_PRIVATE (textbox); + if (event->button == 1) { + priv->is_dragging = FALSE; + textbox->redraw = TRUE; + } + + return TRUE; +} + +static gboolean ui_skinned_textbox_motion_notify(GtkWidget *widget, GdkEventMotion *event) { + UiSkinnedTextbox *textbox = UI_SKINNED_TEXTBOX(widget); + UiSkinnedTextboxPrivate *priv = UI_SKINNED_TEXTBOX_GET_PRIVATE (textbox); + + if (priv->is_dragging) { + if (priv->scroll_allowed && + priv->pixmap_width > priv->w) { + priv->offset = priv->drag_off - (event->x - priv->drag_x); + + while (priv->offset < 0) + priv->offset += priv->pixmap_width; + + while (priv->offset > (priv->pixmap_width - priv->w)) + priv->offset -= priv->pixmap_width; + + ui_skinned_textbox_redraw(textbox); + } + } + + return FALSE; +} + +static void ui_skinned_textbox_add(GtkContainer *container, GtkWidget *widget) { + GTK_CONTAINER_CLASS (parent_class)->add(container, widget); +} + +static void ui_skinned_textbox_toggle_doublesize(UiSkinnedTextbox *textbox) { + GtkWidget *widget = GTK_WIDGET (textbox); + UiSkinnedTextboxPrivate *priv = UI_SKINNED_TEXTBOX_GET_PRIVATE (textbox); + priv->double_size = !priv->double_size; + + gtk_widget_set_size_request(widget, priv->w*(1+priv->double_size), textbox->height*(1+priv->double_size)); + gtk_widget_set_uposition(widget, textbox->x*(1+priv->double_size), textbox->y*(1+priv->double_size)); + + textbox->redraw = TRUE; +} + +static void ui_skinned_textbox_paint(UiSkinnedTextbox *textbox) { + GtkWidget *widget = GTK_WIDGET (textbox); + UiSkinnedTextboxPrivate *priv = UI_SKINNED_TEXTBOX_GET_PRIVATE (textbox); + + if (textbox->redraw == TRUE) { + textbox->redraw = FALSE; + gint cw; + GdkPixmap *obj; + GdkPixmap *src; + + if (textbox->text && (!priv->pixmap_text || strcmp(textbox->text, priv->pixmap_text))) + textbox_generate_pixmap(textbox); + + if (priv->pixmap) { + if (skin_get_id() != priv->skin_id) { + priv->skin_id = skin_get_id(); + textbox_generate_pixmap(textbox); + } + obj = gdk_pixmap_new(NULL, priv->w, textbox->height, gdk_rgb_get_visual()->depth); + src = priv->pixmap; + + cw = priv->pixmap_width - priv->offset; + if (cw > priv->w) + cw = priv->w; + gdk_draw_drawable(obj, priv->gc, src, priv->offset, 0, 0, 0, cw, textbox->height); + if (cw < priv->w) + gdk_draw_drawable(obj, priv->gc, src, 0, 0, + textbox->x + cw, textbox->y, + priv->w - cw, textbox->height); + + if (priv->double_size) { + GdkImage *img, *img2x; + img = gdk_drawable_get_image(obj, 0, 0, priv->w, textbox->height); + img2x = create_dblsize_image(img); + gtk_image_set(GTK_IMAGE(priv->image), img2x, NULL); + g_object_unref(img2x); + g_object_unref(img); + } else + gtk_image_set_from_pixmap(GTK_IMAGE(priv->image), obj, NULL); + + g_object_unref(obj); + gtk_widget_queue_resize(widget); + } + } +} + +static void ui_skinned_textbox_redraw(UiSkinnedTextbox *textbox) { + textbox->redraw = TRUE; + ui_skinned_textbox_paint(textbox); +} + +static gboolean ui_skinned_textbox_should_scroll(UiSkinnedTextbox *textbox) { + UiSkinnedTextboxPrivate *priv = UI_SKINNED_TEXTBOX_GET_PRIVATE (textbox); + if (!priv->scroll_allowed) + return FALSE; + + if (priv->font) { + gint width; + text_get_extents(priv->fontname, textbox->text, &width, NULL, NULL, NULL); + + if (width <= priv->w) + return FALSE; + else + return TRUE; + } + + if (g_utf8_strlen(textbox->text, -1) * bmp_active_skin->properties.textbox_bitmap_font_width > priv->w) + return TRUE; + + return FALSE; +} + +void ui_skinned_textbox_set_xfont(GtkWidget *widget, gboolean use_xfont, const gchar * fontname) { + UiSkinnedTextbox *textbox = UI_SKINNED_TEXTBOX (widget); + UiSkinnedTextboxPrivate *priv = UI_SKINNED_TEXTBOX_GET_PRIVATE (textbox); + gint ascent, descent; + + g_return_if_fail(textbox != NULL); + + if (priv->font) { + pango_font_description_free(priv->font); + priv->font = NULL; + } + + textbox->y = priv->nominal_y; + textbox->height = priv->nominal_height; + + /* Make sure the pixmap is regenerated */ + if (priv->pixmap_text) { + g_free(priv->pixmap_text); + priv->pixmap_text = NULL; + } + + if (!use_xfont || strlen(fontname) == 0) + return; + + priv->font = pango_font_description_from_string(fontname); + priv->fontname = g_strdup(fontname); + + text_get_extents(fontname, + "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz ", + NULL, NULL, &ascent, &descent); + priv->font_ascent = ascent; + priv->font_descent = descent; + + + if (priv->font == NULL) + return; + + textbox->height = priv->font_ascent; + if (textbox->height > priv->nominal_height) + textbox->y -= (textbox->height - priv->nominal_height) / 2; + else + textbox->height = priv->nominal_height; +} + +void ui_skinned_textbox_set_text(GtkWidget *widget, const gchar *text) { + g_return_if_fail(text != NULL); + UiSkinnedTextbox *textbox = UI_SKINNED_TEXTBOX (widget); + UiSkinnedTextboxPrivate *priv = UI_SKINNED_TEXTBOX_GET_PRIVATE (textbox); + + if (textbox->text) { + if (!strcmp(text, textbox->text)) + return; + g_free(textbox->text); + } + + textbox->text = str_to_utf8(text); + priv->scroll_back = FALSE; + ui_skinned_textbox_redraw(textbox); +} + +static void textbox_generate_xfont_pixmap(UiSkinnedTextbox *textbox, const gchar *pixmaptext) { + gint length, i; + GdkGC *gc, *maskgc; + GdkColor *c, pattern; + GdkBitmap *mask; + PangoLayout *layout; + gint width; + UiSkinnedTextboxPrivate *priv = UI_SKINNED_TEXTBOX_GET_PRIVATE (textbox); + + g_return_if_fail(textbox != NULL); + g_return_if_fail(pixmaptext != NULL); + + length = g_utf8_strlen(pixmaptext, -1); + + text_get_extents(priv->fontname, pixmaptext, &width, NULL, NULL, NULL); + + priv->pixmap_width = MAX(width, priv->w); + priv->pixmap = gdk_pixmap_new(mainwin->window, priv->pixmap_width, + textbox->height, + gdk_rgb_get_visual()->depth); + gc = priv->gc; + c = skin_get_color(bmp_active_skin, SKIN_TEXTBG); + for (i = 0; i < textbox->height; i++) { + gdk_gc_set_foreground(gc, &c[6 * i / textbox->height]); + gdk_draw_line(priv->pixmap, gc, 0, i, priv->w, i); + } + + mask = gdk_pixmap_new(mainwin->window, priv->pixmap_width, textbox->height, 1); + maskgc = gdk_gc_new(mask); + pattern.pixel = 0; + gdk_gc_set_foreground(maskgc, &pattern); + + gdk_draw_rectangle(mask, maskgc, TRUE, 0, 0, priv->pixmap_width, textbox->height); + pattern.pixel = 1; + gdk_gc_set_foreground(maskgc, &pattern); + + gdk_gc_set_foreground(gc, skin_get_color(bmp_active_skin, SKIN_TEXTFG)); + + layout = gtk_widget_create_pango_layout(mainwin, pixmaptext); + pango_layout_set_font_description(layout, priv->font); + + gdk_draw_layout(priv->pixmap, gc, 0, (priv->font_descent / 2), layout); + g_object_unref(layout); + + g_object_unref(maskgc); + + gdk_gc_set_clip_mask(gc, mask); + c = skin_get_color(bmp_active_skin, SKIN_TEXTFG); + for (i = 0; i < textbox->height; i++) { + gdk_gc_set_foreground(gc, &c[6 * i / textbox->height]); + gdk_draw_line(priv->pixmap, gc, 0, i, priv->pixmap_width, i); + } + g_object_unref(mask); + gdk_gc_set_clip_mask(gc, NULL); +} + +static gboolean textbox_scroll(gpointer data) { + UiSkinnedTextbox *textbox = UI_SKINNED_TEXTBOX(data); + UiSkinnedTextboxPrivate *priv = UI_SKINNED_TEXTBOX_GET_PRIVATE (data); + + if (!priv->is_dragging) { + if (priv->scroll_back) priv->offset -= 1; + else priv->offset += 1; + + if (priv->offset >= (priv->pixmap_width - priv->w)) priv->scroll_back = TRUE; + if (priv->offset <= 0) priv->scroll_back = FALSE; + ui_skinned_textbox_redraw(textbox); + } + + return TRUE; +} + +static void textbox_generate_pixmap(UiSkinnedTextbox *textbox) { + gint length, i, x, y, wl; + gchar *pixmaptext; + GdkGC *gc; + UiSkinnedTextboxPrivate *priv = UI_SKINNED_TEXTBOX_GET_PRIVATE (textbox); + g_return_if_fail(textbox != NULL); + + if (priv->pixmap) { + g_object_unref(priv->pixmap); + priv->pixmap = NULL; + } + + /* + * Don't reset the offset if only text after the last '(' has + * changed. This is a hack to avoid visual noice on vbr files + * where we guess the length. + */ + if (!(priv->pixmap_text && strrchr(textbox->text, '(') && + !strncmp(priv->pixmap_text, textbox->text, + strrchr(textbox->text, '(') - textbox->text))) + priv->offset = 0; + + g_free(priv->pixmap_text); + priv->pixmap_text = g_strdup(textbox->text); + + /* + * wl is the number of (partial) letters visible. Only makes + * sense when using skinned font. + */ + wl = priv->w / 5; + if (wl * 5 != priv->w) + wl++; + + length = g_utf8_strlen(textbox->text, -1); + + priv->is_scrollable = FALSE; + + priv->is_scrollable = ui_skinned_textbox_should_scroll(textbox); + pixmaptext = g_strdup(priv->pixmap_text); + + if (priv->is_scrollable) { + if (priv->scroll_enabled && !priv->scroll_timeout) { + gint tag; + tag = TEXTBOX_SCROLL_SMOOTH_TIMEOUT; + priv->scroll_timeout = g_timeout_add(tag, textbox_scroll, textbox); + } + } else { + if (priv->scroll_timeout) { + g_source_remove(priv->scroll_timeout); + priv->scroll_timeout = 0; + } + priv->offset = 0; + } + + if (priv->font) { + textbox_generate_xfont_pixmap(textbox, pixmaptext); + g_free(pixmaptext); + return; + } + + priv->pixmap_width = length * bmp_active_skin->properties.textbox_bitmap_font_width; + priv->pixmap = gdk_pixmap_new(mainwin->window, + priv->pixmap_width, bmp_active_skin->properties.textbox_bitmap_font_height, + gdk_rgb_get_visual()->depth); + gc = priv->gc; + + for (i = 0; i < length; i++) { + gchar c; + x = y = -1; + c = toupper((int) pixmaptext[i]); + if (c >= 'A' && c <= 'Z') { + x = bmp_active_skin->properties.textbox_bitmap_font_width * (c - 'A'); + y = 0; + } + else if (c >= '0' && c <= '9') { + x = bmp_active_skin->properties.textbox_bitmap_font_width * (c - '0'); + y = bmp_active_skin->properties.textbox_bitmap_font_height; + } + else + textbox_handle_special_char(c, &x, &y); + + skin_draw_pixmap(bmp_active_skin, + priv->pixmap, gc, priv->skin_index, + x, y, i * bmp_active_skin->properties.textbox_bitmap_font_width, 0, + bmp_active_skin->properties.textbox_bitmap_font_width, + bmp_active_skin->properties.textbox_bitmap_font_height); + } + g_free(pixmaptext); +} + +void ui_skinned_textbox_set_scroll(GtkWidget *widget, gboolean scroll) { + g_return_if_fail(widget != NULL); + UiSkinnedTextbox *textbox = UI_SKINNED_TEXTBOX (widget); + UiSkinnedTextboxPrivate *priv = UI_SKINNED_TEXTBOX_GET_PRIVATE (textbox); + + priv->scroll_enabled = scroll; + if (priv->scroll_enabled && priv->is_scrollable && priv->scroll_allowed) { + gint tag; + tag = TEXTBOX_SCROLL_SMOOTH_TIMEOUT; + if (priv->scroll_timeout) { + g_source_remove(priv->scroll_timeout); + priv->scroll_timeout = 0; + } + priv->scroll_timeout = g_timeout_add(tag, textbox_scroll, textbox); + + } else { + + if (priv->scroll_timeout) { + g_source_remove(priv->scroll_timeout); + priv->scroll_timeout = 0; + } + + priv->offset = 0; + ui_skinned_textbox_redraw(textbox); + } +} + +static void +textbox_handle_special_char(gchar c, gint * x, gint * y) +{ + gint tx, ty; + + switch (c) { + case '"': + tx = 26; + ty = 0; + break; + case '\r': + tx = 10; + ty = 1; + break; + case ':': + case ';': + tx = 12; + ty = 1; + break; + case '(': + tx = 13; + ty = 1; + break; + case ')': + tx = 14; + ty = 1; + break; + case '-': + tx = 15; + ty = 1; + break; + case '`': + case '\'': + tx = 16; + ty = 1; + break; + case '!': + tx = 17; + ty = 1; + break; + case '_': + tx = 18; + ty = 1; + break; + case '+': + tx = 19; + ty = 1; + break; + case '\\': + tx = 20; + ty = 1; + break; + case '/': + tx = 21; + ty = 1; + break; + case '[': + tx = 22; + ty = 1; + break; + case ']': + tx = 23; + ty = 1; + break; + case '^': + tx = 24; + ty = 1; + break; + case '&': + tx = 25; + ty = 1; + break; + case '%': + tx = 26; + ty = 1; + break; + case '.': + case ',': + tx = 27; + ty = 1; + break; + case '=': + tx = 28; + ty = 1; + break; + case '$': + tx = 29; + ty = 1; + break; + case '#': + tx = 30; + ty = 1; + break; + case '?': + tx = 3; + ty = 2; + break; + case '*': + tx = 4; + ty = 2; + break; + default: + tx = 29; + ty = 0; + break; + } + + *x = tx * bmp_active_skin->properties.textbox_bitmap_font_width; + *y = ty * bmp_active_skin->properties.textbox_bitmap_font_height; +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/audacious/ui_skinned_textbox.h Fri Jun 29 01:50:38 2007 -0500 @@ -0,0 +1,62 @@ +/* + * Audacious - a cross-platform multimedia player + * Copyright (c) 2007 Audacious development team. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#ifndef UISKINNEDTEXTBOX_H +#define UISKINNEDTEXTBOX_H + +#include <gdk/gdk.h> +#include <gtk/gtkbin.h> +#include <gtk/gtkenums.h> +#include "widgets/skin.h" + +#define UI_TYPE_SKINNED_TEXTBOX (ui_skinned_textbox_get_type()) +#define UI_SKINNED_TEXTBOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), UI_TYPE_SKINNED_TEXTBOX, UiSkinnedTextbox)) +#define UI_SKINNED_TEXTBOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), UI_TYPE_SKINNED_TEXTBOX, UiSkinnedTextboxClass)) +#define UI_IS_SKINNED_TEXTBOX(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), UI_TYPE_SKINNED_TEXTBOX)) +#define UI_IS_SKINNED_TEXTBOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), UI_TYPE_SKINNED_TEXTBOX)) +#define UI_SKINNED_TEXTBOX_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), UI_TYPE_SKINNED_TEXTBOX, GtkFlatTextboxClass)) + +typedef struct _UiSkinnedTextbox UiSkinnedTextbox; +typedef struct _UiSkinnedTextboxClass UiSkinnedTextboxClass; + +struct _UiSkinnedTextbox { + GtkBin bin; + GdkWindow *event_window; + gint x, y, height; + gboolean redraw; + gchar *text; +}; + +struct _UiSkinnedTextboxClass { + GtkBinClass parent_class; + void (* double_clicked) (UiSkinnedTextbox *textbox); + void (* right_clicked) (UiSkinnedTextbox *textbox); + void (* clicked) (UiSkinnedTextbox *textbox); + void (* doubled) (UiSkinnedTextbox *textbox); + void (* redraw) (UiSkinnedTextbox *textbox); +}; + +GType ui_skinned_textbox_get_type(void) G_GNUC_CONST; +GtkWidget* ui_skinned_textbox_new(); +void ui_skinned_textbox_setup(GtkWidget *widget, GtkWidget *fixed, GdkPixmap *parent, GdkGC *gc, gint x, gint y, gint w, gboolean allow_scroll, SkinPixmapId si); +void ui_skinned_textbox_set_text(GtkWidget *widget, const gchar *text); +void ui_skinned_textbox_set_xfont(GtkWidget *widget, gboolean use_xfont, const gchar *fontname); +void ui_skinned_textbox_set_scroll(GtkWidget *widget, gboolean scroll); + +#endif