Changeset f126c87 in mainline for uspace/lib/gui/terminal.c

Timestamp:

2016-09-01T16:46:27Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2a2fbc8

Parents:

9befb0d (diff), bdfdc51c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from mainline.

File:

• uspace/lib/gui/terminal.c (modified) (3 diffs)

uspace/lib/gui/terminal.c

@@ -696 +696 @@
 }
 
-bool init_terminal(terminal_t *term, widget_t *parent, sysarg_t width,
-    sysarg_t height)
-{
-        widget_init(&term->widget, parent);
+bool init_terminal(terminal_t *term, widget_t *parent, const void *data,
+    sysarg_t width, sysarg_t height)
+{
+        widget_init(&term->widget, parent, data);
         
         link_initialize(&term->link);
@@ -771 +771 @@
 }
 
-terminal_t *create_terminal(widget_t *parent, sysarg_t width, sysarg_t height)
+terminal_t *create_terminal(widget_t *parent, const void *data, sysarg_t width,
+    sysarg_t height)
 {
         terminal_t *term = (terminal_t *) malloc(sizeof(terminal_t));
@@ -777 +778 @@
                 return NULL;
         
-        bool ret = init_terminal(term, parent, width, height);
+        bool ret = init_terminal(term, parent, data, width, height);
         if (!ret) {
                 free(term);