code clean up, styling tweaks -- committing to begin work on a small amount of profiling to see if there are any small opportunities for performance improvement left
This commit is contained in:
camh
parent
5d9ffc1b6f
commit
adeb3ede7f
|
|
@ -11,6 +11,7 @@
|
|||
"devices.h": "c",
|
||||
"stdlib.h": "c",
|
||||
"serialhelper.h": "c",
|
||||
"coprocessorjs.h": "c"
|
||||
"coprocessorjs.h": "c",
|
||||
"dialogs.h": "c"
|
||||
}
|
||||
}
|
||||
94
JS/index.js
94
JS/index.js
|
|
@ -223,7 +223,7 @@ const shortenText = (text) => {
|
|||
return outputText
|
||||
}
|
||||
|
||||
const MAX_ROWS = 15
|
||||
const MAX_ROWS = 16
|
||||
|
||||
const splitMessages = (messages) => {
|
||||
|
||||
|
|
@ -231,7 +231,7 @@ const splitMessages = (messages) => {
|
|||
|
||||
if (!messages) {
|
||||
|
||||
return ``
|
||||
return `no messages ENDLASTMESSAGE`
|
||||
}
|
||||
|
||||
for (const message of messages) {
|
||||
|
|
@ -281,14 +281,28 @@ class iMessageClient {
|
|||
|
||||
console.log(`get messages for chat ID: ${chatId}`)
|
||||
|
||||
let result = await client.query({
|
||||
query: gql`query getMessages {
|
||||
getMessages(chatId: "${chatId}", page: "${page}") {
|
||||
chatter
|
||||
text
|
||||
}
|
||||
}`
|
||||
})
|
||||
let result
|
||||
|
||||
try {
|
||||
|
||||
result = await client.query({
|
||||
query: gql`query getMessages {
|
||||
getMessages(chatId: "${chatId}", page: "${page}") {
|
||||
chatter
|
||||
text
|
||||
}
|
||||
}`
|
||||
})
|
||||
} catch (error) {
|
||||
|
||||
console.log(`error with apollo query`)
|
||||
console.log(error)
|
||||
|
||||
result = {
|
||||
data: {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let messages = result.data.getMessages
|
||||
|
||||
|
|
@ -317,14 +331,28 @@ class iMessageClient {
|
|||
console.log(chatId)
|
||||
console.log(message)
|
||||
|
||||
let result = await client.query({
|
||||
query: gql`query sendMessage {
|
||||
sendMessage(chatId: "${chatId}", message: "${message}") {
|
||||
chatter
|
||||
text
|
||||
}
|
||||
}`
|
||||
})
|
||||
let result
|
||||
|
||||
try {
|
||||
|
||||
result = await client.query({
|
||||
query: gql`query sendMessage {
|
||||
sendMessage(chatId: "${chatId}", message: "${message}") {
|
||||
chatter
|
||||
text
|
||||
}
|
||||
}`
|
||||
})
|
||||
} catch (error) {
|
||||
|
||||
console.log(`error with apollo query`)
|
||||
console.log(error)
|
||||
|
||||
result = {
|
||||
data: {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let messages = result.data.sendMessage
|
||||
|
||||
|
|
@ -333,14 +361,28 @@ class iMessageClient {
|
|||
|
||||
async getChats () {
|
||||
|
||||
let result = await client.query({
|
||||
query: gql`query getChats {
|
||||
getChats {
|
||||
name
|
||||
friendlyName
|
||||
}
|
||||
}`
|
||||
})
|
||||
let result
|
||||
|
||||
try {
|
||||
|
||||
result = await client.query({
|
||||
query: gql`query getChats {
|
||||
getChats {
|
||||
name
|
||||
friendlyName
|
||||
}
|
||||
}`
|
||||
})
|
||||
} catch (error) {
|
||||
|
||||
console.log(`error with apollo query`)
|
||||
console.log(error)
|
||||
|
||||
result = {
|
||||
data: {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let chats = result.data.getChats
|
||||
let friendlyNameStrings = ``
|
||||
|
|
|
|||
3
Sample.c
3
Sample.c
|
|
@ -26,9 +26,6 @@
|
|||
#include "output_js.h"
|
||||
#include "coprocessorjs.h"
|
||||
|
||||
#define WINDOW_WIDTH 510
|
||||
#define WINDOW_HEIGHT 302
|
||||
|
||||
#include "nuklear_app.c"
|
||||
|
||||
/* GMac is used to hold the result of a SysEnvirons call. This makes
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 324 KiB After Width: | Height: | Size: 322 KiB |
|
|
@ -33,13 +33,13 @@ The CXX compiler identification is GNU, found in "/home/camh/Documents/Retro68kA
|
|||
Determining if the C compiler works passed with the following output:
|
||||
Change Dir: /home/camh/Documents/Retro68kApps/NuklearQuickDraw/build/CMakeFiles/CMakeTmp
|
||||
|
||||
Run Build Command(s):/usr/bin/make cmTC_1cb57/fast && /usr/bin/make -f CMakeFiles/cmTC_1cb57.dir/build.make CMakeFiles/cmTC_1cb57.dir/build
|
||||
Run Build Command(s):/usr/bin/make cmTC_8caf1/fast && /usr/bin/make -f CMakeFiles/cmTC_8caf1.dir/build.make CMakeFiles/cmTC_8caf1.dir/build
|
||||
make[1]: Entering directory '/home/camh/Documents/Retro68kApps/NuklearQuickDraw/build/CMakeFiles/CMakeTmp'
|
||||
Building C object CMakeFiles/cmTC_1cb57.dir/testCCompiler.c.obj
|
||||
/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-gcc -o CMakeFiles/cmTC_1cb57.dir/testCCompiler.c.obj -c /home/camh/Documents/Retro68kApps/NuklearQuickDraw/build/CMakeFiles/CMakeTmp/testCCompiler.c
|
||||
Linking C executable cmTC_1cb57
|
||||
/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_1cb57.dir/link.txt --verbose=1
|
||||
/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-gcc CMakeFiles/cmTC_1cb57.dir/testCCompiler.c.obj -o cmTC_1cb57
|
||||
Building C object CMakeFiles/cmTC_8caf1.dir/testCCompiler.c.obj
|
||||
/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-gcc -o CMakeFiles/cmTC_8caf1.dir/testCCompiler.c.obj -c /home/camh/Documents/Retro68kApps/NuklearQuickDraw/build/CMakeFiles/CMakeTmp/testCCompiler.c
|
||||
Linking C executable cmTC_8caf1
|
||||
/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_8caf1.dir/link.txt --verbose=1
|
||||
/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-gcc CMakeFiles/cmTC_8caf1.dir/testCCompiler.c.obj -o cmTC_8caf1
|
||||
make[1]: Leaving directory '/home/camh/Documents/Retro68kApps/NuklearQuickDraw/build/CMakeFiles/CMakeTmp'
|
||||
|
||||
|
||||
|
|
@ -47,18 +47,18 @@ make[1]: Leaving directory '/home/camh/Documents/Retro68kApps/NuklearQuickDraw/b
|
|||
Detecting C compiler ABI info compiled with the following output:
|
||||
Change Dir: /home/camh/Documents/Retro68kApps/NuklearQuickDraw/build/CMakeFiles/CMakeTmp
|
||||
|
||||
Run Build Command(s):/usr/bin/make cmTC_46844/fast && /usr/bin/make -f CMakeFiles/cmTC_46844.dir/build.make CMakeFiles/cmTC_46844.dir/build
|
||||
Run Build Command(s):/usr/bin/make cmTC_70a53/fast && /usr/bin/make -f CMakeFiles/cmTC_70a53.dir/build.make CMakeFiles/cmTC_70a53.dir/build
|
||||
make[1]: Entering directory '/home/camh/Documents/Retro68kApps/NuklearQuickDraw/build/CMakeFiles/CMakeTmp'
|
||||
Building C object CMakeFiles/cmTC_46844.dir/CMakeCCompilerABI.c.obj
|
||||
/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-gcc -v -o CMakeFiles/cmTC_46844.dir/CMakeCCompilerABI.c.obj -c /usr/share/cmake-3.16/Modules/CMakeCCompilerABI.c
|
||||
Building C object CMakeFiles/cmTC_70a53.dir/CMakeCCompilerABI.c.obj
|
||||
/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-gcc -v -o CMakeFiles/cmTC_70a53.dir/CMakeCCompilerABI.c.obj -c /usr/share/cmake-3.16/Modules/CMakeCCompilerABI.c
|
||||
Using built-in specs.
|
||||
COLLECT_GCC=/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-gcc
|
||||
Target: m68k-apple-macos
|
||||
Configured with: /home/camh/Retro68/gcc/configure --target=m68k-apple-macos --prefix=/home/camh/Retro68-build/toolchain/ --enable-languages=c,c++ --with-arch=m68k --with-cpu=m68000 --disable-libssp MAKEINFO=missing
|
||||
Thread model: single
|
||||
gcc version 9.1.0 (GCC)
|
||||
COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_46844.dir/CMakeCCompilerABI.c.obj' '-c' '-mcpu=68000'
|
||||
/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/cc1 -quiet -v -Wno-trigraphs /usr/share/cmake-3.16/Modules/CMakeCCompilerABI.c -quiet -dumpbase CMakeCCompilerABI.c -mcpu=68000 -auxbase-strip CMakeFiles/cmTC_46844.dir/CMakeCCompilerABI.c.obj -version -o /tmp/ccpERgLV.s
|
||||
COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_70a53.dir/CMakeCCompilerABI.c.obj' '-c' '-mcpu=68000'
|
||||
/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/cc1 -quiet -v -Wno-trigraphs /usr/share/cmake-3.16/Modules/CMakeCCompilerABI.c -quiet -dumpbase CMakeCCompilerABI.c -mcpu=68000 -auxbase-strip CMakeFiles/cmTC_70a53.dir/CMakeCCompilerABI.c.obj -version -o /tmp/ccDysVb7.s
|
||||
GNU C17 (GCC) version 9.1.0 (m68k-apple-macos)
|
||||
compiled by GNU C version 9.3.0, GMP version 6.2.0, MPFR version 4.0.2, MPC version 1.1.0, isl version none
|
||||
GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072
|
||||
|
|
@ -73,14 +73,14 @@ GNU C17 (GCC) version 9.1.0 (m68k-apple-macos)
|
|||
compiled by GNU C version 9.3.0, GMP version 6.2.0, MPFR version 4.0.2, MPC version 1.1.0, isl version none
|
||||
GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072
|
||||
Compiler executable checksum: 68baab70957df643ffb4605a09112146
|
||||
COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_46844.dir/CMakeCCompilerABI.c.obj' '-c' '-mcpu=68000'
|
||||
/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/../../../../m68k-apple-macos/bin/as -mcpu=68000 -o CMakeFiles/cmTC_46844.dir/CMakeCCompilerABI.c.obj /tmp/ccpERgLV.s
|
||||
COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_70a53.dir/CMakeCCompilerABI.c.obj' '-c' '-mcpu=68000'
|
||||
/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/../../../../m68k-apple-macos/bin/as -mcpu=68000 -o CMakeFiles/cmTC_70a53.dir/CMakeCCompilerABI.c.obj /tmp/ccDysVb7.s
|
||||
COMPILER_PATH=/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/:/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/:/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/:/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/:/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/:/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/../../../../m68k-apple-macos/bin/
|
||||
LIBRARY_PATH=/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/:/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/../../../../m68k-apple-macos/lib/
|
||||
COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_46844.dir/CMakeCCompilerABI.c.obj' '-c' '-mcpu=68000'
|
||||
Linking C executable cmTC_46844
|
||||
/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_46844.dir/link.txt --verbose=1
|
||||
/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-gcc -v CMakeFiles/cmTC_46844.dir/CMakeCCompilerABI.c.obj -o cmTC_46844
|
||||
COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_70a53.dir/CMakeCCompilerABI.c.obj' '-c' '-mcpu=68000'
|
||||
Linking C executable cmTC_70a53
|
||||
/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_70a53.dir/link.txt --verbose=1
|
||||
/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-gcc -v CMakeFiles/cmTC_70a53.dir/CMakeCCompilerABI.c.obj -o cmTC_70a53
|
||||
Using built-in specs.
|
||||
COLLECT_GCC=/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-gcc
|
||||
COLLECT_LTO_WRAPPER=/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/lto-wrapper
|
||||
|
|
@ -90,9 +90,9 @@ Thread model: single
|
|||
gcc version 9.1.0 (GCC)
|
||||
COMPILER_PATH=/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/:/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/:/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/:/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/:/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/:/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/../../../../m68k-apple-macos/bin/
|
||||
LIBRARY_PATH=/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/:/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/../../../../m68k-apple-macos/lib/
|
||||
COLLECT_GCC_OPTIONS='-v' '-o' 'cmTC_46844' '-mcpu=68000'
|
||||
/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/collect2 -plugin /home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/liblto_plugin.so -plugin-opt=/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/lto-wrapper -plugin-opt=-fresolution=/tmp/ccExJbHq.res -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lc -plugin-opt=-pass-through=-lretrocrt -plugin-opt=-pass-through=-lInterface -elf2mac -q -undefined=_consolewrite -o cmTC_46844 -L/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0 -L/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/../../../../m68k-apple-macos/lib CMakeFiles/cmTC_46844.dir/CMakeCCompilerABI.c.obj --start-group -lgcc -lc -lretrocrt -lInterface --end-group
|
||||
COLLECT_GCC_OPTIONS='-v' '-o' 'cmTC_46844' '-mcpu=68000'
|
||||
COLLECT_GCC_OPTIONS='-v' '-o' 'cmTC_70a53' '-mcpu=68000'
|
||||
/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/collect2 -plugin /home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/liblto_plugin.so -plugin-opt=/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/lto-wrapper -plugin-opt=-fresolution=/tmp/ccKhTygx.res -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lc -plugin-opt=-pass-through=-lretrocrt -plugin-opt=-pass-through=-lInterface -elf2mac -q -undefined=_consolewrite -o cmTC_70a53 -L/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0 -L/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/../../../../m68k-apple-macos/lib CMakeFiles/cmTC_70a53.dir/CMakeCCompilerABI.c.obj --start-group -lgcc -lc -lretrocrt -lInterface --end-group
|
||||
COLLECT_GCC_OPTIONS='-v' '-o' 'cmTC_70a53' '-mcpu=68000'
|
||||
make[1]: Leaving directory '/home/camh/Documents/Retro68kApps/NuklearQuickDraw/build/CMakeFiles/CMakeTmp'
|
||||
|
||||
|
||||
|
|
@ -114,18 +114,18 @@ Parsed C implicit link information from above output:
|
|||
link line regex: [^( *|.*[/\])(m68k-apple-macos-ld|CMAKE_LINK_STARTFILE-NOTFOUND|([^/\]+-)?ld|collect2)[^/\]*( |$)]
|
||||
ignore line: [Change Dir: /home/camh/Documents/Retro68kApps/NuklearQuickDraw/build/CMakeFiles/CMakeTmp]
|
||||
ignore line: []
|
||||
ignore line: [Run Build Command(s):/usr/bin/make cmTC_46844/fast && /usr/bin/make -f CMakeFiles/cmTC_46844.dir/build.make CMakeFiles/cmTC_46844.dir/build]
|
||||
ignore line: [Run Build Command(s):/usr/bin/make cmTC_70a53/fast && /usr/bin/make -f CMakeFiles/cmTC_70a53.dir/build.make CMakeFiles/cmTC_70a53.dir/build]
|
||||
ignore line: [make[1]: Entering directory '/home/camh/Documents/Retro68kApps/NuklearQuickDraw/build/CMakeFiles/CMakeTmp']
|
||||
ignore line: [Building C object CMakeFiles/cmTC_46844.dir/CMakeCCompilerABI.c.obj]
|
||||
ignore line: [/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-gcc -v -o CMakeFiles/cmTC_46844.dir/CMakeCCompilerABI.c.obj -c /usr/share/cmake-3.16/Modules/CMakeCCompilerABI.c]
|
||||
ignore line: [Building C object CMakeFiles/cmTC_70a53.dir/CMakeCCompilerABI.c.obj]
|
||||
ignore line: [/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-gcc -v -o CMakeFiles/cmTC_70a53.dir/CMakeCCompilerABI.c.obj -c /usr/share/cmake-3.16/Modules/CMakeCCompilerABI.c]
|
||||
ignore line: [Using built-in specs.]
|
||||
ignore line: [COLLECT_GCC=/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-gcc]
|
||||
ignore line: [Target: m68k-apple-macos]
|
||||
ignore line: [Configured with: /home/camh/Retro68/gcc/configure --target=m68k-apple-macos --prefix=/home/camh/Retro68-build/toolchain/ --enable-languages=c c++ --with-arch=m68k --with-cpu=m68000 --disable-libssp MAKEINFO=missing]
|
||||
ignore line: [Thread model: single]
|
||||
ignore line: [gcc version 9.1.0 (GCC) ]
|
||||
ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_46844.dir/CMakeCCompilerABI.c.obj' '-c' '-mcpu=68000']
|
||||
ignore line: [ /home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/cc1 -quiet -v -Wno-trigraphs /usr/share/cmake-3.16/Modules/CMakeCCompilerABI.c -quiet -dumpbase CMakeCCompilerABI.c -mcpu=68000 -auxbase-strip CMakeFiles/cmTC_46844.dir/CMakeCCompilerABI.c.obj -version -o /tmp/ccpERgLV.s]
|
||||
ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_70a53.dir/CMakeCCompilerABI.c.obj' '-c' '-mcpu=68000']
|
||||
ignore line: [ /home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/cc1 -quiet -v -Wno-trigraphs /usr/share/cmake-3.16/Modules/CMakeCCompilerABI.c -quiet -dumpbase CMakeCCompilerABI.c -mcpu=68000 -auxbase-strip CMakeFiles/cmTC_70a53.dir/CMakeCCompilerABI.c.obj -version -o /tmp/ccDysVb7.s]
|
||||
ignore line: [GNU C17 (GCC) version 9.1.0 (m68k-apple-macos)]
|
||||
ignore line: [ compiled by GNU C version 9.3.0 GMP version 6.2.0 MPFR version 4.0.2 MPC version 1.1.0 isl version none]
|
||||
ignore line: [GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072]
|
||||
|
|
@ -140,14 +140,14 @@ Parsed C implicit link information from above output:
|
|||
ignore line: [ compiled by GNU C version 9.3.0 GMP version 6.2.0 MPFR version 4.0.2 MPC version 1.1.0 isl version none]
|
||||
ignore line: [GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072]
|
||||
ignore line: [Compiler executable checksum: 68baab70957df643ffb4605a09112146]
|
||||
ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_46844.dir/CMakeCCompilerABI.c.obj' '-c' '-mcpu=68000']
|
||||
ignore line: [ /home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/../../../../m68k-apple-macos/bin/as -mcpu=68000 -o CMakeFiles/cmTC_46844.dir/CMakeCCompilerABI.c.obj /tmp/ccpERgLV.s]
|
||||
ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_70a53.dir/CMakeCCompilerABI.c.obj' '-c' '-mcpu=68000']
|
||||
ignore line: [ /home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/../../../../m68k-apple-macos/bin/as -mcpu=68000 -o CMakeFiles/cmTC_70a53.dir/CMakeCCompilerABI.c.obj /tmp/ccDysVb7.s]
|
||||
ignore line: [COMPILER_PATH=/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/:/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/:/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/:/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/:/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/:/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/../../../../m68k-apple-macos/bin/]
|
||||
ignore line: [LIBRARY_PATH=/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/:/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/../../../../m68k-apple-macos/lib/]
|
||||
ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_46844.dir/CMakeCCompilerABI.c.obj' '-c' '-mcpu=68000']
|
||||
ignore line: [Linking C executable cmTC_46844]
|
||||
ignore line: [/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_46844.dir/link.txt --verbose=1]
|
||||
ignore line: [/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-gcc -v CMakeFiles/cmTC_46844.dir/CMakeCCompilerABI.c.obj -o cmTC_46844 ]
|
||||
ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_70a53.dir/CMakeCCompilerABI.c.obj' '-c' '-mcpu=68000']
|
||||
ignore line: [Linking C executable cmTC_70a53]
|
||||
ignore line: [/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_70a53.dir/link.txt --verbose=1]
|
||||
ignore line: [/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-gcc -v CMakeFiles/cmTC_70a53.dir/CMakeCCompilerABI.c.obj -o cmTC_70a53 ]
|
||||
ignore line: [Using built-in specs.]
|
||||
ignore line: [COLLECT_GCC=/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-gcc]
|
||||
ignore line: [COLLECT_LTO_WRAPPER=/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/lto-wrapper]
|
||||
|
|
@ -157,13 +157,13 @@ Parsed C implicit link information from above output:
|
|||
ignore line: [gcc version 9.1.0 (GCC) ]
|
||||
ignore line: [COMPILER_PATH=/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/:/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/:/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/:/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/:/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/:/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/../../../../m68k-apple-macos/bin/]
|
||||
ignore line: [LIBRARY_PATH=/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/:/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/../../../../m68k-apple-macos/lib/]
|
||||
ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'cmTC_46844' '-mcpu=68000']
|
||||
link line: [ /home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/collect2 -plugin /home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/liblto_plugin.so -plugin-opt=/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/lto-wrapper -plugin-opt=-fresolution=/tmp/ccExJbHq.res -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lc -plugin-opt=-pass-through=-lretrocrt -plugin-opt=-pass-through=-lInterface -elf2mac -q -undefined=_consolewrite -o cmTC_46844 -L/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0 -L/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/../../../../m68k-apple-macos/lib CMakeFiles/cmTC_46844.dir/CMakeCCompilerABI.c.obj --start-group -lgcc -lc -lretrocrt -lInterface --end-group]
|
||||
ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'cmTC_70a53' '-mcpu=68000']
|
||||
link line: [ /home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/collect2 -plugin /home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/liblto_plugin.so -plugin-opt=/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/lto-wrapper -plugin-opt=-fresolution=/tmp/ccKhTygx.res -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lc -plugin-opt=-pass-through=-lretrocrt -plugin-opt=-pass-through=-lInterface -elf2mac -q -undefined=_consolewrite -o cmTC_70a53 -L/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0 -L/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/../../../../m68k-apple-macos/lib CMakeFiles/cmTC_70a53.dir/CMakeCCompilerABI.c.obj --start-group -lgcc -lc -lretrocrt -lInterface --end-group]
|
||||
arg [/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/collect2] ==> ignore
|
||||
arg [-plugin] ==> ignore
|
||||
arg [/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/liblto_plugin.so] ==> ignore
|
||||
arg [-plugin-opt=/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/lto-wrapper] ==> ignore
|
||||
arg [-plugin-opt=-fresolution=/tmp/ccExJbHq.res] ==> ignore
|
||||
arg [-plugin-opt=-fresolution=/tmp/ccKhTygx.res] ==> ignore
|
||||
arg [-plugin-opt=-pass-through=-lgcc] ==> ignore
|
||||
arg [-plugin-opt=-pass-through=-lc] ==> ignore
|
||||
arg [-plugin-opt=-pass-through=-lretrocrt] ==> ignore
|
||||
|
|
@ -172,10 +172,10 @@ Parsed C implicit link information from above output:
|
|||
arg [-q] ==> ignore
|
||||
arg [-undefined=_consolewrite] ==> ignore
|
||||
arg [-o] ==> ignore
|
||||
arg [cmTC_46844] ==> ignore
|
||||
arg [cmTC_70a53] ==> ignore
|
||||
arg [-L/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0] ==> dir [/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0]
|
||||
arg [-L/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/../../../../m68k-apple-macos/lib] ==> dir [/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/../../../../m68k-apple-macos/lib]
|
||||
arg [CMakeFiles/cmTC_46844.dir/CMakeCCompilerABI.c.obj] ==> ignore
|
||||
arg [CMakeFiles/cmTC_70a53.dir/CMakeCCompilerABI.c.obj] ==> ignore
|
||||
arg [--start-group] ==> ignore
|
||||
arg [-lgcc] ==> lib [gcc]
|
||||
arg [-lc] ==> lib [c]
|
||||
|
|
@ -192,13 +192,13 @@ Parsed C implicit link information from above output:
|
|||
Determining if the CXX compiler works passed with the following output:
|
||||
Change Dir: /home/camh/Documents/Retro68kApps/NuklearQuickDraw/build/CMakeFiles/CMakeTmp
|
||||
|
||||
Run Build Command(s):/usr/bin/make cmTC_5884e/fast && /usr/bin/make -f CMakeFiles/cmTC_5884e.dir/build.make CMakeFiles/cmTC_5884e.dir/build
|
||||
Run Build Command(s):/usr/bin/make cmTC_93c14/fast && /usr/bin/make -f CMakeFiles/cmTC_93c14.dir/build.make CMakeFiles/cmTC_93c14.dir/build
|
||||
make[1]: Entering directory '/home/camh/Documents/Retro68kApps/NuklearQuickDraw/build/CMakeFiles/CMakeTmp'
|
||||
Building CXX object CMakeFiles/cmTC_5884e.dir/testCXXCompiler.cxx.obj
|
||||
/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-g++ -o CMakeFiles/cmTC_5884e.dir/testCXXCompiler.cxx.obj -c /home/camh/Documents/Retro68kApps/NuklearQuickDraw/build/CMakeFiles/CMakeTmp/testCXXCompiler.cxx
|
||||
Linking CXX executable cmTC_5884e
|
||||
/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_5884e.dir/link.txt --verbose=1
|
||||
/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-g++ CMakeFiles/cmTC_5884e.dir/testCXXCompiler.cxx.obj -o cmTC_5884e
|
||||
Building CXX object CMakeFiles/cmTC_93c14.dir/testCXXCompiler.cxx.obj
|
||||
/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-g++ -o CMakeFiles/cmTC_93c14.dir/testCXXCompiler.cxx.obj -c /home/camh/Documents/Retro68kApps/NuklearQuickDraw/build/CMakeFiles/CMakeTmp/testCXXCompiler.cxx
|
||||
Linking CXX executable cmTC_93c14
|
||||
/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_93c14.dir/link.txt --verbose=1
|
||||
/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-g++ CMakeFiles/cmTC_93c14.dir/testCXXCompiler.cxx.obj -o cmTC_93c14
|
||||
make[1]: Leaving directory '/home/camh/Documents/Retro68kApps/NuklearQuickDraw/build/CMakeFiles/CMakeTmp'
|
||||
|
||||
|
||||
|
|
@ -206,18 +206,18 @@ make[1]: Leaving directory '/home/camh/Documents/Retro68kApps/NuklearQuickDraw/b
|
|||
Detecting CXX compiler ABI info compiled with the following output:
|
||||
Change Dir: /home/camh/Documents/Retro68kApps/NuklearQuickDraw/build/CMakeFiles/CMakeTmp
|
||||
|
||||
Run Build Command(s):/usr/bin/make cmTC_b936c/fast && /usr/bin/make -f CMakeFiles/cmTC_b936c.dir/build.make CMakeFiles/cmTC_b936c.dir/build
|
||||
Run Build Command(s):/usr/bin/make cmTC_f30f5/fast && /usr/bin/make -f CMakeFiles/cmTC_f30f5.dir/build.make CMakeFiles/cmTC_f30f5.dir/build
|
||||
make[1]: Entering directory '/home/camh/Documents/Retro68kApps/NuklearQuickDraw/build/CMakeFiles/CMakeTmp'
|
||||
Building CXX object CMakeFiles/cmTC_b936c.dir/CMakeCXXCompilerABI.cpp.obj
|
||||
/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-g++ -v -o CMakeFiles/cmTC_b936c.dir/CMakeCXXCompilerABI.cpp.obj -c /usr/share/cmake-3.16/Modules/CMakeCXXCompilerABI.cpp
|
||||
Building CXX object CMakeFiles/cmTC_f30f5.dir/CMakeCXXCompilerABI.cpp.obj
|
||||
/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-g++ -v -o CMakeFiles/cmTC_f30f5.dir/CMakeCXXCompilerABI.cpp.obj -c /usr/share/cmake-3.16/Modules/CMakeCXXCompilerABI.cpp
|
||||
Using built-in specs.
|
||||
COLLECT_GCC=/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-g++
|
||||
Target: m68k-apple-macos
|
||||
Configured with: /home/camh/Retro68/gcc/configure --target=m68k-apple-macos --prefix=/home/camh/Retro68-build/toolchain/ --enable-languages=c,c++ --with-arch=m68k --with-cpu=m68000 --disable-libssp MAKEINFO=missing
|
||||
Thread model: single
|
||||
gcc version 9.1.0 (GCC)
|
||||
COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_b936c.dir/CMakeCXXCompilerABI.cpp.obj' '-c' '-mcpu=68000'
|
||||
/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/cc1plus -quiet -v -Wno-trigraphs /usr/share/cmake-3.16/Modules/CMakeCXXCompilerABI.cpp -quiet -dumpbase CMakeCXXCompilerABI.cpp -mcpu=68000 -auxbase-strip CMakeFiles/cmTC_b936c.dir/CMakeCXXCompilerABI.cpp.obj -version -o /tmp/ccVxJrO2.s
|
||||
COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_f30f5.dir/CMakeCXXCompilerABI.cpp.obj' '-c' '-mcpu=68000'
|
||||
/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/cc1plus -quiet -v -Wno-trigraphs /usr/share/cmake-3.16/Modules/CMakeCXXCompilerABI.cpp -quiet -dumpbase CMakeCXXCompilerABI.cpp -mcpu=68000 -auxbase-strip CMakeFiles/cmTC_f30f5.dir/CMakeCXXCompilerABI.cpp.obj -version -o /tmp/ccpKfWFb.s
|
||||
GNU C++14 (GCC) version 9.1.0 (m68k-apple-macos)
|
||||
compiled by GNU C version 9.3.0, GMP version 6.2.0, MPFR version 4.0.2, MPC version 1.1.0, isl version none
|
||||
GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072
|
||||
|
|
@ -235,14 +235,14 @@ GNU C++14 (GCC) version 9.1.0 (m68k-apple-macos)
|
|||
compiled by GNU C version 9.3.0, GMP version 6.2.0, MPFR version 4.0.2, MPC version 1.1.0, isl version none
|
||||
GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072
|
||||
Compiler executable checksum: 5b31867a30cfa7e65d4bce12c39f8a21
|
||||
COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_b936c.dir/CMakeCXXCompilerABI.cpp.obj' '-c' '-mcpu=68000'
|
||||
/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/../../../../m68k-apple-macos/bin/as -mcpu=68000 -o CMakeFiles/cmTC_b936c.dir/CMakeCXXCompilerABI.cpp.obj /tmp/ccVxJrO2.s
|
||||
COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_f30f5.dir/CMakeCXXCompilerABI.cpp.obj' '-c' '-mcpu=68000'
|
||||
/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/../../../../m68k-apple-macos/bin/as -mcpu=68000 -o CMakeFiles/cmTC_f30f5.dir/CMakeCXXCompilerABI.cpp.obj /tmp/ccpKfWFb.s
|
||||
COMPILER_PATH=/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/:/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/:/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/:/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/:/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/:/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/../../../../m68k-apple-macos/bin/
|
||||
LIBRARY_PATH=/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/:/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/../../../../m68k-apple-macos/lib/
|
||||
COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_b936c.dir/CMakeCXXCompilerABI.cpp.obj' '-c' '-mcpu=68000'
|
||||
Linking CXX executable cmTC_b936c
|
||||
/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_b936c.dir/link.txt --verbose=1
|
||||
/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-g++ -v CMakeFiles/cmTC_b936c.dir/CMakeCXXCompilerABI.cpp.obj -o cmTC_b936c
|
||||
COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_f30f5.dir/CMakeCXXCompilerABI.cpp.obj' '-c' '-mcpu=68000'
|
||||
Linking CXX executable cmTC_f30f5
|
||||
/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_f30f5.dir/link.txt --verbose=1
|
||||
/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-g++ -v CMakeFiles/cmTC_f30f5.dir/CMakeCXXCompilerABI.cpp.obj -o cmTC_f30f5
|
||||
Using built-in specs.
|
||||
COLLECT_GCC=/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-g++
|
||||
COLLECT_LTO_WRAPPER=/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/lto-wrapper
|
||||
|
|
@ -252,9 +252,9 @@ Thread model: single
|
|||
gcc version 9.1.0 (GCC)
|
||||
COMPILER_PATH=/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/:/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/:/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/:/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/:/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/:/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/../../../../m68k-apple-macos/bin/
|
||||
LIBRARY_PATH=/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/:/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/../../../../m68k-apple-macos/lib/
|
||||
COLLECT_GCC_OPTIONS='-v' '-o' 'cmTC_b936c' '-mcpu=68000'
|
||||
/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/collect2 -plugin /home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/liblto_plugin.so -plugin-opt=/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/lto-wrapper -plugin-opt=-fresolution=/tmp/cc7wz44u.res -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lc -plugin-opt=-pass-through=-lretrocrt -plugin-opt=-pass-through=-lInterface -elf2mac -q -undefined=_consolewrite -o cmTC_b936c -L/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0 -L/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/../../../../m68k-apple-macos/lib CMakeFiles/cmTC_b936c.dir/CMakeCXXCompilerABI.cpp.obj -lstdc++ -lm --start-group -lgcc -lc -lretrocrt -lInterface --end-group
|
||||
COLLECT_GCC_OPTIONS='-v' '-o' 'cmTC_b936c' '-mcpu=68000'
|
||||
COLLECT_GCC_OPTIONS='-v' '-o' 'cmTC_f30f5' '-mcpu=68000'
|
||||
/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/collect2 -plugin /home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/liblto_plugin.so -plugin-opt=/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/lto-wrapper -plugin-opt=-fresolution=/tmp/ccLc3iPF.res -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lc -plugin-opt=-pass-through=-lretrocrt -plugin-opt=-pass-through=-lInterface -elf2mac -q -undefined=_consolewrite -o cmTC_f30f5 -L/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0 -L/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/../../../../m68k-apple-macos/lib CMakeFiles/cmTC_f30f5.dir/CMakeCXXCompilerABI.cpp.obj -lstdc++ -lm --start-group -lgcc -lc -lretrocrt -lInterface --end-group
|
||||
COLLECT_GCC_OPTIONS='-v' '-o' 'cmTC_f30f5' '-mcpu=68000'
|
||||
make[1]: Leaving directory '/home/camh/Documents/Retro68kApps/NuklearQuickDraw/build/CMakeFiles/CMakeTmp'
|
||||
|
||||
|
||||
|
|
@ -282,18 +282,18 @@ Parsed CXX implicit link information from above output:
|
|||
link line regex: [^( *|.*[/\])(m68k-apple-macos-ld|CMAKE_LINK_STARTFILE-NOTFOUND|([^/\]+-)?ld|collect2)[^/\]*( |$)]
|
||||
ignore line: [Change Dir: /home/camh/Documents/Retro68kApps/NuklearQuickDraw/build/CMakeFiles/CMakeTmp]
|
||||
ignore line: []
|
||||
ignore line: [Run Build Command(s):/usr/bin/make cmTC_b936c/fast && /usr/bin/make -f CMakeFiles/cmTC_b936c.dir/build.make CMakeFiles/cmTC_b936c.dir/build]
|
||||
ignore line: [Run Build Command(s):/usr/bin/make cmTC_f30f5/fast && /usr/bin/make -f CMakeFiles/cmTC_f30f5.dir/build.make CMakeFiles/cmTC_f30f5.dir/build]
|
||||
ignore line: [make[1]: Entering directory '/home/camh/Documents/Retro68kApps/NuklearQuickDraw/build/CMakeFiles/CMakeTmp']
|
||||
ignore line: [Building CXX object CMakeFiles/cmTC_b936c.dir/CMakeCXXCompilerABI.cpp.obj]
|
||||
ignore line: [/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-g++ -v -o CMakeFiles/cmTC_b936c.dir/CMakeCXXCompilerABI.cpp.obj -c /usr/share/cmake-3.16/Modules/CMakeCXXCompilerABI.cpp]
|
||||
ignore line: [Building CXX object CMakeFiles/cmTC_f30f5.dir/CMakeCXXCompilerABI.cpp.obj]
|
||||
ignore line: [/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-g++ -v -o CMakeFiles/cmTC_f30f5.dir/CMakeCXXCompilerABI.cpp.obj -c /usr/share/cmake-3.16/Modules/CMakeCXXCompilerABI.cpp]
|
||||
ignore line: [Using built-in specs.]
|
||||
ignore line: [COLLECT_GCC=/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-g++]
|
||||
ignore line: [Target: m68k-apple-macos]
|
||||
ignore line: [Configured with: /home/camh/Retro68/gcc/configure --target=m68k-apple-macos --prefix=/home/camh/Retro68-build/toolchain/ --enable-languages=c c++ --with-arch=m68k --with-cpu=m68000 --disable-libssp MAKEINFO=missing]
|
||||
ignore line: [Thread model: single]
|
||||
ignore line: [gcc version 9.1.0 (GCC) ]
|
||||
ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_b936c.dir/CMakeCXXCompilerABI.cpp.obj' '-c' '-mcpu=68000']
|
||||
ignore line: [ /home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/cc1plus -quiet -v -Wno-trigraphs /usr/share/cmake-3.16/Modules/CMakeCXXCompilerABI.cpp -quiet -dumpbase CMakeCXXCompilerABI.cpp -mcpu=68000 -auxbase-strip CMakeFiles/cmTC_b936c.dir/CMakeCXXCompilerABI.cpp.obj -version -o /tmp/ccVxJrO2.s]
|
||||
ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_f30f5.dir/CMakeCXXCompilerABI.cpp.obj' '-c' '-mcpu=68000']
|
||||
ignore line: [ /home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/cc1plus -quiet -v -Wno-trigraphs /usr/share/cmake-3.16/Modules/CMakeCXXCompilerABI.cpp -quiet -dumpbase CMakeCXXCompilerABI.cpp -mcpu=68000 -auxbase-strip CMakeFiles/cmTC_f30f5.dir/CMakeCXXCompilerABI.cpp.obj -version -o /tmp/ccpKfWFb.s]
|
||||
ignore line: [GNU C++14 (GCC) version 9.1.0 (m68k-apple-macos)]
|
||||
ignore line: [ compiled by GNU C version 9.3.0 GMP version 6.2.0 MPFR version 4.0.2 MPC version 1.1.0 isl version none]
|
||||
ignore line: [GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072]
|
||||
|
|
@ -311,14 +311,14 @@ Parsed CXX implicit link information from above output:
|
|||
ignore line: [ compiled by GNU C version 9.3.0 GMP version 6.2.0 MPFR version 4.0.2 MPC version 1.1.0 isl version none]
|
||||
ignore line: [GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072]
|
||||
ignore line: [Compiler executable checksum: 5b31867a30cfa7e65d4bce12c39f8a21]
|
||||
ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_b936c.dir/CMakeCXXCompilerABI.cpp.obj' '-c' '-mcpu=68000']
|
||||
ignore line: [ /home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/../../../../m68k-apple-macos/bin/as -mcpu=68000 -o CMakeFiles/cmTC_b936c.dir/CMakeCXXCompilerABI.cpp.obj /tmp/ccVxJrO2.s]
|
||||
ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_f30f5.dir/CMakeCXXCompilerABI.cpp.obj' '-c' '-mcpu=68000']
|
||||
ignore line: [ /home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/../../../../m68k-apple-macos/bin/as -mcpu=68000 -o CMakeFiles/cmTC_f30f5.dir/CMakeCXXCompilerABI.cpp.obj /tmp/ccpKfWFb.s]
|
||||
ignore line: [COMPILER_PATH=/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/:/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/:/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/:/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/:/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/:/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/../../../../m68k-apple-macos/bin/]
|
||||
ignore line: [LIBRARY_PATH=/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/:/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/../../../../m68k-apple-macos/lib/]
|
||||
ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_b936c.dir/CMakeCXXCompilerABI.cpp.obj' '-c' '-mcpu=68000']
|
||||
ignore line: [Linking CXX executable cmTC_b936c]
|
||||
ignore line: [/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_b936c.dir/link.txt --verbose=1]
|
||||
ignore line: [/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-g++ -v CMakeFiles/cmTC_b936c.dir/CMakeCXXCompilerABI.cpp.obj -o cmTC_b936c ]
|
||||
ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_f30f5.dir/CMakeCXXCompilerABI.cpp.obj' '-c' '-mcpu=68000']
|
||||
ignore line: [Linking CXX executable cmTC_f30f5]
|
||||
ignore line: [/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_f30f5.dir/link.txt --verbose=1]
|
||||
ignore line: [/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-g++ -v CMakeFiles/cmTC_f30f5.dir/CMakeCXXCompilerABI.cpp.obj -o cmTC_f30f5 ]
|
||||
ignore line: [Using built-in specs.]
|
||||
ignore line: [COLLECT_GCC=/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-g++]
|
||||
ignore line: [COLLECT_LTO_WRAPPER=/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/lto-wrapper]
|
||||
|
|
@ -328,13 +328,13 @@ Parsed CXX implicit link information from above output:
|
|||
ignore line: [gcc version 9.1.0 (GCC) ]
|
||||
ignore line: [COMPILER_PATH=/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/:/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/:/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/:/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/:/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/:/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/../../../../m68k-apple-macos/bin/]
|
||||
ignore line: [LIBRARY_PATH=/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/:/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/../../../../m68k-apple-macos/lib/]
|
||||
ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'cmTC_b936c' '-mcpu=68000']
|
||||
link line: [ /home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/collect2 -plugin /home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/liblto_plugin.so -plugin-opt=/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/lto-wrapper -plugin-opt=-fresolution=/tmp/cc7wz44u.res -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lc -plugin-opt=-pass-through=-lretrocrt -plugin-opt=-pass-through=-lInterface -elf2mac -q -undefined=_consolewrite -o cmTC_b936c -L/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0 -L/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/../../../../m68k-apple-macos/lib CMakeFiles/cmTC_b936c.dir/CMakeCXXCompilerABI.cpp.obj -lstdc++ -lm --start-group -lgcc -lc -lretrocrt -lInterface --end-group]
|
||||
ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'cmTC_f30f5' '-mcpu=68000']
|
||||
link line: [ /home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/collect2 -plugin /home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/liblto_plugin.so -plugin-opt=/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/lto-wrapper -plugin-opt=-fresolution=/tmp/ccLc3iPF.res -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lc -plugin-opt=-pass-through=-lretrocrt -plugin-opt=-pass-through=-lInterface -elf2mac -q -undefined=_consolewrite -o cmTC_f30f5 -L/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0 -L/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/../../../../m68k-apple-macos/lib CMakeFiles/cmTC_f30f5.dir/CMakeCXXCompilerABI.cpp.obj -lstdc++ -lm --start-group -lgcc -lc -lretrocrt -lInterface --end-group]
|
||||
arg [/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/collect2] ==> ignore
|
||||
arg [-plugin] ==> ignore
|
||||
arg [/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/liblto_plugin.so] ==> ignore
|
||||
arg [-plugin-opt=/home/camh/Retro68-build/toolchain/libexec/gcc/m68k-apple-macos/9.1.0/lto-wrapper] ==> ignore
|
||||
arg [-plugin-opt=-fresolution=/tmp/cc7wz44u.res] ==> ignore
|
||||
arg [-plugin-opt=-fresolution=/tmp/ccLc3iPF.res] ==> ignore
|
||||
arg [-plugin-opt=-pass-through=-lgcc] ==> ignore
|
||||
arg [-plugin-opt=-pass-through=-lc] ==> ignore
|
||||
arg [-plugin-opt=-pass-through=-lretrocrt] ==> ignore
|
||||
|
|
@ -343,10 +343,10 @@ Parsed CXX implicit link information from above output:
|
|||
arg [-q] ==> ignore
|
||||
arg [-undefined=_consolewrite] ==> ignore
|
||||
arg [-o] ==> ignore
|
||||
arg [cmTC_b936c] ==> ignore
|
||||
arg [cmTC_f30f5] ==> ignore
|
||||
arg [-L/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0] ==> dir [/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0]
|
||||
arg [-L/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/../../../../m68k-apple-macos/lib] ==> dir [/home/camh/Retro68-build/toolchain/lib/gcc/m68k-apple-macos/9.1.0/../../../../m68k-apple-macos/lib]
|
||||
arg [CMakeFiles/cmTC_b936c.dir/CMakeCXXCompilerABI.cpp.obj] ==> ignore
|
||||
arg [CMakeFiles/cmTC_f30f5.dir/CMakeCXXCompilerABI.cpp.obj] ==> ignore
|
||||
arg [-lstdc++] ==> lib [stdc++]
|
||||
arg [-lm] ==> lib [m]
|
||||
arg [--start-group] ==> ignore
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -9746,8 +9746,8 @@ nk_style_from_table(struct nk_context *ctx, const struct nk_color *table)
|
|||
win->header.label_normal = table[NK_COLOR_TEXT];
|
||||
win->header.label_hover = table[NK_COLOR_TEXT];
|
||||
win->header.label_active = table[NK_COLOR_TEXT];
|
||||
win->header.label_padding = nk_vec2(4,4);
|
||||
win->header.padding = nk_vec2(4,4);
|
||||
win->header.label_padding = nk_vec2(1,1);
|
||||
win->header.padding = nk_vec2(2,2);
|
||||
win->header.spacing = nk_vec2(0,0);
|
||||
|
||||
/* window header close button */
|
||||
|
|
|
|||
|
|
@ -6,6 +6,21 @@
|
|||
// - need timeout on serial messages in case the computer at the other end dies (prevent hard reset)
|
||||
// - delete doesnt work right (leaves characters at end of string)
|
||||
// - move app-specific code to distinct file
|
||||
// - 1 too many lines in the chat -- just reduce line spacing a bit
|
||||
|
||||
#define WINDOW_WIDTH 510
|
||||
#define WINDOW_HEIGHT 302
|
||||
|
||||
#define NK_ZERO_COMMAND_MEMORY
|
||||
#define NK_INCLUDE_FIXED_TYPES
|
||||
#define NK_INCLUDE_STANDARD_IO
|
||||
// #define NK_INCLUDE_STANDARD_VARARGS
|
||||
#define NK_INCLUDE_DEFAULT_ALLOCATOR
|
||||
#define NK_IMPLEMENTATION
|
||||
#define NK_QUICKDRAW_IMPLEMENTATION
|
||||
// #define NK_BUTTON_TRIGGER_ON_RELEASE
|
||||
#define NK_MEMSET memset
|
||||
#define NK_MEMCPY memcpy
|
||||
|
||||
void aFailed(char *file, int line) {
|
||||
|
||||
|
|
@ -22,25 +37,16 @@ void aFailed(char *file, int line) {
|
|||
if (!(e)) \
|
||||
aFailed(__FILE__, __LINE__)
|
||||
|
||||
#define NK_ZERO_COMMAND_MEMORY
|
||||
#define NK_INCLUDE_FIXED_TYPES
|
||||
#define NK_INCLUDE_STANDARD_IO
|
||||
// #define NK_INCLUDE_STANDARD_VARARGS
|
||||
#define NK_INCLUDE_DEFAULT_ALLOCATOR
|
||||
#define NK_IMPLEMENTATION
|
||||
#define NK_QUICKDRAW_IMPLEMENTATION
|
||||
// #define NK_BUTTON_TRIGGER_ON_RELEASE
|
||||
#define NK_MEMSET memset
|
||||
#define NK_MEMCPY memcpy
|
||||
|
||||
#include <Types.h>
|
||||
#include "nuklear.h"
|
||||
#include "nuklear_quickdraw.h"
|
||||
|
||||
#define MAX_CHAT_MESSAGES 16
|
||||
|
||||
Boolean firstOrMouseMove = true;
|
||||
Boolean gotMouseEvent = false;
|
||||
char activeChat[64];
|
||||
char activeChatMessages[15][2048]; // this should match to MAX_ROWS in index.js
|
||||
char activeChatMessages[MAX_CHAT_MESSAGES][2048]; // this should match to MAX_ROWS in index.js
|
||||
char box_input_buffer[2048];
|
||||
char chatFriendlyNames[16][64];
|
||||
char ip_input_buffer[255];
|
||||
|
|
@ -64,10 +70,11 @@ struct nk_rect chats_window_size;
|
|||
struct nk_rect graphql_input_window_size;
|
||||
struct nk_rect message_input_window_size;
|
||||
struct nk_rect messages_window_size;
|
||||
struct nuklear_context *ctx;
|
||||
|
||||
void getMessagesFromjsFunctionResponse() {
|
||||
|
||||
for (int i = 0; i < 15; i++) {
|
||||
for (int i = 0; i < MAX_CHAT_MESSAGES; i++) {
|
||||
|
||||
memset(&activeChatMessages[i], '\0', 2048);
|
||||
}
|
||||
|
|
@ -102,12 +109,13 @@ void sendMessage() {
|
|||
memset(&box_input_buffer, '\0', 2048);
|
||||
sprintf(box_input_buffer, "");
|
||||
box_input_len = 0;
|
||||
refreshNuklearApp(1);
|
||||
|
||||
callFunctionOnCoprocessor("sendMessage", output, jsFunctionResponse);
|
||||
|
||||
getMessagesFromjsFunctionResponse();
|
||||
|
||||
forceRedraw = 3;
|
||||
forceRedraw = 2;
|
||||
firstOrMouseMove = true;
|
||||
|
||||
return;
|
||||
|
|
@ -124,6 +132,7 @@ void sendIPAddressToCoprocessor() {
|
|||
|
||||
return;
|
||||
}
|
||||
|
||||
// set up function to get messages in current chat
|
||||
// limit to recent messages
|
||||
// figure out pagination?? button on the top that says "get previous chats"?
|
||||
|
|
@ -242,11 +251,11 @@ static void nuklearApp(struct nk_context *ctx) {
|
|||
|
||||
nk_layout_row_begin(ctx, NK_STATIC, 30, 2);
|
||||
{
|
||||
nk_layout_row_push(ctx, WINDOW_WIDTH / 2 - 90);
|
||||
|
||||
nk_layout_row_push(ctx, WINDOW_WIDTH / 2 - 100);
|
||||
nk_edit_string(ctx, NK_EDIT_SIMPLE, ip_input_buffer, &ip_input_buffer_len, 255, nk_filter_default);
|
||||
nk_layout_row_push(ctx, 55);
|
||||
|
||||
nk_layout_row_push(ctx, 60);
|
||||
if (nk_button_label(ctx, "save")) {
|
||||
|
||||
ipAddressSet = 1;
|
||||
|
|
@ -269,11 +278,11 @@ static void nuklearApp(struct nk_context *ctx) {
|
|||
|
||||
nk_layout_row_begin(ctx, NK_STATIC, 30, 2);
|
||||
{
|
||||
|
||||
nk_layout_row_push(ctx, WINDOW_WIDTH / 2 - 110);
|
||||
|
||||
nk_edit_string(ctx, NK_EDIT_SIMPLE, new_message_input_buffer, &new_message_input_buffer_len, 2048, nk_filter_default);
|
||||
|
||||
nk_layout_row_push(ctx, 80);
|
||||
|
||||
if (nk_button_label(ctx, "open chat")) {
|
||||
|
||||
sendNewChat = 0;
|
||||
|
|
@ -328,7 +337,7 @@ static void nuklearApp(struct nk_context *ctx) {
|
|||
|
||||
if (nk_begin(ctx, "Message Input", message_input_window_size, NK_WINDOW_BORDER|NK_WINDOW_NO_SCROLLBAR)) {
|
||||
|
||||
// bottom text input
|
||||
// bottom text input
|
||||
nk_layout_row_begin(ctx, NK_STATIC, 28, 1);
|
||||
{
|
||||
nk_layout_row_push(ctx, 320);
|
||||
|
|
@ -374,22 +383,34 @@ static void nuklearApp(struct nk_context *ctx) {
|
|||
}
|
||||
}
|
||||
|
||||
struct nk_context* initializeNuklearApp() {
|
||||
|
||||
sprintf(activeChat, "no active chat");
|
||||
|
||||
graphql_input_window_size = nk_rect(WINDOW_WIDTH / 4, WINDOW_HEIGHT / 4, WINDOW_WIDTH / 2, 120);
|
||||
chats_window_size = nk_rect(0, 0, 180, WINDOW_HEIGHT);
|
||||
messages_window_size = nk_rect(180, 0, 330, WINDOW_HEIGHT - 36);
|
||||
message_input_window_size = nk_rect(180, WINDOW_HEIGHT - 36, 330, 36);
|
||||
|
||||
struct nk_context *ctx = nk_quickdraw_init(WINDOW_WIDTH, WINDOW_HEIGHT);
|
||||
void refreshNuklearApp(Boolean blankInput) {
|
||||
|
||||
nk_input_begin(ctx);
|
||||
|
||||
if (blankInput) {
|
||||
|
||||
nk_input_key(ctx, NK_KEY_DEL, 1);
|
||||
nk_input_key(ctx, NK_KEY_DEL, 0);
|
||||
}
|
||||
|
||||
nk_input_end(ctx);
|
||||
nuklearApp(ctx);
|
||||
nk_quickdraw_render(FrontWindow(), ctx);
|
||||
nk_clear(ctx);
|
||||
}
|
||||
|
||||
struct nk_context* initializeNuklearApp() {
|
||||
|
||||
sprintf(activeChat, "no active chat");
|
||||
|
||||
graphql_input_window_size = nk_rect(WINDOW_WIDTH / 2 - 118, 80, 234, 100);
|
||||
chats_window_size = nk_rect(0, 0, 180, WINDOW_HEIGHT);
|
||||
messages_window_size = nk_rect(180, 0, 330, WINDOW_HEIGHT - 36);
|
||||
message_input_window_size = nk_rect(180, WINDOW_HEIGHT - 36, 330, 36);
|
||||
|
||||
ctx = nk_quickdraw_init(WINDOW_WIDTH, WINDOW_HEIGHT);
|
||||
refreshNuklearApp(false);
|
||||
|
||||
sprintf(ip_input_buffer, "http://"); // doesn't work due to bug, see variable definition
|
||||
|
||||
return ctx;
|
||||
|
|
|
|||
|
|
@ -1266,7 +1266,7 @@ NK_API struct nk_context* nk_quickdraw_init(unsigned int width, unsigned int hei
|
|||
button->image_padding = nk_vec2(0,0);
|
||||
button->touch_padding = nk_vec2(0, 0);
|
||||
button->userdata = nk_handle_ptr(0);
|
||||
button->text_alignment = NK_TEXT_LEFT;
|
||||
button->text_alignment = NK_TEXT_CENTERED;
|
||||
button->border = 1;
|
||||
button->rounding = 10;
|
||||
button->draw_begin = 0;
|
||||
|
|
|
|||
380
output_js
380
output_js
|
|
@ -224,7 +224,7 @@ const shortenText = (text) => {
|
|||
return outputText
|
||||
}
|
||||
|
||||
const MAX_ROWS = 15
|
||||
const MAX_ROWS = 16
|
||||
|
||||
const splitMessages = (messages) => {
|
||||
|
||||
|
|
@ -232,7 +232,7 @@ const splitMessages = (messages) => {
|
|||
|
||||
if (!messages) {
|
||||
|
||||
return ``
|
||||
return `no messages ENDLASTMESSAGE`
|
||||
}
|
||||
|
||||
for (const message of messages) {
|
||||
|
|
@ -282,14 +282,28 @@ class iMessageClient {
|
|||
|
||||
console.log(`get messages for chat ID: ${chatId}`)
|
||||
|
||||
let result = await client.query({
|
||||
query: gql`query getMessages {
|
||||
getMessages(chatId: "${chatId}", page: "${page}") {
|
||||
chatter
|
||||
text
|
||||
}
|
||||
}`
|
||||
})
|
||||
let result
|
||||
|
||||
try {
|
||||
|
||||
result = await client.query({
|
||||
query: gql`query getMessages {
|
||||
getMessages(chatId: "${chatId}", page: "${page}") {
|
||||
chatter
|
||||
text
|
||||
}
|
||||
}`
|
||||
})
|
||||
} catch (error) {
|
||||
|
||||
console.log(`error with apollo query`)
|
||||
console.log(error)
|
||||
|
||||
result = {
|
||||
data: {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let messages = result.data.getMessages
|
||||
|
||||
|
|
@ -318,14 +332,28 @@ class iMessageClient {
|
|||
console.log(chatId)
|
||||
console.log(message)
|
||||
|
||||
let result = await client.query({
|
||||
query: gql`query sendMessage {
|
||||
sendMessage(chatId: "${chatId}", message: "${message}") {
|
||||
chatter
|
||||
text
|
||||
}
|
||||
}`
|
||||
})
|
||||
let result
|
||||
|
||||
try {
|
||||
|
||||
result = await client.query({
|
||||
query: gql`query sendMessage {
|
||||
sendMessage(chatId: "${chatId}", message: "${message}") {
|
||||
chatter
|
||||
text
|
||||
}
|
||||
}`
|
||||
})
|
||||
} catch (error) {
|
||||
|
||||
console.log(`error with apollo query`)
|
||||
console.log(error)
|
||||
|
||||
result = {
|
||||
data: {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let messages = result.data.sendMessage
|
||||
|
||||
|
|
@ -334,14 +362,28 @@ class iMessageClient {
|
|||
|
||||
async getChats () {
|
||||
|
||||
let result = await client.query({
|
||||
query: gql`query getChats {
|
||||
getChats {
|
||||
name
|
||||
friendlyName
|
||||
}
|
||||
}`
|
||||
})
|
||||
let result
|
||||
|
||||
try {
|
||||
|
||||
result = await client.query({
|
||||
query: gql`query getChats {
|
||||
getChats {
|
||||
name
|
||||
friendlyName
|
||||
}
|
||||
}`
|
||||
})
|
||||
} catch (error) {
|
||||
|
||||
console.log(`error with apollo query`)
|
||||
console.log(error)
|
||||
|
||||
result = {
|
||||
data: {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let chats = result.data.getChats
|
||||
let friendlyNameStrings = ``
|
||||
|
|
@ -892,289 +934,3 @@ package-lock.json@@@
|
|||
}
|
||||
}
|
||||
}
|
||||
&&&
|
||||
test.js@@@
|
||||
|
||||
const widthFor12ptFont = [
|
||||
0,
|
||||
10,
|
||||
10,
|
||||
10,
|
||||
10,
|
||||
10,
|
||||
10,
|
||||
10,
|
||||
10,
|
||||
8,
|
||||
10,
|
||||
10,
|
||||
10,
|
||||
0,
|
||||
10,
|
||||
10,
|
||||
10,
|
||||
11,
|
||||
11,
|
||||
9,
|
||||
11,
|
||||
10,
|
||||
10,
|
||||
10,
|
||||
10,
|
||||
10,
|
||||
10,
|
||||
10,
|
||||
10,
|
||||
10,
|
||||
10,
|
||||
10,
|
||||
4,
|
||||
6,
|
||||
7,
|
||||
10,
|
||||
7,
|
||||
11,
|
||||
10,
|
||||
3,
|
||||
5,
|
||||
5,
|
||||
7,
|
||||
7,
|
||||
4,
|
||||
7,
|
||||
4,
|
||||
7,
|
||||
8,
|
||||
8,
|
||||
8,
|
||||
8,
|
||||
8,
|
||||
8,
|
||||
8,
|
||||
8,
|
||||
8,
|
||||
8,
|
||||
4,
|
||||
4,
|
||||
6,
|
||||
8,
|
||||
6,
|
||||
8,
|
||||
11,
|
||||
8,
|
||||
8,
|
||||
8,
|
||||
8,
|
||||
7,
|
||||
7,
|
||||
8,
|
||||
8,
|
||||
6,
|
||||
7,
|
||||
9,
|
||||
7,
|
||||
12,
|
||||
9,
|
||||
8,
|
||||
8,
|
||||
8,
|
||||
8,
|
||||
7,
|
||||
6,
|
||||
8,
|
||||
8,
|
||||
12,
|
||||
8,
|
||||
8,
|
||||
8,
|
||||
5,
|
||||
7,
|
||||
5,
|
||||
8,
|
||||
8,
|
||||
6,
|
||||
8,
|
||||
8,
|
||||
7,
|
||||
8,
|
||||
8,
|
||||
6,
|
||||
8,
|
||||
8,
|
||||
4,
|
||||
6,
|
||||
8,
|
||||
4,
|
||||
12,
|
||||
8,
|
||||
8,
|
||||
8,
|
||||
8,
|
||||
6,
|
||||
7,
|
||||
6,
|
||||
8,
|
||||
8,
|
||||
12,
|
||||
8,
|
||||
8,
|
||||
8,
|
||||
5,
|
||||
5,
|
||||
5,
|
||||
8,
|
||||
8
|
||||
]
|
||||
|
||||
const getLineWidth = (line) => {
|
||||
|
||||
let length = 0;
|
||||
for (const char of line.split(``)) {
|
||||
|
||||
let currentCharWidth = widthFor12ptFont[char.charCodeAt()]
|
||||
|
||||
if (isNaN(currentCharWidth)) {
|
||||
|
||||
console.log(`BAD: ${char}`)
|
||||
|
||||
currentCharWidth = 1;
|
||||
}
|
||||
|
||||
length += currentCharWidth
|
||||
}
|
||||
|
||||
return length
|
||||
}
|
||||
|
||||
// this is tied to Sample.c's message window max width
|
||||
const MAX_WIDTH = 304
|
||||
const SPACE_WIDTH = widthFor12ptFont[32]
|
||||
|
||||
const getNextWordLength = (word) => {
|
||||
|
||||
let currentWidth = 0
|
||||
|
||||
for (const char of word.split(``)) {
|
||||
|
||||
let currentCharWidth = widthFor12ptFont[char.charCodeAt()]
|
||||
|
||||
if (isNaN(currentCharWidth)) {
|
||||
|
||||
currentCharWidth = 1;
|
||||
}
|
||||
|
||||
currentWidth += currentCharWidth
|
||||
}
|
||||
|
||||
return currentWidth
|
||||
}
|
||||
|
||||
const shortenText = (text) => {
|
||||
|
||||
let outputText = ``
|
||||
let currentWidth = 0
|
||||
|
||||
for (const word of text.split(` `)) {
|
||||
|
||||
let currentWordWidth = getNextWordLength(word)
|
||||
|
||||
console.log(`${word}: ${currentWordWidth}, pre: ${currentWidth}`)
|
||||
|
||||
if (currentWidth + currentWordWidth + SPACE_WIDTH > MAX_WIDTH) {
|
||||
|
||||
outputText = `${outputText}ENDLASTMESSAGE`
|
||||
currentWidth = 0
|
||||
|
||||
// okay, but what if the word itself is greater than max width?
|
||||
if (currentWordWidth > MAX_WIDTH) {
|
||||
|
||||
let splitWordWidth = 0
|
||||
|
||||
for (const char of word.split(``)) {
|
||||
|
||||
let currentCharWidth = widthFor12ptFont[char.charCodeAt()]
|
||||
|
||||
if (isNaN(currentCharWidth)) {
|
||||
|
||||
currentCharWidth = 1;
|
||||
}
|
||||
|
||||
if (splitWordWidth + currentCharWidth > MAX_WIDTH) {
|
||||
|
||||
outputText = `${outputText}ENDLASTMESSAGE`
|
||||
splitWordWidth = 0
|
||||
}
|
||||
|
||||
splitWordWidth += currentCharWidth
|
||||
outputText = `${outputText}${char}`
|
||||
}
|
||||
|
||||
currentWidth += splitWordWidth
|
||||
|
||||
continue
|
||||
}
|
||||
}
|
||||
|
||||
currentWidth += currentWordWidth + SPACE_WIDTH
|
||||
outputText = `${outputText} ${word}`
|
||||
}
|
||||
|
||||
return outputText
|
||||
}
|
||||
|
||||
const MAX_ROWS = 15
|
||||
|
||||
const splitMessages = (messages) => {
|
||||
|
||||
let firstMessage = true
|
||||
|
||||
if (!messages) {
|
||||
|
||||
return ``
|
||||
}
|
||||
|
||||
for (const message of messages) {
|
||||
|
||||
if (firstMessage) {
|
||||
|
||||
let tempMessageOutput = `${message.chatter}: ${message.text}`
|
||||
|
||||
tempMessageOutput = shortenText(tempMessageOutput)
|
||||
messageOutput = tempMessageOutput
|
||||
} else {
|
||||
|
||||
let tempMessageOutput = `${message.chatter}: ${message.text}`
|
||||
|
||||
tempMessageOutput = shortenText(tempMessageOutput)
|
||||
messageOutput = `${messageOutput}ENDLASTMESSAGE${tempMessageOutput}`
|
||||
}
|
||||
|
||||
firstMessage = false
|
||||
}
|
||||
|
||||
|
||||
if (messageOutput.split(`ENDLASTMESSAGE`).length > MAX_ROWS) {
|
||||
|
||||
messageOutput = messageOutput.split(`ENDLASTMESSAGE`)
|
||||
|
||||
let newMessageOutput = []
|
||||
|
||||
for (let i = messageOutput.length; i > messageOutput.length - MAX_ROWS; i--) {
|
||||
|
||||
newMessageOutput.unshift(messageOutput[i])
|
||||
}
|
||||
|
||||
messageOutput = newMessageOutput.join(`ENDLASTMESSAGE`)
|
||||
}
|
||||
|
||||
lastMessageOutput = messageOutput
|
||||
|
||||
return messageOutput
|
||||
}
|
||||
|
||||
|
||||
let x = splitMessages([{chatter: `me`, text: 'me: were gonna end up with so much shit on our counter tops that well have to prep the food on the floor with the dogs'}])
|
||||
for (const line of x.split(`ENDLASTMESSAGE`)) {
|
||||
|
||||
console.log(`${getLineWidth(line)}: ${line}`)
|
||||
}
|
||||
|
|
|
|||
3949
output_js.h
3949
output_js.h
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue