Commit 86bb5f2d61d9086104cfefb6f57e0bd8e2afc350
2020-04-29T14:41:32
rtbuf-gtk connection using rtbuf bind
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261
diff --git a/rtbuf_gtk.c b/rtbuf_gtk.c
index 27aa822..02636a0 100644
--- a/rtbuf_gtk.c
+++ b/rtbuf_gtk.c
@@ -27,26 +27,41 @@
unsigned int g_next_id = 0;
GtkBuilder *builder = NULL;
-GtkWindow *modular = NULL;
-GtkLayout *modular_layout = NULL;
-GtkMenu *library_menu = NULL;
-GtkWidget *drag_widget = NULL;
-gint drag_x = 0;
-gint drag_y = 0;
+GtkWindow *modular = NULL;
+s_rtbuf_gtk_connection *modular_connections = NULL;
+GtkLayout *modular_layout = NULL;
+
+GtkMenu *library_menu = NULL;
gint rtbuf_x = 100;
gint rtbuf_y = 100;
-s_rtbuf_gtk_connection *modular_connections = NULL;
s_rtbuf_gtk_connection *drag_connection = NULL;
+GtkWidget *drag_widget = NULL;
+gint drag_x = 0;
+gint drag_y = 0;
void rtbuf_gtk_drag_connection_end (RtbufInputWidget *input_widget)
{
if (drag_connection) {
if (input_widget) {
+ s_rtbuf_gtk_connection *dc = drag_connection;
printf("rtbuf-gtk drag connection connected to input\n");
- drag_connection->input_widget = input_widget;
+ drag_connection = NULL;
+ if (!rtbuf_gtk_connection_find(modular_connections,
+ dc->output_widget, input_widget)) {
+ s_rtbuf *src = rtbuf_output_widget_get_rtbuf(dc->output_widget);
+ unsigned int out = rtbuf_output_widget_get_out(dc->output_widget);
+ s_rtbuf *dest = rtbuf_input_widget_get_rtbuf(input_widget);
+ unsigned int in = rtbuf_input_widget_get_in(input_widget);
+ unsigned int src_i = src - g_rtbuf;
+ rtbuf_bind(src_i, out, dest, in);
+ dc->input_widget = input_widget;
+ }
+ else
+ rtbuf_gtk_connection_remove_one(&modular_connections, dc);
+ gtk_widget_queue_draw(GTK_WIDGET(modular_layout));
}
else {
printf("rtbuf-gtk drag connection abort\n");
@@ -58,22 +73,17 @@ void rtbuf_gtk_drag_connection_end (RtbufInputWidget *input_widget)
}
}
-gboolean rtbuf_gtk_input_motion (RtbufInputWidget *widget,
- GdkEventMotion *event)
+gboolean rtbuf_gtk_input_button_press (RtbufInputWidget *widget,
+ GdkEvent *event)
{
- printf("rtbuf-gtk input motion\n");
+ printf("rtbuf-gtk input button press\n");
+ (void) widget;
+ (void) event;
if (drag_connection) {
- if (!(event->state & GDK_BUTTON1_MASK)) {
- rtbuf_gtk_drag_connection_end(widget);
- return TRUE;
- }
- else {
- drag_connection->input_widget = widget;
- gtk_widget_queue_draw(GTK_WIDGET(modular_layout));
- return TRUE;
- }
+ rtbuf_gtk_drag_connection_end(widget);
+ return TRUE;
}
- return FALSE;
+ return TRUE;
}
RtbufWidget * rtbuf_gtk_modular_layout_new (s_rtbuf *rtbuf,
@@ -98,11 +108,11 @@ RtbufWidget * rtbuf_gtk_modular_layout_new (s_rtbuf *rtbuf,
G_CALLBACK(rtbuf_gtk_rtbuf_button_press),
widget);
rtbuf_widget_connect_inputs
- (widget, "motion-notify-event",
- G_CALLBACK(rtbuf_gtk_input_motion));
+ (widget, "button-press-event",
+ G_CALLBACK(rtbuf_gtk_input_button_press));
rtbuf_widget_connect_input_checks
(widget, "button-press-event",
- G_CALLBACK(rtbuf_gtk_input_check_button_press));
+ G_CALLBACK(rtbuf_gtk_input_button_press));
rtbuf_widget_connect_output_checks
(widget, "button-press-event",
G_CALLBACK(rtbuf_gtk_output_check_button_press));
@@ -236,6 +246,7 @@ void rtbuf_gtk_modular_draw_connection (s_rtbuf_gtk_connection *c,
0,
allocation.height / 2,
&x2, &y2);
+ x2 -= 2;
}
else {
x2 = drag_x;
@@ -274,7 +285,13 @@ gboolean rtbuf_gtk_modular_button_press (GtkWidget *widget,
if (widget == GTK_WIDGET(modular_layout) &&
event->type == GDK_BUTTON_PRESS) {
GdkEventButton *eb = (GdkEventButton*) event;
- if (eb->button == 3) {
+ if (eb->button == 1) {
+ if (drag_connection) {
+ rtbuf_gtk_drag_connection_end(NULL);
+ return TRUE;
+ }
+ }
+ else if (eb->button == 3) {
GdkWindow *window =
gtk_widget_get_window(GTK_WIDGET(modular_layout));
printf("rtbuf-gtk modular popup\n");
@@ -311,19 +328,13 @@ gboolean rtbuf_gtk_modular_motion (GtkWidget *widget,
}
}
else if (drag_connection) {
- if (!(event->state & GDK_BUTTON1_MASK)) {
- rtbuf_gtk_drag_connection_end(NULL);
- return TRUE;
- }
- else {
- GdkWindow *window =
- gtk_widget_get_window(GTK_WIDGET(modular_layout));
- gdk_window_get_device_position(window, event->device,
- &drag_x, &drag_y, NULL);
- drag_connection->input_widget = NULL;
- gtk_widget_queue_draw(GTK_WIDGET(modular_layout));
- return TRUE;
- }
+ GdkWindow *window;
+ window = gtk_widget_get_window(GTK_WIDGET(modular_layout));
+ gdk_window_get_device_position(window, event->device,
+ &drag_x, &drag_y, NULL);
+ drag_connection->input_widget = NULL;
+ gtk_widget_queue_draw(GTK_WIDGET(modular_layout));
+ return TRUE;
}
return FALSE;
}
diff --git a/rtbuf_gtk.h b/rtbuf_gtk.h
index e999221..564c3ba 100644
--- a/rtbuf_gtk.h
+++ b/rtbuf_gtk.h
@@ -43,6 +43,8 @@ extern s_rtbuf_gtk_connection *drag_connection;
extern gint drag_x;
extern gint drag_y;
+void rtbuf_gtk_drag_connection_end (RtbufInputWidget *input_widget);
+
gboolean rtbuf_gtk_rtbuf_button_press (GtkWidget *widget,
GdkEvent *event,
gpointer data);
@@ -53,5 +55,7 @@ gboolean rtbuf_gtk_input_check_button_press (RtbufInputWidget *widget,
void rtbuf_gtk_output_init ();
gboolean rtbuf_gtk_output_check_button_press (RtbufOutputWidget *widget,
GdkEvent *event);
+gboolean rtbuf_gtk_output_check_button_release (RtbufOutputWidget *widget,
+ GdkEvent *event);
#endif /* RTBUF_GTK_H */
diff --git a/rtbuf_gtk_connection.c b/rtbuf_gtk_connection.c
index 28dfea0..086cf53 100644
--- a/rtbuf_gtk_connection.c
+++ b/rtbuf_gtk_connection.c
@@ -62,3 +62,15 @@ int rtbuf_gtk_connection_remove_one (s_rtbuf_gtk_connection **head,
}
return 0;
}
+
+s_rtbuf_gtk_connection * rtbuf_gtk_connection_find
+(s_rtbuf_gtk_connection *c,
+ RtbufOutputWidget *output_widget,
+ RtbufInputWidget *input_widget)
+{
+ while (c && (c->output_widget != output_widget ||
+ c->input_widget != input_widget))
+ c = c->next;
+ return c;
+}
+
diff --git a/rtbuf_gtk_connection.h b/rtbuf_gtk_connection.h
index b2856d1..eba2c4a 100644
--- a/rtbuf_gtk_connection.h
+++ b/rtbuf_gtk_connection.h
@@ -20,5 +20,9 @@ void rtbuf_gtk_connection_push (s_rtbuf_gtk_connection **head,
s_rtbuf_gtk_connection *item);
int rtbuf_gtk_connection_remove_one (s_rtbuf_gtk_connection **head,
s_rtbuf_gtk_connection *item);
+s_rtbuf_gtk_connection * rtbuf_gtk_connection_find
+(s_rtbuf_gtk_connection *c,
+ RtbufOutputWidget *output_widget,
+ RtbufInputWidget *input_widget);
#endif
diff --git a/rtbuf_gtk_input.c b/rtbuf_gtk_input.c
index efaf638..7449501 100644
--- a/rtbuf_gtk_input.c
+++ b/rtbuf_gtk_input.c
@@ -21,6 +21,20 @@
#include "rtbuf_gtk.h"
#include "rtbuf_input_widget.h"
+GtkTargetList *rtbuf_gtk_input_target_list;
+#define RTBUF_GTK_INPUT_TARGETS 1
+GtkTargetEntry rtbuf_gtk_input_target_entry[RTBUF_GTK_INPUT_TARGETS]
+= {
+ {"RtbufOutputWidget", GTK_TARGET_SAME_APP, TARGET_RTBUF_OUTPUT}
+};
+
+void rtbuf_gtk_input_init ()
+{
+ rtbuf_gtk_input_target_list =
+ gtk_target_list_new(rtbuf_gtk_input_target_entry,
+ RTBUF_GTK_INPUT_TARGETS);
+}
+
void rtbuf_gtk_input_disconnect (RtbufInputWidget *widget)
{
(void) widget;
diff --git a/rtbuf_input_widget.ui b/rtbuf_input_widget.ui
index e667276..450a8a3 100644
--- a/rtbuf_input_widget.ui
+++ b/rtbuf_input_widget.ui
@@ -5,16 +5,14 @@
<template class="RtbufInputWidget" parent="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_STRUCTURE_MASK</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_BUTTON_MOTION_MASK | GDK_STRUCTURE_MASK</property>
<child>
<object class="GtkCheckButton" id="check">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_BUTTON_MOTION_MASK | GDK_STRUCTURE_MASK</property>
<property name="draw_indicator">True</property>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
<property name="expand">False</property>
@@ -26,6 +24,7 @@
<object class="GtkLabel" id="label">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_BUTTON_MOTION_MASK | GDK_STRUCTURE_MASK</property>
<property name="label" translatable="yes">input</property>
</object>
<packing>