1640

Another bug in manually running the editor. At least show the error
message when you raise warnings in console mode.

Later we'll want to create a separate side channel and transparently
plumb warnings to the 'menu bar' of the editor..

2 files changed, 2 insertions, 2 deletions

diff --git a/003trace.cc b/003trace.cc
index 9d32cf76..b8c1c737 100644
--- a/003trace.cc
+++ b/003trace.cc
@@ -156,7 +156,7 @@ trace_stream* Trace_stream = NULL;
 #define trace(...)  !Trace_stream ? cerr /*print nothing*/ : Trace_stream->stream(__VA_ARGS__)
 // Warnings should go straight to cerr by default since calls to trace() have
 // some unfriendly constraints (they delay printing, they can't nest)
-#define raise  ((!Trace_stream || !Hide_warnings) ? cerr /*do print*/ : Trace_stream->stream("warn"))
+#define raise  ((!Trace_stream || !Hide_warnings) ? (tb_shutdown(),cerr) /*do print*/ : Trace_stream->stream("warn"))
 
 // A separate helper for debugging. We should only trace domain-specific
 // facts. For everything else use log.
diff --git a/070display.cc b/070display.cc
index 76950156..07656c7d 100644
--- a/070display.cc
+++ b/070display.cc
@@ -271,7 +271,7 @@ case CHECK_FOR_INTERACTION: {
     break;
   }
   if (event_type == TB_EVENT_MOUSE) {
-    products.at(0).push_back(/*mouse event*/1);
+    products.at(0).push_back(/*touch event*/2);
     products.at(0).push_back(event.key);  // which button, etc.
     products.at(0).push_back(event.y);  // row
     products.at(0).push_back(event.x);  // column