X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fshuttle.C;h=80d2fdff01a39bfeea539cebd89e6442ca93a46c;hb=33758f9c7af61e85cc5934a22a5ca300703b233a;hp=4860a7697a4c7a6076154f7fbae6132f955013f4;hpb=b104b77f5296719bd5e6de8472eb71542ddaedec;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/shuttle.C b/cinelerra-5.1/cinelerra/shuttle.C
index 4860a769..80d2fdff 100644
--- a/cinelerra-5.1/cinelerra/shuttle.C
+++ b/cinelerra-5.1/cinelerra/shuttle.C
@@ -504,6 +504,8 @@ int Shuttle::send_keycode(unsigned key, unsigned msk, int press, int send)
 	k->x = wx;
 	k->y = wy;
 	k->state = msk;
+// also clear modifiers state if a key is to be released
+	if( !press ) k->state = 0;
 	k->keycode = key;
 	k->same_screen = 1;
 	wdw->top_level->put_event((XEvent *) k);
@@ -553,9 +555,9 @@ void Shuttle::key(unsigned short code, unsigned int value)
 		fprintf(stderr, "key(%d, %d) out of range\n", code + EVENT_CODE_KEY1, value);
 		return;
 	}
-// Show help if both Alt's pressed on keyboard together with a shuttle button
-	if( wdw && wdw->alt_down() ) {
-		if( value ) wdw->context_help_show("Shuttle key default arrangement");
+// Show help if Alt is pressed on the keyboard together with a shuttle button
+	if( wdw && wdw->alt_down() && value ) {
+		wdw->context_help_show("Shuttle key default arrangement");
 		return;
 	}
 	send_stroke_sequence(value ? KJS_KEY_DOWN : KJS_KEY_UP, code);
@@ -622,10 +624,16 @@ static const struct shuttle_dev {
 } shuttle_devs[] = {
 	{ "/dev/input/by-id/usb-Contour_Design_ShuttleXpress-event-if00",
 		0x0b33, 0x0020 },
+	{ "/dev/input/by-id/usb-Contour_Design_ShuttleXpress-event-mouse",
+		0x0b33, 0x0020 },
 	{ "/dev/input/by-id/usb-Contour_Design_ShuttlePRO_v2-event-if00",
 		0x0b33, 0x0030 },
+	{ "/dev/input/by-id/usb-Contour_Design_ShuttlePRO_v2-event-mouse",
+		0x0b33, 0x0030 },
 	{ "/dev/input/by-id/usb-Contour_Design_ShuttlePro-event-if00",
 		0x0b33, 0x0030 },
+	{ "/dev/input/by-id/usb-Contour_Design_ShuttlePro-event-mouse",
+		0x0b33, 0x0030 },
 	{ "/dev/input/by-id/usb-Contour_Design_ShuttlePRO_v2-event-joystick",
 		0x0b33, 0x0030 },
 };