From e4c4f5ea11291e551967f5240f53c43895771ffb Mon Sep 17 00:00:00 2001 From: Rr42 Date: Wed, 20 Jun 2018 11:57:42 +0530 Subject: Major update with functional program display (without cursor) --- ldmicro/lib/linuxUI/linuxUI.cpp | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'ldmicro/lib/linuxUI/linuxUI.cpp') diff --git a/ldmicro/lib/linuxUI/linuxUI.cpp b/ldmicro/lib/linuxUI/linuxUI.cpp index 5125ed9..3447c02 100644 --- a/ldmicro/lib/linuxUI/linuxUI.cpp +++ b/ldmicro/lib/linuxUI/linuxUI.cpp @@ -262,20 +262,21 @@ void SetBkColor(HWID widget, HCRDC hcr, COLORREF bkCol) gtk_widget_override_background_color(GTK_WIDGET(widget), GTK_STATE_FLAG_NORMAL, &bkCol); - GtkStyleContext *context; + gint width = gtk_widget_get_allocated_width (widget); + gint height = gtk_widget_get_allocated_height (widget); + COLORREF col; + GtkStyleContext *context; context = gtk_widget_get_style_context (widget); - gint width = gtk_widget_get_allocated_width (widget); - gint height = gtk_widget_get_allocated_height (widget); gtk_style_context_get_color (context, - gtk_style_context_get_state (context), - &col); + gtk_style_context_get_state (context), + &col); gdk_cairo_set_source_rgba (hcr, &col); - gtk_render_background (context, hcr, 0, 0, width, height); + cairo_fill (hcr); } void SetTextColor(HCRDC hcr, COLORREF color) @@ -286,7 +287,7 @@ void SetTextColor(HCRDC hcr, COLORREF color) void TextOut(HWID hWid, HCRDC hcr, int nXStart, int nYStart, LPCTSTR lpString, int cchString) { - nYStart += 20; + nYStart += 30; cairo_text_extents_t extents; cairo_text_extents (hcr, lpString, &extents); @@ -297,12 +298,14 @@ void TextOut(HWID hWid, HCRDC hcr, int nXStart, int nYStart, LPCTSTR lpString, i if(nYStart+(extents.height/2.0) >= height) { - height += extents.height; + // g_print("Y extend\n"); + height += extents.height += 50; resize_flag = TRUE; } if (nXStart+(extents.width/2.0) >= width) { + // g_print("X extend\n"); width += extents.width; resize_flag = TRUE; } @@ -316,6 +319,8 @@ void TextOut(HWID hWid, HCRDC hcr, int nXStart, int nYStart, LPCTSTR lpString, i cairo_move_to(hcr, nXStart, nYStart); cairo_show_text(hcr, text); + // g_print("%s", text); + cairo_fill (hcr); } @@ -332,7 +337,10 @@ COLORREF GetTextColor(HCRDC Hdc) BOOL InvalidateRect(HWID hWid, const RECT *lpRect, BOOL bErase) { if(!GDK_IS_WINDOW(hWid)) + { + // g_print("not window\n"); return FALSE; + } if (lpRect == NULL) { -- cgit From 5efa69ff8b273ac1b706acff283a3c16bbec9a34 Mon Sep 17 00:00:00 2001 From: Rr42 Date: Wed, 20 Jun 2018 12:20:38 +0530 Subject: Minor update, fixes bug in displaying text in paint window --- ldmicro/lib/linuxUI/linuxUI.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ldmicro/lib/linuxUI/linuxUI.cpp') diff --git a/ldmicro/lib/linuxUI/linuxUI.cpp b/ldmicro/lib/linuxUI/linuxUI.cpp index d9fbd3f..bb6600b 100644 --- a/ldmicro/lib/linuxUI/linuxUI.cpp +++ b/ldmicro/lib/linuxUI/linuxUI.cpp @@ -303,7 +303,7 @@ void TextOut(HWID hWid, HCRDC hcr, int nXStart, int nYStart, LPCTSTR lpString, i if(nYStart+(extents.height/2.0) >= height) { // g_print("Y extend\n"); - height += extents.height += 50; + height += extents.height + 50; resize_flag = TRUE; } -- cgit From 70674cf532c911a0aba872422039bfa5b04ada29 Mon Sep 17 00:00:00 2001 From: Rr42 Date: Wed, 20 Jun 2018 15:38:43 +0530 Subject: Added blink cursor functionality --- ldmicro/lib/linuxUI/linuxUI.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'ldmicro/lib/linuxUI/linuxUI.cpp') diff --git a/ldmicro/lib/linuxUI/linuxUI.cpp b/ldmicro/lib/linuxUI/linuxUI.cpp index bb6600b..1d525c5 100644 --- a/ldmicro/lib/linuxUI/linuxUI.cpp +++ b/ldmicro/lib/linuxUI/linuxUI.cpp @@ -25,7 +25,7 @@ HWID view; HTVC column; /// Wraper function for gtk_window_has_toplevel_focus -BOOL isFocus(HWID window) +BOOL GetFocus(HWID window) { return (BOOL) gtk_window_has_toplevel_focus(GTK_WINDOW(window)); } @@ -373,6 +373,17 @@ int FillRect(HCRDC hDC, const RECT *lprc, HBRUSH hbr) return 0; } +BOOL PatBlt(HCRDC hdc, int nXLeft, int nYLeft, int nWidth, int nHeight, DWORD dwRop, HBRUSH hbr) +{ + cairo_set_source_rgb(hdc, hbr->red, hbr->green, hbr->blue); + cairo_rectangle(hdc, nXLeft, nYLeft + 20, nWidth, nHeight); + cairo_stroke_preserve(hdc); + + cairo_fill(hdc); + + return TRUE; +} + BOOL GetClientRect(HWID hWid, PRECT pRect) { GtkAllocation allocation; -- cgit From 62b404d735ba540b7b4c532705cfcc99d9d61d67 Mon Sep 17 00:00:00 2001 From: Rr42 Date: Thu, 21 Jun 2018 14:37:00 +0530 Subject: Bug fixes for cursor and PrintWindow --- ldmicro/lib/linuxUI/linuxUI.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'ldmicro/lib/linuxUI/linuxUI.cpp') diff --git a/ldmicro/lib/linuxUI/linuxUI.cpp b/ldmicro/lib/linuxUI/linuxUI.cpp index 1d525c5..52c4c36 100644 --- a/ldmicro/lib/linuxUI/linuxUI.cpp +++ b/ldmicro/lib/linuxUI/linuxUI.cpp @@ -263,24 +263,24 @@ HFONT CreateFont(int nHeight, int nWidth, int nOrientation, int fnWeight, void SetBkColor(HWID widget, HCRDC hcr, COLORREF bkCol) { - gtk_widget_override_background_color(GTK_WIDGET(widget), - GTK_STATE_FLAG_NORMAL, &bkCol); + // gtk_widget_override_background_color(GTK_WIDGET(widget), + // GTK_STATE_FLAG_NORMAL, &bkCol); - gint width = gtk_widget_get_allocated_width (widget); - gint height = gtk_widget_get_allocated_height (widget); + // gint width = gtk_widget_get_allocated_width (widget); + // gint height = gtk_widget_get_allocated_height (widget); - COLORREF col; - GtkStyleContext *context; + // COLORREF col; + // GtkStyleContext *context; - context = gtk_widget_get_style_context (widget); + // context = gtk_widget_get_style_context (widget); - gtk_style_context_get_color (context, - gtk_style_context_get_state (context), - &col); + // gtk_style_context_get_color (context, + // gtk_style_context_get_state (context), + // &col); - gdk_cairo_set_source_rgba (hcr, &col); + // gdk_cairo_set_source_rgba (hcr, &col); - cairo_fill (hcr); + // cairo_fill (hcr); } void SetTextColor(HCRDC hcr, COLORREF color) -- cgit