Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-06 20:55:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

double buffering

Browse source 
svn path=/trunk/; revision=5763
This commit is contained in:
Martin Fuchs 2003-08-22 18:25:48 +00:00
parent cc1e453ce3
commit ddcf08e7d2
9 changed files with 139 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/subsys/system/explorer/explorer_intres.h
View file

@ -67,7 +67,7 @@
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 127
#define _APS_NEXT_RESOURCE_VALUE 128
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1000
#define _APS_NEXT_SYMED_VALUE 101

10
reactos/subsys/system/explorer/taskbar/desktopbar.cpp
View file

@ -81,20 +81,14 @@ LRESULT DesktopBar::Init(LPCREATESTRUCT pcs)
new PictureButton(Button(_hwnd, ResString(IDS_START), 2, 2, STARTBUTTON_WIDTH, DESKTOPBARBAR_HEIGHT-8, IDC_START, WS_VISIBLE|WS_CHILD|BS_OWNERDRAW),
SmallIcon(IDI_STARTMENU));
ClientRect clnt(_hwnd);
// create task bar
_hwndTaskBar = Window::Create(WINDOW_CREATOR(TaskBar), 0,
BtnWindowClass(CLASSNAME_TASKBAR), TITLE_TASKBAR, WS_CHILD|WS_VISIBLE,
TASKBAR_LEFT, 0, clnt.right-TASKBAR_LEFT-(NOTIFYAREA_WIDTH+1), DESKTOPBARBAR_HEIGHT, _hwnd);
_hwndTaskBar = TaskBar::Create(_hwnd);
TaskBar* taskbar = static_cast<TaskBar*>(get_window(_hwndTaskBar));
taskbar->_desktop_bar = this;
// create tray notification area
_hwndNotify = Window::Create(WINDOW_CREATOR(NotifyArea), WS_EX_STATICEDGE,
BtnWindowClass(CLASSNAME_TRAYNOTIFY,CS_DBLCLKS), TITLE_TRAYNOTIFY, WS_CHILD|WS_VISIBLE,
clnt.right-(NOTIFYAREA_WIDTH+1), 1, NOTIFYAREA_WIDTH, clnt.bottom-2, _hwnd);
_hwndNotify = NotifyArea::Create(_hwnd);
// NotifyArea* notify_area = static_cast<NotifyArea*>(get_window(_hwndNotify));
// notify_area->_desktop_bar = this;

9
reactos/subsys/system/explorer/taskbar/taskbar.cpp
View file

@ -64,6 +64,15 @@ TaskBar::~TaskBar()
//DeinstallShellHook();
}
HWND TaskBar::Create(HWND hwndParent)
{
ClientRect clnt(hwndParent);
return Window::Create(WINDOW_CREATOR(TaskBar), 0,
BtnWindowClass(CLASSNAME_TASKBAR), TITLE_TASKBAR, WS_CHILD|WS_VISIBLE,
TASKBAR_LEFT, 0, clnt.right-TASKBAR_LEFT/*-(NOTIFYAREA_WIDTH+1)*/, clnt.bottom, hwndParent);
}
LRESULT TaskBar::Init(LPCREATESTRUCT pcs)
{
if (super::Init(pcs))

2
reactos/subsys/system/explorer/taskbar/taskbar.h
View file

@ -76,6 +76,8 @@ struct TaskBar : public Window
TaskBar(HWND hwnd);
~TaskBar();
static HWND Create(HWND hwndParent);
DesktopBar* _desktop_bar; // may be not necessary
protected:

45
reactos/subsys/system/explorer/taskbar/traynotify.cpp
View file

@ -91,12 +91,8 @@ LRESULT NotifyArea::Init(LPCREATESTRUCT pcs)
if (super::Init(pcs))
return 1;
ClientRect clnt(_hwnd);
// create clock window
_hwndClock = Window::Create(WINDOW_CREATOR(ClockWindow), 0,
BtnWindowClass(CLASSNAME_CLOCKWINDOW,CS_DBLCLKS), NULL, WS_CHILD|WS_VISIBLE,
clnt.right-(CLOCKWINDOW_WIDTH+1), 1, CLOCKWINDOW_WIDTH, clnt.bottom-2, _hwnd);
_hwndClock = ClockWindow::Create(_hwnd);
SetTimer(_hwnd, 0, 1000, NULL);
@ -108,6 +104,15 @@ NotifyArea::~NotifyArea()
KillTimer(_hwnd, 0);
}
HWND NotifyArea::Create(HWND hwndParent)
{
ClientRect clnt(hwndParent);
return Window::Create(WINDOW_CREATOR(NotifyArea), WS_EX_STATICEDGE,
BtnWindowClass(CLASSNAME_TRAYNOTIFY,CS_DBLCLKS), TITLE_TRAYNOTIFY, WS_CHILD|WS_VISIBLE,
clnt.right-(NOTIFYAREA_WIDTH+1), 1, NOTIFYAREA_WIDTH, clnt.bottom-2, hwndParent);
}
LRESULT NotifyArea::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam)
{
switch(nmsg) {
@ -133,7 +138,7 @@ LRESULT NotifyArea::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam)
|| nmsg==WM_XBUTTONDOWN
#endif
)
CancelModes(0);
CancelModes();
NotifyIconSet::iterator found = IconHitTest(Point(lparam));
@ -154,16 +159,12 @@ LRESULT NotifyArea::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam)
return 0;
}
void NotifyArea::CancelModes(HWND hwnd)
void NotifyArea::CancelModes()
{
if (hwnd)
PostMessage(hwnd, WM_CANCELMODE, 0, 0);
else {
PostMessage(HWND_BROADCAST, WM_CANCELMODE, 0, 0);
PostMessage(HWND_BROADCAST, WM_CANCELMODE, 0, 0);
for(NotifyIconSet::const_iterator it=_sorted_icons.begin(); it!=_sorted_icons.end(); ++it)
PostMessage(it->_hWnd, WM_CANCELMODE, 0, 0);
}
for(NotifyIconSet::const_iterator it=_sorted_icons.begin(); it!=_sorted_icons.end(); ++it)
PostMessage(it->_hWnd, WM_CANCELMODE, 0, 0);
}
LRESULT NotifyArea::ProcessTrayNotification(int notify_code, NOTIFYICONDATA* pnid)
@ -213,13 +214,16 @@ void NotifyArea::Refresh()
_sorted_icons.insert(entry);
}
InvalidateRect(_hwnd, NULL, TRUE); // refresh icon display
InvalidateRect(_hwnd, NULL, FALSE); // refresh icon display
UpdateWindow(_hwnd);
}
void NotifyArea::Paint()
{
PaintCanvas canvas(_hwnd);
BufferedPaintCanvas canvas(_hwnd);
// first fill with the background color
FillRect(canvas, &canvas.rcPaint, GetSysColorBrush(COLOR_BTNFACE));
// draw icons
int x = 2;
@ -279,6 +283,15 @@ ClockWindow::ClockWindow(HWND hwnd)
FormatTime();
}
HWND ClockWindow::Create(HWND hwndParent)
{
ClientRect clnt(hwndParent);
return Window::Create(WINDOW_CREATOR(ClockWindow), 0,
BtnWindowClass(CLASSNAME_CLOCKWINDOW,CS_DBLCLKS), NULL, WS_CHILD|WS_VISIBLE,
clnt.right-(CLOCKWINDOW_WIDTH+1), 1, CLOCKWINDOW_WIDTH, clnt.bottom-2, hwndParent);
}
LRESULT ClockWindow::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam)
{
switch(nmsg) {

6
reactos/subsys/system/explorer/taskbar/traynotify.h
View file

@ -78,6 +78,8 @@ struct NotifyArea : public Window
NotifyArea(HWND hwnd);
~NotifyArea();
static HWND Create(HWND hwndParent);
// DesktopBar* _desktop_bar;
LRESULT ProcessTrayNotification(int notify_code, NOTIFYICONDATA* pnid);
@ -95,7 +97,7 @@ protected:
void Refresh();
void Paint();
void TimerTick();
void CancelModes(HWND hwnd);
void CancelModes();
NotifyIconSet::iterator IconHitTest(const POINT& pos);
};
@ -108,6 +110,8 @@ struct ClockWindow : public Window
ClockWindow(HWND hwnd);
static HWND Create(HWND hwndParent);
void TimerTick();
protected:

73
reactos/subsys/system/explorer/utility/utility.h
View file

@ -186,6 +186,79 @@ protected:
HWND _hwnd;
};
// double buffering classes
struct Canvas
{
Canvas(HDC hdc) : _hdc(hdc) {}
operator HDC() {return _hdc;}
protected:
HDC _hdc;
};
struct MemCanvas : public Canvas
{
MemCanvas(HDC hdc=0)
: Canvas(CreateCompatibleDC(hdc)) {assert(_hdc);}
~MemCanvas() {DeleteDC(_hdc);}
};
struct SelectedBitmap
{
SelectedBitmap(HDC hdc, HBITMAP hbmp)
: _hdc(hdc), _old_hbmp(SelectBitmap(hdc, hbmp)) {}
~SelectedBitmap() {SelectBitmap(_hdc, _old_hbmp);}
protected:
HDC _hdc;
HBITMAP _old_hbmp;
};
struct BufferCanvas : public MemCanvas
{
BufferCanvas(HDC hdc, int x, int y, int w, int h)
: MemCanvas(hdc), _hdctarg(hdc),
_x(x), _y(y), _w(w), _h(h),
_bmp(_hdc, CreateCompatibleBitmap(hdc, w, h)) {}
BufferCanvas(HDC hdc, const RECT& rect)
: MemCanvas(hdc), _hdctarg(hdc),
_x(rect.left), _y(rect.top), _w(rect.right-rect.left), _h(rect.bottom-rect.top),
_bmp(_hdc, CreateCompatibleBitmap(hdc, _w, _h)) {}
protected:
HDC _hdctarg;
int _x, _y, _w, _h;
SelectedBitmap _bmp;
};
struct BufferedCanvas : public BufferCanvas
{
BufferedCanvas(HDC hdc, int x, int y, int w, int h, DWORD mode=SRCCOPY)
: BufferCanvas(hdc, x, y, w, h), _mode(mode) {}
BufferedCanvas(HDC hdc, const RECT& rect, DWORD mode=SRCCOPY)
: BufferCanvas(hdc, rect), _mode(mode) {}
~BufferedCanvas() {BitBlt(_hdctarg, _x, _y, _w, _h, _hdc, 0, 0, _mode);}
DWORD _mode;
};
struct BufferedPaintCanvas : public PaintCanvas, public BufferedCanvas
{
BufferedPaintCanvas(HWND hwnd)
: PaintCanvas(hwnd), BufferedCanvas(hdc, 0, 0, rcPaint.right, rcPaint.bottom) {}
operator HDC() {return BufferedCanvas::_hdc;}
};
struct TextColor
{
TextColor(HDC hdc, COLORREF color)

32
reactos/subsys/system/explorer/utility/window.cpp
View file

@ -186,14 +186,10 @@ LRESULT CALLBACK Window::WindowWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPAR
LRESULT Window::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam)
{
if (nmsg == WM_SETFOCUS) {
// close startup menu and other popup menus
// This functionality is for tray notification icons missing in MS Windows.
if (wparam)
PostMessage((HWND)wparam, WM_CANCELMODE, 0, 0);
else
PostMessage(HWND_BROADCAST, WM_CANCELMODE, 0, 0);
}
// close startup menu and other popup menus
// This functionality is for tray notification icons missing in MS Windows.
if (nmsg == WM_SETFOCUS)
CancelModes((HWND)wparam);
return DefWindowProc(_hwnd, nmsg, wparam, lparam);
}
@ -208,6 +204,14 @@ int Window::Notify(int id, NMHDR* pnmh)
return 0;
}
void Window::CancelModes(HWND hwnd)
{
if (hwnd)
PostMessage(hwnd, WM_CANCELMODE, 0, 0);
else
PostMessage(HWND_BROADCAST, WM_CANCELMODE, 0, 0);
}
SubclassedWindow::SubclassedWindow(HWND hwnd)
: super(hwnd)
@ -220,14 +224,10 @@ SubclassedWindow::SubclassedWindow(HWND hwnd)
LRESULT SubclassedWindow::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam)
{
if (nmsg == WM_SETFOCUS) {
// close startup menu and other popup menus
// This functionality is for tray notification icons missing in MS Windows.
if (wparam)
PostMessage((HWND)wparam, WM_CANCELMODE, 0, 0);
else
PostMessage(HWND_BROADCAST, WM_CANCELMODE, 0, 0);
}
// close startup menu and other popup menus
// This functionality is for tray notification icons missing in MS Windows.
if (nmsg == WM_SETFOCUS)
CancelModes((HWND)wparam);
return CallWindowProc(_orgWndProc, _hwnd, nmsg, wparam, lparam);
}

2
reactos/subsys/system/explorer/utility/window.h
View file

@ -111,6 +111,8 @@ struct Window : public WindowHandle
LRESULT SendParent(UINT nmsg, WPARAM wparam=0, LPARAM lparam=0);
LRESULT PostParent(UINT nmsg, WPARAM wparam=0, LPARAM lparam=0);
static void CancelModes(HWND hwnd=0);
protected:
virtual LRESULT Init(LPCREATESTRUCT pcs); // WM_CREATE processing