sinek/src sinek.c,1.12,1.13

Update of /cvsroot/sinek/sinek/src
In directory sc8-pr-cvs1:/tmp/cvs-serv8290

Modified Files:
	sinek.c 
Log Message:
button presses/clicks work in video window again.  needs checking over, of course.


Index: sinek.c
===================================================================
RCS file: /cvsroot/sinek/sinek/src/sinek.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- sinek.c	17 Feb 2003 08:26:01 -0000	1.12
+++ sinek.c	18 Feb 2003 02:05:49 -0000	1.13
@@ -18,6 +18,35 @@
 	return TRUE;
 }
 
+static gboolean cb_clicked (GtkWidget *widget, GdkEventButton *button, gpointer user_data)
+{
+	int vol;
+
+	video_cursor(1);
+	sinek.osd_place = 0;
+	switch (button->button) {
+		case 3:
+			popup_pop(button->time);
+			break;
+		case 4:
+			g_object_get(G_OBJECT(sinek.xine), "volume", &vol, NULL);
+			g_object_set(G_OBJECT(sinek.xine), "volume", vol + 5, NULL);
+			break;
+		case 5:
+			g_object_get(G_OBJECT(sinek.xine), "volume", &vol, NULL);
+			g_object_set(G_OBJECT(sinek.xine), "volume", vol - 5, NULL);
+			break;
+	}
+
+	return FALSE;
+}
+
+static gboolean cb_key_press(GtkWidget *window, GdkEventKey *key, gpointer user_data)
+{
+	key_handle(key->keyval, key->state);
+	return FALSE;
+}
+
 void sinek_init(void)
 {
 	GtkWidget *window, *xine;
@@ -27,7 +56,10 @@
 
 	window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_title(GTK_WINDOW(window), _("Sinek Video Output"));
+	gtk_widget_add_events(window, GDK_BUTTON_PRESS_MASK);
 	g_signal_connect(G_OBJECT(window), "delete-event", G_CALLBACK(cb_delete), NULL);
+	g_signal_connect(G_OBJECT(window), "button-press-event", G_CALLBACK(cb_clicked), NULL);
+	g_signal_connect(G_OBJECT(window), "key-press-event", G_CALLBACK(cb_key_press), NULL);
 	gtk_container_add(GTK_CONTAINER(window), xine);
 	gtk_widget_show(xine);
 	sinek.videowin = window;
@@ -39,12 +71,6 @@
 	gtk_xine_config_set(GTK_XINE(xine), "audio.driver", audio);
 
 	/* video stuff */
-//g_signal_connect(G_OBJECT(videoframe), "key-press-event", G_CALLBACK(videowin_key_press), NULL);
-//g_signal_connect(G_OBJECT(videowin), "unrealize", G_CALLBACK(videowin_unrealized_cb), NULL);
-//g_signal_connect(G_OBJECT(videowin), "configure-event", G_CALLBACK(videowin_configure_cb), NULL);
-
-//g_signal_connect(G_OBJECT(videowin), "clicked", G_CALLBACK(videowin_button_press), NULL);
-
 	video = gtk_xine_config_register_string(GTK_XINE(xine), "video.driver", "auto");
 	g_object_set(G_OBJECT(xine), "video_driver", video, NULL);
 	g_object_get(G_OBJECT(xine), "video_driver", &video, NULL);




-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf