Ros-diffs December 2015

ros-diffs@reactos.org

12 participants
252 discussions

[dquintana] 70337: [MAGNIFY] * Use GetGUIThreadInfo instead of multiple separate "hacks" to obtain all the necessary data in one single call. * Keep the off-screen DC for later use, and only recrea...

by dquintana＠svn.reactos.org

Author: dquintana Date: Sun Dec 13 05:07:37 2015 New Revision: 70337 URL: http://svn.reactos.org/svn/reactos?rev=70337&view=rev Log: [MAGNIFY] * Use GetGUIThreadInfo instead of multiple separate "hacks" to obtain all the necessary data in one single call. * Keep the off-screen DC for later use, and only recreate when needed. * Restore caret follow back to default-on. More changes toward CORE-10691 Modified: trunk/reactos/base/applications/magnify/magnifier.c trunk/reactos/base/applications/magnify/settings.c Modified: trunk/reactos/base/applications/magnify/magnifier.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/magnifier.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/magnify/magnifier.c [iso-8859-1] Sun Dec 13 05:07:37 2015 @@ -44,6 +44,13 @@ HWND hOptionsDialog; BOOL bOptionsDialog = FALSE; +BOOL bRecreateOffscreenDC = TRUE; +LONG sourceWidth = 0; +LONG sourceHeight = 0; +HDC hdcOffscreen = NULL; +HANDLE hbmpOld; +HBITMAP hbmpOffscreen = NULL; + /* Current magnified area */ POINT cp; @@ -51,6 +58,8 @@ POINT pMouse; POINT pCaret; POINT pFocus; +HWND pCaretWnd; +HWND pFocusWnd; ATOM MyRegisterClass(HINSTANCE hInstance); BOOL InitInstance(HINSTANCE, int); @@ -96,6 +105,11 @@ DispatchMessage(&msg); } } + + + SelectObject(hdcOffscreen, hbmpOld); + DeleteObject (hbmpOffscreen); + DeleteDC(hdcOffscreen); return (int) msg.wParam; } @@ -201,9 +215,6 @@ void Draw(HDC aDc) { HDC desktopHdc = NULL; - HDC HdcStretch; - HANDLE hOld; - HBITMAP HbmpStrech; RECT sourceRect, intersectedRect; RECT targetRect, appRect; @@ -212,7 +223,6 @@ ICONINFO iinfo; int AppWidth, AppHeight; - LONG blitAreaWidth, blitAreaHeight; if (bInvertColors) rop = NOTSRCCOPY; @@ -220,7 +230,8 @@ desktopHdc = GetDC(0); GetClientRect(hMainWnd, &appRect); - GetWindowRect(hDesktopWindow, &sourceRect); + AppWidth = (appRect.right - appRect.left); + AppHeight = (appRect.bottom - appRect.top); ZeroMemory(&cinfo, sizeof(cinfo)); ZeroMemory(&iinfo, sizeof(iinfo)); @@ -232,38 +243,48 @@ ClientToScreen(hMainWnd, (POINT*)&targetRect.left); ClientToScreen(hMainWnd, (POINT*)&targetRect.right); - AppWidth = (appRect.right - appRect.left); - AppHeight = (appRect.bottom - appRect.top); - - blitAreaWidth = AppWidth / iZoom; - blitAreaHeight = AppHeight / iZoom; - - sourceRect.left = (cp.x) - (blitAreaWidth /2); - sourceRect.top = (cp.y) - (blitAreaHeight /2); - sourceRect.right = sourceRect.left + blitAreaWidth; - sourceRect.bottom = sourceRect.top + blitAreaHeight; + if (bRecreateOffscreenDC || !hdcOffscreen) + { + bRecreateOffscreenDC = FALSE; + + if(hdcOffscreen) + { + SelectObject(hdcOffscreen, hbmpOld); + DeleteObject (hbmpOffscreen); + DeleteDC(hdcOffscreen); + } + + sourceWidth = AppWidth / iZoom; + sourceHeight = AppHeight / iZoom; + + /* Create a memory DC compatible with client area DC */ + hdcOffscreen = CreateCompatibleDC(desktopHdc); + + /* Create a bitmap compatible with the client area DC */ + hbmpOffscreen = CreateCompatibleBitmap( + desktopHdc, + sourceWidth, + sourceHeight); + + /* Select our bitmap in memory DC and save the old one */ + hbmpOld = SelectObject(hdcOffscreen , hbmpOffscreen); + } + + GetWindowRect(hDesktopWindow, &sourceRect); + sourceRect.left = (cp.x) - (sourceWidth /2); + sourceRect.top = (cp.y) - (sourceHeight /2); + sourceRect.right = sourceRect.left + sourceWidth; + sourceRect.bottom = sourceRect.top + sourceHeight; GetBestOverlapWithMonitors(&sourceRect); - - /* Create a memory DC compatible with client area DC */ - HdcStretch = CreateCompatibleDC(desktopHdc); - - /* Create a bitmap compatible with the client area DC */ - HbmpStrech = CreateCompatibleBitmap( - desktopHdc, - blitAreaWidth, - blitAreaHeight); - - /* Select our bitmap in memory DC and save the old one */ - hOld = SelectObject(HdcStretch , HbmpStrech); /* Paint the screen bitmap to our in memory DC */ BitBlt( - HdcStretch, + hdcOffscreen, 0, 0, - blitAreaWidth, - blitAreaHeight, + sourceWidth, + sourceHeight, desktopHdc, sourceRect.left, sourceRect.top, @@ -272,12 +293,12 @@ if (IntersectRect(&intersectedRect, &sourceRect, &targetRect)) { OffsetRect(&intersectedRect, -sourceRect.left, -sourceRect.top); - FillRect(HdcStretch, &intersectedRect, GetStockObject(DC_BRUSH)); + FillRect(hdcOffscreen, &intersectedRect, GetStockObject(DC_BRUSH)); } /* Draw the mouse pointer in the right position */ DrawIcon( - HdcStretch , + hdcOffscreen , pMouse.x - iinfo.xHotspot - sourceRect.left, // - 10, pMouse.y - iinfo.yHotspot - sourceRect.top, // - 10, cinfo.hCursor); @@ -289,11 +310,11 @@ 0, AppWidth, AppHeight, - HdcStretch, + hdcOffscreen, 0, 0, - blitAreaWidth, - blitAreaHeight, + sourceWidth, + sourceHeight, SRCCOPY | NOMIRRORBITMAP); /* Cleanup */ @@ -301,9 +322,6 @@ DeleteObject(iinfo.hbmMask); if (iinfo.hbmColor) DeleteObject(iinfo.hbmColor); - SelectObject(HdcStretch, hOld); - DeleteObject (HbmpStrech); - DeleteDC(HdcStretch); ReleaseDC(hDesktopWindow, desktopHdc); } @@ -332,6 +350,12 @@ case WM_TIMER: { BOOL hasMoved = FALSE; + HWND hwndForeground = GetForegroundWindow (); + DWORD threadId = GetWindowThreadProcessId(hwndForeground, NULL); + GUITHREADINFO guiInfo; + guiInfo.cbSize = sizeof(guiInfo); + + GetGUIThreadInfo(threadId, &guiInfo); if (bFollowMouse) { @@ -350,47 +374,43 @@ } } - if (bFollowCaret && !hasMoved) - { - POINT pNewCaret; - HWND hwnd2; - - //Get caret position - HWND hwnd1 = GetForegroundWindow (); - DWORD a = GetWindowThreadProcessId(hwnd1, NULL); - DWORD b = GetCurrentThreadId(); - AttachThreadInput (a, b, TRUE); - hwnd2 = GetFocus(); - - GetCaretPos( &pNewCaret); - ClientToScreen (hwnd2, (LPPOINT) &pNewCaret); - AttachThreadInput (a, b, FALSE); - - if (((pCaret.x != pNewCaret.x) || (pCaret.y != pNewCaret.y))) + if (bFollowCaret && hwndForeground && guiInfo.hwndCaret) + { + POINT ptCaret; + ptCaret.x = (guiInfo.rcCaret.left + guiInfo.rcCaret.right) / 2; + ptCaret.y = (guiInfo.rcCaret.top + guiInfo.rcCaret.bottom) / 2; + + if (guiInfo.hwndCaret && ((pCaretWnd != guiInfo.hwndCaret) || (pCaret.x != ptCaret.x) || (pCaret.y != ptCaret.y))) { //Update to new position - pCaret = pNewCaret; - cp = pNewCaret; + pCaret = ptCaret; + pCaretWnd = guiInfo.hwndCaret; + if(!hasMoved) + { + ClientToScreen (guiInfo.hwndCaret, (LPPOINT) &ptCaret); + cp = ptCaret; + } hasMoved = TRUE; } } - if (bFollowFocus && !hasMoved) - { - POINT pNewFocus; - RECT controlRect; + if (bFollowFocus && hwndForeground && guiInfo.hwndFocus) + { + POINT ptFocus; + RECT activeRect; //Get current control focus - HWND hwnd3 = GetFocus (); - GetWindowRect (hwnd3 , &controlRect); - pNewFocus.x = controlRect.left; - pNewFocus.y = controlRect.top; - - if(((pFocus.x != pNewFocus.x) || (pFocus.y != pNewFocus.y))) + GetWindowRect (guiInfo.hwndFocus, &activeRect); + ptFocus.x = (activeRect.left + activeRect.right) / 2; + ptFocus.y = (activeRect.top + activeRect.bottom) / 2; + + if(guiInfo.hwndFocus && ((guiInfo.hwndFocus != pFocusWnd) || (pFocus.x != ptFocus.x) || (pFocus.y != ptFocus.y))) { //Update to new position - pFocus = pNewFocus; - cp = pNewFocus; + pFocus = ptFocus; + pFocusWnd = guiInfo.hwndFocus; + if(!hasMoved) + cp = ptFocus; hasMoved = TRUE; } } @@ -451,6 +471,16 @@ break; } + case WM_CONTEXTMENU: + TrackPopupMenu(notifyMenu, 0, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), 0, hWnd, NULL); + break; + + case WM_SIZE: + case WM_DISPLAYCHANGE: + bRecreateOffscreenDC = TRUE; + Refresh(); + return DefWindowProc(hWnd, message, wParam, lParam); + case WM_ERASEBKGND: // handle WM_ERASEBKGND by simply returning non-zero because we did all the drawing in WM_PAINT. break; @@ -511,12 +541,6 @@ break; - case WM_CONTEXTMENU: - { - TrackPopupMenu(notifyMenu, 0, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), 0, hWnd, NULL); - break; - } - default: return DefWindowProc(hWnd, message, wParam, lParam); } Modified: trunk/reactos/base/applications/magnify/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/magnify/settings.c [iso-8859-1] Sun Dec 13 05:07:37 2015 @@ -18,7 +18,7 @@ BOOL bFollowMouse = TRUE; BOOL bFollowFocus = TRUE; -BOOL bFollowCaret = FALSE; // FIXME: Default to false because AttachThreadInput seems to break. +BOOL bFollowCaret = TRUE; BOOL bInvertColors = FALSE; BOOL bStartMinimized = FALSE;

8 years, 9 months

[dquintana] 70336: [MAGNIFY] * Replace the menubar with a notification icon and context menu. * Change the dialog button to "Ok" instead of "Exit" (applied to en-US and es-ES only, the translators ...

by dquintana＠svn.reactos.org

Author: dquintana Date: Sun Dec 13 02:57:14 2015 New Revision: 70336 URL: http://svn.reactos.org/svn/reactos?rev=70336&view=rev Log: [MAGNIFY] * Replace the menubar with a notification icon and context menu. * Change the dialog button to "Ok" instead of "Exit" (applied to en-US and es-ES only, the translators will have to do the rest :P). * Due to a rather bad problem presumably caused by AttachThreadInput, set the "Follow Caret" option to disabled by default. This can be re-enabled once the problem is fixed. More changes toward CORE-10691 Modified: trunk/reactos/base/applications/magnify/lang/en-US.rc trunk/reactos/base/applications/magnify/lang/es-ES.rc trunk/reactos/base/applications/magnify/magnifier.c trunk/reactos/base/applications/magnify/settings.c Modified: trunk/reactos/base/applications/magnify/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/magnify/lang/en-US.rc [iso-8859-1] Sun Dec 13 02:57:14 2015 @@ -33,7 +33,7 @@ CAPTION "Magnifier Settings" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "Exit", IDOK, 96, 161, 50, 14 + DEFPUSHBUTTON "Ok", IDOK, 96, 161, 50, 14 PUSHBUTTON "Help", IDC_BUTTON_HELP, 38, 161, 50, 14 LTEXT "Magnification level:", IDC_STATIC, 6, 8, 68, 8 COMBOBOX IDC_ZOOM, 72, 6, 63, 66, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP Modified: trunk/reactos/base/applications/magnify/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/magnify/lang/es-ES.rc [iso-8859-1] Sun Dec 13 02:57:14 2015 @@ -37,7 +37,7 @@ CAPTION "Configurar lupa" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "Salir", IDOK, 96, 161, 50, 14 + DEFPUSHBUTTON "Aceptar", IDOK, 96, 161, 50, 14 PUSHBUTTON "Ayuda", IDC_BUTTON_HELP, 38, 161, 50, 14 LTEXT "Niveles de aumento:", IDC_STATIC, 6, 8, 68, 8 COMBOBOX IDC_ZOOM, 76, 6, 63, 66, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP Modified: trunk/reactos/base/applications/magnify/magnifier.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/magnifier.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/magnify/magnifier.c [iso-8859-1] Sun Dec 13 02:57:14 2015 @@ -3,8 +3,9 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/magnify/magnifier.c * PURPOSE: Magnification of parts of the screen. - * COPYRIGHT: Copyright 2007 Marc Piulachs <marc.piulachs(a)codexchange.net> - * + * AUTHORS: + * Marc Piulachs <marc.piulachs(a)codexchange.net> + * David Quintana <gigaherz(a)gmail.com> */ /* TODO: AppBar */ @@ -14,6 +15,8 @@ #include <winuser.h> #include <wingdi.h> #include <winnls.h> +#include <shellapi.h> +#include <windowsx.h> #include "resource.h" @@ -28,11 +31,18 @@ TCHAR szTitle[MAX_LOADSTRING]; #define TIMER_SPEED 1 -#define REPAINT_SPEED 100 +#define REPAINT_SPEED 100 DWORD lastTicks = 0; HWND hDesktopWindow = NULL; + +#define APPMSG_NOTIFYICON (WM_APP+1) +HICON notifyIcon; +NOTIFYICONDATA nid; +HMENU notifyMenu; +HWND hOptionsDialog; +BOOL bOptionsDialog = FALSE; /* Current magnified area */ POINT cp; @@ -102,7 +112,7 @@ wc.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_ICON)); wc.hCursor = LoadCursor(NULL, IDC_ARROW); wc.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); - wc.lpszMenuName = MAKEINTRESOURCE(IDC_MAGNIFIER); + wc.lpszMenuName = NULL; //MAKEINTRESOURCE(IDC_MAGNIFIER); wc.lpszClassName = szWindowClass; return RegisterClass(&wc); @@ -136,6 +146,10 @@ ShowWindow(hMainWnd, bStartMinimized ? SW_MINIMIZE : nCmdShow); UpdateWindow(hMainWnd); + // Windows 2003's Magnifier always shows this dialog, and exits when the dialog isclosed. + // Should we add a custom means to prevent opening it? + hOptionsDialog = CreateDialog(hInstance, MAKEINTRESOURCE(IDD_DIALOGOPTIONS), hMainWnd, OptionsProc); + if (bShowWarning) DialogBox(hInstance, MAKEINTRESOURCE(IDD_WARNINGDIALOG), hMainWnd, WarningProc); @@ -293,6 +307,22 @@ ReleaseDC(hDesktopWindow, desktopHdc); } +void HandleNotifyIconMessage(HWND hWnd, WPARAM wParam, LPARAM lParam) +{ + POINT pt; + + switch(lParam) + { + case WM_LBUTTONUP: + PostMessage(hMainWnd, WM_COMMAND, IDM_OPTIONS, 0); + break; + case WM_RBUTTONUP: + GetCursorPos (&pt); + TrackPopupMenu(notifyMenu, 0, pt.x, pt.y, 0, hWnd, NULL); + break; + } +} + LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { int wmId; @@ -390,7 +420,14 @@ switch (wmId) { case IDM_OPTIONS: - DialogBox(hInst, MAKEINTRESOURCE(IDD_DIALOGOPTIONS), hWnd, OptionsProc); + if(bOptionsDialog) + { + ShowWindow(hOptionsDialog, SW_HIDE); + } + else + { + ShowWindow(hOptionsDialog, SW_SHOW); + } break; case IDM_ABOUT: DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hWnd, AboutProc); @@ -423,9 +460,24 @@ SaveSettings(); KillTimer(hWnd , 1); PostQuitMessage(0); + + /* Cleanup notification icon */ + ZeroMemory(&nid, sizeof(nid)); + nid.cbSize = sizeof(nid); + nid.uFlags = NIF_MESSAGE; + nid.hWnd = hWnd; + nid.uCallbackMessage = APPMSG_NOTIFYICON; + Shell_NotifyIcon(NIM_DELETE, &nid); + + DestroyIcon(notifyIcon); + + DestroyWindow(hOptionsDialog); break; case WM_CREATE: + { + HMENU tempMenu; + /* Load settings from registry */ LoadSettings(); @@ -434,7 +486,36 @@ /* Set the timer */ SetTimer (hWnd , 1, TIMER_SPEED , NULL); - break; + + /* Notification icon */ + notifyIcon = (HICON)LoadImage(hInst, MAKEINTRESOURCE(IDI_ICON), IMAGE_ICON, 16, 16, 0); + + ZeroMemory(&nid, sizeof(nid)); + nid.cbSize = sizeof(nid); + nid.uFlags = NIF_ICON | NIF_MESSAGE; + nid.hWnd = hWnd; + nid.uCallbackMessage = APPMSG_NOTIFYICON; + nid.hIcon = notifyIcon; + Shell_NotifyIcon(NIM_ADD, &nid); + + tempMenu = LoadMenu(hInst, MAKEINTRESOURCE(IDC_MAGNIFIER)); + notifyMenu = GetSubMenu(tempMenu, 0); + RemoveMenu(tempMenu, 0, MF_BYPOSITION); + DestroyMenu(tempMenu); + + break; + } + + case APPMSG_NOTIFYICON: + HandleNotifyIconMessage(hWnd, wParam, lParam); + + break; + + case WM_CONTEXTMENU: + { + TrackPopupMenu(notifyMenu, 0, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), 0, hWnd, NULL); + break; + } default: return DefWindowProc(hWnd, message, wParam, lParam); @@ -468,6 +549,9 @@ UNREFERENCED_PARAMETER(lParam); switch (message) { + case WM_SHOWWINDOW: + bOptionsDialog = wParam; + break; case WM_INITDIALOG: { // Add the zoom items... @@ -508,7 +592,7 @@ { case IDOK: case IDCANCEL: - EndDialog(hDlg, LOWORD(wParam)); + ShowWindow(hDlg, SW_HIDE); return (INT_PTR)TRUE; case IDC_BUTTON_HELP: Modified: trunk/reactos/base/applications/magnify/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/magnify/settings.c [iso-8859-1] Sun Dec 13 02:57:14 2015 @@ -18,7 +18,7 @@ BOOL bFollowMouse = TRUE; BOOL bFollowFocus = TRUE; -BOOL bFollowCaret = TRUE; +BOOL bFollowCaret = FALSE; // FIXME: Default to false because AttachThreadInput seems to break. BOOL bInvertColors = FALSE; BOOL bStartMinimized = FALSE;

8 years, 9 months

[dquintana] 70335: [MAGNIFY] Some improvements to the drawing code: * Draw as soon as the mouse/caret/focus changes, or after 100ms if nothing changed. * Copy only the needed area of the screen int...

by dquintana＠svn.reactos.org

Author: dquintana Date: Sun Dec 13 00:34:18 2015 New Revision: 70335 URL: http://svn.reactos.org/svn/reactos?rev=70335&view=rev Log: [MAGNIFY] Some improvements to the drawing code: * Draw as soon as the mouse/caret/focus changes, or after 100ms if nothing changed. * Copy only the needed area of the screen into the internal buffer. * Blank out the area of the buffer where the client region of the magnifier overlaps, to avoid re-zooming the pixels. * Keep the source region contained within the closest monitor, instead of only the primary one. * Invert colors when copying from the screen, instead of when stretching, since there's less pixels to draw. First step toward the improvements described in CORE-10691 Modified: trunk/reactos/base/applications/magnify/magnifier.c Modified: trunk/reactos/base/applications/magnify/magnifier.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/magnifier.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/magnify/magnifier.c [iso-8859-1] Sun Dec 13 00:34:18 2015 @@ -27,7 +27,10 @@ TCHAR szTitle[MAX_LOADSTRING]; +#define TIMER_SPEED 1 #define REPAINT_SPEED 100 + +DWORD lastTicks = 0; HWND hDesktopWindow = NULL; @@ -148,26 +151,62 @@ } } +void GetBestOverlapWithMonitors(LPRECT rect) +{ + int rcLeft, rcTop; + int rcWidth, rcHeight; + RECT rcMon; + HMONITOR hMon = MonitorFromRect(rect, MONITOR_DEFAULTTONEAREST); + MONITORINFO info; + info.cbSize = sizeof(info); + + GetMonitorInfo(hMon, &info); + + rcMon = info.rcMonitor; + + rcLeft = rect->left; + rcTop = rect->top; + rcWidth = (rect->right - rect->left); + rcHeight = (rect->bottom - rect->top); + + if (rcLeft < rcMon.left) + rcLeft = rcMon.left; + + if (rcTop < rcMon.top) + rcTop = rcMon.top; + + if (rcLeft > (rcMon.right - rcWidth)) + rcLeft = (rcMon.right - rcWidth); + + if (rcTop > (rcMon.bottom - rcHeight)) + rcTop = (rcMon.bottom - rcHeight); + + OffsetRect(rect, (rcLeft-rect->left), (rcTop-rect->top)); +} + void Draw(HDC aDc) { HDC desktopHdc = NULL; - HDC HdcStrech; + HDC HdcStretch; HANDLE hOld; HBITMAP HbmpStrech; - - RECT R; - RECT appRect; + + RECT sourceRect, intersectedRect; + RECT targetRect, appRect; DWORD rop = SRCCOPY; CURSORINFO cinfo; ICONINFO iinfo; - int Width, Height, AppWidth, AppHeight; - LONG blitAreaWidth, blitAreaHeight, blitAreaX, blitAreaY; - - desktopHdc = GetWindowDC(hDesktopWindow); + int AppWidth, AppHeight; + LONG blitAreaWidth, blitAreaHeight; + + if (bInvertColors) + rop = NOTSRCCOPY; + + desktopHdc = GetDC(0); GetClientRect(hMainWnd, &appRect); - GetWindowRect(hDesktopWindow, &R); + GetWindowRect(hDesktopWindow, &sourceRect); ZeroMemory(&cinfo, sizeof(cinfo)); ZeroMemory(&iinfo, sizeof(iinfo)); @@ -175,63 +214,59 @@ GetCursorInfo(&cinfo); GetIconInfo(cinfo.hCursor, &iinfo); + targetRect = appRect; + ClientToScreen(hMainWnd, (POINT*)&targetRect.left); + ClientToScreen(hMainWnd, (POINT*)&targetRect.right); + + AppWidth = (appRect.right - appRect.left); + AppHeight = (appRect.bottom - appRect.top); + + blitAreaWidth = AppWidth / iZoom; + blitAreaHeight = AppHeight / iZoom; + + sourceRect.left = (cp.x) - (blitAreaWidth /2); + sourceRect.top = (cp.y) - (blitAreaHeight /2); + sourceRect.right = sourceRect.left + blitAreaWidth; + sourceRect.bottom = sourceRect.top + blitAreaHeight; + + GetBestOverlapWithMonitors(&sourceRect); + /* Create a memory DC compatible with client area DC */ - HdcStrech = CreateCompatibleDC(desktopHdc); + HdcStretch = CreateCompatibleDC(desktopHdc); /* Create a bitmap compatible with the client area DC */ HbmpStrech = CreateCompatibleBitmap( desktopHdc, - R.right, - R.bottom); + blitAreaWidth, + blitAreaHeight); /* Select our bitmap in memory DC and save the old one */ - hOld = SelectObject(HdcStrech , HbmpStrech); - + hOld = SelectObject(HdcStretch , HbmpStrech); + /* Paint the screen bitmap to our in memory DC */ BitBlt( - HdcStrech, + HdcStretch, 0, 0, - R.right, - R.bottom, + blitAreaWidth, + blitAreaHeight, desktopHdc, - 0, - 0, - SRCCOPY); - + sourceRect.left, + sourceRect.top, + rop); + + if (IntersectRect(&intersectedRect, &sourceRect, &targetRect)) + { + OffsetRect(&intersectedRect, -sourceRect.left, -sourceRect.top); + FillRect(HdcStretch, &intersectedRect, GetStockObject(DC_BRUSH)); + } + /* Draw the mouse pointer in the right position */ DrawIcon( - HdcStrech , - pMouse.x - iinfo.xHotspot, // - 10, - pMouse.y - iinfo.yHotspot, // - 10, + HdcStretch , + pMouse.x - iinfo.xHotspot - sourceRect.left, // - 10, + pMouse.y - iinfo.yHotspot - sourceRect.top, // - 10, cinfo.hCursor); - - Width = (R.right - R.left); - Height = (R.bottom - R.top); - - AppWidth = (appRect.right - appRect.left); - AppHeight = (appRect.bottom - appRect.top); - - blitAreaWidth = AppWidth / iZoom; - blitAreaHeight = AppHeight / iZoom; - - blitAreaX = (cp.x) - (blitAreaWidth /2); - blitAreaY = (cp.y) - (blitAreaHeight /2); - - if (blitAreaX < 0) - blitAreaX = 0; - - if (blitAreaY < 0) - blitAreaY = 0; - - if (blitAreaX > (Width - blitAreaWidth)) - blitAreaX = (Width - blitAreaWidth); - - if (blitAreaY > (Height - blitAreaHeight)) - blitAreaY = (Height - blitAreaHeight); - - if (bInvertColors) - rop = NOTSRCCOPY; /* Blast the stretched image from memory DC to window DC */ StretchBlt( @@ -240,22 +275,21 @@ 0, AppWidth, AppHeight, - HdcStrech, - blitAreaX, - blitAreaY, + HdcStretch, + 0, + 0, blitAreaWidth, blitAreaHeight, - rop | NOMIRRORBITMAP); - - + SRCCOPY | NOMIRRORBITMAP); + /* Cleanup */ if (iinfo.hbmMask) DeleteObject(iinfo.hbmMask); if (iinfo.hbmColor) DeleteObject(iinfo.hbmColor); - SelectObject(HdcStrech, hOld); + SelectObject(HdcStretch, hOld); DeleteObject (HbmpStrech); - DeleteDC(HdcStrech); + DeleteDC(HdcStretch); ReleaseDC(hDesktopWindow, desktopHdc); } @@ -267,53 +301,85 @@ { case WM_TIMER: { - POINT pNewMouse; - POINT pNewCaret; - POINT pNewFocus; - HWND hwnd1, hwnd2, hwnd3; - DWORD a, b; - RECT controlRect; - - //Get current mouse position - GetCursorPos (&pNewMouse); - - //Get caret position - hwnd1 = GetForegroundWindow (); - a = GetWindowThreadProcessId(hwnd1, NULL); - b = GetCurrentThreadId(); - AttachThreadInput (a, b, TRUE); - hwnd2 = GetFocus(); - - GetCaretPos( &pNewCaret); - ClientToScreen (hwnd2, (LPPOINT) &pNewCaret); - AttachThreadInput (a, b, FALSE); - - //Get current control focus - hwnd3 = GetFocus (); - GetWindowRect (hwnd3 , &controlRect); - pNewFocus.x = controlRect.left; - pNewFocus.y = controlRect.top; - - //If mouse has moved .... - if (((pMouse.x != pNewMouse.x) || (pMouse.y != pNewMouse.y)) && bFollowMouse) - { - //Update to new position - pMouse = pNewMouse; - cp = pNewMouse; - } - else if (((pCaret.x != pNewCaret.x) || (pCaret.y != pNewCaret.y)) && bFollowCaret) - { - //Update to new position - pCaret = pNewCaret; - cp = pNewCaret; - } - else if (((pFocus.x != pNewFocus.x) || (pFocus.y != pNewFocus.y)) && bFollowFocus) - { - //Update to new position - pFocus = pNewFocus; - cp = pNewFocus; - } - Refresh(); + BOOL hasMoved = FALSE; + + if (bFollowMouse) + { + POINT pNewMouse; + + //Get current mouse position + GetCursorPos (&pNewMouse); + + //If mouse has moved ... + if (((pMouse.x != pNewMouse.x) || (pMouse.y != pNewMouse.y))) + { + //Update to new position + pMouse = pNewMouse; + cp = pNewMouse; + hasMoved = TRUE; + } + } + + if (bFollowCaret && !hasMoved) + { + POINT pNewCaret; + HWND hwnd2; + + //Get caret position + HWND hwnd1 = GetForegroundWindow (); + DWORD a = GetWindowThreadProcessId(hwnd1, NULL); + DWORD b = GetCurrentThreadId(); + AttachThreadInput (a, b, TRUE); + hwnd2 = GetFocus(); + + GetCaretPos( &pNewCaret); + ClientToScreen (hwnd2, (LPPOINT) &pNewCaret); + AttachThreadInput (a, b, FALSE); + + if (((pCaret.x != pNewCaret.x) || (pCaret.y != pNewCaret.y))) + { + //Update to new position + pCaret = pNewCaret; + cp = pNewCaret; + hasMoved = TRUE; + } + } + + if (bFollowFocus && !hasMoved) + { + POINT pNewFocus; + RECT controlRect; + + //Get current control focus + HWND hwnd3 = GetFocus (); + GetWindowRect (hwnd3 , &controlRect); + pNewFocus.x = controlRect.left; + pNewFocus.y = controlRect.top; + + if(((pFocus.x != pNewFocus.x) || (pFocus.y != pNewFocus.y))) + { + //Update to new position + pFocus = pNewFocus; + cp = pNewFocus; + hasMoved = TRUE; + } + } + + if(!hasMoved) + { + DWORD newTicks = GetTickCount(); + DWORD elapsed = (newTicks - lastTicks); + if(elapsed > REPAINT_SPEED) + { + hasMoved = TRUE; + } + } + + if(hasMoved) + { + lastTicks = GetTickCount(); + Refresh(); + } } break; @@ -367,7 +433,7 @@ hDesktopWindow = GetDesktopWindow(); /* Set the timer */ - SetTimer (hWnd , 1, REPAINT_SPEED , NULL); + SetTimer (hWnd , 1, TIMER_SPEED , NULL); break; default:

8 years, 9 months

[hbelusca] 70334: [WIN32K:CLIP] - Adjust the type of some variables. - Correctly set the fClipboardChanged flag to TRUE when emptying the clipboard: now this correctly triggers sending the WM_DRAWC...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Dec 12 21:47:14 2015 New Revision: 70334 URL: http://svn.reactos.org/svn/reactos?rev=70334&view=rev Log: [WIN32K:CLIP] - Adjust the type of some variables. - Correctly set the fClipboardChanged flag to TRUE when emptying the clipboard: now this correctly triggers sending the WM_DRAWCLIPBOARD message to windows. Adapted from a patch by Ricardo Hanke. CORE-10351 Modified: trunk/reactos/win32ss/user/ntuser/clipboard.c Modified: trunk/reactos/win32ss/user/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/clipbo… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] Sat Dec 12 21:47:14 2015 @@ -40,7 +40,7 @@ static PCLIP FASTCALL IntIsFormatAvailable(PWINSTATION_OBJECT pWinStaObj, UINT fmt) { - unsigned i = 0; + DWORD i; for (i = 0; i < pWinStaObj->cNumClipFormats; ++i) { @@ -335,7 +335,7 @@ VOID NTAPI UserEmptyClipboardData(PWINSTATION_OBJECT pWinSta) { - unsigned i; + DWORD i; PCLIP pElement; for (i = 0; i < pWinSta->cNumClipFormats; ++i) @@ -630,6 +630,7 @@ pWinStaObj->spwndClipOwner = pWinStaObj->spwndClipOpen; pWinStaObj->iClipSequenceNumber++; + pWinStaObj->fClipboardChanged = TRUE; bRet = TRUE; }

8 years, 9 months

[hbelusca] 70333: Whitespace fixes only.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Dec 12 21:28:55 2015 New Revision: 70333 URL: http://svn.reactos.org/svn/reactos?rev=70333&view=rev Log: Whitespace fixes only. Modified: trunk/reactos/win32ss/user/ntuser/clipboard.c Modified: trunk/reactos/win32ss/user/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/clipbo… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] Sat Dec 12 21:28:55 2015 @@ -44,7 +44,7 @@ for (i = 0; i < pWinStaObj->cNumClipFormats; ++i) { - if (pWinStaObj->pClipBase[i].fmt == fmt) + if (pWinStaObj->pClipBase[i].fmt == fmt) return &pWinStaObj->pClipBase[i]; } @@ -232,14 +232,14 @@ pDibEl = IntIsFormatAvailable(pWinStaObj, CF_DIB); ASSERT(pDibEl && !IS_DATA_SYNTHESIZED(pDibEl)); - if(!pDibEl->fGlobalHandle) + if (!pDibEl->fGlobalHandle) return; pMemObj = (PCLIPBOARDDATA)UserGetObject(gHandleTable, pDibEl->hData, TYPE_CLIPDATA); if (!pMemObj) return; - pBmi = (BITMAPINFO*)pMemObj->Data; + pBmi = (BITMAPINFO*)pMemObj->Data; if (pMemObj->cbData < sizeof(DWORD) && pMemObj->cbData < pBmi->bmiHeader.biSize) goto cleanup; @@ -341,11 +341,12 @@ for (i = 0; i < pWinSta->cNumClipFormats; ++i) { pElement = &pWinSta->pClipBase[i]; - IntFreeElementData(pElement); - } - - if(pWinSta->pClipBase) + IntFreeElementData(pElement); + } + + if (pWinSta->pClipBase) ExFreePoolWithTag(pWinSta->pClipBase, USERTAG_CLIPBOARD); + pWinSta->pClipBase = NULL; pWinSta->cNumClipFormats = 0; } @@ -413,7 +414,7 @@ } cleanup: - if(pWinStaObj) + if (pWinStaObj) ObDereferenceObject(pWinStaObj); return Ret; @@ -569,10 +570,10 @@ if (pWindowRemove && pWinStaObj->spwndClipViewer) { - if(pWindowRemove == pWinStaObj->spwndClipViewer) + if (pWindowRemove == pWinStaObj->spwndClipViewer) pWinStaObj->spwndClipViewer = UserGetWindowObject(hWndNewNext); - if(pWinStaObj->spwndClipViewer) + if (pWinStaObj->spwndClipViewer) bRet = (BOOL)co_IntSendMessage(pWinStaObj->spwndClipViewer->head.h, WM_CHANGECBCHAIN, (WPARAM)hWndRemove, (LPARAM)hWndNewNext); } @@ -730,7 +731,7 @@ UserEnterShared(); pWinStaObj = IntGetWinStaForCbAccess(); - if(!pWinStaObj) + if (!pWinStaObj) goto cleanup; if (pWinStaObj->spwndClipViewer) @@ -911,7 +912,7 @@ _SEH2_END; cleanup: - if(pWinStaObj) + if (pWinStaObj) ObDereferenceObject(pWinStaObj); UserLeave(); @@ -976,7 +977,7 @@ cleanup: TRACE("NtUserSetClipboardData returns: %p\n", hRet); - if(pWinStaObj) + if (pWinStaObj) ObDereferenceObject(pWinStaObj); return hRet; @@ -1041,7 +1042,7 @@ pWinStaObj->spwndClipViewer = pWindow; cleanup: - if(pWinStaObj) + if (pWinStaObj) ObDereferenceObject(pWinStaObj); UserLeave();

8 years, 9 months

[hbelusca] 70332: [CLIPBRD]: SVN failure again: for some reason this file was not added to the code when applying the patch. See r70331. CORE-10679

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Dec 12 21:21:28 2015 New Revision: 70332 URL: http://svn.reactos.org/svn/reactos?rev=70332&view=rev Log: [CLIPBRD]: SVN failure again: for some reason this file was not added to the code when applying the patch. See r70331. CORE-10679 Added: trunk/reactos/base/applications/clipbrd/scrollutils.h (with props) Added: trunk/reactos/base/applications/clipbrd/scrollutils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/scrollutils.h (added) +++ trunk/reactos/base/applications/clipbrd/scrollutils.h [iso-8859-1] Sat Dec 12 21:21:28 2015 @@ -0,0 +1,21 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Clipboard Viewer + * FILE: base/applications/clipbrd/scrollutils.h + * PURPOSE: Scrolling releated helper functions. + * PROGRAMMERS: Ricardo Hanke + */ + +typedef struct _SCROLLSTATE +{ + int CurrentX; + int CurrentY; + int MaxX; + int MaxY; +} SCROLLSTATE, *LPSCROLLSTATE; + +void HandleKeyboardScrollEvents(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); +void HandleHorizontalScrollEvents(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LPSCROLLSTATE state); +void HandleVerticalScrollEvents(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LPSCROLLSTATE state); +void UpdateWindowScrollState(HWND hWnd, HBITMAP hBmp, LPSCROLLSTATE lpState); +BOOL ScrollBlt(PAINTSTRUCT ps, HBITMAP hBmp, SCROLLSTATE state); Propchange: trunk/reactos/base/applications/clipbrd/scrollutils.h ------------------------------------------------------------------------------ svn:eol-style = native

8 years, 9 months

[hbelusca] 70331: [CLIPBRD] Start scrolling support, work in progress. By Ricardo Hanke CORE-10679

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Dec 12 21:15:53 2015 New Revision: 70331 URL: http://svn.reactos.org/svn/reactos?rev=70331&view=rev Log: [CLIPBRD] Start scrolling support, work in progress. By Ricardo Hanke CORE-10679 Added: trunk/reactos/base/applications/clipbrd/scrollutils.c (with props) Modified: trunk/reactos/base/applications/clipbrd/CMakeLists.txt trunk/reactos/base/applications/clipbrd/clipbrd.c trunk/reactos/base/applications/clipbrd/fileutils.h trunk/reactos/base/applications/clipbrd/precomp.h trunk/reactos/base/applications/clipbrd/winutils.h Modified: trunk/reactos/base/applications/clipbrd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/CMakeLists.txt [iso-8859-1] Sat Dec 12 21:15:53 2015 @@ -4,6 +4,7 @@ cliputils.c winutils.c fileutils.c + scrollutils.c precomp.h) add_executable(clipbrd ${SOURCE} clipbrd.rc) Modified: trunk/reactos/base/applications/clipbrd/clipbrd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/clipbrd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/clipbrd.c [iso-8859-1] Sat Dec 12 21:15:53 2015 @@ -11,6 +11,7 @@ static const WCHAR szClassName[] = L"ClipBookWClass"; CLIPBOARD_GLOBALS Globals; +SCROLLSTATE Scrollstate; static void SaveClipboardToFile(void) { @@ -124,8 +125,15 @@ Globals.uDisplayFormat = uFormat; } + if (Globals.hDspBmp) + { + DeleteObject(Globals.hDspBmp); + } + + ZeroMemory(&Scrollstate, sizeof(Scrollstate)); + UpdateWindowScrollState(Globals.hMainWnd, Globals.hDspBmp, &Scrollstate); + InvalidateRect(Globals.hMainWnd, NULL, TRUE); - UpdateWindow(Globals.hMainWnd); } static void InitMenuPopup(HMENU hMenu, LPARAM index) @@ -330,10 +338,40 @@ break; } + case WM_KEYDOWN: + { + HandleKeyboardScrollEvents(hWnd, uMsg, wParam, lParam); + break; + } + + case WM_HSCROLL: + { + HandleHorizontalScrollEvents(hWnd, uMsg, wParam, lParam, &Scrollstate); + break; + } + + case WM_VSCROLL: + { + HandleVerticalScrollEvents(hWnd, uMsg, wParam, lParam, &Scrollstate); + break; + } + case WM_SIZE: { - InvalidateRect(hWnd, NULL, TRUE); - UpdateWindow(hWnd); + UpdateWindowScrollState(hWnd, Globals.hDspBmp, &Scrollstate); + + if ((Globals.uDisplayFormat == CF_METAFILEPICT) || + (Globals.uDisplayFormat == CF_ENHMETAFILE) || + (Globals.uDisplayFormat == CF_DSPENHMETAFILE) || + (Globals.uDisplayFormat == CF_DSPMETAFILEPICT)) + { + InvalidateRect(Globals.hMainWnd, NULL, FALSE); + } + else if (!IsClipboardFormatSupported(Globals.uDisplayFormat)) + { + InvalidateRect(Globals.hMainWnd, NULL, TRUE); + } + break; } @@ -428,6 +466,12 @@ UpdateWindow(hWnd); } } + break; + } + + case WM_SYSCOLORCHANGE: + { + SetDisplayFormat(Globals.uDisplayFormat); break; } @@ -510,5 +554,10 @@ } } + if (Globals.hDspBmp) + { + DeleteObject(Globals.hDspBmp); + } + return (int)msg.wParam; } Modified: trunk/reactos/base/applications/clipbrd/fileutils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/fileutils.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/fileutils.h [iso-8859-1] Sat Dec 12 21:15:53 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Clipboard Viewer - * FILE: base/applications/clipbrd/fileutils.c + * FILE: base/applications/clipbrd/fileutils.h * PURPOSE: Clipboard file format helper functions. * PROGRAMMERS: Ricardo Hanke */ Modified: trunk/reactos/base/applications/clipbrd/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/precomp.h [iso-8859-1] Sat Dec 12 21:15:53 2015 @@ -15,6 +15,7 @@ #include "cliputils.h" #include "fileutils.h" #include "winutils.h" +#include "scrollutils.h" #define MAX_STRING_LEN 255 #define DISPLAY_MENU_POS 2 @@ -28,6 +29,7 @@ HMENU hMenu; UINT uDisplayFormat; UINT uCheckedItem; + HBITMAP hDspBmp; } CLIPBOARD_GLOBALS; extern CLIPBOARD_GLOBALS Globals; Added: trunk/reactos/base/applications/clipbrd/scrollutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/scrollutils.c (added) +++ trunk/reactos/base/applications/clipbrd/scrollutils.c [iso-8859-1] Sat Dec 12 21:15:53 2015 @@ -0,0 +1,267 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Clipboard Viewer + * FILE: base/applications/clipbrd/scrollutils.c + * PURPOSE: Scrolling releated helper functions. + * PROGRAMMERS: Ricardo Hanke + */ + +#include "precomp.h" + +static int InternalSetScrollInfo(HWND hWnd, int nMin, int nMax, UINT nPage, int nPos, int fnBar) +{ + SCROLLINFO si; + + ZeroMemory(&si, sizeof(si)); + si.cbSize = sizeof(si); + si.fMask = SIF_RANGE | SIF_PAGE | SIF_POS | SIF_DISABLENOSCROLL; + si.nMin = nMin; + si.nMax = nMax; + si.nPage = nPage; + si.nPos = nPos; + + return SetScrollInfo(hWnd, fnBar, &si, TRUE); +} + +void HandleKeyboardScrollEvents(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch (wParam) + { + case VK_UP: + { + SendMessage(hWnd, WM_VSCROLL, MAKELONG(SB_LINEUP, 0), 0); + break; + } + + case VK_DOWN: + { + SendMessage(hWnd, WM_VSCROLL, MAKELONG(SB_LINEDOWN, 0), 0); + break; + } + + case VK_LEFT: + { + SendMessage(hWnd, WM_HSCROLL, MAKELONG(SB_LINEUP, 0), 0); + break; + } + + case VK_RIGHT: + { + SendMessage(hWnd, WM_HSCROLL, MAKELONG(SB_LINEDOWN, 0), 0); + break; + } + + case VK_PRIOR: + { + SendMessage(hWnd, WM_VSCROLL, MAKELONG(SB_PAGEUP, 0), 0); + break; + } + + case VK_NEXT: + { + SendMessage(hWnd, WM_VSCROLL, MAKELONG(SB_PAGEDOWN, 0), 0); + break; + } + + default: + { + break; + } + } +} + +void HandleHorizontalScrollEvents(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LPSCROLLSTATE state) +{ + SCROLLINFO si; + int Delta; + int NewPos; + + ZeroMemory(&si, sizeof(si)); + si.cbSize = sizeof(si); + si.fMask = SIF_PAGE | SIF_TRACKPOS; + GetScrollInfo(hWnd, SB_HORZ, &si); + + switch (LOWORD(wParam)) + { + case SB_THUMBPOSITION: + case SB_THUMBTRACK: + { + NewPos = si.nTrackPos; + break; + } + + case SB_LINELEFT: + { + NewPos = state->CurrentX - 5; + break; + } + + case SB_LINERIGHT: + { + NewPos = state->CurrentX + 5; + break; + } + + case SB_PAGELEFT: + { + NewPos = state->CurrentX - si.nPage; + break; + } + + case SB_PAGERIGHT: + { + NewPos = state->CurrentX + si.nPage; + break; + } + + default: + { + NewPos = state->CurrentX; + break; + } + } + + NewPos = min(state->MaxX, max(0, NewPos)); + + if (NewPos == state->CurrentX) + { + return; + } + + Delta = NewPos - state->CurrentX; + + state->CurrentX = NewPos; + + ScrollWindowEx(hWnd, -Delta, 0, NULL, NULL, NULL, NULL, SW_INVALIDATE); + + si.cbSize = sizeof(si); + si.fMask = SIF_POS; + si.nPos = state->CurrentX; + SetScrollInfo(hWnd, SB_HORZ, &si, TRUE); +} + +void HandleVerticalScrollEvents(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LPSCROLLSTATE state) +{ + SCROLLINFO si; + int Delta; + int NewPos; + + ZeroMemory(&si, sizeof(si)); + si.cbSize = sizeof(si); + si.fMask = SIF_PAGE | SIF_TRACKPOS; + GetScrollInfo(hWnd, SB_VERT, &si); + + switch (LOWORD(wParam)) + { + case SB_THUMBPOSITION: + case SB_THUMBTRACK: + { + NewPos = si.nTrackPos; + break; + } + + case SB_LINEUP: + { + NewPos = state->CurrentY - 5; + break; + } + + case SB_LINEDOWN: + { + NewPos = state->CurrentY + 5; + break; + } + + case SB_PAGEUP: + { + NewPos = state->CurrentY - si.nPage; + break; + } + + case SB_PAGEDOWN: + { + NewPos = state->CurrentY + si.nPage; + break; + } + + default: + { + NewPos = state->CurrentY; + break; + } + } + + NewPos = min(state->MaxY, max(0, NewPos)); + + if (NewPos == state->CurrentY) + { + return; + } + + Delta = NewPos - state->CurrentY; + + state->CurrentY = NewPos; + + ScrollWindowEx(hWnd, 0, -Delta, NULL, NULL, NULL, NULL, SW_INVALIDATE); + + si.cbSize = sizeof(si); + si.fMask = SIF_POS; + si.nPos = state->CurrentY; + SetScrollInfo(hWnd, SB_VERT, &si, TRUE); +} + +void UpdateWindowScrollState(HWND hWnd, HBITMAP hBitmap, LPSCROLLSTATE lpState) +{ + BITMAP bmp; + RECT rc; + + if (!GetObject(hBitmap, sizeof(BITMAP), &bmp)) + { + bmp.bmWidth = 0; + bmp.bmHeight = 0; + } + + if (!GetClientRect(hWnd, &rc)) + { + SetRectEmpty(&rc); + } + + lpState->MaxX = max(bmp.bmWidth - rc.right, 0); + lpState->CurrentX = min(lpState->CurrentX, lpState->MaxX); + InternalSetScrollInfo(hWnd, 0, bmp.bmWidth, rc.right, lpState->CurrentX, SB_HORZ); + + lpState->MaxY = max(bmp.bmHeight - rc.bottom, 0); + lpState->CurrentY = min(lpState->CurrentY, lpState->MaxY); + InternalSetScrollInfo(hWnd, 0, bmp.bmHeight, rc.bottom, lpState->CurrentY, SB_VERT); +} + +BOOL ScrollBlt(PAINTSTRUCT ps, HBITMAP hBmp, SCROLLSTATE state) +{ + RECT rect; + BOOL ret; + HDC hdc; + int xpos; + int ypos; + + rect.left = ps.rcPaint.left; + rect.top = ps.rcPaint.top; + rect.right = (ps.rcPaint.right - ps.rcPaint.left); + rect.bottom = (ps.rcPaint.bottom - ps.rcPaint.top); + + xpos = ps.rcPaint.left + state.CurrentX; + ypos = ps.rcPaint.top + state.CurrentY; + + ret = FALSE; + + hdc = CreateCompatibleDC(ps.hdc); + if (hdc) + { + if (SelectObject(hdc, hBmp)) + { + ret = BitBlt(ps.hdc, rect.left, rect.top, rect.right, rect.bottom, hdc, xpos, ypos, SRCCOPY); + } + DeleteDC(hdc); + } + + return ret; +} Propchange: trunk/reactos/base/applications/clipbrd/scrollutils.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/clipbrd/winutils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/winutils.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/winutils.h [iso-8859-1] Sat Dec 12 21:15:53 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Clipboard Viewer - * FILE: base/applications/clipbrd/winutils.c + * FILE: base/applications/clipbrd/winutils.h * PURPOSE: Miscellaneous helper functions. * PROGRAMMERS: Ricardo Hanke */

8 years, 9 months

[hbelusca] 70330: [CLIPBRD]: Fix SVN patching failure & build; see r70329 and CORE-10662. Patch of r70329 was by Ricardo Hanke :)

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Dec 12 20:47:36 2015 New Revision: 70330 URL: http://svn.reactos.org/svn/reactos?rev=70330&view=rev Log: [CLIPBRD]: Fix SVN patching failure & build; see r70329 and CORE-10662. Patch of r70329 was by Ricardo Hanke :) Modified: trunk/reactos/base/applications/clipbrd/winutils.c Modified: trunk/reactos/base/applications/clipbrd/winutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/winutils.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/winutils.c [iso-8859-1] Sat Dec 12 20:47:36 2015 @@ -204,5 +204,5 @@ CloseClipboard(); - PlayEnhMetaFile(hdc, hEmf, lpRect); -} + return uResult; +}

8 years, 9 months

[hbelusca] 70329: [CLIPBRD] Handle WM_PALETTECHANGED and WM_QUERYNEWPALETTE: realizes any palette found on the clipboard, if there is any, if it receives one of those messages.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Dec 12 20:40:19 2015 New Revision: 70329 URL: http://svn.reactos.org/svn/reactos?rev=70329&view=rev Log: [CLIPBRD] Handle WM_PALETTECHANGED and WM_QUERYNEWPALETTE: realizes any palette found on the clipboard, if there is any, if it receives one of those messages. Modified: trunk/reactos/base/applications/clipbrd/clipbrd.c trunk/reactos/base/applications/clipbrd/winutils.c trunk/reactos/base/applications/clipbrd/winutils.h Modified: trunk/reactos/base/applications/clipbrd/clipbrd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/clipbrd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/clipbrd.c [iso-8859-1] Sat Dec 12 20:40:19 2015 @@ -404,6 +404,30 @@ case WM_DROPFILES: { LoadClipboardFromDrop((HDROP)wParam); + break; + } + + case WM_QUERYNEWPALETTE: + { + if (RealizeClipboardPalette(hWnd) != GDI_ERROR) + { + InvalidateRect(hWnd, NULL, TRUE); + UpdateWindow(hWnd); + return TRUE; + } + return FALSE; + } + + case WM_PALETTECHANGED: + { + if ((HWND)wParam != hWnd) + { + if (RealizeClipboardPalette(hWnd) != GDI_ERROR) + { + InvalidateRect(hWnd, NULL, TRUE); + UpdateWindow(hWnd); + } + } break; } Modified: trunk/reactos/base/applications/clipbrd/winutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/winutils.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/winutils.c [iso-8859-1] Sat Dec 12 20:40:19 2015 @@ -156,3 +156,53 @@ hEmf = GetClipboardData(CF_ENHMETAFILE); PlayEnhMetaFile(hdc, hEmf, lpRect); } + +UINT RealizeClipboardPalette(HWND hWnd) +{ + HPALETTE hPalette; + HPALETTE hOldPalette; + UINT uResult; + HDC hDevContext; + + if (!OpenClipboard(NULL)) + { + return GDI_ERROR; + } + + if (!IsClipboardFormatAvailable(CF_PALETTE)) + { + CloseClipboard(); + return GDI_ERROR; + } + + hPalette = GetClipboardData(CF_PALETTE); + if (!hPalette) + { + CloseClipboard(); + return GDI_ERROR; + } + + hDevContext = GetDC(hWnd); + if (!hDevContext) + { + CloseClipboard(); + return GDI_ERROR; + } + + hOldPalette = SelectPalette(hDevContext, hPalette, FALSE); + if (!hOldPalette) + { + ReleaseDC(hWnd, hDevContext); + CloseClipboard(); + return GDI_ERROR; + } + + uResult = RealizePalette(hDevContext); + + SelectPalette(hDevContext, hOldPalette, FALSE); + ReleaseDC(hWnd, hDevContext); + + CloseClipboard(); + + PlayEnhMetaFile(hdc, hEmf, lpRect); +} Modified: trunk/reactos/base/applications/clipbrd/winutils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/winutils.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/winutils.h [iso-8859-1] Sat Dec 12 20:40:19 2015 @@ -15,3 +15,4 @@ void SetDIBitsToDeviceFromClipboard(UINT uFormat, HDC hdc, int XDest, int YDest, int XSrc, int YSrc, UINT uStartScan, UINT fuColorUse); void PlayMetaFileFromClipboard(HDC hdc, const RECT *lpRect); void PlayEnhMetaFileFromClipboard(HDC hdc, const RECT *lpRect); +UINT RealizeClipboardPalette(HWND hWnd);

8 years, 9 months

[hbelusca] 70328: [CLIPBRD] - Display the application icon in program's about dialog. - Add missing DT_NOPREFIX flag to DrawText() calls. - Let ShowLastWin32Error() show an error message even if th...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Dec 12 20:34:21 2015 New Revision: 70328 URL: http://svn.reactos.org/svn/reactos?rev=70328&view=rev Log: [CLIPBRD] - Display the application icon in program's about dialog. - Add missing DT_NOPREFIX flag to DrawText() calls. - Let ShowLastWin32Error() show an error message even if the last error code is zero. - Remove the calls to OpenClipboard() and CloseClipboard() from the functions in winutils.c and let the caller open and close the clipboard instead. Patch by Ricardo Hanke CORE-10657 Modified: trunk/reactos/base/applications/clipbrd/clipbrd.c trunk/reactos/base/applications/clipbrd/winutils.c Modified: trunk/reactos/base/applications/clipbrd/clipbrd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/clipbrd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/clipbrd.c [iso-8859-1] Sat Dec 12 20:34:21 2015 @@ -234,8 +234,12 @@ case CMD_ABOUT: { WCHAR szTitle[MAX_STRING_LEN]; + HICON hIcon; + + hIcon = LoadIconW(Globals.hInstance, MAKEINTRESOURCE(CLIP_ICON)); LoadStringW(Globals.hInstance, STRING_CLIPBOARD, szTitle, ARRAYSIZE(szTitle)); - ShellAboutW(Globals.hMainWnd, szTitle, 0, NULL); + ShellAboutW(Globals.hMainWnd, szTitle, 0, hIcon); + DeleteObject(hIcon); break; } @@ -253,6 +257,11 @@ PAINTSTRUCT ps; RECT rc; + if (!OpenClipboard(NULL)) + { + return; + } + hdc = BeginPaint(hWnd, &ps); GetClientRect(hWnd, &rc); @@ -265,7 +274,7 @@ case CF_UNICODETEXT: { - DrawTextFromClipboard(hdc, &rc, DT_LEFT); + DrawTextFromClipboard(hdc, &rc, DT_LEFT | DT_NOPREFIX); break; } @@ -301,13 +310,14 @@ default: { - - DrawTextFromResource(Globals.hInstance, ERROR_UNSUPPORTED_FORMAT, hdc, &rc, DT_CENTER | DT_WORDBREAK); + DrawTextFromResource(Globals.hInstance, ERROR_UNSUPPORTED_FORMAT, hdc, &rc, DT_CENTER | DT_WORDBREAK | DT_NOPREFIX); break; } } EndPaint(hWnd, &ps); + + CloseClipboard(); } static LRESULT WINAPI MainWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) Modified: trunk/reactos/base/applications/clipbrd/winutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/winutils.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/winutils.c [iso-8859-1] Sat Dec 12 20:34:21 2015 @@ -14,8 +14,6 @@ LPWSTR lpMsgBuf = NULL; dwError = GetLastError(); - if (dwError == NO_ERROR) - return; FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, dwError, 0, (LPWSTR)&lpMsgBuf, 0, NULL); @@ -73,9 +71,6 @@ HGLOBAL hGlobal; LPWSTR lpchText; - if (!OpenClipboard(NULL)) - return; - hGlobal = GetClipboardData(CF_UNICODETEXT); if (!hGlobal) return; @@ -86,16 +81,12 @@ DrawTextW(hDC, lpchText, -1, lpRect, uFormat); GlobalUnlock(hGlobal); - CloseClipboard(); } void BitBltFromClipboard(HDC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, int nXSrc, int nYSrc, DWORD dwRop) { HDC hdcMem; HBITMAP hbm; - - if (!OpenClipboard(NULL)) - return; hdcMem = CreateCompatibleDC(hdcDest); if (hdcMem) @@ -105,7 +96,6 @@ BitBlt(hdcDest, nXDest, nYDest, nWidth, nHeight, hdcMem, nXSrc, nYSrc, dwRop); DeleteDC(hdcMem); } - CloseClipboard(); } void SetDIBitsToDeviceFromClipboard(UINT uFormat, HDC hdc, int XDest, int YDest, int XSrc, int YSrc, UINT uStartScan, UINT fuColorUse) @@ -114,9 +104,6 @@ LPBYTE lpBits; HGLOBAL hGlobal; INT iPalSize; - - if (!OpenClipboard(NULL)) - return; hGlobal = GetClipboardData(uFormat); if (!hGlobal) @@ -140,16 +127,12 @@ SetDIBitsToDevice(hdc, XDest, YDest, lpInfoHeader->biWidth, lpInfoHeader->biHeight, XSrc, YSrc, uStartScan, lpInfoHeader->biHeight, lpBits, (LPBITMAPINFO)lpInfoHeader, fuColorUse); GlobalUnlock(hGlobal); - CloseClipboard(); } void PlayMetaFileFromClipboard(HDC hdc, const RECT *lpRect) { LPMETAFILEPICT mp; HGLOBAL hGlobal; - - if (!OpenClipboard(NULL)) - return; hGlobal = GetClipboardData(CF_METAFILEPICT); if (!hGlobal) @@ -164,17 +147,12 @@ SetViewportOrgEx(hdc, lpRect->left, lpRect->top, NULL); PlayMetaFile(hdc, mp->hMF); GlobalUnlock(hGlobal); - CloseClipboard(); } void PlayEnhMetaFileFromClipboard(HDC hdc, const RECT *lpRect) { HENHMETAFILE hEmf; - if (!OpenClipboard(NULL)) - return; - hEmf = GetClipboardData(CF_ENHMETAFILE); PlayEnhMetaFile(hdc, hEmf, lpRect); - CloseClipboard(); }

8 years, 9 months

← Newer
1
...
12
13
14
15
16
17
18
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2015