committing before removing individual window rendering code, too buggy, going to try some other perf paths
This commit is contained in:
camh
parent
d7ee26e975
commit
90f444a3c4
49
JS/index.js
49
JS/index.js
|
|
@ -11,25 +11,18 @@ const defaultOptions = {
|
|||
},
|
||||
query: {
|
||||
fetchPolicy: 'no-cache',
|
||||
errorPolicy: 'all',
|
||||
errorPolicy: 'ignore',
|
||||
},
|
||||
}
|
||||
|
||||
const client = new ApolloClient({
|
||||
uri: 'http://10.0.1.167:4000/',
|
||||
cache: new InMemoryCache(),
|
||||
link: new createHttpLink({
|
||||
uri: 'http://10.0.1.167:4000/'
|
||||
}),
|
||||
defaultOptions
|
||||
});
|
||||
let client
|
||||
|
||||
|
||||
class iMessageClient {
|
||||
|
||||
async getMessages (chatId, page) {
|
||||
|
||||
console.log(`get messages for caht ID: ${chatId}`)
|
||||
console.log(`get messages for chat ID: ${chatId}`)
|
||||
|
||||
let result = await client.query({
|
||||
query: gql`query getMessages {
|
||||
|
|
@ -56,8 +49,10 @@ class iMessageClient {
|
|||
for (const message of messages) {
|
||||
|
||||
if (firstMessage) {
|
||||
|
||||
messageOutput = `${message.chatter}: ${message.text}`
|
||||
} else {
|
||||
|
||||
messageOutput = `${messageOutput}ENDLASTMESSAGE${message.chatter}: ${message.text}`
|
||||
}
|
||||
|
||||
|
|
@ -70,7 +65,7 @@ class iMessageClient {
|
|||
|
||||
async sendMessage (chatId, message) {
|
||||
|
||||
console.log(`send messages for caht ID: ${chatId} ${message}`)
|
||||
console.log(`send messages for chat ID: ${chatId} ${message}`)
|
||||
|
||||
let result = await client.query({
|
||||
query: gql`query sendMessage {
|
||||
|
|
@ -81,11 +76,9 @@ class iMessageClient {
|
|||
}`
|
||||
})
|
||||
|
||||
let messages = result.data.getMessages
|
||||
let messages = result.data.sendMessage
|
||||
let messageOutput = ``
|
||||
const maxPerLine = 20000
|
||||
console.log(`return messages from send messages:`)
|
||||
console.log(messages)
|
||||
|
||||
let firstMessage = true
|
||||
|
||||
|
|
@ -97,9 +90,11 @@ class iMessageClient {
|
|||
for (const message of messages) {
|
||||
|
||||
if (firstMessage) {
|
||||
messageOutput = `${message.chatter}: `
|
||||
|
||||
messageOutput = `${message.chatter}: ${message.text}`
|
||||
} else {
|
||||
messageOutput = `${messageOutput}ENDLASTMESSAGE${message.chatter}: `
|
||||
|
||||
messageOutput = `${messageOutput}ENDLASTMESSAGE${message.chatter}: ${message.text}`
|
||||
}
|
||||
|
||||
firstMessage = false
|
||||
|
|
@ -136,6 +131,28 @@ class iMessageClient {
|
|||
|
||||
return friendlyNameStrings
|
||||
}
|
||||
|
||||
setIPAddress (IPAddress) {
|
||||
|
||||
try {
|
||||
|
||||
client = new ApolloClient({
|
||||
uri: `${IPAddress}:4000/`,
|
||||
cache: new InMemoryCache(),
|
||||
link: new createHttpLink({
|
||||
uri: `${IPAddress}:4000/`
|
||||
}),
|
||||
defaultOptions
|
||||
});
|
||||
} catch (err) {
|
||||
console.log(`error instantiating the ApolloClient`)
|
||||
console.log(err)
|
||||
|
||||
return `failure`
|
||||
}
|
||||
|
||||
return `success`
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = iMessageClient
|
||||
|
|
|
|||
440
Sample.c
440
Sample.c
|
|
@ -9,6 +9,7 @@
|
|||
#include <Dialogs.h>
|
||||
#include <ToolUtils.h>
|
||||
#include <Memory.h>
|
||||
#include <Sound.h>
|
||||
#include <SegLoad.h>
|
||||
#include <Files.h>
|
||||
#include <OSUtils.h>
|
||||
|
|
@ -37,12 +38,12 @@
|
|||
#define NK_ZERO_COMMAND_MEMORY
|
||||
#define NK_INCLUDE_FIXED_TYPES
|
||||
#define NK_INCLUDE_STANDARD_IO
|
||||
#define NK_INCLUDE_STANDARD_VARARGS
|
||||
// #define NK_INCLUDE_STANDARD_VARARGS
|
||||
#define NK_INCLUDE_DEFAULT_ALLOCATOR
|
||||
#define NK_IMPLEMENTATION
|
||||
#define NK_QUICKDRAW_IMPLEMENTATION
|
||||
#define NK_MEMSET memset
|
||||
#define NK_MEMCPY memcpy
|
||||
// #define NK_MEMSET memset
|
||||
// #define NK_MEMCPY memcpy
|
||||
|
||||
void aFailed(char *file, int line) {
|
||||
|
||||
|
|
@ -55,6 +56,9 @@ void aFailed(char *file, int line) {
|
|||
while (true) {}
|
||||
}
|
||||
|
||||
int mouse_x;
|
||||
int mouse_y;
|
||||
|
||||
#define NK_ASSERT(e) \
|
||||
if (!(e)) \
|
||||
aFailed(__FILE__, __LINE__)
|
||||
|
|
@ -108,28 +112,39 @@ void AlertUser( void );
|
|||
#define BotRight(aRect) (* (Point *) &(aRect).bottom)
|
||||
|
||||
// TODO:
|
||||
// set up coprocessor
|
||||
// set up imessage service
|
||||
// new typescript one that responds via graphql endpoints?????
|
||||
// finish setting up UI (maybe mock data from coprocessor?)
|
||||
// need UI to start new chat threads
|
||||
// need function to create new chat + send message in it
|
||||
// QUESTION should the chat UI be a scrollable panel with labels inside of it so both sides of the conversation can be shown?
|
||||
// further improve ui performance -- it's close! eliminate more on keyboard events and we'll be fine
|
||||
// - IN PROGRESS, fix issues related to perf work... need to have nuklear redraw on text scroll, need to hold scroll positions somehow for inactive windows (undo, see what happens?)
|
||||
// - potential perf gain: float -> integer math
|
||||
// - potential perf gain: strip unnecessary function calls (which?)
|
||||
// - get new messages (when?) -- start with on send
|
||||
// - IN PROGRESS new message window -- needs to blank out messages, then needs fixes on new mac end
|
||||
// - chat during the day for a few minutes and figure out small issues
|
||||
// - transfer to mac, get hw setup working
|
||||
// - start writing blog posts
|
||||
// - js code needs to split long messages into max length per line, so that they display properly
|
||||
|
||||
|
||||
char jsFunctionResponse[102400]; // Matches MAX_RECEIVE_SIZE
|
||||
|
||||
|
||||
|
||||
int haveRun = 0;
|
||||
int chatFriendlyNamesCounter = 0;
|
||||
int ipAddressSet = 0;
|
||||
int sendNewChat = 0;
|
||||
char chatFriendlyNames[16][64];
|
||||
char activeChat[64];
|
||||
int activeMessageCounter = 0;
|
||||
char activeChatMessages[10][2048];
|
||||
char box_input_buffer[2048];
|
||||
char ip_input_buffer[255];
|
||||
char new_message_input_buffer[255];
|
||||
int box_len;
|
||||
int box_input_len;
|
||||
int new_message_input_buffer_len;
|
||||
int ip_input_buffer_len;
|
||||
int shouldScrollMessages = 0;
|
||||
int forceRedraw = 2; // this is how many 'iterations' of the UI that we need to see every element for
|
||||
int messagesScrollBarLocation = 0;
|
||||
int messageWindowWasDormant = 0;
|
||||
int coprocessorLoaded = 0;
|
||||
|
||||
void getMessagesFromjsFunctionResponse() {
|
||||
|
||||
|
|
@ -168,6 +183,17 @@ void sendMessage() {
|
|||
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
void sendIPAddressToCoprocessor() {
|
||||
|
||||
char output[2048];
|
||||
sprintf(output, "%s", ip_input_buffer);
|
||||
|
||||
callFunctionOnCoprocessor("setIPAddress", output, jsFunctionResponse);
|
||||
|
||||
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"?
|
||||
|
|
@ -206,72 +232,235 @@ void getChats() {
|
|||
return;
|
||||
}
|
||||
|
||||
Boolean checkCollision(struct nk_rect window) {
|
||||
// writeSerialPortDebug(boutRefNum, "checkCollision!");
|
||||
|
||||
// Boolean testout = (window.x < mouse_x &&
|
||||
// window.x + window.w > mouse_x &&
|
||||
// window.y < mouse_y &&
|
||||
// window.y + window.h > mouse_y);
|
||||
// char str[255];
|
||||
// sprintf(str, "what %d", testout);
|
||||
// writeSerialPortDebug(boutRefNum, str);
|
||||
|
||||
|
||||
// if truthy return, mouse is over window!
|
||||
return (window.x < mouse_x &&
|
||||
window.x + window.w > mouse_x &&
|
||||
window.y < mouse_y &&
|
||||
window.y + window.h > mouse_y);
|
||||
|
||||
}
|
||||
|
||||
struct nk_rect graphql_input_window_size;
|
||||
struct nk_rect chats_window_size;
|
||||
struct nk_rect messages_window_size;
|
||||
struct nk_rect message_input_window_size;
|
||||
|
||||
static void boxTest(struct nk_context *ctx) {
|
||||
|
||||
if (nk_begin(ctx, "Chats", nk_rect(0, 0, 200, WINDOW_HEIGHT), NK_WINDOW_BORDER)) {
|
||||
Boolean isMouseHoveringWindow;
|
||||
|
||||
getChats();
|
||||
// prompt the user for the graphql instance
|
||||
if (!coprocessorLoaded) {
|
||||
|
||||
nk_layout_row_begin(ctx, NK_STATIC, 25, 1);
|
||||
{
|
||||
for (int i = 0; i < chatFriendlyNamesCounter; i++) {
|
||||
|
||||
nk_layout_row_push(ctx, 175); // 40% wide
|
||||
if (nk_begin_titled(ctx, "Loading coprocessor services", "Loading coprocessor services", graphql_input_window_size, NK_WINDOW_TITLE|NK_WINDOW_BORDER)) {
|
||||
|
||||
if (nk_button_label(ctx, chatFriendlyNames[i])) {
|
||||
nk_layout_row_begin(ctx, NK_STATIC, 20, 1);
|
||||
{
|
||||
nk_layout_row_push(ctx, 200); // 40% wide
|
||||
nk_label_wrap(ctx, "Please wait");
|
||||
}
|
||||
nk_layout_row_end(ctx);
|
||||
|
||||
// writeSerialPortDebug(boutRefNum, "CLICK!");
|
||||
// writeSerialPortDebug(boutRefNum, chatFriendlyNames[i]);
|
||||
sprintf(activeChat, "%s", chatFriendlyNames[i]);
|
||||
getMessages(activeChat, 0);
|
||||
// writeSerialPortDebug(boutRefNum, "CLICK complete, enjoy your chat!");
|
||||
}
|
||||
}
|
||||
}
|
||||
nk_layout_row_end(ctx);
|
||||
nk_end(ctx);
|
||||
}
|
||||
|
||||
nk_end(ctx);
|
||||
}
|
||||
|
||||
if (nk_begin(ctx, "Message Input", nk_rect(200, WINDOW_HEIGHT - 50, 310, 50), NK_WINDOW_BORDER|NK_WINDOW_NO_SCROLLBAR)) {
|
||||
// bottom text input
|
||||
nk_layout_row_begin(ctx, NK_STATIC, 40, 2);
|
||||
{
|
||||
nk_layout_row_push(ctx, 200); // 40% wide
|
||||
|
||||
nk_edit_string(ctx, NK_EDIT_BOX, box_input_buffer, &box_input_len, 2048, nk_filter_default);
|
||||
|
||||
nk_layout_row_push(ctx, 96); // 40% wide
|
||||
if (nk_button_label(ctx, "send")) {
|
||||
//fprintf(stdout, "pushed!\n");
|
||||
sendMessage();
|
||||
}
|
||||
}
|
||||
nk_layout_row_end(ctx);
|
||||
|
||||
nk_end(ctx);
|
||||
return;
|
||||
}
|
||||
|
||||
if (nk_begin_titled(ctx, "Message", activeChat, nk_rect(200, 0, 310, WINDOW_HEIGHT - 50), NK_WINDOW_BORDER|NK_WINDOW_TITLE)) {
|
||||
|
||||
nk_layout_row_begin(ctx, NK_STATIC, 0, 1);
|
||||
{
|
||||
for (int i = 0; i < activeMessageCounter; i++) {
|
||||
|
||||
nk_layout_row_push(ctx, 285); // 40% wide
|
||||
// message label
|
||||
// writeSerialPortDebug(boutRefNum, "create label!");
|
||||
// writeSerialPortDebug(boutRefNum, activeChatMessages[i]);
|
||||
// prompt the user for the graphql instance
|
||||
if (!ipAddressSet) {
|
||||
|
||||
nk_label_wrap(ctx, activeChatMessages[i]);
|
||||
isMouseHoveringWindow = checkCollision(graphql_input_window_size);
|
||||
|
||||
if (isMouseHoveringWindow || forceRedraw) {
|
||||
|
||||
if (nk_begin_titled(ctx, "Enter iMessage GraphQL Server", "Enter iMessage GraphQL Server", graphql_input_window_size, NK_WINDOW_TITLE|NK_WINDOW_BORDER)) {
|
||||
|
||||
nk_layout_row_begin(ctx, NK_STATIC, 20, 1);
|
||||
{
|
||||
nk_layout_row_push(ctx, 200); // 40% wide
|
||||
nk_label_wrap(ctx, "ex: http://127.0.0.1");
|
||||
}
|
||||
nk_layout_row_end(ctx);
|
||||
|
||||
nk_layout_row_begin(ctx, NK_STATIC, 30, 2);
|
||||
{
|
||||
nk_layout_row_push(ctx, WINDOW_WIDTH / 2 - 90); // 40% wide
|
||||
|
||||
nk_edit_string(ctx, NK_EDIT_SIMPLE, ip_input_buffer, &ip_input_buffer_len, 2048, nk_filter_default);
|
||||
|
||||
nk_layout_row_push(ctx, 60); // 40% wide
|
||||
if (nk_button_label(ctx, "save")) {
|
||||
|
||||
ipAddressSet = 1;
|
||||
forceRedraw = 2;
|
||||
sendIPAddressToCoprocessor();
|
||||
}
|
||||
}
|
||||
nk_layout_row_end(ctx);
|
||||
|
||||
nk_end(ctx);
|
||||
}
|
||||
|
||||
}
|
||||
nk_layout_row_end(ctx);
|
||||
nk_end(ctx);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
// prompt the user for new chat
|
||||
if (sendNewChat) {
|
||||
|
||||
if (nk_begin_titled(ctx, "Enter New Message Recipient", "Enter New Message Recipient", nk_rect(WINDOW_WIDTH / 4, WINDOW_HEIGHT / 4, WINDOW_WIDTH / 2, 120), NK_WINDOW_TITLE|NK_WINDOW_BORDER)) {
|
||||
|
||||
nk_layout_row_begin(ctx, NK_STATIC, 30, 2);
|
||||
{
|
||||
nk_layout_row_push(ctx, WINDOW_WIDTH / 2 - 110); // 40% wide
|
||||
|
||||
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); // 40% wide
|
||||
if (nk_button_label(ctx, "open chat")) {
|
||||
|
||||
sendNewChat = 0;
|
||||
forceRedraw = 2;
|
||||
// sendIPAddressToCoprocessor();
|
||||
|
||||
sprintf(activeChat, new_message_input_buffer);
|
||||
}
|
||||
}
|
||||
nk_layout_row_end(ctx);
|
||||
|
||||
nk_end(ctx);
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
isMouseHoveringWindow = checkCollision(chats_window_size);
|
||||
|
||||
if (isMouseHoveringWindow || forceRedraw) {
|
||||
|
||||
if (nk_begin(ctx, "Chats", chats_window_size, NK_WINDOW_BORDER|NK_WINDOW_NO_SCROLLBAR)) {
|
||||
|
||||
getChats();
|
||||
|
||||
nk_layout_row_begin(ctx, NK_STATIC, 25, 1);
|
||||
{
|
||||
for (int i = 0; i < chatFriendlyNamesCounter; i++) {
|
||||
|
||||
if (i > 9) {
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
nk_layout_row_push(ctx, 185); // 40% wide
|
||||
|
||||
if (nk_button_label(ctx, chatFriendlyNames[i])) {
|
||||
|
||||
// writeSerialPortDebug(boutRefNum, "CLICK!");
|
||||
// writeSerialPortDebug(boutRefNum, chatFriendlyNames[i]);
|
||||
sprintf(activeChat, "%s", chatFriendlyNames[i]);
|
||||
getMessages(activeChat, 0);
|
||||
shouldScrollMessages = 1;
|
||||
forceRedraw = 2;
|
||||
// writeSerialPortDebug(boutRefNum, "CLICK complete, enjoy your chat!");
|
||||
}
|
||||
}
|
||||
}
|
||||
nk_layout_row_end(ctx);
|
||||
|
||||
nk_end(ctx);
|
||||
}
|
||||
}
|
||||
|
||||
isMouseHoveringWindow = checkCollision(message_input_window_size);
|
||||
|
||||
if (isMouseHoveringWindow || forceRedraw) {
|
||||
|
||||
if (nk_begin(ctx, "Message Input", message_input_window_size, NK_WINDOW_BORDER|NK_WINDOW_NO_SCROLLBAR)) {
|
||||
|
||||
// bottom text input
|
||||
nk_layout_row_begin(ctx, NK_STATIC, 40, 2);
|
||||
{
|
||||
nk_layout_row_push(ctx, 220); // 40% wide
|
||||
|
||||
nk_edit_string(ctx, NK_EDIT_BOX, box_input_buffer, &box_input_len, 2048, nk_filter_default);
|
||||
|
||||
nk_layout_row_push(ctx, 76); // 40% wide
|
||||
if (nk_button_label(ctx, "send")) {
|
||||
//fprintf(stdout, "pushed!\n");
|
||||
sendMessage();
|
||||
forceRedraw = 2;
|
||||
}
|
||||
}
|
||||
nk_layout_row_end(ctx);
|
||||
|
||||
nk_end(ctx);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
isMouseHoveringWindow = checkCollision(messages_window_size);
|
||||
|
||||
if (isMouseHoveringWindow || forceRedraw) {
|
||||
|
||||
|
||||
if (nk_begin_titled(ctx, "Message", activeChat, messages_window_size, NK_WINDOW_BORDER|NK_WINDOW_TITLE)) {
|
||||
|
||||
nk_layout_row_begin(ctx, NK_STATIC, 15, 1);
|
||||
{
|
||||
for (int i = 0; i < activeMessageCounter; i++) {
|
||||
|
||||
nk_layout_row_push(ctx, 285); // 40% wide
|
||||
// message label
|
||||
writeSerialPortDebug(boutRefNum, "create label!");
|
||||
writeSerialPortDebug(boutRefNum, activeChatMessages[i]);
|
||||
|
||||
nk_label_wrap(ctx, activeChatMessages[i]);
|
||||
}
|
||||
|
||||
if (shouldScrollMessages) {
|
||||
|
||||
ctx->current->scrollbar.y = 10000;
|
||||
shouldScrollMessages = 0;
|
||||
} else if (messageWindowWasDormant) {
|
||||
|
||||
ctx->current->scrollbar.y = messagesScrollBarLocation;
|
||||
}
|
||||
|
||||
messagesScrollBarLocation = ctx->current->scrollbar.y;
|
||||
|
||||
}
|
||||
|
||||
nk_layout_row_end(ctx);
|
||||
nk_end(ctx);
|
||||
}
|
||||
|
||||
messageWindowWasDormant = 0;
|
||||
} else {
|
||||
|
||||
messageWindowWasDormant = 1;
|
||||
}
|
||||
|
||||
|
||||
if (forceRedraw > 0) {
|
||||
|
||||
forceRedraw--;
|
||||
}
|
||||
}
|
||||
|
||||
#pragma segment Main
|
||||
|
|
@ -282,12 +471,6 @@ void main()
|
|||
|
||||
UnloadSeg((Ptr) Initialize); /* note that Initialize must not be in Main! */
|
||||
|
||||
setupCoprocessor("nuklear", "modem"); // could also be "printer", modem is 0 in PCE settings - printer would be 1
|
||||
|
||||
char programResult[MAX_RECEIVE_SIZE];
|
||||
sendProgramToCoprocessor(OUTPUT_JS, programResult);
|
||||
|
||||
nk_quickdraw_init(WINDOW_WIDTH, WINDOW_HEIGHT);
|
||||
|
||||
struct nk_context *ctx;
|
||||
|
||||
|
|
@ -296,8 +479,33 @@ void main()
|
|||
// writeSerialPortDebug(boutRefNum, "call nk_init");
|
||||
#endif
|
||||
|
||||
graphql_input_window_size = nk_rect(WINDOW_WIDTH / 4, WINDOW_HEIGHT / 4, WINDOW_WIDTH / 2, 120);
|
||||
chats_window_size = nk_rect(0, 0, 200, WINDOW_HEIGHT);
|
||||
messages_window_size = nk_rect(200, 0, 310, WINDOW_HEIGHT - 50);
|
||||
message_input_window_size = nk_rect(200, WINDOW_HEIGHT - 50, 310, 50);
|
||||
ctx = nk_quickdraw_init(WINDOW_WIDTH, WINDOW_HEIGHT);
|
||||
|
||||
// run our nuklear app one time to render the window telling us to be patient for the coprocessor
|
||||
// app to load up
|
||||
nk_input_begin(ctx);
|
||||
nk_input_end(ctx);
|
||||
boxTest(ctx);
|
||||
nk_quickdraw_render(FrontWindow(), ctx);
|
||||
nk_clear(ctx);
|
||||
SysBeep(1);
|
||||
|
||||
writeSerialPortDebug(boutRefNum, "setupCoprocessor!");
|
||||
setupCoprocessor("nuklear", "modem"); // could also be "printer", modem is 0 in PCE settings - printer would be 1
|
||||
|
||||
char programResult[MAX_RECEIVE_SIZE];
|
||||
writeSerialPortDebug(boutRefNum, "sendProgramToCoprocessor!");
|
||||
sendProgramToCoprocessor(OUTPUT_JS, programResult);
|
||||
|
||||
coprocessorLoaded = 1;
|
||||
sprintf(ip_input_buffer, "http://");
|
||||
|
||||
|
||||
|
||||
#ifdef MAC_APP_DEBUGGING
|
||||
|
||||
// writeSerialPortDebug(boutRefNum, "call into event loop");
|
||||
|
|
@ -312,7 +520,9 @@ void EventLoop(struct nk_context *ctx)
|
|||
{
|
||||
RgnHandle cursorRgn;
|
||||
Boolean gotEvent;
|
||||
Boolean hasNextEvent;
|
||||
EventRecord event;
|
||||
EventRecord nextEventRecord;
|
||||
Point mouse;
|
||||
cursorRgn = NewRgn();
|
||||
|
||||
|
|
@ -334,10 +544,8 @@ void EventLoop(struct nk_context *ctx)
|
|||
// writeSerialPortDebug(boutRefNum, "nk_input_begin complete");
|
||||
#endif
|
||||
|
||||
|
||||
GetGlobalMouse(&mouse);
|
||||
|
||||
|
||||
// as far as i can tell, there is no way to event on mouse movement with mac libraries,
|
||||
// so we are just going to track on our own, and create our own events.
|
||||
// this seems kind of a bummer to not pass this to event handling code, but to make
|
||||
|
|
@ -359,73 +567,45 @@ void EventLoop(struct nk_context *ctx)
|
|||
beganInput = true;
|
||||
nk_input_begin(ctx);
|
||||
nk_input_motion(ctx, tempPoint.h, tempPoint.v);
|
||||
|
||||
mouse_x = tempPoint.h;
|
||||
mouse_y = tempPoint.v;
|
||||
}
|
||||
|
||||
lastMouseHPos = mouse.h;
|
||||
lastMouseVPos = mouse.v;
|
||||
|
||||
if (gHasWaitNextEvent) {
|
||||
SystemTask();
|
||||
gotEvent = GetNextEvent(everyEvent, &event);
|
||||
|
||||
gotEvent = WaitNextEvent(everyEvent, &event, MAXLONG, cursorRgn);
|
||||
} else {
|
||||
|
||||
SystemTask();
|
||||
gotEvent = GetNextEvent(everyEvent, &event);
|
||||
}
|
||||
|
||||
long start;
|
||||
long end;
|
||||
long total;
|
||||
long eventTime0;
|
||||
long eventTime1;
|
||||
long eventTime2;
|
||||
long eventTime3;
|
||||
|
||||
start = TickCount();
|
||||
if (gotEvent) {
|
||||
// drain all events before rendering
|
||||
while (gotEvent) {
|
||||
|
||||
#ifdef MAC_APP_DEBUGGING
|
||||
|
||||
// writeSerialPortDebug(boutRefNum, "calling to DoEvent");
|
||||
writeSerialPortDebug(boutRefNum, "calling to DoEvent");
|
||||
#endif
|
||||
|
||||
if (!beganInput) {
|
||||
|
||||
nk_input_begin(ctx);
|
||||
beganInput = true;
|
||||
}
|
||||
|
||||
beganInput = true;
|
||||
|
||||
DoEvent(&event, ctx);
|
||||
|
||||
#ifdef MAC_APP_DEBUGGING
|
||||
|
||||
// writeSerialPortDebug(boutRefNum, "done with DoEvent");
|
||||
writeSerialPortDebug(boutRefNum, "done with DoEvent");
|
||||
#endif
|
||||
|
||||
gotEvent = GetNextEvent(everyEvent, &event);
|
||||
}
|
||||
|
||||
end = TickCount();
|
||||
|
||||
total = end - start;
|
||||
eventTime0 = total;// / 60.0;
|
||||
start = TickCount();
|
||||
#ifdef MAC_APP_DEBUGGING
|
||||
|
||||
// writeSerialPortDebug(boutRefNum, "nk_input_end");
|
||||
#endif
|
||||
|
||||
if (beganInput) {
|
||||
// only re-render if there is an event, prevents screen flickering
|
||||
if (beganInput || firstOrMouseMove) {
|
||||
|
||||
nk_input_end(ctx);
|
||||
}
|
||||
|
||||
#ifdef MAC_APP_DEBUGGING
|
||||
|
||||
// writeSerialPortDebug(boutRefNum, "nk_input_end complete");
|
||||
#endif
|
||||
|
||||
// only re-render if there is an event, prevents screen flickering
|
||||
if (gotEvent || firstOrMouseMove) {
|
||||
|
||||
firstOrMouseMove = false;
|
||||
|
||||
|
|
@ -434,36 +614,11 @@ void EventLoop(struct nk_context *ctx)
|
|||
// writeSerialPortDebug(boutRefNum, "nk_quickdraw_render");
|
||||
#endif
|
||||
|
||||
boxTest(ctx);
|
||||
|
||||
nk_quickdraw_render(FrontWindow(), ctx);
|
||||
|
||||
start = TickCount();
|
||||
|
||||
//calculator(ctx);
|
||||
//overview(ctx);
|
||||
boxTest(ctx);
|
||||
|
||||
|
||||
end = TickCount();
|
||||
|
||||
total = end - start;
|
||||
eventTime1 = total;// / 60.0;
|
||||
start = TickCount();
|
||||
nk_quickdraw_render(FrontWindow(), ctx);
|
||||
end = TickCount();
|
||||
|
||||
total = end - start;
|
||||
eventTime2 = total;// / 60.0;
|
||||
start = TickCount();
|
||||
nk_clear(ctx);
|
||||
end = TickCount();
|
||||
|
||||
total = end - start;
|
||||
eventTime3 = total;// / 60.0;
|
||||
start = TickCount();
|
||||
|
||||
// char logx[255];
|
||||
// sprintf(logx, "EventLoop() eventTime0 (handle event) %ld, eventTime1 (nuklear UI) %ld, eventTime2 (render function) %ld, eventTime3 (clear) %ld ticks to execute\n", eventTime0, eventTime1, eventTime2, eventTime3);
|
||||
// // writeSerialPortDebug(boutRefNum, logx);
|
||||
nk_clear(ctx);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -775,12 +930,7 @@ void DoMenuCommand(menuResult)
|
|||
handledByDA = SystemEdit(menuItem-1); /* since we donÕt do any Editing */
|
||||
break;
|
||||
case mLight:
|
||||
switch ( menuItem ) {
|
||||
case iStop:
|
||||
break;
|
||||
case iGo:
|
||||
break;
|
||||
}
|
||||
sendNewChat = 1;
|
||||
break;
|
||||
|
||||
case mHelp:
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 394 KiB After Width: | Height: | Size: 383 KiB |
|
|
@ -1,6 +1,6 @@
|
|||
set(CMAKE_HOST_SYSTEM "Linux-5.11.0-27-generic")
|
||||
set(CMAKE_HOST_SYSTEM "Linux-5.11.0-36-generic")
|
||||
set(CMAKE_HOST_SYSTEM_NAME "Linux")
|
||||
set(CMAKE_HOST_SYSTEM_VERSION "5.11.0-27-generic")
|
||||
set(CMAKE_HOST_SYSTEM_VERSION "5.11.0-36-generic")
|
||||
set(CMAKE_HOST_SYSTEM_PROCESSOR "x86_64")
|
||||
|
||||
include("/home/camh/Retro68-build/toolchain/m68k-apple-macos/cmake/retro68.toolchain.cmake")
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
The target system is: Retro68 - 1 -
|
||||
The host system is: Linux - 5.11.0-27-generic - x86_64
|
||||
The host system is: Linux - 5.11.0-36-generic - x86_64
|
||||
Compiling the C compiler identification source file "CMakeCCompilerId.c" succeeded.
|
||||
Compiler: /home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-gcc
|
||||
Build flags:
|
||||
|
|
@ -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_34648/fast && /usr/bin/make -f CMakeFiles/cmTC_34648.dir/build.make CMakeFiles/cmTC_34648.dir/build
|
||||
Run Build Command(s):/usr/bin/make cmTC_0858b/fast && /usr/bin/make -f CMakeFiles/cmTC_0858b.dir/build.make CMakeFiles/cmTC_0858b.dir/build
|
||||
make[1]: Entering directory '/home/camh/Documents/Retro68kApps/NuklearQuickDraw/build/CMakeFiles/CMakeTmp'
|
||||
Building C object CMakeFiles/cmTC_34648.dir/testCCompiler.c.obj
|
||||
/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-gcc -o CMakeFiles/cmTC_34648.dir/testCCompiler.c.obj -c /home/camh/Documents/Retro68kApps/NuklearQuickDraw/build/CMakeFiles/CMakeTmp/testCCompiler.c
|
||||
Linking C executable cmTC_34648
|
||||
/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_34648.dir/link.txt --verbose=1
|
||||
/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-gcc CMakeFiles/cmTC_34648.dir/testCCompiler.c.obj -o cmTC_34648
|
||||
Building C object CMakeFiles/cmTC_0858b.dir/testCCompiler.c.obj
|
||||
/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-gcc -o CMakeFiles/cmTC_0858b.dir/testCCompiler.c.obj -c /home/camh/Documents/Retro68kApps/NuklearQuickDraw/build/CMakeFiles/CMakeTmp/testCCompiler.c
|
||||
Linking C executable cmTC_0858b
|
||||
/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_0858b.dir/link.txt --verbose=1
|
||||
/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-gcc CMakeFiles/cmTC_0858b.dir/testCCompiler.c.obj -o cmTC_0858b
|
||||
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_2b078/fast && /usr/bin/make -f CMakeFiles/cmTC_2b078.dir/build.make CMakeFiles/cmTC_2b078.dir/build
|
||||
Run Build Command(s):/usr/bin/make cmTC_57eab/fast && /usr/bin/make -f CMakeFiles/cmTC_57eab.dir/build.make CMakeFiles/cmTC_57eab.dir/build
|
||||
make[1]: Entering directory '/home/camh/Documents/Retro68kApps/NuklearQuickDraw/build/CMakeFiles/CMakeTmp'
|
||||
Building C object CMakeFiles/cmTC_2b078.dir/CMakeCCompilerABI.c.obj
|
||||
/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-gcc -v -o CMakeFiles/cmTC_2b078.dir/CMakeCCompilerABI.c.obj -c /usr/share/cmake-3.16/Modules/CMakeCCompilerABI.c
|
||||
Building C object CMakeFiles/cmTC_57eab.dir/CMakeCCompilerABI.c.obj
|
||||
/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-gcc -v -o CMakeFiles/cmTC_57eab.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_2b078.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_2b078.dir/CMakeCCompilerABI.c.obj -version -o /tmp/ccZKR5f0.s
|
||||
COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_57eab.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_57eab.dir/CMakeCCompilerABI.c.obj -version -o /tmp/ccxzytuk.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_2b078.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_2b078.dir/CMakeCCompilerABI.c.obj /tmp/ccZKR5f0.s
|
||||
COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_57eab.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_57eab.dir/CMakeCCompilerABI.c.obj /tmp/ccxzytuk.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_2b078.dir/CMakeCCompilerABI.c.obj' '-c' '-mcpu=68000'
|
||||
Linking C executable cmTC_2b078
|
||||
/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_2b078.dir/link.txt --verbose=1
|
||||
/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-gcc -v CMakeFiles/cmTC_2b078.dir/CMakeCCompilerABI.c.obj -o cmTC_2b078
|
||||
COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_57eab.dir/CMakeCCompilerABI.c.obj' '-c' '-mcpu=68000'
|
||||
Linking C executable cmTC_57eab
|
||||
/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_57eab.dir/link.txt --verbose=1
|
||||
/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-gcc -v CMakeFiles/cmTC_57eab.dir/CMakeCCompilerABI.c.obj -o cmTC_57eab
|
||||
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_2b078' '-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/ccmVsDhC.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_2b078 -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_2b078.dir/CMakeCCompilerABI.c.obj --start-group -lgcc -lc -lretrocrt -lInterface --end-group
|
||||
COLLECT_GCC_OPTIONS='-v' '-o' 'cmTC_2b078' '-mcpu=68000'
|
||||
COLLECT_GCC_OPTIONS='-v' '-o' 'cmTC_57eab' '-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/ccOWPyRM.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_57eab -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_57eab.dir/CMakeCCompilerABI.c.obj --start-group -lgcc -lc -lretrocrt -lInterface --end-group
|
||||
COLLECT_GCC_OPTIONS='-v' '-o' 'cmTC_57eab' '-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_2b078/fast && /usr/bin/make -f CMakeFiles/cmTC_2b078.dir/build.make CMakeFiles/cmTC_2b078.dir/build]
|
||||
ignore line: [Run Build Command(s):/usr/bin/make cmTC_57eab/fast && /usr/bin/make -f CMakeFiles/cmTC_57eab.dir/build.make CMakeFiles/cmTC_57eab.dir/build]
|
||||
ignore line: [make[1]: Entering directory '/home/camh/Documents/Retro68kApps/NuklearQuickDraw/build/CMakeFiles/CMakeTmp']
|
||||
ignore line: [Building C object CMakeFiles/cmTC_2b078.dir/CMakeCCompilerABI.c.obj]
|
||||
ignore line: [/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-gcc -v -o CMakeFiles/cmTC_2b078.dir/CMakeCCompilerABI.c.obj -c /usr/share/cmake-3.16/Modules/CMakeCCompilerABI.c]
|
||||
ignore line: [Building C object CMakeFiles/cmTC_57eab.dir/CMakeCCompilerABI.c.obj]
|
||||
ignore line: [/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-gcc -v -o CMakeFiles/cmTC_57eab.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_2b078.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_2b078.dir/CMakeCCompilerABI.c.obj -version -o /tmp/ccZKR5f0.s]
|
||||
ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_57eab.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_57eab.dir/CMakeCCompilerABI.c.obj -version -o /tmp/ccxzytuk.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_2b078.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_2b078.dir/CMakeCCompilerABI.c.obj /tmp/ccZKR5f0.s]
|
||||
ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_57eab.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_57eab.dir/CMakeCCompilerABI.c.obj /tmp/ccxzytuk.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_2b078.dir/CMakeCCompilerABI.c.obj' '-c' '-mcpu=68000']
|
||||
ignore line: [Linking C executable cmTC_2b078]
|
||||
ignore line: [/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_2b078.dir/link.txt --verbose=1]
|
||||
ignore line: [/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-gcc -v CMakeFiles/cmTC_2b078.dir/CMakeCCompilerABI.c.obj -o cmTC_2b078 ]
|
||||
ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_57eab.dir/CMakeCCompilerABI.c.obj' '-c' '-mcpu=68000']
|
||||
ignore line: [Linking C executable cmTC_57eab]
|
||||
ignore line: [/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_57eab.dir/link.txt --verbose=1]
|
||||
ignore line: [/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-gcc -v CMakeFiles/cmTC_57eab.dir/CMakeCCompilerABI.c.obj -o cmTC_57eab ]
|
||||
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_2b078' '-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/ccmVsDhC.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_2b078 -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_2b078.dir/CMakeCCompilerABI.c.obj --start-group -lgcc -lc -lretrocrt -lInterface --end-group]
|
||||
ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'cmTC_57eab' '-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/ccOWPyRM.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_57eab -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_57eab.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/ccmVsDhC.res] ==> ignore
|
||||
arg [-plugin-opt=-fresolution=/tmp/ccOWPyRM.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_2b078] ==> ignore
|
||||
arg [cmTC_57eab] ==> 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_2b078.dir/CMakeCCompilerABI.c.obj] ==> ignore
|
||||
arg [CMakeFiles/cmTC_57eab.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_a430c/fast && /usr/bin/make -f CMakeFiles/cmTC_a430c.dir/build.make CMakeFiles/cmTC_a430c.dir/build
|
||||
Run Build Command(s):/usr/bin/make cmTC_a6fa4/fast && /usr/bin/make -f CMakeFiles/cmTC_a6fa4.dir/build.make CMakeFiles/cmTC_a6fa4.dir/build
|
||||
make[1]: Entering directory '/home/camh/Documents/Retro68kApps/NuklearQuickDraw/build/CMakeFiles/CMakeTmp'
|
||||
Building CXX object CMakeFiles/cmTC_a430c.dir/testCXXCompiler.cxx.obj
|
||||
/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-g++ -o CMakeFiles/cmTC_a430c.dir/testCXXCompiler.cxx.obj -c /home/camh/Documents/Retro68kApps/NuklearQuickDraw/build/CMakeFiles/CMakeTmp/testCXXCompiler.cxx
|
||||
Linking CXX executable cmTC_a430c
|
||||
/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_a430c.dir/link.txt --verbose=1
|
||||
/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-g++ CMakeFiles/cmTC_a430c.dir/testCXXCompiler.cxx.obj -o cmTC_a430c
|
||||
Building CXX object CMakeFiles/cmTC_a6fa4.dir/testCXXCompiler.cxx.obj
|
||||
/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-g++ -o CMakeFiles/cmTC_a6fa4.dir/testCXXCompiler.cxx.obj -c /home/camh/Documents/Retro68kApps/NuklearQuickDraw/build/CMakeFiles/CMakeTmp/testCXXCompiler.cxx
|
||||
Linking CXX executable cmTC_a6fa4
|
||||
/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_a6fa4.dir/link.txt --verbose=1
|
||||
/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-g++ CMakeFiles/cmTC_a6fa4.dir/testCXXCompiler.cxx.obj -o cmTC_a6fa4
|
||||
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_ec149/fast && /usr/bin/make -f CMakeFiles/cmTC_ec149.dir/build.make CMakeFiles/cmTC_ec149.dir/build
|
||||
Run Build Command(s):/usr/bin/make cmTC_cbf60/fast && /usr/bin/make -f CMakeFiles/cmTC_cbf60.dir/build.make CMakeFiles/cmTC_cbf60.dir/build
|
||||
make[1]: Entering directory '/home/camh/Documents/Retro68kApps/NuklearQuickDraw/build/CMakeFiles/CMakeTmp'
|
||||
Building CXX object CMakeFiles/cmTC_ec149.dir/CMakeCXXCompilerABI.cpp.obj
|
||||
/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-g++ -v -o CMakeFiles/cmTC_ec149.dir/CMakeCXXCompilerABI.cpp.obj -c /usr/share/cmake-3.16/Modules/CMakeCXXCompilerABI.cpp
|
||||
Building CXX object CMakeFiles/cmTC_cbf60.dir/CMakeCXXCompilerABI.cpp.obj
|
||||
/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-g++ -v -o CMakeFiles/cmTC_cbf60.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_ec149.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_ec149.dir/CMakeCXXCompilerABI.cpp.obj -version -o /tmp/cc58RCfk.s
|
||||
COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_cbf60.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_cbf60.dir/CMakeCXXCompilerABI.cpp.obj -version -o /tmp/ccQugppr.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_ec149.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_ec149.dir/CMakeCXXCompilerABI.cpp.obj /tmp/cc58RCfk.s
|
||||
COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_cbf60.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_cbf60.dir/CMakeCXXCompilerABI.cpp.obj /tmp/ccQugppr.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_ec149.dir/CMakeCXXCompilerABI.cpp.obj' '-c' '-mcpu=68000'
|
||||
Linking CXX executable cmTC_ec149
|
||||
/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_ec149.dir/link.txt --verbose=1
|
||||
/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-g++ -v CMakeFiles/cmTC_ec149.dir/CMakeCXXCompilerABI.cpp.obj -o cmTC_ec149
|
||||
COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_cbf60.dir/CMakeCXXCompilerABI.cpp.obj' '-c' '-mcpu=68000'
|
||||
Linking CXX executable cmTC_cbf60
|
||||
/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_cbf60.dir/link.txt --verbose=1
|
||||
/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-g++ -v CMakeFiles/cmTC_cbf60.dir/CMakeCXXCompilerABI.cpp.obj -o cmTC_cbf60
|
||||
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_ec149' '-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/ccPhpacO.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_ec149 -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_ec149.dir/CMakeCXXCompilerABI.cpp.obj -lstdc++ -lm --start-group -lgcc -lc -lretrocrt -lInterface --end-group
|
||||
COLLECT_GCC_OPTIONS='-v' '-o' 'cmTC_ec149' '-mcpu=68000'
|
||||
COLLECT_GCC_OPTIONS='-v' '-o' 'cmTC_cbf60' '-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/cc7QCGeS.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_cbf60 -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_cbf60.dir/CMakeCXXCompilerABI.cpp.obj -lstdc++ -lm --start-group -lgcc -lc -lretrocrt -lInterface --end-group
|
||||
COLLECT_GCC_OPTIONS='-v' '-o' 'cmTC_cbf60' '-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_ec149/fast && /usr/bin/make -f CMakeFiles/cmTC_ec149.dir/build.make CMakeFiles/cmTC_ec149.dir/build]
|
||||
ignore line: [Run Build Command(s):/usr/bin/make cmTC_cbf60/fast && /usr/bin/make -f CMakeFiles/cmTC_cbf60.dir/build.make CMakeFiles/cmTC_cbf60.dir/build]
|
||||
ignore line: [make[1]: Entering directory '/home/camh/Documents/Retro68kApps/NuklearQuickDraw/build/CMakeFiles/CMakeTmp']
|
||||
ignore line: [Building CXX object CMakeFiles/cmTC_ec149.dir/CMakeCXXCompilerABI.cpp.obj]
|
||||
ignore line: [/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-g++ -v -o CMakeFiles/cmTC_ec149.dir/CMakeCXXCompilerABI.cpp.obj -c /usr/share/cmake-3.16/Modules/CMakeCXXCompilerABI.cpp]
|
||||
ignore line: [Building CXX object CMakeFiles/cmTC_cbf60.dir/CMakeCXXCompilerABI.cpp.obj]
|
||||
ignore line: [/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-g++ -v -o CMakeFiles/cmTC_cbf60.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_ec149.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_ec149.dir/CMakeCXXCompilerABI.cpp.obj -version -o /tmp/cc58RCfk.s]
|
||||
ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_cbf60.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_cbf60.dir/CMakeCXXCompilerABI.cpp.obj -version -o /tmp/ccQugppr.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_ec149.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_ec149.dir/CMakeCXXCompilerABI.cpp.obj /tmp/cc58RCfk.s]
|
||||
ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_cbf60.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_cbf60.dir/CMakeCXXCompilerABI.cpp.obj /tmp/ccQugppr.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_ec149.dir/CMakeCXXCompilerABI.cpp.obj' '-c' '-mcpu=68000']
|
||||
ignore line: [Linking CXX executable cmTC_ec149]
|
||||
ignore line: [/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_ec149.dir/link.txt --verbose=1]
|
||||
ignore line: [/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-g++ -v CMakeFiles/cmTC_ec149.dir/CMakeCXXCompilerABI.cpp.obj -o cmTC_ec149 ]
|
||||
ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_cbf60.dir/CMakeCXXCompilerABI.cpp.obj' '-c' '-mcpu=68000']
|
||||
ignore line: [Linking CXX executable cmTC_cbf60]
|
||||
ignore line: [/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_cbf60.dir/link.txt --verbose=1]
|
||||
ignore line: [/home/camh/Retro68-build/toolchain/bin/m68k-apple-macos-g++ -v CMakeFiles/cmTC_cbf60.dir/CMakeCXXCompilerABI.cpp.obj -o cmTC_cbf60 ]
|
||||
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_ec149' '-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/ccPhpacO.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_ec149 -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_ec149.dir/CMakeCXXCompilerABI.cpp.obj -lstdc++ -lm --start-group -lgcc -lc -lretrocrt -lInterface --end-group]
|
||||
ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'cmTC_cbf60' '-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/cc7QCGeS.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_cbf60 -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_cbf60.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/ccPhpacO.res] ==> ignore
|
||||
arg [-plugin-opt=-fresolution=/tmp/cc7QCGeS.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_ec149] ==> ignore
|
||||
arg [cmTC_cbf60] ==> 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_ec149.dir/CMakeCXXCompilerABI.cpp.obj] ==> ignore
|
||||
arg [CMakeFiles/cmTC_cbf60.dir/CMakeCXXCompilerABI.cpp.obj] ==> ignore
|
||||
arg [-lstdc++] ==> lib [stdc++]
|
||||
arg [-lm] ==> lib [m]
|
||||
arg [--start-group] ==> ignore
|
||||
|
|
|
|||
|
|
@ -29,6 +29,8 @@ ToolUtils.h
|
|||
-
|
||||
Memory.h
|
||||
-
|
||||
Sound.h
|
||||
-
|
||||
SegLoad.h
|
||||
-
|
||||
Files.h
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -556,6 +556,8 @@ void callFunctionOnCoprocessor(char* functionName, char* parameters, char* outpu
|
|||
readSerialPort(serialPortResponse);
|
||||
// writeSerialPortDebug(boutRefNum, "========================Got response from serial port");
|
||||
// writeSerialPortDebug(boutRefNum, serialPortResponse);
|
||||
|
||||
memset(output, '\0', RECEIVE_WINDOW_SIZE);
|
||||
getReturnValueFromResponse(serialPortResponse, "FUNCTION", output);
|
||||
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -115,6 +115,7 @@ void NewShockBitmap(ShockBitmap *theMap, short width, short height) {
|
|||
theMap->Address = theMap->BWBits.baseAddr;
|
||||
theMap->RowBytes = (long) theMap->BWBits.rowBytes;
|
||||
theMap->bits = (GrafPtr) &theMap->BWPort;
|
||||
|
||||
}
|
||||
|
||||
ShockBitmap gMainOffScreen;
|
||||
|
|
@ -392,7 +393,7 @@ int widthFor12ptFont[128] = {
|
|||
// TODO: fully convert
|
||||
// TODO: assuming system font for v1, support other fonts in v2
|
||||
// doing this in a "fast" way by using a precomputed table for a 12pt font
|
||||
static int nk_quickdraw_font_get_text_width(nk_handle handle, int height, const char *text, int len) {
|
||||
static float nk_quickdraw_font_get_text_width(nk_handle handle, int height, const char *text, int len) {
|
||||
|
||||
// // writeSerialPortDebug(boutRefNum, "nk_quickdraw_font_get_text_width");
|
||||
|
||||
|
|
@ -408,7 +409,7 @@ static int nk_quickdraw_font_get_text_width(nk_handle handle, int height, const
|
|||
width += widthFor12ptFont[(int)text[i]];
|
||||
}
|
||||
|
||||
return width;
|
||||
return (float)width;
|
||||
}
|
||||
|
||||
static int _get_text_width(const char *text, int len) {
|
||||
|
|
@ -533,15 +534,27 @@ NK_API void nk_quickdraw_render(WindowPtr window, struct nk_context *ctx) {
|
|||
|
||||
const struct nk_command *cmd = 0;
|
||||
|
||||
if (!lastEventWasKey) {
|
||||
// if (!lastEventWasKey) {
|
||||
OpenPort(&gMainOffScreen.BWPort);
|
||||
SetPort(&gMainOffScreen.BWPort);
|
||||
SetPortBits(&gMainOffScreen.BWBits);
|
||||
// EraseRect(&gMainOffScreen.bounds);
|
||||
} else {
|
||||
|
||||
// int theNum;
|
||||
// GetFNum('Chicago', theNum);
|
||||
// // do this twice, once now, and once after the port is switched to the offscreen
|
||||
// TextFont(theNum);
|
||||
// TextSize(12);
|
||||
// } else {
|
||||
|
||||
SetPort(window);
|
||||
}
|
||||
// SetPort(window);
|
||||
|
||||
// int theNum;
|
||||
// GetFNum('Chicago', theNum);
|
||||
// // do this twice, once now, and once after the port is switched to the offscreen
|
||||
// TextFont(theNum);
|
||||
// TextSize(12);
|
||||
// }
|
||||
|
||||
end = TickCount();
|
||||
total = end - start;
|
||||
|
|
@ -551,34 +564,34 @@ NK_API void nk_quickdraw_render(WindowPtr window, struct nk_context *ctx) {
|
|||
nk_foreach(cmd, ctx) {
|
||||
|
||||
int color;
|
||||
ForeColor(blackColor);
|
||||
// ForeColor(blackColor);
|
||||
|
||||
if (lastEventWasKey && cmd->type == NK_COMMAND_TEXT) {
|
||||
// if (lastEventWasKey && cmd->type == NK_COMMAND_TEXT) {
|
||||
|
||||
|
||||
writeSerialPortDebug(boutRefNum, "FAST INPUT");
|
||||
// // writeSerialPortDebug(boutRefNum, "FAST INPUT");
|
||||
|
||||
|
||||
const struct nk_command_text *t = (const struct nk_command_text*)cmd;
|
||||
// const struct nk_command_text *t = (const struct nk_command_text*)cmd;
|
||||
|
||||
#ifdef NK_QUICKDRAW_GRAPHICS_DEBUGGING
|
||||
// #ifdef NK_QUICKDRAW_GRAPHICS_DEBUGGING
|
||||
|
||||
// writeSerialPortDebug(boutRefNum, "NK_COMMAND_TEXT");
|
||||
char log[255];
|
||||
sprintf(log, "%f: %c, %d", (int)t->height, &t->string, (int)t->length);
|
||||
// writeSerialPortDebug(boutRefNum, log);
|
||||
#endif
|
||||
// // writeSerialPortDebug(boutRefNum, "NK_COMMAND_TEXT");
|
||||
// char log[255];
|
||||
// sprintf(log, "%f: %c, %d", (int)t->height, &t->string, (int)t->length);
|
||||
// // writeSerialPortDebug(boutRefNum, log);
|
||||
// #endif
|
||||
|
||||
MoveTo((int)t->x + _get_text_width(t->string, (int)t->length - 1), (int)t->y + (int)t->height);
|
||||
// MoveTo((int)t->x + _get_text_width(t->string, (int)t->length - 1), (int)t->y + (int)t->height);
|
||||
|
||||
// DrawText((const char*)t->string, 0, (int)t->length);
|
||||
// // DrawText((const char*)t->string, 0, (int)t->length);
|
||||
// PenSize(1.0, 1.0);
|
||||
// DrawChar(t->string[t->length - 1]);
|
||||
|
||||
DrawChar(t->string[t->length - 1]);
|
||||
|
||||
} else if (!lastEventWasKey) {
|
||||
// } else if (!lastEventWasKey) {
|
||||
|
||||
|
||||
writeSerialPortDebug(boutRefNum, "SLOW INPUT");
|
||||
// writeSerialPortDebug(boutRefNum, "SLOW INPUT");
|
||||
switch (cmd->type) {
|
||||
|
||||
case NK_COMMAND_NOP:
|
||||
|
|
@ -904,6 +917,7 @@ NK_API void nk_quickdraw_render(WindowPtr window, struct nk_context *ctx) {
|
|||
ForeColor(color);
|
||||
MoveTo((int)t->x, (int)t->y + (int)t->height);
|
||||
|
||||
PenSize(1.0, 1.0);
|
||||
DrawText((const char*)t->string, 0, (int)t->length);
|
||||
|
||||
// DrawChar(t->string[t->length - 1]);
|
||||
|
|
@ -998,7 +1012,7 @@ NK_API void nk_quickdraw_render(WindowPtr window, struct nk_context *ctx) {
|
|||
#endif
|
||||
break;
|
||||
}
|
||||
}
|
||||
// }
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1009,14 +1023,14 @@ NK_API void nk_quickdraw_render(WindowPtr window, struct nk_context *ctx) {
|
|||
|
||||
|
||||
|
||||
if (!lastEventWasKey) {
|
||||
// if (!lastEventWasKey) {
|
||||
SetPort(window);
|
||||
|
||||
|
||||
// our offscreen bitmap is the same size as our port rectangle, so we
|
||||
// get away with using the portRect sizing for source and destination
|
||||
CopyBits(&gMainOffScreen.bits->portBits, &window->portBits, &window->portRect, &window->portRect, srcCopy, 0L);
|
||||
}
|
||||
// }
|
||||
|
||||
end = TickCount();
|
||||
total = end - start;
|
||||
|
|
@ -1138,14 +1152,14 @@ NK_API int nk_quickdraw_handle_event(EventRecord *event, struct nk_context *nukl
|
|||
int key = (int)charKey;
|
||||
|
||||
|
||||
// #ifdef NK_QUICKDRAW_EVENTS_DEBUGGING
|
||||
#ifdef NK_QUICKDRAW_EVENTS_DEBUGGING
|
||||
|
||||
writeSerialPortDebug(boutRefNum, "keyDown/autoKey");
|
||||
|
||||
char logy[255];
|
||||
sprintf(logy, "key pressed: key: '%c', 02x: '%02X', return: '%02X', %d == %d ??", key, key, returnKey, (int)(key), (int)(returnKey));
|
||||
writeSerialPortDebug(boutRefNum, logy);
|
||||
// #endif
|
||||
#endif
|
||||
|
||||
const Boolean isKeyDown = event->what == keyDown;
|
||||
|
||||
|
|
@ -1269,10 +1283,18 @@ NK_INTERN void nk_quickdraw_clipboard_copy(nk_handle usr, const char *text, int
|
|||
// it us up to our "main" function to call this code
|
||||
NK_API struct nk_context* nk_quickdraw_init(unsigned int width, unsigned int height) {
|
||||
|
||||
|
||||
int theNum;
|
||||
GetFNum('Chicago', theNum);
|
||||
// do this twice, once now, and once after the port is switched to the offscreen buffer
|
||||
TextFont(theNum);
|
||||
TextSize(12);
|
||||
// needed to calculate bezier info, see mactech article.
|
||||
setupBezier();
|
||||
|
||||
NewShockBitmap(&gMainOffScreen, width, height);
|
||||
TextFont(theNum);
|
||||
TextSize(12);
|
||||
NkQuickDrawFont *quickdrawfont = nk_quickdraw_font_create_from_file();
|
||||
struct nk_user_font *font = &quickdrawfont->nk;
|
||||
|
||||
|
|
|
|||
49
output_js
49
output_js
|
|
@ -12,25 +12,18 @@ const defaultOptions = {
|
|||
},
|
||||
query: {
|
||||
fetchPolicy: 'no-cache',
|
||||
errorPolicy: 'all',
|
||||
errorPolicy: 'ignore',
|
||||
},
|
||||
}
|
||||
|
||||
const client = new ApolloClient({
|
||||
uri: 'http://10.0.1.167:4000/',
|
||||
cache: new InMemoryCache(),
|
||||
link: new createHttpLink({
|
||||
uri: 'http://10.0.1.167:4000/'
|
||||
}),
|
||||
defaultOptions
|
||||
});
|
||||
let client
|
||||
|
||||
|
||||
class iMessageClient {
|
||||
|
||||
async getMessages (chatId, page) {
|
||||
|
||||
console.log(`get messages for caht ID: ${chatId}`)
|
||||
console.log(`get messages for chat ID: ${chatId}`)
|
||||
|
||||
let result = await client.query({
|
||||
query: gql`query getMessages {
|
||||
|
|
@ -57,8 +50,10 @@ class iMessageClient {
|
|||
for (const message of messages) {
|
||||
|
||||
if (firstMessage) {
|
||||
|
||||
messageOutput = `${message.chatter}: ${message.text}`
|
||||
} else {
|
||||
|
||||
messageOutput = `${messageOutput}ENDLASTMESSAGE${message.chatter}: ${message.text}`
|
||||
}
|
||||
|
||||
|
|
@ -71,7 +66,7 @@ class iMessageClient {
|
|||
|
||||
async sendMessage (chatId, message) {
|
||||
|
||||
console.log(`send messages for caht ID: ${chatId} ${message}`)
|
||||
console.log(`send messages for chat ID: ${chatId} ${message}`)
|
||||
|
||||
let result = await client.query({
|
||||
query: gql`query sendMessage {
|
||||
|
|
@ -82,11 +77,9 @@ class iMessageClient {
|
|||
}`
|
||||
})
|
||||
|
||||
let messages = result.data.getMessages
|
||||
let messages = result.data.sendMessage
|
||||
let messageOutput = ``
|
||||
const maxPerLine = 20000
|
||||
console.log(`return messages from send messages:`)
|
||||
console.log(messages)
|
||||
|
||||
let firstMessage = true
|
||||
|
||||
|
|
@ -98,9 +91,11 @@ class iMessageClient {
|
|||
for (const message of messages) {
|
||||
|
||||
if (firstMessage) {
|
||||
messageOutput = `${message.chatter}: `
|
||||
|
||||
messageOutput = `${message.chatter}: ${message.text}`
|
||||
} else {
|
||||
messageOutput = `${messageOutput}ENDLASTMESSAGE${message.chatter}: `
|
||||
|
||||
messageOutput = `${messageOutput}ENDLASTMESSAGE${message.chatter}: ${message.text}`
|
||||
}
|
||||
|
||||
firstMessage = false
|
||||
|
|
@ -137,6 +132,28 @@ class iMessageClient {
|
|||
|
||||
return friendlyNameStrings
|
||||
}
|
||||
|
||||
setIPAddress (IPAddress) {
|
||||
|
||||
try {
|
||||
|
||||
client = new ApolloClient({
|
||||
uri: `${IPAddress}:4000/`,
|
||||
cache: new InMemoryCache(),
|
||||
link: new createHttpLink({
|
||||
uri: `${IPAddress}:4000/`
|
||||
}),
|
||||
defaultOptions
|
||||
});
|
||||
} catch (err) {
|
||||
console.log(`error instantiating the ApolloClient`)
|
||||
console.log(err)
|
||||
|
||||
return `failure`
|
||||
}
|
||||
|
||||
return `success`
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = iMessageClient
|
||||
|
|
|
|||
3612
output_js.h
3612
output_js.h
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue