qulogic/pidgin

Replace TalkatuEditor in PidginConversation with a basic GtkTextView

8 months ago, Gary Kramlich
3f1004d7772a
Parents bcaffaf9588f
Children c86302777faf
Replace TalkatuEditor in PidginConversation with a basic GtkTextView

I also wired up PidginAutoAdjustments increment/decrement functions to the
page up and page down keys for the input.

Testing Done:
Sent a bunch of messages to `echo` and then also verified the page up and page down keys.

Reviewed at https://reviews.imfreedom.org/r/2746/
2 files changed, 57 insertions(+), 19 deletions(-)
  • +45 -12
    pidgin/pidginconversation.c
  • +12 -7
    pidgin/resources/Conversations/conversation.ui
    • --- a/pidgin/pidginconversation.c Fri Oct 27 00:27:12 2023 -0500
    +++ b/pidgin/pidginconversation.c Fri Oct 27 01:46:24 2023 -0500
    @@ -24,8 +24,7 @@
    #include <purple.h>
    -#include <talkatu.h>
    -
    +#include "pidginautoadjustment.h"
    #include "pidgincolor.h"
    #include "pidginconversation.h"
    #include "pidgininfopane.h"
    @@ -45,9 +44,11 @@
    PurpleConversation *conversation;
    GtkWidget *info_pane;
    - GtkWidget *editor;
    GtkWidget *history;
    + GtkAdjustment *history_adjustment;
    GtkNoSelection *history_selection;
    +
    + GtkWidget *input;
    };
    G_DEFINE_TYPE(PidginConversation, pidgin_conversation, GTK_TYPE_BOX)
    @@ -115,16 +116,46 @@
    /******************************************************************************
    * Callbacks
    *****************************************************************************/
    -static void
    -pidgin_conversation_send_message_cb(TalkatuInput *input, gpointer data) {
    +static gboolean
    +pidgin_conversation_input_key_pressed_cb(G_GNUC_UNUSED GtkEventControllerKey *self,
    + guint keyval,
    + G_GNUC_UNUSED guint keycode,
    + GdkModifierType state,
    + gpointer data)
    +{
    PidginConversation *conversation = data;
    - const char *contents = NULL;
    + gboolean handled = TRUE;
    +
    + if(keyval == GDK_KEY_Return || keyval == GDK_KEY_KP_Enter) {
    + GtkTextBuffer *buffer = NULL;
    + GtkTextIter start;
    + GtkTextIter end;
    + char *contents = NULL;
    +
    + if(state == GDK_SHIFT_MASK || state == GDK_CONTROL_MASK) {
    + return FALSE;
    + }
    - contents = talkatu_message_get_contents(TALKATU_MESSAGE(input));
    + buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(conversation->input));
    + gtk_text_buffer_get_start_iter(buffer, &start);
    + gtk_text_buffer_get_end_iter(buffer, &end);
    +
    + contents = gtk_text_buffer_get_text(buffer, &start, &end, TRUE);
    +
    + purple_conversation_send(conversation->conversation, contents);
    +
    + g_clear_pointer(&contents, g_free);
    - purple_conversation_send(conversation->conversation, contents);
    + gtk_text_buffer_set_text(buffer, "", -1);
    + } else if(keyval == GDK_KEY_Page_Up) {
    + pidgin_auto_adjustment_decrement(PIDGIN_AUTO_ADJUSTMENT(conversation->history_adjustment));
    + } else if(keyval == GDK_KEY_Page_Down) {
    + pidgin_auto_adjustment_increment(PIDGIN_AUTO_ADJUSTMENT(conversation->history_adjustment));
    + } else {
    + handled = FALSE;
    + }
    - talkatu_message_set_contents(TALKATU_MESSAGE(input), "");
    + return handled;
    }
    static void
    @@ -340,14 +371,16 @@
    gtk_widget_class_bind_template_child(widget_class, PidginConversation,
    info_pane);
    gtk_widget_class_bind_template_child(widget_class, PidginConversation,
    - editor);
    - gtk_widget_class_bind_template_child(widget_class, PidginConversation,
    history);
    gtk_widget_class_bind_template_child(widget_class, PidginConversation,
    history_selection);
    + gtk_widget_class_bind_template_child(widget_class, PidginConversation,
    + history_adjustment);
    + gtk_widget_class_bind_template_child(widget_class, PidginConversation,
    + input);
    gtk_widget_class_bind_template_callback(widget_class,
    - pidgin_conversation_send_message_cb);
    + pidgin_conversation_input_key_pressed_cb);
    gtk_widget_class_bind_template_callback(widget_class,
    pidgin_conversation_get_author_attributes);
    gtk_widget_class_bind_template_callback(widget_class,
    --- a/pidgin/resources/Conversations/conversation.ui Fri Oct 27 00:27:12 2023 -0500
    +++ b/pidgin/resources/Conversations/conversation.ui Fri Oct 27 01:46:24 2023 -0500
    @@ -54,7 +54,7 @@
    <object class="GtkScrolledWindow">
    <property name="hexpand">1</property>
    <property name="vadjustment">
    - <object class="PidginAutoAdjustment"/>
    + <object class="PidginAutoAdjustment" id="history_adjustment"/>
    </property>
    <property name="vexpand">1</property>
    <child>
    @@ -83,13 +83,18 @@
    </object>
    </child>
    <child>
    - <object class="TalkatuEditor" id="editor">
    + <object class="GtkSeparator"/>
    + </child>
    + <child>
    + <object class="GtkScrolledWindow">
    <property name="vexpand">0</property>
    - <property name="orientation">vertical</property>
    - <child internal-child="input">
    - <object class="TalkatuInput" id="input">
    - <property name="send-binding">return|kp-enter</property>
    - <signal name="send-message" handler="pidgin_conversation_send_message_cb"/>
    + <child>
    + <object class="GtkTextView" id="input">
    + <child>
    + <object class="GtkEventControllerKey">
    + <signal name="key-pressed" handler="pidgin_conversation_input_key_pressed_cb"/>
    + </object>
    + </child>
    </object>
    </child>
    </object>