diff --git a/.gitignore b/.gitignore index f50ae6d..ad961ae 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,4 @@ ValgrindOut.xml *.patch *.sh *.conf +*.pdf diff --git a/src/dialogs/print/convenience.c b/src/dialogs/print/convenience.c index 32b1681..5395cf4 100644 --- a/src/dialogs/print/convenience.c +++ b/src/dialogs/print/convenience.c @@ -44,7 +44,7 @@ if(!(widget && GTK_IS_V3270(widget))) return errno = EINVAL; - lib3270_trace_event(v3270_get_session(widget),"print action activated (type=%d)\n",(int) mode); + lib3270_write_event_trace(v3270_get_session(widget),"print action activated (type=%d)\n",(int) mode); if(!v3270_is_connected(widget)) return errno = ENOTCONN; diff --git a/src/dialogs/print/print.c b/src/dialogs/print/print.c index 2e81b20..ea8752b 100644 --- a/src/dialogs/print/print.c +++ b/src/dialogs/print/print.c @@ -69,27 +69,27 @@ { case GTK_PRINT_OPERATION_RESULT_ERROR: debug("%s: Error on print operation",__FUNCTION__); - lib3270_trace_event(operation->widget->host,"%s\n",_("Error on print operation")); + lib3270_write_event_trace(operation->widget->host,"%s\n",_("Error on print operation")); break; case GTK_PRINT_OPERATION_RESULT_APPLY: debug("%s: The print settings should be stored.",__FUNCTION__); - lib3270_trace_event(operation->widget->host,"%s\n",_("The print settings should be stored.")); + lib3270_write_event_trace(operation->widget->host,"%s\n",_("The print settings should be stored.")); break; case GTK_PRINT_OPERATION_RESULT_CANCEL: debug("%s: The print operation has been canceled, the print settings should not be stored.", __FUNCTION__); - lib3270_trace_event(operation->widget->host,"%s\n",_("The print operation has been canceled, the print settings should not be stored.")); + lib3270_write_event_trace(operation->widget->host,"%s\n",_("The print operation has been canceled, the print settings should not be stored.")); break; case GTK_PRINT_OPERATION_RESULT_IN_PROGRESS: debug("%s: The print operation is running",__FUNCTION__); - lib3270_trace_event(operation->widget->host,"%s\n",_("The print operation is running")); + lib3270_write_event_trace(operation->widget->host,"%s\n",_("The print operation is running")); break; default: debug("Unexpected status %d in print operation",(int) result); - lib3270_trace_event(operation->widget->host,_("Unexpected status %d in print operation"),(int) result); + lib3270_write_event_trace(operation->widget->host,_("Unexpected status %d in print operation"),(int) result); } diff --git a/src/terminal/drawing/draw.c b/src/terminal/drawing/draw.c index beee516..c85e6ea 100644 --- a/src/terminal/drawing/draw.c +++ b/src/terminal/drawing/draw.c @@ -40,6 +40,7 @@ #include #include #include + #include #include #include @@ -256,6 +257,7 @@ static void draw_small_text(cairo_t *cr, const GdkRectangle *rect, v3270FontInfo static gboolean draw_cg(cairo_t *cr, unsigned char chr, v3270FontInfo *font, GdkRectangle *rect) { + // https://unicode.org/charts/PDF/U2300.pdf static const struct CharList { unsigned char chr; @@ -350,25 +352,25 @@ void v3270_draw_char(cairo_t *cr, unsigned char chr, unsigned short attr, H3270 cairo_rel_line_to(cr,0,rect->height); break; - case 0xd4: // CG 0xac, LR corner + case 0xd4: // CG 0xac, LR corner ⌟ cairo_move_to(cr,rect->x, rect->y+(rect->height/2)); cairo_rel_line_to(cr,rect->width/2,0); cairo_rel_line_to(cr,0,-(rect->height/2)); break; - case 0xd5: // CG 0xad, UR corner + case 0xd5: // CG 0xad, UR corner ⌝ cairo_move_to(cr,rect->x, rect->y+(rect->height/2)); cairo_rel_line_to(cr,rect->width/2,0); cairo_rel_line_to(cr,0,rect->height/2); break; - case 0xc5: // CG 0xa4, UL corner + case 0xc5: // CG 0xa4, UL corner ⌜ cairo_move_to(cr,rect->x+rect->width,rect->y+(rect->height/2)); cairo_rel_line_to(cr,-(rect->width/2),0); cairo_rel_line_to(cr,0,(rect->height/2)); break; - case 0xc4: // CG 0xa3, LL corner + case 0xc4: // CG 0xa3, LL corner ⌞ cairo_move_to(cr,rect->x+rect->width,rect->y+(rect->height/2)); cairo_rel_line_to(cr,-(rect->width/2),0); cairo_rel_line_to(cr,0,-(rect->height/2)); @@ -405,7 +407,10 @@ void v3270_draw_char(cairo_t *cr, unsigned char chr, unsigned short attr, H3270 default: if(!draw_cg(cr, chr, font, rect)) + { + lib3270_write_screen_trace(session,"I don't known how to draw CG character %02x\n",(int) chr); cairo_rectangle(cr, rect->x+1, rect->y+1, rect->width-2, rect->height-2); + } } } diff --git a/src/terminal/scroll.c b/src/terminal/scroll.c index eb591de..0a52d08 100644 --- a/src/terminal/scroll.c +++ b/src/terminal/scroll.c @@ -45,15 +45,15 @@ gboolean v3270_scroll_event(GtkWidget *widget, GdkEventScroll *event) { v3270 * terminal = GTK_V3270(widget); - lib3270_trace_event(terminal->host,"scroll event direction=%d",(int) event->direction); + lib3270_write_event_trace(terminal->host,"scroll event direction=%d",(int) event->direction); if(lib3270_get_program_message(terminal->host) != LIB3270_MESSAGE_NONE || event->direction < 0 || event->direction > G_N_ELEMENTS(terminal->scroll)) { - lib3270_trace_event(terminal->host," dropped (not available)\n"); + lib3270_write_event_trace(terminal->host," dropped (not available)\n"); return FALSE; } - lib3270_trace_event(terminal->host,"\n"); + lib3270_write_event_trace(terminal->host,"\n"); debug("%d %p", (int) event->direction, terminal->scroll[event->direction]); -- libgit2 0.21.2