From ac5d0bc6855e612417fba2643835f795806a137f Mon Sep 17 00:00:00 2001
From: Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
Date: Sat, 25 Oct 2008 10:57:23 +0900
Subject: [PATCH] [2/19] paint: Add TOOL_LINE

---
 programs/paint/canvas.c   |   75 +++++++++++++++++++++++++++++++++++++++++++++
 programs/paint/line.bmp   |  Bin 0 -> 670 bytes
 programs/paint/main.c     |   56 +++++++++++++++++++++++++++++----
 programs/paint/resource.h |    1 +
 programs/paint/rsrc.rc    |    2 +
 5 files changed, 127 insertions(+), 7 deletions(-)
 create mode 100644 programs/paint/line.bmp

diff --git a/programs/paint/canvas.c b/programs/paint/canvas.c
index 0adb108..3d18902 100644
--- a/programs/paint/canvas.c
+++ b/programs/paint/canvas.c
@@ -59,6 +59,28 @@ VOID PrepareForUndo(VOID)
 
 VOID Canvas_DrawBuffer(HDC hDC)
 {
+    HDC hMemDC;
+    HPEN hPen;
+    HBRUSH hbr;
+    HGDIOBJ hbmOld, hpenOld, hbrOld;
+
+    switch(Globals.iToolSelect)
+    {
+    case TOOL_LINE:
+        hPen = CreatePen(PS_SOLID, Globals.nLineWidth, Globals.fSwapColor ?
+                         Globals.rgbBack : Globals.rgbFore);
+        hpenOld = SelectObject(hDC, hPen);
+        MoveToEx(hDC, Globals.pt0.x, Globals.pt0.y, NULL);
+        LineTo(hDC, Globals.pt1.x, Globals.pt1.y);
+        SetPixel(hDC, Globals.pt1.x, Globals.pt1.y, Globals.fSwapColor ?
+                 Globals.rgbBack : Globals.rgbFore);
+        SelectObject(hDC, hpenOld);
+        DeleteObject(hPen);
+        break;
+
+    default:
+        break;
+    }
 }
 
 VOID Canvas_OnPaint(HWND hWnd, HDC hDC)
@@ -307,6 +329,14 @@ VOID Canvas_OnButtonDown(HWND hWnd, INT x, INT y, BOOL fRight)
             Globals.pt0 = pt;
             break;
 
+        case TOOL_LINE:
+            SetCursor(Globals.hcurCross2);
+            Globals.mode = MODE_CANVAS;
+            SetCapture(hWnd);
+            CanvasToImage(&pt);
+            Globals.pt0 = Globals.pt1 = pt;
+            break;
+
         default:
             break;
         }
@@ -407,6 +437,16 @@ VOID Canvas_OnMouseMove(HWND hWnd, INT x, INT y, BOOL fLeftDown, BOOL fRightDown
         case MODE_CANVAS:
             switch (Globals.iToolSelect)
             {
+            case TOOL_LINE:
+                SetCursor(Globals.hcurCross2);
+                CanvasToImage(&pt);
+                Globals.pt1 = pt;
+                ShowSize(Globals.pt1.x - Globals.pt0.x,
+                         Globals.pt1.y - Globals.pt0.y);
+                InvalidateRect(hWnd, NULL, FALSE);
+                UpdateWindow(hWnd);
+                break;
+
             case TOOL_PENCIL:
                 SetCursor(Globals.hcurPencil);
                 CanvasToImage(&pt);
@@ -450,6 +490,14 @@ VOID Canvas_OnMouseMove(HWND hWnd, INT x, INT y, BOOL fLeftDown, BOOL fRightDown
         {
             switch (Globals.iToolSelect)
             {
+            case TOOL_LINE:
+                SetCursor(Globals.hcurCross2);
+                CanvasToImage(&pt);
+                Globals.pt1 = pt;
+                InvalidateRect(hWnd, NULL, FALSE);
+                UpdateWindow(hWnd);
+                break;
+
             case TOOL_PENCIL:
                 SetCursor(Globals.hcurPencil);
                 CanvasToImage(&pt);
@@ -671,6 +719,33 @@ VOID Canvas_OnButtonUp(HWND hWnd, INT x, INT y, BOOL fRight)
             UpdateWindow(hWnd);
             break;
 
+        case TOOL_LINE:
+            CanvasToImage(&pt);
+            PrepareForUndo();
+            hDC = GetDC(hWnd);
+            if (hDC != NULL)
+            {
+                hMemDC = CreateCompatibleDC(hDC);
+                if (hMemDC != NULL)
+                {
+                    HPEN hPen = CreatePen(PS_SOLID, Globals.nLineWidth, fRight ?
+                                          Globals.rgbBack : Globals.rgbFore);
+                    HGDIOBJ hpenOld = SelectObject(hMemDC, hPen);
+                    HGDIOBJ hbmOld = SelectObject(hMemDC, Globals.hbmImage);
+                    MoveToEx(hMemDC, Globals.pt0.x , Globals.pt0.y, NULL);
+                    LineTo(hMemDC, pt.x, pt.y);
+                    SetPixel(hMemDC, pt.x, pt.y, fRight ? Globals.rgbBack :
+                             Globals.rgbFore);
+                    SelectObject(hMemDC, hbmOld);
+                    SelectObject(hMemDC, hpenOld);
+                    DeleteObject(hPen);
+                    DeleteDC(hMemDC);
+                    Globals.fModified = TRUE;
+                }
+                ReleaseDC(hWnd, hDC);
+            }
+            break;
+
         default:
             break;
         }
diff --git a/programs/paint/line.bmp b/programs/paint/line.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..9a27bce3f43b98121f5eaf095009fdc0bbaa3e81
GIT binary patch
literal 670
zcmZ?royWug26jMF1B!isG$Rm#Kmt@A%t0dl|NqYb#6Xe(C;b2@#}CAWXhP<YDo=0w
b(A|g2esp!T=A*lV*7l*B53?U#oLD{p0#-vx

literal 0
HcmV?d00001

diff --git a/programs/paint/main.c b/programs/paint/main.c
index 2508285..0a77ab1 100644
--- a/programs/paint/main.c
+++ b/programs/paint/main.c
@@ -543,6 +543,28 @@ VOID ToolBox_OnPaint(HWND hWnd, HDC hDC)
         rc.bottom = 290;
         DrawEdge(hDC, &rc, EDGE_SUNKEN, BF_RECT|BF_ADJUST);
 
+        switch (Globals.iToolSelect)
+        {
+        case TOOL_LINE:
+            hbm = LoadBitmap(Globals.hInstance, MAKEINTRESOURCE(IDB_LINE));
+            hbmOld = SelectObject(hdcMem, hbm);
+            BitBlt(hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top,
+                   hdcMem, 0, 0, SRCCOPY);
+            SelectObject(hdcMem, hbmOld);
+            DeleteObject(hbm);
+
+            if (Globals.nLineWidth == 0)
+                Globals.nLineWidth = 1;
+            rc.left = 6;
+            rc.top = 210 + (290 - 210) * (Globals.nLineWidth - 1) / 5;
+            rc.right = 48;
+            rc.bottom = rc.top + (290 - 210) / 5;
+            InvertRect(hDC, &rc);
+            break;
+
+        default:
+            break;
+        }
         DeleteDC(hdcMem);
     }
 }
@@ -589,7 +611,6 @@ void ToolBox_OnLButton(HWND hWnd, int x, int y, BOOL fDown)
                 case TOOL_BOX:
                 case TOOL_ELLIPSE:
                 case TOOL_ROUNDRECT:
-                case TOOL_LINE:
                     NotSupportedYet();
                     break;
 
@@ -608,13 +629,34 @@ void ToolBox_OnLButton(HWND hWnd, int x, int y, BOOL fDown)
         }
     }
 
-    rc.left = 6;
-    rc.top = 210;
-    rc.right = 48;
-    rc.bottom = 290;
-    if (PtInRect(&rc, pt))
+    switch (Globals.iToolSelect)
     {
-        MessageBeep(0xFFFFFFFF);
+    case TOOL_LINE:
+        rc.left = 6;
+        rc.right = 48;
+        for (i = 0; i < 5; i++)
+        {
+            rc.top = 210 + (290 - 210) * i / 5;
+            rc.bottom = rc.top + (290 - 210) / 5;
+            if (PtInRect(&rc, pt))
+            {
+                Globals.nLineWidth = i + 1;
+                InvalidateRect(hWnd, NULL, TRUE);
+                UpdateWindow(hWnd);
+                break;
+            }
+        }
+        break;
+
+    default:
+        rc.left = 6;
+        rc.top = 210;
+        rc.right = 48;
+        rc.bottom = 290;
+        if (PtInRect(&rc, pt))
+        {
+            MessageBeep(0xFFFFFFFF);
+        }
     }
 }
 
diff --git a/programs/paint/resource.h b/programs/paint/resource.h
index d029bb2..2fd5fe9 100644
--- a/programs/paint/resource.h
+++ b/programs/paint/resource.h
@@ -23,6 +23,7 @@
 #define SELECTION_MENU          0x203
 #define ID_ACCEL                0x204
 #define IDB_TOOLS               0x205
+#define IDB_LINE                0x20D
 #define IDD_ZOOM                0x207
 #define IDD_STRETCH_SKEW        0x208
 #define IDD_ATTRIBUTES          0x209
diff --git a/programs/paint/rsrc.rc b/programs/paint/rsrc.rc
index 290133f..ee15c2a 100644
--- a/programs/paint/rsrc.rc
+++ b/programs/paint/rsrc.rc
@@ -61,6 +61,8 @@ IDI_PAINT ICON "paint.ico"
 
 /* @makedep: tools.bmp */
 IDB_TOOLS BITMAP "tools.bmp"
+/* @makedep: line.bmp */
+IDB_LINE BITMAP "line.bmp"
 
 /* @makedep: horizon.cur */
 1 CURSOR "horizon.cur"
-- 
1.6.0.2