X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fgtk_pianokeyboard.c;h=96742d74622ae94e8a963a7900da82c7af15afab;hb=6b1b72a247bf04c81292fc41af4f69c9b7f90379;hp=4e91c0a67133517962144606bd54b7f446d97ebe;hpb=98d994f29c968796c5e9822e7c3b1713e53b274d;p=ardour.git diff --git a/gtk2_ardour/gtk_pianokeyboard.c b/gtk2_ardour/gtk_pianokeyboard.c index 4e91c0a671..96742d7462 100644 --- a/gtk2_ardour/gtk_pianokeyboard.c +++ b/gtk2_ardour/gtk_pianokeyboard.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2007, 2008 Edward Tomasz Napierała + * Copyright (c) 2007, 2008 Edward Tomasz NapieraÅ‚a * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -33,9 +33,9 @@ #include #include -#include #include #include + #include #include @@ -92,7 +92,7 @@ queue_note_draw (PianoKeyboard* pk, int note) } } -static void +static void draw_note(PianoKeyboard *pk, cairo_t* cr, int note) { int is_white = pk->notes[note].white; @@ -102,17 +102,21 @@ draw_note(PianoKeyboard *pk, cairo_t* cr, int note) int h = pk->notes[note].h; if (pk->notes[note].pressed || pk->notes[note].sustained) { - is_white = !is_white; + if (is_white) { + cairo_set_source_rgb (cr, 0.60f, 0.60f, 0.60f); + } else { + cairo_set_source_rgb (cr, 0.50f, 0.50f, 0.50f); + } + } else { + if (is_white) { + cairo_set_source_rgb (cr, 1.0f, 1.0f, 1.0f); + } else { + cairo_set_source_rgb (cr, 0.0f, 0.0f, 0.0f); + } } cairo_set_line_width (cr, 1.0); - if (is_white) { - cairo_set_source_rgb (cr, 1.0f, 1.0f, 1.0f); - } else { - cairo_set_source_rgb (cr, 0.0f, 0.0f, 0.0f); - } - cairo_rectangle (cr, x, 0, w, h); cairo_fill (cr); @@ -134,7 +138,7 @@ draw_note(PianoKeyboard *pk, cairo_t* cr, int note) } } -static int +static int press_key(PianoKeyboard *pk, int key) { assert(key >= 0); @@ -151,6 +155,13 @@ press_key(PianoKeyboard *pk, int key) else pk->notes[key].sustained = 0; + if (pk->monophonic && pk->last_key != key) { + pk->notes[pk->last_key].pressed = 0; + pk->notes[pk->last_key].sustained = 0; + queue_note_draw(pk, pk->last_key); + } + pk->last_key = key; + pk->notes[key].pressed = 1; g_signal_emit_by_name(GTK_WIDGET(pk), "note-on", key); @@ -159,7 +170,7 @@ press_key(PianoKeyboard *pk, int key) return 1; } -static int +static int release_key(PianoKeyboard *pk, int key) { assert(key >= 0); @@ -188,9 +199,9 @@ static void rest (PianoKeyboard* pk) { g_signal_emit_by_name(GTK_WIDGET(pk), "rest"); -} +} -static void +static void stop_unsustained_notes(PianoKeyboard *pk) { int i; @@ -204,7 +215,7 @@ stop_unsustained_notes(PianoKeyboard *pk) } } -static void +static void stop_sustained_notes(PianoKeyboard *pk) { int i; @@ -240,7 +251,7 @@ bind_key(PianoKeyboard *pk, const char *key, int note) { assert(pk->key_bindings != NULL); - g_hash_table_insert(pk->key_bindings, (gpointer)key, (gpointer)((intptr_t)note)); + g_hash_table_insert(pk->key_bindings, (const gpointer)key, (gpointer)((intptr_t)note)); } static void @@ -251,7 +262,7 @@ clear_notes(PianoKeyboard *pk) g_hash_table_remove_all(pk->key_bindings); } -static void +static void bind_keys_qwerty(PianoKeyboard *pk) { clear_notes(pk); @@ -294,7 +305,7 @@ bind_keys_qwerty(PianoKeyboard *pk) bind_key(pk, "p", 40); } -static void +static void bind_keys_qwertz(PianoKeyboard *pk) { bind_keys_qwerty(pk); @@ -347,8 +358,8 @@ bind_keys_azerty(PianoKeyboard *pk) bind_key(pk, "p", 40); } -static gint -keyboard_event_handler(GtkWidget *mk, GdkEventKey *event, gpointer notused) +static gint +keyboard_event_handler(GtkWidget *mk, GdkEventKey *event, gpointer ignored) { int note; char *key; @@ -356,6 +367,8 @@ keyboard_event_handler(GtkWidget *mk, GdkEventKey *event, gpointer notused) GdkKeymapKey kk; PianoKeyboard *pk = PIANO_KEYBOARD(mk); + (void) ignored; + /* We're not using event->keyval, because we need keyval with level set to 0. E.g. if user holds Shift and presses '7', we want to get a '7', not '&'. */ kk.keycode = event->hardware_keycode; @@ -382,7 +395,7 @@ keyboard_event_handler(GtkWidget *mk, GdkEventKey *event, gpointer notused) if (event->type == GDK_KEY_RELEASE) { rest (pk); } - + return TRUE; } @@ -401,7 +414,7 @@ keyboard_event_handler(GtkWidget *mk, GdkEventKey *event, gpointer notused) return TRUE; } -static int +static int get_note_for_xy(PianoKeyboard *pk, int x, int y) { int height = GTK_WIDGET(pk)->allocation.height; @@ -428,14 +441,16 @@ get_note_for_xy(PianoKeyboard *pk, int x, int y) return -1; } -static gboolean -mouse_button_event_handler(PianoKeyboard *pk, GdkEventButton *event, gpointer notused) +static gboolean +mouse_button_event_handler(PianoKeyboard *pk, GdkEventButton *event, gpointer ignored) { int x = event->x; int y = event->y; int note = get_note_for_xy(pk, x, y); + (void) ignored; + if (event->button != 1) return TRUE; @@ -468,18 +483,20 @@ mouse_button_event_handler(PianoKeyboard *pk, GdkEventButton *event, gpointer no return TRUE; } -static gboolean -mouse_motion_event_handler(PianoKeyboard *pk, GdkEventMotion *event, gpointer notused) +static gboolean +mouse_motion_event_handler(PianoKeyboard *pk, GdkEventMotion *event, gpointer ignored) { int note; + (void) ignored; + if ((event->state & GDK_BUTTON1_MASK) == 0) return TRUE; note = get_note_for_xy(pk, event->x, event->y); if (note != pk->note_being_pressed_using_mouse && note >= 0) { - + if (pk->note_being_pressed_using_mouse >= 0) release_key(pk, pk->note_being_pressed_using_mouse); press_key(pk, note); @@ -495,7 +512,7 @@ piano_keyboard_expose(GtkWidget *widget, GdkEventExpose *event) int i; PianoKeyboard *pk = PIANO_KEYBOARD(widget); cairo_t* cr = gdk_cairo_create (GDK_DRAWABLE (GTK_WIDGET(pk)->window)); - + gdk_cairo_region (cr, event->region); cairo_clip (cr); @@ -522,9 +539,11 @@ piano_keyboard_expose(GtkWidget *widget, GdkEventExpose *event) return TRUE; } -static void -piano_keyboard_size_request(GtkWidget* widget, GtkRequisition *requisition) +static void +piano_keyboard_size_request(GtkWidget* w, GtkRequisition *requisition) { + (void) w; + requisition->width = PIANO_KEYBOARD_DEFAULT_WIDTH; requisition->height = PIANO_KEYBOARD_DEFAULT_HEIGHT; } @@ -598,18 +617,18 @@ piano_keyboard_class_init(PianoKeyboardClass *klass) /* Set up signals. */ piano_keyboard_signals[NOTE_ON_SIGNAL] = g_signal_new ("note-on", - G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, + G_TYPE_FROM_CLASS (klass), (GSignalFlags)(G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION), 0, NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); piano_keyboard_signals[NOTE_OFF_SIGNAL] = g_signal_new ("note-off", - G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, + G_TYPE_FROM_CLASS (klass), (GSignalFlags)(G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION), 0, NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); piano_keyboard_signals[REST_SIGNAL] = g_signal_new ("rest", - G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, - 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + G_TYPE_FROM_CLASS (klass), (GSignalFlags)(G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION), + 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - widget_klass = (GtkWidgetClass*) klass; + widget_klass = (GtkWidgetClass*) klass; widget_klass->expose_event = piano_keyboard_expose; widget_klass->size_request = piano_keyboard_size_request; @@ -647,7 +666,7 @@ piano_keyboard_get_type(void) 0, /* value_table */ }; - mk_type = g_type_register_static(GTK_TYPE_DRAWING_AREA, "PianoKeyboard", &mk_info, 0); + mk_type = g_type_register_static(GTK_TYPE_DRAWING_AREA, "PianoKeyboard", &mk_info, (GTypeFlags)0); } return mk_type; @@ -656,7 +675,7 @@ piano_keyboard_get_type(void) GtkWidget * piano_keyboard_new(void) { - GtkWidget *widget = gtk_type_new(piano_keyboard_get_type()); + GtkWidget *widget = (GtkWidget*)gtk_type_new(piano_keyboard_get_type()); PianoKeyboard *pk = PIANO_KEYBOARD(widget); @@ -665,7 +684,11 @@ piano_keyboard_new(void) pk->enable_keyboard_cue = 0; pk->octave = 4; pk->note_being_pressed_using_mouse = -1; - memset((void *)pk->notes, 0, sizeof(struct Note) * NNOTES); + pk->last_key = 0; + pk->monophonic = FALSE; + + memset((void *)pk->notes, 0, sizeof(struct PKNote) * NNOTES); + pk->key_bindings = g_hash_table_new(g_str_hash, g_str_equal); bind_keys_qwerty(pk); @@ -678,6 +701,12 @@ piano_keyboard_set_keyboard_cue(PianoKeyboard *pk, int enabled) pk->enable_keyboard_cue = enabled; } +void +piano_keyboard_set_monophonic(PianoKeyboard *pk, gboolean monophonic) +{ + pk->monophonic = monophonic; +} + void piano_keyboard_sustain_press(PianoKeyboard *pk) { @@ -687,7 +716,7 @@ piano_keyboard_sustain_press(PianoKeyboard *pk) } } -void +void piano_keyboard_sustain_release(PianoKeyboard *pk) { if (pk->maybe_stop_sustained_notes) @@ -728,13 +757,13 @@ piano_keyboard_set_keyboard_layout(PianoKeyboard *pk, const char *layout) { assert(layout); - if (!strcasecmp(layout, "QWERTY")) { + if (!g_ascii_strcasecmp(layout, "QWERTY")) { bind_keys_qwerty(pk); - } else if (!strcasecmp(layout, "QWERTZ")) { + } else if (!g_ascii_strcasecmp(layout, "QWERTZ")) { bind_keys_qwertz(pk); - } else if (!strcasecmp(layout, "AZERTY")) { + } else if (!g_ascii_strcasecmp(layout, "AZERTY")) { bind_keys_azerty(pk); } else { @@ -744,4 +773,3 @@ piano_keyboard_set_keyboard_layout(PianoKeyboard *pk, const char *layout) return FALSE; } -