interesting
/
andlabs-ui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

And migrated tablemodel.go back. And now we can finally build it properly!

This commit is contained in:
Pietro Gagliardi 2018-08-26 17:36:39 -04:00
parent dd9db1c145
commit 3c4b7e208a
3 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgui.c
View File

@ -224,3 +224,17 @@ void pkguiFreeAreaHandler(uiAreaHandler *ah)
{ {
free(ah); free(ah);
} }
// cgo can't generate const, so we need this trampoline
static void realDoTableModelSetCellValue(uiTableModelHandler *mh, uiTableModel *m, int row, int column, const uiTableValue *value)
{
pkguiDoTableModelSetCellValue(mh, m, row, column, (uiTableValue *) value);
}
const uiTableModelHandler pkguiTableModelHandler = {
.NumColumns = pkguiDoTableModelNumColumns,
.ColumnType = pkguiDoTableModelColumnType,
.NumRows = pkguiDoTableModelNumRows,
.CellValue = pkguiDoTableModelCellValue,
.SetCellValue = realDoTableModelSetCellValue,
};

5
pkgui.h
View File

@ -85,8 +85,11 @@ extern void pkguiFreeFontDescriptor(uiFontDescriptor *fd);
extern uiDrawTextLayoutParams *pkguiNewDrawTextLayoutParams(void); extern uiDrawTextLayoutParams *pkguiNewDrawTextLayoutParams(void);
extern void pkguiFreeDrawTextLayoutParams(uiDrawTextLayoutParams *p); extern void pkguiFreeDrawTextLayoutParams(uiDrawTextLayoutParams *p);
// area.go // areahandler.go
extern uiAreaHandler *pkguiAllocAreaHandler(void); extern uiAreaHandler *pkguiAllocAreaHandler(void);
extern void pkguiFreeAreaHandler(uiAreaHandler *ah); extern void pkguiFreeAreaHandler(uiAreaHandler *ah);
// tablemodel.go
extern const uiTableModelHandler pkguiTableModelHandler;
#endif #endif

40
BBB_GOFILES/tablemodel.go → tablemodel.go
View File

@ -2,25 +2,7 @@
package ui package ui
// #include "ui.h" // #include "pkgui.h"
// extern int doTableModelNumColumns(uiTableModelHandler *, uiTableModel *);
// extern uiTableValueType doTableModelColumnType(uiTableModelHandler *, uiTableModel *, int);
// extern int doTableModelNumRows(uiTableModelHandler *, uiTableModel *);
// extern uiTableValue *doTableModelCellValue(uiTableModelHandler *mh, uiTableModel *m, int row, int column);
// extern void doTableModelSetCellValue(uiTableModelHandler *, uiTableModel *, int, int, uiTableValue *);
// // deal with cgo being dumb
// static inline void realDoTableModelSetCellValue(uiTableModelHandler *mh, uiTableModel *m, int row, int column, const uiTableValue *value)
// {
// doTableModelSetCellValue(mh, m, row, column, (uiTableValue *) value);
// }
// // TODO why can't this be static?
// const uiTableModelHandler pkguiTableModelHandler = {
// .NumColumns = doTableModelNumColumns,
// .ColumnType = doTableModelColumnType,
// .NumRows = doTableModelNumRows,
// .CellValue = doTableModelCellValue,
// .SetCellValue = realDoTableModelSetCellValue,
// };
import "C" import "C"
// TableValue is a type that represents a piece of data that can come // TableValue is a type that represents a piece of data that can come
@ -154,14 +136,14 @@ type TableModelHandler interface {
SetCellValue(m *TableModel, row, column int, value TableValue) SetCellValue(m *TableModel, row, column int, value TableValue)
} }
//export doTableModelNumColumns //export pkguiDoTableModelNumColumns
func doTableModelNumColumns(umh *C.uiTableModelHandler, um *C.uiTableModel) C.int { func pkguiDoTableModelNumColumns(umh *C.uiTableModelHandler, um *C.uiTableModel) C.int {
mh := modelhandlers[um] mh := modelhandlers[um]
return C.int(len(mh.ColumnTypes(models[um]))) return C.int(len(mh.ColumnTypes(models[um])))
} }
//export doTableModelColumnType //export pkguiDoTableModelColumnType
func doTableModelColumnType(umh *C.uiTableModelHandler, um *C.uiTableModel, n C.int) C.uiTableValueType { func pkguiDoTableModelColumnType(umh *C.uiTableModelHandler, um *C.uiTableModel, n C.int) C.uiTableValueType {
mh := modelhandlers[um] mh := modelhandlers[um]
c := mh.ColumnTypes(models[um]) c := mh.ColumnTypes(models[um])
switch c[n].(type) { switch c[n].(type) {
@ -177,14 +159,14 @@ func doTableModelColumnType(umh *C.uiTableModelHandler, um *C.uiTableModel, n C.
panic("unreachable") panic("unreachable")
} }
//export doTableModelNumRows //export pkguiDoTableModelNumRows
func doTableModelNumRows(umh *C.uiTableModelHandler, um *C.uiTableModel) C.int { func pkguiDoTableModelNumRows(umh *C.uiTableModelHandler, um *C.uiTableModel) C.int {
mh := modelhandlers[um] mh := modelhandlers[um]
return C.int(mh.NumRows(models[um])) return C.int(mh.NumRows(models[um]))
} }
//export doTableModelCellValue //export pkguiDoTableModelCellValue
func doTableModelCellValue(umh *C.uiTableModelHandler, um *C.uiTableModel, row, column C.int) *C.uiTableValue { func pkguiDoTableModelCellValue(umh *C.uiTableModelHandler, um *C.uiTableModel, row, column C.int) *C.uiTableValue {
mh := modelhandlers[um] mh := modelhandlers[um]
v := mh.CellValue(models[um], int(row), int(column)) v := mh.CellValue(models[um], int(row), int(column))
if v == nil { if v == nil {
@ -193,8 +175,8 @@ func doTableModelCellValue(umh *C.uiTableModelHandler, um *C.uiTableModel, row,
return v.toLibui() return v.toLibui()
} }
//export doTableModelSetCellValue //export pkguiDoTableModelSetCellValue
func doTableModelSetCellValue(umh *C.uiTableModelHandler, um *C.uiTableModel, row, column C.int, value *C.uiTableValue) { func pkguiDoTableModelSetCellValue(umh *C.uiTableModelHandler, um *C.uiTableModel, row, column C.int, value *C.uiTableValue) {
mh := modelhandlers[um] mh := modelhandlers[um]
v := tableValueFromLibui(value) v := tableValueFromLibui(value)
mh.SetCellValue(models[um], int(row), int(column), v) mh.SetCellValue(models[um], int(row), int(column), v)