Fix a couple of keyboard shortcuts as they were in the wrong shift

state, similar to gnome-mplayer fix (upstream svn revision r118)
This commit is contained in:
dcoppa 2012-06-13 07:50:10 +00:00
parent bc7dc620b2
commit 215141fdbc
2 changed files with 16 additions and 4 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.9 2012/05/09 14:19:36 dcoppa Exp $
# $OpenBSD: Makefile,v 1.10 2012/06/13 07:50:10 dcoppa Exp $
COMMENT = gnome-mplayer toolkit
DISTNAME = gmtk-1.0.6
REVISION = 1
REVISION = 2
SHARED_LIBS = gmlib 0.0 \
gmtk 0.0

View File

@ -1,8 +1,11 @@
$OpenBSD: patch-src_gmtk_media_player_c,v 1.7 2012/05/09 14:19:37 dcoppa Exp $
$OpenBSD: patch-src_gmtk_media_player_c,v 1.8 2012/06/13 07:50:11 dcoppa Exp $
Set black background color for all GTK states on media widget
(upstream svn revision r105)
Fix a couple of keyboard shortcuts as they were in the wrong shift
state, similar to gnome-mplayer fix (upstream svn revision r118)
Correct situation where media player window allocation is too small
or incorrect (upstream svn revision r109)
@ -22,7 +25,7 @@ Replace deprecated g_strncasecmp with g_ascii_strncasecmp
(upstream svn revision r106)
--- src/gmtk_media_player.c.orig Fri Apr 6 15:19:32 2012
+++ src/gmtk_media_player.c Wed May 9 15:26:51 2012
+++ src/gmtk_media_player.c Wed Jun 13 09:41:41 2012
@@ -56,6 +56,11 @@ static void socket_realized(GtkWidget * widget, gpoint
player->socket_id = GPOINTER_TO_INT(gtk_socket_get_id(GTK_SOCKET(widget)));
style = gtk_widget_get_style(GTK_WIDGET(player));
@ -35,6 +38,15 @@ Replace deprecated g_strncasecmp with g_ascii_strncasecmp
if (player->vo != NULL) {
if (!(g_ascii_strncasecmp(player->vo, "vdpau", strlen("vdpau")) == 0)) {
gtk_widget_modify_bg(GTK_WIDGET(player->socket), GTK_STATE_NORMAL, &(style->black));
@@ -444,7 +449,7 @@ static gboolean player_key_press_event_callback(GtkWid
if (event->is_modifier)
return TRUE;
- if ((event->state & GDK_SHIFT_MASK) == 0 && (event->state & GDK_CONTROL_MASK) == 0
+ if ((event->state & GDK_CONTROL_MASK) == 0
&& (event->state & GDK_MOD1_MASK) == 0) {
switch (event->keyval) {
case GDK_Right:
@@ -635,6 +640,15 @@ static void gmtk_media_player_size_allocate(GtkWidget
gdouble widget_aspect;
gfloat xscale, yscale;