Commit f85010e4cbf884f864e04888ff5f66f9f80abda3
2020-03-18T19:13:05
bind signals to rtbuf input widget checkbox
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
diff --git a/rtbuf_gtk.c b/rtbuf_gtk.c
index 3d6efff..8f7d58c 100644
--- a/rtbuf_gtk.c
+++ b/rtbuf_gtk.c
@@ -18,6 +18,7 @@
#include <gtk/gtk.h>
#include <stdio.h>
#include "rtbuf.h"
+#include "rtbuf_input_widget.h"
#include "rtbuf_lib.h"
#include "rtbuf_var.h"
#include "rtbuf_widget.h"
@@ -66,7 +67,7 @@ void rtbuf_gtk_rtbuf_menu (RtbufWidget *widget, GdkEvent *event)
static GtkWidget *rename;
static GtkWidget *delete;
static guint signal;
- printf("rtbuf-gtk rtbuf popup\n");
+ printf("rtbuf-gtk rtbuf menu\n");
if (!menu) {
signal = g_signal_lookup("activate", GTK_TYPE_MENU_ITEM);
assert(signal);
@@ -135,7 +136,7 @@ gboolean rtbuf_gtk_rtbuf_button_press (GtkWidget *widget,
{
RtbufWidget *rtbuf_widget = RTBUF_WIDGET(widget);
(void) data;
- printf("rtbuf-gtk rtbuf mouse down\n");
+ printf("rtbuf-gtk rtbuf button press\n");
if (event->type == GDK_BUTTON_PRESS) {
GdkEventButton *eb = (GdkEventButton*) event;
if (eb->button == 1) {
@@ -150,6 +151,52 @@ gboolean rtbuf_gtk_rtbuf_button_press (GtkWidget *widget,
return FALSE;
}
+void rtbuf_gtk_input_disconnect (RtbufInputWidget *widget)
+{
+ (void) widget;
+ printf("rtbuf-gtk input disconnect\n");
+}
+
+void rtbuf_gtk_input_menu (RtbufInputWidget *widget, GdkEvent *event)
+{
+ static GtkMenu *menu = 0;
+ static GtkWidget *disconnect;
+ static guint signal;
+ printf("rtbuf-gtk input menu\n");
+ if (!menu) {
+ signal = g_signal_lookup("activate", GTK_TYPE_MENU_ITEM);
+ assert(signal);
+ menu = GTK_MENU(gtk_menu_new());
+ disconnect = gtk_menu_item_new_with_label("Disconnect");
+ gtk_container_add(GTK_CONTAINER(menu), disconnect);
+ gtk_widget_show(disconnect);
+ }
+ g_signal_handlers_disconnect_matched(G_OBJECT(disconnect),
+ G_SIGNAL_MATCH_FUNC,
+ signal,
+ 0,
+ NULL,
+ G_CALLBACK(rtbuf_gtk_input_disconnect),
+ NULL);
+ g_signal_connect_swapped(G_OBJECT(disconnect), "activate",
+ G_CALLBACK(rtbuf_gtk_input_disconnect),
+ widget);
+ gtk_menu_popup_at_pointer(menu, event);
+}
+
+gboolean rtbuf_gtk_input_check_button_press (RtbufInputWidget *widget,
+ GdkEvent *event)
+{
+ printf("rtbuf-gtk input check button press\n");
+ if (event->type == GDK_BUTTON_PRESS) {
+ GdkEventButton *eb = (GdkEventButton*) event;
+ if (eb->button == 3) {
+ rtbuf_gtk_input_menu(widget, event);
+ return TRUE;
+ }
+ }
+ return FALSE;
+}
RtbufWidget * rtbuf_gtk_modular_layout_new (s_rtbuf *rtbuf,
const gint x, const gint y)
@@ -168,6 +215,9 @@ RtbufWidget * rtbuf_gtk_modular_layout_new (s_rtbuf *rtbuf,
g_signal_connect_swapped(G_OBJECT(event_box), "button-press-event",
G_CALLBACK(rtbuf_gtk_rtbuf_button_press),
widget);
+ rtbuf_widget_connect_input_checks
+ (widget, "button-press-event",
+ G_CALLBACK(rtbuf_gtk_input_check_button_press));
return widget;
}
diff --git a/rtbuf_gtk_signal_binding.h b/rtbuf_gtk_signal_binding.h
new file mode 100644
index 0000000..79a6104
--- /dev/null
+++ b/rtbuf_gtk_signal_binding.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2020 Thomas de Grivel <thoxdg@gmail.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef RTBUF_GTK_SIGNAL_BINDING
+#define RTBUF_GTK_SIGNAL_BINDING
+
+#include <gtk/gtk.h>
+
+typedef struct {
+ const char *signal;
+ GCallback callback;
+} s_signal_binding;
+
+#endif /* RTBUF_GTK_SIGNAL_BINDING */
diff --git a/rtbuf_input_widget.c b/rtbuf_input_widget.c
index e81b76f..87b8e51 100644
--- a/rtbuf_input_widget.c
+++ b/rtbuf_input_widget.c
@@ -16,6 +16,7 @@
#include <assert.h>
#include <gtk/gtk.h>
+#include "rtbuf_gtk_signal_binding.h"
#include "rtbuf_input_widget.h"
#include "rtbuf.h"
@@ -206,3 +207,14 @@ rtbuf_input_widget_update (RtbufInputWidget *widget)
gtk_label_set_text(GTK_LABEL(priv->label), label);
}
}
+
+void rtbuf_input_widget_connect_check (GtkWidget *input,
+ gpointer data)
+{
+ RtbufInputWidget *widget = RTBUF_INPUT_WIDGET(input);
+ RtbufInputWidgetPrivate *priv =
+ rtbuf_input_widget_get_instance_private(widget);
+ s_signal_binding *sb = (s_signal_binding*) data;
+ g_signal_connect_swapped(G_OBJECT(priv->check), sb->signal,
+ sb->callback, widget);
+}
diff --git a/rtbuf_input_widget.h b/rtbuf_input_widget.h
index c183b41..83cbd76 100644
--- a/rtbuf_input_widget.h
+++ b/rtbuf_input_widget.h
@@ -59,5 +59,7 @@ s_rtbuf * rtbuf_input_widget_get_rtbuf (RtbufInputWidget *widget);
unsigned int rtbuf_input_widget_get_in (RtbufInputWidget *widget);
GtkWidget * rtbuf_input_widget_get_check (RtbufInputWidget *widget);
void rtbuf_input_widget_update (RtbufInputWidget *widget);
+void rtbuf_input_widget_connect_check (GtkWidget *input,
+ gpointer data);
#endif
diff --git a/rtbuf_widget.c b/rtbuf_widget.c
index db086cc..1a238fb 100644
--- a/rtbuf_widget.c
+++ b/rtbuf_widget.c
@@ -16,6 +16,7 @@
#include <assert.h>
#include <gtk/gtk.h>
+#include "rtbuf_gtk_signal_binding.h"
#include "rtbuf_input_widget.h"
#include "rtbuf_output_widget.h"
#include "rtbuf_widget.h"
@@ -224,8 +225,8 @@ void rtbuf_widget_set_label (RtbufWidget *widget,
const gchar *
rtbuf_widget_get_label (RtbufWidget *widget)
{
- RtbufWidgetPrivate *priv;
- priv = rtbuf_widget_get_instance_private(widget);
+ RtbufWidgetPrivate *priv =
+ rtbuf_widget_get_instance_private(widget);
if (priv && priv->label)
return gtk_label_get_text(GTK_LABEL(priv->label));
return NULL;
@@ -234,8 +235,8 @@ rtbuf_widget_get_label (RtbufWidget *widget)
GtkWidget *
rtbuf_widget_get_event_box (RtbufWidget *widget)
{
- RtbufWidgetPrivate *priv;
- priv = rtbuf_widget_get_instance_private(widget);
+ RtbufWidgetPrivate *priv =
+ rtbuf_widget_get_instance_private(widget);
if (priv)
return priv->event_box;
return NULL;
@@ -244,9 +245,22 @@ rtbuf_widget_get_event_box (RtbufWidget *widget)
s_rtbuf *
rtbuf_widget_get_rtbuf (RtbufWidget *widget)
{
- RtbufWidgetPrivate *priv;
- priv = rtbuf_widget_get_instance_private(widget);
+ RtbufWidgetPrivate *priv =
+ rtbuf_widget_get_instance_private(widget);
if (priv)
return priv->rtbuf;
return NULL;
}
+
+void rtbuf_widget_connect_input_checks (RtbufWidget *widget,
+ const char *signal,
+ GCallback callback)
+{
+ RtbufWidgetPrivate *priv =
+ rtbuf_widget_get_instance_private(widget);
+ s_signal_binding sb = { signal, callback };
+ gtk_container_foreach(GTK_CONTAINER(priv->inputs),
+ rtbuf_input_widget_connect_check,
+ &sb);
+
+}
diff --git a/rtbuf_widget.h b/rtbuf_widget.h
index bb42165..10a3471 100644
--- a/rtbuf_widget.h
+++ b/rtbuf_widget.h
@@ -61,5 +61,8 @@ void rtbuf_widget_set_label (RtbufWidget *widget,
const gchar * rtbuf_widget_get_label (RtbufWidget *widget);
GtkWidget * rtbuf_widget_get_event_box (RtbufWidget *widget);
s_rtbuf * rtbuf_widget_get_rtbuf (RtbufWidget *widget);
+void rtbuf_widget_connect_input_checks (RtbufWidget *widget,
+ const char *signal,
+ GCallback callback);
#endif