toolkit: comparison ui/gtk/text.c

-:dbde25a5bc53
+:c03c338a7dcf
 /*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
-* Copyright 2014 Olaf Wintermann. All rights reserved.
+* Copyright 2017 Olaf Wintermann. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
 *
 *   1. Redistributions of source code must retain the above copyright
 #include <stdlib.h>
 #include <string.h>
 #include "text.h"
 #include "container.h"
-#include "../common/context.h"
-#include "../common/document.h"
 static void selection_handler(
 GtkTextBuffer *buf,
 GtkTextIter *location,
 GtkTextMark *mark,
 }
 textview->last_selection_state = sel;
 }
 }
-UIWIDGET ui_textarea(UiObject *obj, UiText *value) {
+UIWIDGET ui_textarea_var(UiObject *obj, UiVar *var) {
 GtkWidget *text_area = gtk_text_view_new();
 gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(text_area), GTK_WRAP_WORD_CHAR);
 g_signal_connect(
 text_area,
 "realize",
 G_CALLBACK(ui_textarea_realize_event),
 NULL);
+UiTextArea *uitext = malloc(sizeof(UiTextArea));
+uitext->ctx = obj->ctx;
+uitext->var = var;
+uitext->last_selection_state = 0;
 g_signal_connect(
 text_area,
-"selection-clear-event",
+"destroy",
-G_CALLBACK(selection_handler),
+G_CALLBACK(ui_textarea_destroy),
-NULL);
+uitext);
-UiTextArea *uitext = ucx_mempool_malloc(
-obj->ctx->mempool,
-sizeof(UiTextArea));
-uitext->ctx = obj->ctx;
-uitext->last_selection_state = 0;
 GtkWidget *scroll_area = gtk_scrolled_window_new (NULL, NULL);
 gtk_scrolled_window_set_policy(
 GTK_SCROLLED_WINDOW(scroll_area),
 GTK_POLICY_AUTOMATIC,
 // add
 UiContainer *ct = uic_get_current_container(obj);
 ct->add(ct, scroll_area, TRUE);
 // bind value
+UiText *value = var->value;
 if(value) {
 GtkTextBuffer *buf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text_area));
 if(value->value) {
 gtk_text_buffer_set_text(buf, value->value, -1);
 // register undo manager
 g_signal_connect(
 buf,
 "insert-text",
 G_CALLBACK(ui_textbuf_insert),
-value);
+var);
 g_signal_connect(
 buf,
 "delete-range",
 G_CALLBACK(ui_textbuf_delete),
-value);
+var);
 g_signal_connect(
 buf,
 "mark-set",
 G_CALLBACK(selection_handler),
 }
 return scroll_area;
 }
+void ui_textarea_destroy(GtkWidget *object, UiTextArea *textarea) {
+ui_destroy_boundvar(textarea->ctx, textarea->var);
+free(textarea);
+}
+UIWIDGET ui_textarea(UiObject *obj, UiText *value) {
+UiVar *var = NULL;
+if(value) {
+var = malloc(sizeof(UiVar));
+var->value = value;
+var->type = UI_VAR_SPECIAL;
+}
+return ui_textarea_var(obj, var);
+}
 UIWIDGET ui_textarea_nv(UiObject *obj, char *varname) {
-UiVar *var = uic_connect_var(obj->ctx, varname, UI_VAR_TEXT);
+UiVar *var = uic_create_var(obj->ctx, varname, UI_VAR_TEXT);
 if(var) {
-UiText *value = var->value;
+return ui_textarea_var(obj, var);
-return ui_textarea(obj, value);
 } else {
 // TODO: error
 }
 return NULL;
 }
 text->value = str;
 return str;
 }
 void ui_textarea_set(UiText *text, char *str) {
+gtk_text_buffer_set_text((GtkTextBuffer*)text->obj, str, -1);
 if(text->value) {
 g_free(text->value);
 }
 text->value = NULL;
-gtk_text_buffer_set_text((GtkTextBuffer*)text->obj, str, -1);
 }
 char* ui_textarea_getsubstr(UiText *text, int begin, int end) {
 if(text->value) {
 g_free(text->value);
 void ui_textarea_realize_event(GtkWidget *widget, gpointer data) {
 gtk_widget_grab_focus(widget);
 }
-void ui_text_set(UiText *text, char *str) {
-if(text->set) {
-text->set(text, str);
-} else {
-if(text->value) {
-g_free(text->value);
-}
-text->value = g_strdup(str);
-}
-}
-char* ui_text_get(UiText *text) {
-if(text->get) {
-return text->get(text);
-} else {
-return text->value;
-}
-}
 // undo manager functions
 void ui_textbuf_insert(
 GtkTextIter *location,
 char *text,
 int length,
 void *data)
 {
-UiText *value = data;
+UiVar *var = data;
+UiText *value = var->value;
+if(!value->undomgr) {
+value->undomgr = ui_create_undomgr();
+}
 UiUndoMgr *mgr = value->undomgr;
 if(!mgr->event) {
 return;
 }
 GtkTextBuffer *textbuffer,
 GtkTextIter *start,
 GtkTextIter *end,
 void *data)
 {
-UiText *value = data;
+UiVar *var = data;
+UiText *value = var->value;
+if(!value->undomgr) {
+value->undomgr = ui_create_undomgr();
+}
 UiUndoMgr *mgr = value->undomgr;
 if(!mgr->event) {
 return;
 }
 mgr->cur = elm;
 }
 }
-static UIWIDGET create_textfield(UiObject *obj, int width, UiBool frameless, UiBool password, UiString *value) {
+static UIWIDGET create_textfield_var(UiObject *obj, int width, UiBool frameless, UiBool password, UiVar *var) {
 GtkWidget *textfield = gtk_entry_new();
+UiTextField *uitext = malloc(sizeof(UiTextField));
+uitext->ctx = obj->ctx;
+uitext->var = var;
+g_signal_connect(
+textfield,
+"destroy",
+G_CALLBACK(ui_textfield_destroy),
+uitext);
 if(width > 0) {
 gtk_entry_set_width_chars(GTK_ENTRY(textfield), width);
 }
 if(frameless) {
 // TODO: gtk2legacy workaroud
 }
 UiContainer *ct = uic_get_current_container(obj);
 ct->add(ct, textfield, FALSE);
-if(value) {
+if(var) {
+UiString *value = var->value;
 if(value->value) {
 gtk_entry_set_text(GTK_ENTRY(textfield), value->value);
 g_free(value->value);
-// TODO: free value
+value->value = NULL;
 }
 value->get = ui_textfield_get;
 value->set = ui_textfield_set;
 value->value = NULL;
 return textfield;
 }
 static UIWIDGET create_textfield_nv(UiObject *obj, int width, UiBool frameless, UiBool password, char *varname) {
-UiVar *var = uic_connect_var(obj->ctx, varname, UI_VAR_STRING);
+UiVar *var = uic_create_var(obj->ctx, varname, UI_VAR_STRING);
 if(var) {
-UiString *value = var->value;
+return create_textfield_var(obj, width, frameless, password, var);
-return create_textfield(obj, width, frameless, password, value);
 } else {
 // TODO: error
 }
 return NULL;
+}
+static UIWIDGET create_textfield(UiObject *obj, int width, UiBool frameless, UiBool password, UiString *value) {
+UiVar *var = NULL;
+if(value) {
+var = malloc(sizeof(UiVar));
+var->value = value;
+var->type = UI_VAR_SPECIAL;
+}
+return create_textfield_var(obj, width, frameless, password, var);
+}
+void ui_textfield_destroy(GtkWidget *object, UiTextField *textfield) {
+ui_destroy_boundvar(textfield->ctx, textfield->var);
+free(textfield);
 }
 UIWIDGET ui_textfield(UiObject *obj, UiString *value) {
 return create_textfield(obj, 0, FALSE, FALSE, value);
 }

Mercurial > hg > toolkit / file comparison

comparison: ui/gtk/text.c

ui/gtk/text.c