Ticket #2534: ServerWindow.diff

src/servers/app/ServerWindow.cpp

@@ -2399 +2399 @@
             link.Read<float>(&y);
 
             picture->WriteSetOrigin(BPoint(x, y));
+            
+            fCurrentView->SetDrawingOrigin(BPoint(x, y));
+            _UpdateDrawState(fCurrentView);
             break;
         }
 
@@ -2429 +2432 @@
             link.Read<int8>(&drawingMode);
 
             picture->WriteSetDrawingMode((drawing_mode)drawingMode);
+            
+            fCurrentView->CurrentState()->SetDrawingMode((drawing_mode)drawingMode);
+            fWindow->GetDrawingEngine()->SetDrawingMode((drawing_mode)drawingMode);
             break;
         }
 
@@ -2438 +2444 @@
             link.Read<float>(&x);
             link.Read<float>(&y);
             picture->WriteSetPenLocation(BPoint(x, y));
+            
+            fCurrentView->CurrentState()->SetPenLocation(BPoint(x, y));
             break;
         }
         case AS_VIEW_SET_PEN_SIZE:
@@ -2445 +2453 @@
             float penSize;
             link.Read<float>(&penSize);
             picture->WriteSetPenSize(penSize);
+            
+            fCurrentView->CurrentState()->SetPenSize(penSize);
+            fWindow->GetDrawingEngine()->SetPenSize(
+                fCurrentView->CurrentState()->PenSize());
             break;
         }
 
@@ -2459 +2471 @@
 
             picture->WriteSetLineMode((cap_mode)lineCap, (join_mode)lineJoin, miterLimit);
 
+            fCurrentView->CurrentState()->SetLineCapMode((cap_mode)lineCap);
+            fCurrentView->CurrentState()->SetLineJoinMode((join_mode)lineJoin);
+            fCurrentView->CurrentState()->SetMiterLimit(miterLimit);
+
+            fWindow->GetDrawingEngine()->SetStrokeMode((cap_mode)lineCap,
+                (join_mode)lineJoin, miterLimit);
             break;
         }
         case AS_VIEW_SET_SCALE:
@@ -2466 +2484 @@
             float scale;
             link.Read<float>(&scale);
             picture->WriteSetScale(scale);
+            
+            fCurrentView->SetScale(scale);
+            _UpdateDrawState(fCurrentView);
             break;
         }
 
@@ -2641 +2662 @@
             rgb_color color;
             link.Read(&color, sizeof(rgb_color));
 
-            if (code == AS_VIEW_SET_HIGH_COLOR)
+            if (code == AS_VIEW_SET_HIGH_COLOR) {
                 picture->WriteSetHighColor(color);
-            else
+                fCurrentView->CurrentState()->SetHighColor(color);
+                fWindow->GetDrawingEngine()->SetHighColor(color);
+            } else {
                 picture->WriteSetLowColor(color);
-            break;
-        }
+                fCurrentView->CurrentState()->SetLowColor(color);
+                fWindow->GetDrawingEngine()->SetLowColor(color);
+            }
+        }   break;
 
         case AS_DRAW_STRING:
         case AS_DRAW_STRING_WITH_DELTA:
@@ -2815 +2840 @@
             picture->AddInt16((int16)alphaFunc);
             picture->EndOp();
 
+            fCurrentView->CurrentState()->SetBlendingMode((source_alpha)srcAlpha,
+                (alpha_function)alphaFunc);
+            fWindow->GetDrawingEngine()->SetBlendingMode((source_alpha)srcAlpha,
+                (alpha_function)alphaFunc);
             break;
         }*/
         default: