// Author: Vaclav Slavik
// RCS-ID: $Id$
// Copyright: (c) 1999 Vaclav Slavik
-// Licence: wxWindows Licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "htmlwin.h"
-#pragma implementation "htmlproc.h"
-#endif
-
#include "wx/wxprec.h"
#include "wx/defs.h"
#include "wx/dataobj.h"
#include "wx/timer.h"
#include "wx/dcmemory.h"
+#include "wx/settings.h"
#include "wx/arrimpl.cpp"
#include "wx/listimpl.cpp"
-
#if wxUSE_CLIPBOARD
// ----------------------------------------------------------------------------
// wxHtmlWinAutoScrollTimer: the timer used to generate a stream of scroll
//-----------------------------------------------------------------------------
WX_DECLARE_OBJARRAY(wxHtmlHistoryItem, wxHtmlHistoryArray);
-WX_DEFINE_OBJARRAY(wxHtmlHistoryArray);
+WX_DEFINE_OBJARRAY(wxHtmlHistoryArray)
WX_DECLARE_LIST(wxHtmlProcessor, wxHtmlProcessorList);
-WX_DEFINE_LIST(wxHtmlProcessorList);
+WX_DEFINE_LIST(wxHtmlProcessorList)
//-----------------------------------------------------------------------------
// wxHtmlWindow
void wxHtmlWindow::Init()
{
- m_tmpMouseMoved = FALSE;
+ m_tmpMouseMoved = false;
m_tmpLastLink = NULL;
m_tmpLastCell = NULL;
m_tmpCanDrawLocks = 0;
m_FS = new wxFileSystem();
+#if wxUSE_STATUSBAR
m_RelatedStatusBar = -1;
+#endif // wxUSE_STATUSBAR
m_RelatedFrame = NULL;
m_TitleFormat = wxT("%s");
m_OpenedPage = m_OpenedAnchor = m_OpenedPageTitle = wxEmptyString;
m_Parser = new wxHtmlWinParser(this);
m_Parser->SetFS(m_FS);
m_HistoryPos = -1;
- m_HistoryOn = TRUE;
+ m_HistoryOn = true;
m_History = new wxHtmlHistoryArray;
m_Processors = NULL;
m_Style = 0;
m_lastDoubleClick = 0;
#endif // wxUSE_CLIPBOARD
m_backBuffer = NULL;
+ m_eraseBgInOnPaint = false;
+ m_tmpSelFromCell = NULL;
}
bool wxHtmlWindow::Create(wxWindow *parent, wxWindowID id,
long style, const wxString& name)
{
if (!wxScrolledWindow::Create(parent, id, pos, size,
- style | wxVSCROLL | wxHSCROLL, name))
- return FALSE;
+ style | wxVSCROLL | wxHSCROLL,
+ name))
+ return false;
m_Style = style;
SetPage(wxT("<html><body></body></html>"));
- return TRUE;
+ return true;
}
#endif // wxUSE_CLIPBOARD
HistoryClear();
- if (m_Cell) delete m_Cell;
+ delete m_selection;
+
+ delete m_Cell;
if ( m_Processors )
{
+#if wxUSE_STATUSBAR
void wxHtmlWindow::SetRelatedStatusBar(int bar)
{
m_RelatedStatusBar = bar;
}
+#endif // wxUSE_STATUSBAR
-void wxHtmlWindow::SetFonts(wxString normal_face, wxString fixed_face, const int *sizes)
+void wxHtmlWindow::SetFonts(const wxString& normal_face, const wxString& fixed_face, const int *sizes)
{
- wxString op = m_OpenedPage;
-
m_Parser->SetFonts(normal_face, fixed_face, sizes);
- // fonts changed => contents invalid, so reload the page:
- SetPage(wxT("<html><body></body></html>"));
- if (!op.IsEmpty()) LoadPage(op);
+
+ // re-layout the page after changing fonts:
+ DoSetPage(*(m_Parser->GetSource()));
}
+void wxHtmlWindow::SetStandardFonts(int size,
+ const wxString& normal_face,
+ const wxString& fixed_face)
+{
+ m_Parser->SetStandardFonts(size, normal_face, fixed_face);
+ // re-layout the page after changing fonts:
+ DoSetPage(*(m_Parser->GetSource()));
+}
bool wxHtmlWindow::SetPage(const wxString& source)
+{
+ m_OpenedPage = m_OpenedAnchor = m_OpenedPageTitle = wxEmptyString;
+ return DoSetPage(source);
+}
+
+bool wxHtmlWindow::DoSetPage(const wxString& source)
{
wxString newsrc(source);
wxDELETE(m_selection);
+ // we will soon delete all the cells, so clear pointers to them:
+ m_tmpSelFromCell = NULL;
+
// pass HTML through registered processors:
if (m_Processors || m_GlobalProcessors)
{
wxClientDC *dc = new wxClientDC(this);
dc->SetMapMode(wxMM_TEXT);
SetBackgroundColour(wxColour(0xFF, 0xFF, 0xFF));
- m_OpenedPage = m_OpenedAnchor = m_OpenedPageTitle = wxEmptyString;
+ SetBackgroundImage(wxNullBitmap);
+
m_Parser->SetDC(dc);
if (m_Cell)
{
CreateLayout();
if (m_tmpCanDrawLocks == 0)
Refresh();
- return TRUE;
+ return true;
}
bool wxHtmlWindow::AppendToPage(const wxString& source)
{
- return SetPage(*(GetParser()->GetSource()) + source);
+ return DoSetPage(*(GetParser()->GetSource()) + source);
}
bool wxHtmlWindow::LoadPage(const wxString& location)
wxFSFile *f;
bool rt_val;
- bool needs_refresh = FALSE;
+ bool needs_refresh = false;
m_tmpCanDrawLocks++;
if (m_HistoryOn && (m_HistoryPos != -1))
else
{
- needs_refresh = TRUE;
+ needs_refresh = true;
+#if wxUSE_STATUSBAR
// load&display it:
if (m_RelatedStatusBar != -1)
{
m_RelatedFrame->SetStatusText(_("Connecting..."), m_RelatedStatusBar);
- Refresh(FALSE);
+ Refresh(false);
}
+#endif // wxUSE_STATUSBAR
f = m_Parser->OpenURL(wxHTML_URL_PAGE, location);
{
wxLogError(_("Unable to open requested HTML document: %s"), location.c_str());
m_tmpCanDrawLocks--;
- return FALSE;
+ return false;
}
else
wxList::compatibility_iterator node;
wxString src = wxEmptyString;
+#if wxUSE_STATUSBAR
if (m_RelatedStatusBar != -1)
{
wxString msg = _("Loading : ") + location;
m_RelatedFrame->SetStatusText(msg, m_RelatedStatusBar);
- Refresh(FALSE);
+ Refresh(false);
}
+#endif // wxUSE_STATUSBAR
node = m_Filters.GetFirst();
while (node)
delete f;
- if (m_RelatedStatusBar != -1) m_RelatedFrame->SetStatusText(_("Done"), m_RelatedStatusBar);
+#if wxUSE_STATUSBAR
+ if (m_RelatedStatusBar != -1)
+ m_RelatedFrame->SetStatusText(_("Done"), m_RelatedStatusBar);
+#endif // wxUSE_STATUSBAR
}
}
if (!c)
{
wxLogWarning(_("HTML anchor %s does not exist."), anchor.c_str());
- return FALSE;
+ return false;
}
else
{
for (y = 0; c != NULL; c = c->GetParent()) y += c->GetPosY();
Scroll(-1, y / wxHTML_SCROLL_STEP);
m_OpenedAnchor = anchor;
- return TRUE;
+ return true;
}
}
{
wxString a, l;
- if (m_HistoryPos < 1) return FALSE;
+ if (m_HistoryPos < 1) return false;
// store scroll position into history item:
int x, y;
l = (*m_History)[m_HistoryPos].GetPage();
a = (*m_History)[m_HistoryPos].GetAnchor();
- m_HistoryOn = FALSE;
+ m_HistoryOn = false;
m_tmpCanDrawLocks++;
if (a == wxEmptyString) LoadPage(l);
else LoadPage(l + wxT("#") + a);
- m_HistoryOn = TRUE;
+ m_HistoryOn = true;
m_tmpCanDrawLocks--;
Scroll(0, (*m_History)[m_HistoryPos].GetPos());
Refresh();
- return TRUE;
+ return true;
}
bool wxHtmlWindow::HistoryCanBack()
{
- if (m_HistoryPos < 1) return FALSE;
- return TRUE ;
+ if (m_HistoryPos < 1) return false;
+ return true ;
}
{
wxString a, l;
- if (m_HistoryPos == -1) return FALSE;
- if (m_HistoryPos >= (int)m_History->GetCount() - 1)return FALSE;
+ if (m_HistoryPos == -1) return false;
+ if (m_HistoryPos >= (int)m_History->GetCount() - 1)return false;
m_OpenedPage = wxEmptyString; // this will disable adding new entry into history in LoadPage()
m_HistoryPos++;
l = (*m_History)[m_HistoryPos].GetPage();
a = (*m_History)[m_HistoryPos].GetAnchor();
- m_HistoryOn = FALSE;
+ m_HistoryOn = false;
m_tmpCanDrawLocks++;
if (a == wxEmptyString) LoadPage(l);
else LoadPage(l + wxT("#") + a);
- m_HistoryOn = TRUE;
+ m_HistoryOn = true;
m_tmpCanDrawLocks--;
Scroll(0, (*m_History)[m_HistoryPos].GetPos());
Refresh();
- return TRUE;
+ return true;
}
bool wxHtmlWindow::HistoryCanForward()
{
- if (m_HistoryPos == -1) return FALSE;
- if (m_HistoryPos >= (int)m_History->GetCount() - 1)return FALSE;
- return TRUE ;
+ if (m_HistoryPos == -1) return false;
+ if (m_HistoryPos >= (int)m_History->GetCount() - 1)return false;
+ return true ;
}
#if wxUSE_CLIPBOARD
-wxString wxHtmlWindow::SelectionToText()
+wxString wxHtmlWindow::DoSelectionToText(wxHtmlSelection *sel)
{
- if ( !m_selection )
+ if ( !sel )
return wxEmptyString;
wxClientDC dc(this);
- const wxHtmlCell *end = m_selection->GetToCell();
+ const wxHtmlCell *end = sel->GetToCell();
wxString text;
- wxHtmlTerminalCellsInterator i(m_selection->GetFromCell(), end);
+ wxHtmlTerminalCellsInterator i(sel->GetFromCell(), end);
if ( i )
{
- text << i->ConvertToText(m_selection);
+ text << i->ConvertToText(sel);
++i;
}
const wxHtmlCell *prev = *i;
{
if ( prev->GetParent() != i->GetParent() )
text << _T('\n');
- text << i->ConvertToText(*i == end ? m_selection : NULL);
+ text << i->ConvertToText(*i == end ? sel : NULL);
prev = *i;
++i;
}
return text;
}
+wxString wxHtmlWindow::ToText()
+{
+ if (m_Cell)
+ {
+ wxHtmlSelection sel;
+ sel.Set(m_Cell->GetFirstTerminal(), m_Cell->GetLastTerminal());
+ return DoSelectionToText(&sel);
+ }
+ else
+ return wxEmptyString;
+}
+
#endif // wxUSE_CLIPBOARD
-void wxHtmlWindow::CopySelection(ClipboardType t)
+bool wxHtmlWindow::CopySelection(ClipboardType t)
{
#if wxUSE_CLIPBOARD
if ( m_selection )
{
-#ifdef __UNIX__
+#if defined(__UNIX__) && !defined(__WXMAC__)
wxTheClipboard->UsePrimarySelection(t == Primary);
#else // !__UNIX__
// Primary selection exists only under X11, so don't do anything under
//
// TODO: this should be abstracted at wxClipboard level!
if ( t == Primary )
- return;
+ return false;
#endif // __UNIX__/!__UNIX__
if ( wxTheClipboard->Open() )
wxTheClipboard->Close();
wxLogTrace(_T("wxhtmlselection"),
_("Copied to clipboard:\"%s\""), txt.c_str());
+
+ return true;
}
}
+#else
+ wxUnusedVar(t);
#endif // wxUSE_CLIPBOARD
+
+ return false;
}
// do nothing here
}
-void wxHtmlWindow::OnEraseBackground(wxEraseEvent& WXUNUSED(event))
+void wxHtmlWindow::OnEraseBackground(wxEraseEvent& event)
{
+ if ( !m_bmpBg.Ok() )
+ {
+ // don't even skip the event, if we don't have a bg bitmap we're going
+ // to overwrite background in OnPaint() below anyhow, so letting the
+ // default handling take place would only result in flicker, just set a
+ // flag to erase the background below
+ m_eraseBgInOnPaint = true;
+ return;
+ }
+
+ wxDC& dc = *event.GetDC();
+
+ // if the image is not fully opaque, we have to erase the background before
+ // drawing it, however avoid doing it for opaque images as this would just
+ // result in extra flicker without any other effect as background is
+ // completely covered anyhow
+ if ( m_bmpBg.GetMask() )
+ {
+ dc.SetBackground(wxBrush(GetBackgroundColour(), wxSOLID));
+ dc.Clear();
+ }
+
+ const wxSize sizeWin(GetClientSize());
+ const wxSize sizeBmp(m_bmpBg.GetWidth(), m_bmpBg.GetHeight());
+ for ( wxCoord x = 0; x < sizeWin.x; x += sizeBmp.x )
+ {
+ for ( wxCoord y = 0; y < sizeWin.y; y += sizeBmp.y )
+ {
+ dc.DrawBitmap(m_bmpBg, x, y, true /* use mask */);
+ }
+ }
}
void wxHtmlWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
{
wxPaintDC dc(this);
- if (m_tmpCanDrawLocks > 0 || m_Cell == NULL) return;
+ if (m_tmpCanDrawLocks > 0 || m_Cell == NULL)
+ return;
int x, y;
GetViewStart(&x, &y);
if ( !m_backBuffer )
m_backBuffer = new wxBitmap(sz.x, sz.y);
dcm.SelectObject(*m_backBuffer);
- dcm.SetBackground(wxBrush(GetBackgroundColour(), wxSOLID));
- dcm.Clear();
+
+ if ( m_eraseBgInOnPaint )
+ {
+ dcm.SetBackground(wxBrush(GetBackgroundColour(), wxSOLID));
+ dcm.Clear();
+
+ m_eraseBgInOnPaint = false;
+ }
+ else // someone has already erased the background, keep it
+ {
+ // preserve the existing background, otherwise we'd erase anything the
+ // user code had drawn in its EVT_ERASE_BACKGROUND handler when we do
+ // the Blit back below
+ dcm.Blit(0, rect.GetTop(),
+ sz.x, rect.GetBottom() - rect.GetTop() + 1,
+ &dc,
+ 0, rect.GetTop());
+ }
+
PrepareDC(dcm);
dcm.SetMapMode(wxMM_TEXT);
dcm.SetBackgroundMode(wxTRANSPARENT);
y * wxHTML_SCROLL_STEP + rect.GetTop(),
y * wxHTML_SCROLL_STEP + rect.GetBottom(),
rinfo);
-
-//#define DEBUG_HTML_SELECTION
+
+//#define DEBUG_HTML_SELECTION
#ifdef DEBUG_HTML_SELECTION
{
int xc, yc, x, y;
ScreenToClient(&xc, &yc);
CalcUnscrolledPosition(xc, yc, &x, &y);
wxHtmlCell *at = m_Cell->FindCellByPos(x, y);
- wxHtmlCell *before =
+ wxHtmlCell *before =
m_Cell->FindCellByPos(x, y, wxHTML_FIND_NEAREST_BEFORE);
- wxHtmlCell *after =
+ wxHtmlCell *after =
m_Cell->FindCellByPos(x, y, wxHTML_FIND_NEAREST_AFTER);
-
+
dcm.SetBrush(*wxTRANSPARENT_BRUSH);
dcm.SetPen(*wxBLACK_PEN);
if (at)
after->GetWidth()-4,after->GetHeight()-4);
}
#endif
-
+
dcm.SetDeviceOrigin(0,0);
dc.Blit(0, rect.GetTop(),
sz.x, rect.GetBottom() - rect.GetTop() + 1,
{
SelectLine(CalcUnscrolledPosition(event.GetPosition()));
- CopySelection();
+ (void) CopySelection();
}
else
{
CaptureMouse();
}
}
+#else
+ wxUnusedVar(event);
#endif // wxUSE_CLIPBOARD
}
m_makingSelection = false;
// did the user move the mouse far enough from starting point?
- if ( m_selection )
+ if ( CopySelection(Primary) )
{
- CopySelection(Primary);
-
// we don't want mouse up event that ended selecting to be
// handled as mouse click and e.g. follow hyperlink:
return;
void wxHtmlWindow::OnInternalIdle()
{
wxWindow::OnInternalIdle();
-
+
if (m_tmpMouseMoved && (m_Cell != NULL))
{
#ifdef DEBUG_HTML_SELECTION
if ( !m_tmpSelFromCell )
m_tmpSelFromCell = m_Cell->FindCellByPos(
m_tmpSelFromPos.x,m_tmpSelFromPos.y);
-
+
// NB: a trick - we adjust selFromPos to be upper left or bottom
// right corner of the first cell of the selection depending
// on whether the mouse is moving to the right or to the left.
dirFromPos.y += m_tmpSelFromCell->GetHeight();
}
}
- bool goingDown = dirFromPos.y < y ||
+ bool goingDown = dirFromPos.y < y ||
(dirFromPos.y == y && dirFromPos.x < x);
// determine selection span:
if (lnk != m_tmpLastLink)
{
+#if wxUSE_STATUSBAR
if (lnk == NULL)
{
if (m_RelatedStatusBar != -1)
m_RelatedFrame->SetStatusText(lnk->GetHref(),
m_RelatedStatusBar);
}
+#endif // wxUSE_STATUSBAR
m_tmpLastLink = lnk;
}
OnCellMouseHover(cell, x, y);
}
- m_tmpMouseMoved = FALSE;
+ m_tmpMouseMoved = false;
}
}
void wxHtmlWindow::OnKeyUp(wxKeyEvent& event)
{
- if ( IsSelectionEnabled() &&
- event.GetKeyCode() == 'C' && event.ControlDown() )
+ if ( IsSelectionEnabled() && event.GetKeyCode() == 'C' && event.CmdDown() )
{
- if ( m_selection )
- CopySelection();
+ (void) CopySelection();
}
}
void wxHtmlWindow::OnCopy(wxCommandEvent& WXUNUSED(event))
{
- if ( m_selection )
- CopySelection();
+ (void) CopySelection();
}
void wxHtmlWindow::OnDoubleClick(wxMouseEvent& event)
{
SelectWord(CalcUnscrolledPosition(event.GetPosition()));
- CopySelection(Primary);
+ (void) CopySelection(Primary);
m_lastDoubleClick = wxGetLocalTimeMillis();
}
void wxHtmlWindow::SelectWord(const wxPoint& pos)
{
- wxHtmlCell *cell = m_Cell->FindCellByPos(pos.x, pos.y);
- if ( cell )
+ if ( m_Cell )
{
- delete m_selection;
- m_selection = new wxHtmlSelection();
- m_selection->Set(cell, cell);
- RefreshRect(wxRect(CalcScrolledPosition(cell->GetAbsPos()),
- wxSize(cell->GetWidth(), cell->GetHeight())));
+ wxHtmlCell *cell = m_Cell->FindCellByPos(pos.x, pos.y);
+ if ( cell )
+ {
+ delete m_selection;
+ m_selection = new wxHtmlSelection();
+ m_selection->Set(cell, cell);
+ RefreshRect(wxRect(CalcScrolledPosition(cell->GetAbsPos()),
+ wxSize(cell->GetWidth(), cell->GetHeight())));
+ }
}
}
void wxHtmlWindow::SelectLine(const wxPoint& pos)
{
- wxHtmlCell *cell = m_Cell->FindCellByPos(pos.x, pos.y);
- if ( cell )
+ if ( m_Cell )
{
- // We use following heuristic to find a "line": let the line be all
- // cells in same container as the cell under mouse cursor that are
- // neither completely above nor completely bellow the clicked cell
- // (i.e. are likely to be words positioned on same line of text).
-
- int y1 = cell->GetAbsPos().y;
- int y2 = y1 + cell->GetHeight();
- int y;
- const wxHtmlCell *c;
- const wxHtmlCell *before = NULL;
- const wxHtmlCell *after = NULL;
-
- // find last cell of line:
- for ( c = cell->GetNext(); c; c = c->GetNext())
+ wxHtmlCell *cell = m_Cell->FindCellByPos(pos.x, pos.y);
+ if ( cell )
{
- y = c->GetAbsPos().y;
- if ( y + c->GetHeight() > y1 && y < y2 )
- after = c;
- else
- break;
- }
- if ( !after )
- after = cell;
+ // We use following heuristic to find a "line": let the line be all
+ // cells in same container as the cell under mouse cursor that are
+ // neither completely above nor completely bellow the clicked cell
+ // (i.e. are likely to be words positioned on same line of text).
+
+ int y1 = cell->GetAbsPos().y;
+ int y2 = y1 + cell->GetHeight();
+ int y;
+ const wxHtmlCell *c;
+ const wxHtmlCell *before = NULL;
+ const wxHtmlCell *after = NULL;
+
+ // find last cell of line:
+ for ( c = cell->GetNext(); c; c = c->GetNext())
+ {
+ y = c->GetAbsPos().y;
+ if ( y + c->GetHeight() > y1 && y < y2 )
+ after = c;
+ else
+ break;
+ }
+ if ( !after )
+ after = cell;
- // find first cell of line:
- for ( c = cell->GetParent()->GetFirstChild();
- c && c != cell; c = c->GetNext())
- {
- y = c->GetAbsPos().y;
- if ( y + c->GetHeight() > y1 && y < y2 )
+ // find first cell of line:
+ for ( c = cell->GetParent()->GetFirstChild();
+ c && c != cell; c = c->GetNext())
{
- if ( ! before )
- before = c;
+ y = c->GetAbsPos().y;
+ if ( y + c->GetHeight() > y1 && y < y2 )
+ {
+ if ( ! before )
+ before = c;
+ }
+ else
+ before = NULL;
}
- else
- before = NULL;
+ if ( !before )
+ before = cell;
+
+ delete m_selection;
+ m_selection = new wxHtmlSelection();
+ m_selection->Set(before, after);
+
+ Refresh();
}
- if ( !before )
- before = cell;
+ }
+}
+void wxHtmlWindow::SelectAll()
+{
+ if ( m_Cell )
+ {
delete m_selection;
m_selection = new wxHtmlSelection();
- m_selection->Set(before, after);
-
+ m_selection->Set(m_Cell->GetFirstTerminal(), m_Cell->GetLastTerminal());
Refresh();
}
}
+
#endif // wxUSE_CLIPBOARD
#if wxUSE_EXTENDED_RTTI
IMPLEMENT_DYNAMIC_CLASS_XTI(wxHtmlWindow, wxScrolledWindow,"wx/html/htmlwin.h")
-WX_BEGIN_PROPERTIES_TABLE(wxHtmlWindow)
+wxBEGIN_PROPERTIES_TABLE(wxHtmlWindow)
/*
- TODO PROPERTIES
- style , wxHW_SCROLLBAR_AUTO
- borders , (dimension)
- url , string
- htmlcode , string
+ TODO PROPERTIES
+ style , wxHW_SCROLLBAR_AUTO
+ borders , (dimension)
+ url , string
+ htmlcode , string
*/
-WX_END_PROPERTIES_TABLE()
+wxEND_PROPERTIES_TABLE()
-WX_BEGIN_HANDLERS_TABLE(wxHtmlWindow)
-WX_END_HANDLERS_TABLE()
+wxBEGIN_HANDLERS_TABLE(wxHtmlWindow)
+wxEND_HANDLERS_TABLE()
-WX_CONSTRUCTOR_5( wxHtmlWindow , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
+wxCONSTRUCTOR_5( wxHtmlWindow , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
#else
IMPLEMENT_DYNAMIC_CLASS(wxHtmlWindow,wxScrolledWindow)
#endif
DECLARE_DYNAMIC_CLASS(wxHtmlWinModule)
public:
wxHtmlWinModule() : wxModule() {}
- bool OnInit() { return TRUE; }
+ bool OnInit() { return true; }
void OnExit() { wxHtmlWindow::CleanUpStatics(); }
};
projects / wxWidgets.git / blobdiff