July 2008 - Wine-Commits - list.winehq.org

Stefan Dösinger : wined3d: Move material application to the vertex pipeline.
by Alexandre Julliard July 8, 2008

July 8, 2008

Module: wine Branch: master Commit: 956bfca1e2f65eaf54075fca1811d41b5631526f URL: http://source.winehq.org/git/wine.git/?a=commit;h=956bfca1e2f65eaf54075fca1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 10:13:01 2008 -0500 wined3d: Move material application to the vertex pipeline. --- dlls/wined3d/state.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 47fb87f..2b1adba 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3849,7 +3849,7 @@ const struct StateEntry FFPStateTable[] = { /* 26, WINED3DRS_DITHERENABLE */ STATE_RENDER(WINED3DRS_DITHERENABLE), state_ditherenable }, { /* 27, WINED3DRS_ALPHABLENDENABLE */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), NULL }, { /* 28, WINED3DRS_FOGENABLE */ STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }, - { /* 29, WINED3DRS_SPECULARENABLE */ STATE_RENDER(WINED3DRS_SPECULARENABLE), state_specularenable}, + { /* 29, WINED3DRS_SPECULARENABLE */ STATE_RENDER(WINED3DRS_SPECULARENABLE), NULL }, { /* 30, WINED3DRS_ZVISIBLE */ 0 /* Not supported according to the msdn */, state_nogl }, { /* 31, WINED3DRS_SUBPIXEL */ STATE_RENDER(WINED3DRS_SUBPIXEL), state_subpixel }, { /* 32, WINED3DRS_SUBPIXELX */ STATE_RENDER(WINED3DRS_SUBPIXELX), state_subpixelx }, @@ -4887,7 +4887,7 @@ const struct StateEntry FFPStateTable[] = { /* STATE_CLIPPLANE(30) */ STATE_CLIPPLANE(30), clipplane }, { /* STATE_CLIPPLANE(31) */ STATE_CLIPPLANE(31), clipplane }, - { /* STATE_MATERIAL */ STATE_RENDER(WINED3DRS_SPECULARENABLE), state_specularenable}, + { /* STATE_MATERIAL */ STATE_RENDER(WINED3DRS_SPECULARENABLE), NULL }, { /* STATE_FRONTFACE */ STATE_FRONTFACE, frontface }, }; @@ -4910,6 +4910,8 @@ const struct StateEntryTemplate misc_state_template[] = { const struct StateEntryTemplate ffp_vertexstate_template[] = { { STATE_VDECL, { STATE_VDECL, vertexdeclaration }}, { STATE_VSHADER, { STATE_VDECL, vertexdeclaration }}, + { STATE_MATERIAL, { STATE_RENDER(WINED3DRS_SPECULARENABLE), state_specularenable}}, + { STATE_RENDER(WINED3DRS_SPECULARENABLE), { STATE_RENDER(WINED3DRS_SPECULARENABLE), state_specularenable}}, {0 /* Terminate */, { 0, 0 }}, };

1 0

Stefan Dösinger : wined3d: Start the state splitup.
by Alexandre Julliard July 8, 2008

July 8, 2008

Module: wine Branch: master Commit: 98faed8ff58d92bc6c138310b46608fff1ace9a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98faed8ff58d92bc6c138310b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 1 18:23:44 2008 -0500 wined3d: Start the state splitup. The idea of this patchset is to split the monolithic state set into 3 parts, vertex processing, fragment processing and other states(depth, stencil, scissor, ...). The states will be provided in templates which can be (mostly) independently combined, and are merged into a single state table at device creation time. This way we retain the advantages of the single state table and having the advantage of separated pipeline implementations which can be combined without any manually written glue code. --- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/context.c | 8 ++++---- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/state.c | 11 +++++++++-- dlls/wined3d/wined3d_private.h | 4 +++- 6 files changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 99f1fd4..8377917 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -859,7 +859,7 @@ struct StateEntry ATIFSStateTable[STATE_HIGHEST + 1]; static void init_state_table() { unsigned int i; const DWORD rep = STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP); - memcpy(ATIFSStateTable, arb_program_shader_backend.StateTable, sizeof(ATIFSStateTable)); + memcpy(ATIFSStateTable, arb_program_shader_backend.StateTable_remove, sizeof(ATIFSStateTable)); for(i = 0; i < MAX_TEXTURES; i++) { ATIFSStateTable[STATE_TEXTURESTAGE(i, WINED3DTSS_COLOROP)].apply = set_tex_op_atifs; diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6f5424c..b09707b 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -102,7 +102,7 @@ static WineD3DContext *AddContextToArray(IWineD3DDeviceImpl *This, HWND win_hand /* Mark all states dirty to force a proper initialization of the states on the first use of the context */ for(state = 0; state <= STATE_HIGHEST; state++) { - Context_MarkStateDirty(This->contexts[This->numContexts], state, This->shader_backend->StateTable); + Context_MarkStateDirty(This->contexts[This->numContexts], state, This->StateTable); } This->numContexts++; @@ -641,7 +641,7 @@ static inline void set_blit_dimension(UINT width, UINT height) { *****************************************************************************/ static inline void SetupForBlit(IWineD3DDeviceImpl *This, WineD3DContext *context, UINT width, UINT height) { int i; - const struct StateEntry *StateTable = This->shader_backend->StateTable; + const struct StateEntry *StateTable = This->StateTable; TRACE("Setting up context %p for blitting\n", context); if(context->last_was_blit) { @@ -836,7 +836,7 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf BOOL oldRenderOffscreen = This->render_offscreen; const WINED3DFORMAT oldFmt = ((IWineD3DSurfaceImpl *) This->lastActiveRenderTarget)->resource.format; const WINED3DFORMAT newFmt = ((IWineD3DSurfaceImpl *) target)->resource.format; - const struct StateEntry *StateTable = This->shader_backend->StateTable; + const struct StateEntry *StateTable = This->StateTable; /* To compensate the lack of format switching with some offscreen rendering methods and on onscreen buffers * the alpha blend state changes with different render target formats @@ -1034,7 +1034,7 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU BYTE shift; WineD3DContext *context; GLint drawBuffer=0; - const struct StateEntry *StateTable = This->shader_backend->StateTable; + const struct StateEntry *StateTable = This->StateTable; TRACE("(%p): Selecting context for render target %p, thread %d\n", This, target, tid); if(This->lastActiveRenderTarget != target || tid != This->lastThread) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 26c1c9c..74bb676 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4507,7 +4507,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetTextureStageState(IWineD3DDevice *if } if(Stage > This->stateBlock->lowest_disabled_stage && - This->shader_backend->StateTable[STATE_TEXTURESTAGE(0, Type)].representative == STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP)) { + This->StateTable[STATE_TEXTURESTAGE(0, Type)].representative == STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP)) { /* Colorop change above lowest disabled stage? That won't change anything in the gl setup * Changes in other states are important on disabled stages too */ @@ -7977,7 +7977,7 @@ const DWORD SavedVertexStates_S[NUM_SAVEDVERTEXSTATES_S] = { }; void IWineD3DDeviceImpl_MarkStateDirty(IWineD3DDeviceImpl *This, DWORD state) { - DWORD rep = This->shader_backend->StateTable[state].representative; + DWORD rep = This->StateTable[state].representative; DWORD idx; BYTE shift; UINT i; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8811d0a..f121cde 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3446,6 +3446,8 @@ static HRESULT WINAPI IWineD3DImpl_CreateDevice(IWineD3D *iface, UINT Adapter, select_shader_mode(&GLINFO_LOCATION, DeviceType, &object->ps_selected_mode, &object->vs_selected_mode); object->shader_backend = select_shader_backend(Adapter, DeviceType); + compile_state_table(object->StateTable, object->shader_backend->StateTable_remove); + /* Prefer the vtable with functions optimized for single dirtifyable objects if the shader * model can deal with that. It is essentially the same, just with adjusted * Set*ShaderConstantF implementations diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 1fc1309..94a27fa 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -446,7 +446,7 @@ static void state_blend(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D /* colorkey fixup for stage 0 alphaop depends on WINED3DRS_ALPHABLENDENABLE state, so it may need updating */ if (stateblock->renderState[WINED3DRS_COLORKEYENABLE]) { - const struct StateEntry *StateTable = stateblock->wineD3DDevice->shader_backend->StateTable; + const struct StateEntry *StateTable = stateblock->wineD3DDevice->StateTable; StateTable[STATE_TEXTURESTAGE(0, WINED3DTSS_ALPHAOP)].apply(STATE_TEXTURESTAGE(0, WINED3DTSS_ALPHAOP), stateblock, context); } } @@ -496,7 +496,7 @@ static void state_alpha(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D } if(enable_ckey || context->last_was_ckey) { - const struct StateEntry *StateTable = stateblock->wineD3DDevice->shader_backend->StateTable; + const struct StateEntry *StateTable = stateblock->wineD3DDevice->StateTable; StateTable[STATE_TEXTURESTAGE(0, WINED3DTSS_ALPHAOP)].apply(STATE_TEXTURESTAGE(0, WINED3DTSS_ALPHAOP), stateblock, context); } context->last_was_ckey = enable_ckey; @@ -4885,3 +4885,10 @@ const struct StateEntry FFPStateTable[] = { /* STATE_MATERIAL */ STATE_RENDER(WINED3DRS_SPECULARENABLE), state_specularenable}, { /* STATE_FRONTFACE */ STATE_FRONTFACE, frontface }, }; + +/* Remove the temptable, but instead pass a fragment pipeline table, vertex pipeline and misc pipeline + * table in + */ +void compile_state_table(struct StateEntry *StateTable, const struct StateEntry *temptable) { + memcpy(StateTable, temptable, sizeof(*StateTable) * (STATE_HIGHEST + 1)); +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d1456d2..5e988df 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -302,7 +302,7 @@ typedef struct { void (*shader_get_caps)(WINED3DDEVTYPE devtype, WineD3D_GL_Info *gl_info, struct shader_caps *caps); void (*shader_dll_load_init)(void); void (*shader_fragment_enable)(IWineD3DDevice *iface, BOOL enable); - const struct StateEntry *StateTable; + const struct StateEntry *StateTable_remove; /* TODO: This has to go away */ } shader_backend_t; extern const shader_backend_t atifs_shader_backend; @@ -588,6 +588,7 @@ struct StateEntry /* "Base" state table */ extern const struct StateEntry FFPStateTable[]; +void compile_state_table(struct StateEntry *StateTable, const struct StateEntry *temptable); /* The new context manager that should deal with onscreen and offscreen rendering */ struct WineD3DContext { @@ -812,6 +813,7 @@ struct IWineD3DDeviceImpl const shader_backend_t *shader_backend; hash_table_t *glsl_program_lookup; void *shader_priv; + struct StateEntry StateTable[STATE_HIGHEST + 1]; /* To store */ BOOL view_ident; /* true iff view matrix is identity */

1 0

Stefan Dösinger : wined3d: Implement the state merger and start to use it.
by Alexandre Julliard July 8, 2008

July 8, 2008

Module: wine Branch: master Commit: 68dec9d16187b8346b58cf46fe2471f6632b0a1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=68dec9d16187b8346b58cf46f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 1 19:43:52 2008 -0500 wined3d: Implement the state merger and start to use it. --- dlls/wined3d/directx.c | 4 +- dlls/wined3d/state.c | 125 +++++++++++++++++++++++++++++++++++----- dlls/wined3d/wined3d_private.h | 21 ++++++- 3 files changed, 132 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=68dec9d16187b8346b58c…

1 0

Stefan Dösinger : wined3d: Remove an unneeded atifs hack.
by Alexandre Julliard July 8, 2008

July 8, 2008

Module: wine Branch: master Commit: 155d3ac4cc9fa8444a63d72a15f2f10186b43f93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=155d3ac4cc9fa8444a63d72a1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 1 17:18:29 2008 -0500 wined3d: Remove an unneeded atifs hack. The atifs fragment processing implementation doesn't borrow a pixel shader implementation from anywhere. It was a hack during development, but never needed. --- dlls/wined3d/ati_fragment_shader.c | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index e722f05..99f1fd4 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -850,19 +850,6 @@ static void set_bumpmat(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D mat[1][1] = (mat[1][1] + 1.0) * 0.5; GL_EXTCALL(glSetFragmentShaderConstantATI(ATI_FFP_CONST_BUMPMAT(stage), (float *) mat)); checkGLcall("glSetFragmentShaderConstantATI(ATI_FFP_CONST_BUMPMAT(stage), mat)"); - - /* FIXME: This should go away - * This is currently needed because atifs borrows a pixel shader implementation - * from somewhere else, but consumes bump map matrix change events. The other pixel - * shader implementation may need notification about the change to update the texbem - * constants. Once ATIFS supports real shaders on its own, and GLSL/ARB have a replacement - * pipeline this call can go away - * - * FIXME2: Even considering this workaround calling FFPStateTable directly isn't nice - * as well. Better would be to call the model's table we inherit from, but currently - * it is always the FFP table, and as soon as this changes we can remove the call anyway - */ - FFPStateTable[state].apply(state, stateblock, context); } #undef GLINFO_LOCATION

1 0

Dylan Smith : richedit: Implemented triple click selection.
by Alexandre Julliard July 8, 2008

July 8, 2008

Module: wine Branch: master Commit: 69cf4e9ac4427db7a8c6136db813246b83fb639f URL: http://source.winehq.org/git/wine.git/?a=commit;h=69cf4e9ac4427db7a8c6136db… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Jul 7 11:04:02 2008 -0400 richedit: Implemented triple click selection. --- dlls/riched20/caret.c | 26 ++++++++++++++++++--- dlls/riched20/editor.c | 56 +++++++++++++++++++++++++++++++++++++++++++++- dlls/riched20/editstr.h | 3 +- 3 files changed, 78 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 0be4cf5..b2dbd97 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -787,6 +787,14 @@ ME_SelectByType(ME_TextEditor *editor, ME_SelectionType selectionType) editor->pCursors[1].nOffset = 0; break; } + case stDocument: + /* Select everything with cursor anchored from the start of the text */ + editor->nSelectionType = stDocument; + editor->pCursors[1].pRun = ME_FindItemFwd(editor->pBuffer->pFirst, diRun); + editor->pCursors[1].nOffset = 0; + editor->pCursors[0].pRun = ME_FindItemBack(editor->pBuffer->pLast, diRun); + editor->pCursors[0].nOffset = 0; + break; default: assert(0); } /* Store the anchor positions for extending the selection. */ @@ -925,7 +933,7 @@ static void ME_ExtendAnchorSelection(ME_TextEditor *editor) { ME_Cursor tmp_cursor; int curOfs, anchorStartOfs, anchorEndOfs; - if (editor->nSelectionType == stPosition) + if (editor->nSelectionType == stPosition || editor->nSelectionType == stDocument) return; curOfs = ME_GetCursorOfs(editor, 0); anchorStartOfs = ME_GetCursorOfs(editor, 2); @@ -992,10 +1000,16 @@ void ME_LButtonDown(ME_TextEditor *editor, int x, int y, int clickNum) if (clickNum > 1) { editor->pCursors[1] = editor->pCursors[0]; - if (x >= editor->selofs) + if (is_shift) { + if (x >= editor->selofs) + ME_SelectByType(editor, stWord); + else + ME_SelectByType(editor, stParagraph); + } else if (clickNum % 2 == 0) { ME_SelectByType(editor, stWord); - else + } else { ME_SelectByType(editor, stParagraph); + } } else if (!is_shift) { @@ -1016,8 +1030,10 @@ void ME_LButtonDown(ME_TextEditor *editor, int x, int y, int clickNum) { if (clickNum < 2) { ME_SelectByType(editor, stLine); - } else { + } else if (clickNum % 2 == 0 || is_shift) { ME_SelectByType(editor, stParagraph); + } else { + ME_SelectByType(editor, stDocument); } } ME_InvalidateSelection(editor); @@ -1032,6 +1048,8 @@ void ME_MouseMove(ME_TextEditor *editor, int x, int y) { ME_Cursor tmp_cursor; + if (editor->nSelectionType == stDocument) + return; y += ME_GetYScrollPos(editor); tmp_cursor = editor->pCursors[0]; diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index de89022..e763090 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1612,6 +1612,57 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) return FALSE; } +/* Process the message and calculate the new click count. + * + * returns: The click count if it is mouse down event, else returns 0. */ +static int ME_CalculateClickCount(HWND hWnd, UINT msg, WPARAM wParam, + LPARAM lParam) +{ + static int clickNum = 0; + if (msg < WM_MOUSEFIRST || msg > WM_MOUSELAST) + return 0; + + if ((msg == WM_LBUTTONDBLCLK) || + (msg == WM_RBUTTONDBLCLK) || + (msg == WM_MBUTTONDBLCLK) || + (msg == WM_XBUTTONDBLCLK)) + { + msg -= (WM_LBUTTONDBLCLK - WM_LBUTTONDOWN); + } + + if ((msg == WM_LBUTTONDOWN) || + (msg == WM_RBUTTONDOWN) || + (msg == WM_MBUTTONDOWN) || + (msg == WM_XBUTTONDOWN)) + { + static MSG prevClickMsg; + MSG clickMsg; + clickMsg.hwnd = hWnd; + clickMsg.message = msg; + clickMsg.wParam = wParam; + clickMsg.lParam = lParam; + clickMsg.time = GetMessageTime(); + clickMsg.pt.x = LOWORD(lParam); + clickMsg.pt.x = HIWORD(lParam); + if ((clickNum != 0) && + (clickMsg.message == prevClickMsg.message) && + (clickMsg.hwnd == prevClickMsg.hwnd) && + (clickMsg.wParam == prevClickMsg.wParam) && + (clickMsg.time - prevClickMsg.time < GetDoubleClickTime()) && + (abs(clickMsg.pt.x - prevClickMsg.pt.x) < GetSystemMetrics(SM_CXDOUBLECLK)/2) && + (abs(clickMsg.pt.y - prevClickMsg.pt.y) < GetSystemMetrics(SM_CYDOUBLECLK)/2)) + { + clickNum++; + } else { + clickNum = 1; + } + prevClickMsg = clickMsg; + } else { + return 0; + } + return clickNum; +} + static BOOL ME_SetCursor(ME_TextEditor *editor, int x) { if ((GetWindowLongW(editor->hWnd, GWL_STYLE) & ES_SELECTIONBAR) && @@ -2979,14 +3030,13 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, case WM_LBUTTONDBLCLK: case WM_LBUTTONDOWN: { - int clickNum = (msg == WM_LBUTTONDBLCLK) ? 2 : 1; ME_CommitUndo(editor); /* End coalesced undos for typed characters */ if ((editor->nEventMask & ENM_MOUSEEVENTS) && !ME_FilterEvent(editor, msg, &wParam, &lParam)) return 0; SetFocus(hWnd); ME_LButtonDown(editor, (short)LOWORD(lParam), (short)HIWORD(lParam), - clickNum); + ME_CalculateClickCount(hWnd, msg, wParam, lParam)); SetCapture(hWnd); ME_LinkNotify(editor,msg,wParam,lParam); if (!ME_SetCursor(editor, LOWORD(lParam))) goto do_default; @@ -3004,6 +3054,8 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, case WM_LBUTTONUP: if (GetCapture() == hWnd) ReleaseCapture(); + if (editor->nSelectionType == stDocument) + editor->nSelectionType = stPosition; if ((editor->nEventMask & ENM_MOUSEEVENTS) && !ME_FilterEvent(editor, msg, &wParam, &lParam)) return 0; diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 40e1b70..98769e4 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -248,7 +248,8 @@ typedef enum { stPosition = 0, stWord, stLine, - stParagraph + stParagraph, + stDocument } ME_SelectionType; typedef struct tagME_FontTableItem {

1 0

Dylan Smith : richedit: Hide cursor when text is selected.
by Alexandre Julliard July 8, 2008

July 8, 2008

Module: wine Branch: master Commit: 762e5818d1c6cad877c3add809ef40c993478542 URL: http://source.winehq.org/git/wine.git/?a=commit;h=762e5818d1c6cad877c3add80… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Jul 7 11:04:06 2008 -0400 richedit: Hide cursor when text is selected. The cursor should only be shown when there is no selection, since this is how it is done in Windows. This patch avoids showing the cursor when there is a selection, and destroys the cursor when a selection is made. --- dlls/riched20/caret.c | 16 ++++++++-------- dlls/riched20/editor.c | 6 +++++- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index b2dbd97..a76f2db 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -234,7 +234,7 @@ ME_MoveCaret(ME_TextEditor *editor) if (ME_WrapMarkedParagraphs(editor)) ME_UpdateScrollBar(editor); ME_GetCursorCoordinates(editor, &editor->pCursors[0], &x, &y, &height); - if(editor->bHaveFocus) + if(editor->bHaveFocus && !ME_IsSelection(editor)) { RECT rect; @@ -242,6 +242,8 @@ ME_MoveCaret(ME_TextEditor *editor) x = min(x, rect.right-2); CreateCaret(editor->hWnd, NULL, 0, height); SetCaretPos(x, y); + } else { + DestroyCaret(); } } @@ -249,13 +251,13 @@ ME_MoveCaret(ME_TextEditor *editor) void ME_ShowCaret(ME_TextEditor *ed) { ME_MoveCaret(ed); - if(ed->bHaveFocus) + if(ed->bHaveFocus && !ME_IsSelection(ed)) ShowCaret(ed->hWnd); } void ME_HideCaret(ME_TextEditor *ed) { - if(ed->bHaveFocus) + if(!ed->bHaveFocus || ME_IsSelection(ed)) { HideCaret(ed->hWnd); DestroyCaret(); @@ -1038,8 +1040,7 @@ void ME_LButtonDown(ME_TextEditor *editor, int x, int y, int clickNum) } ME_InvalidateSelection(editor); HideCaret(editor->hWnd); - ME_MoveCaret(editor); - ShowCaret(editor->hWnd); + ME_ShowCaret(editor); ME_ClearTempStyle(editor); ME_SendSelChange(editor); } @@ -1076,10 +1077,9 @@ void ME_MouseMove(ME_TextEditor *editor, int x, int y) SendMessageW(editor->hWnd, EM_SCROLLCARET, 0, 0); } - HideCaret(editor->hWnd); - ME_MoveCaret(editor); ME_InvalidateSelection(editor); - ShowCaret(editor->hWnd); + HideCaret(editor->hWnd); + ME_ShowCaret(editor); ME_SendSelChange(editor); } diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index e763090..7e90096 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2195,6 +2195,8 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, ME_InvalidateSelection(editor); ME_SetSelection(editor, wParam, lParam); ME_InvalidateSelection(editor); + HideCaret(editor->hWnd); + ME_ShowCaret(editor); ME_SendSelChange(editor); return 0; } @@ -2227,6 +2229,8 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, ME_InvalidateSelection(editor); end = ME_SetSelection(editor, range.cpMin, range.cpMax); ME_InvalidateSelection(editor); + HideCaret(editor->hWnd); + ME_ShowCaret(editor); ME_SendSelChange(editor); return end; @@ -3096,8 +3100,8 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, return 0; case WM_KILLFOCUS: ME_CommitUndo(editor); /* End coalesced undos for typed characters */ - ME_HideCaret(editor); editor->bHaveFocus = FALSE; + ME_HideCaret(editor); ME_SendOldNotify(editor, EN_KILLFOCUS); return 0; case WM_ERASEBKGND:

1 0

Michael Karcher : Add support for compatibility mode in WineEngCreateFontInstance.
by Alexandre Julliard July 8, 2008

July 8, 2008

Module: wine Branch: master Commit: 49eb12373918c6598e5955429bfa12679bc6449b URL: http://source.winehq.org/git/wine.git/?a=commit;h=49eb12373918c6598e5955429… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Mon Jul 7 17:18:10 2008 +0200 Add support for compatibility mode in WineEngCreateFontInstance. --- dlls/gdi32/freetype.c | 25 +++++++++++++++++-------- dlls/gdi32/tests/font.c | 19 +++++++++++++++++++ 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 4fe468c..8cfd7aa 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3064,7 +3064,7 @@ static void calc_hash(FONT_DESC *pfd) return; } -static GdiFont *find_in_cache(HFONT hfont, const LOGFONTW *plf, const XFORM *pxf, BOOL can_use_bitmap) +static GdiFont *find_in_cache(HFONT hfont, const LOGFONTW *plf, const FMAT2 *pmat, BOOL can_use_bitmap) { GdiFont *ret; FONT_DESC fd; @@ -3072,7 +3072,7 @@ static GdiFont *find_in_cache(HFONT hfont, const LOGFONTW *plf, const XFORM *pxf struct list *font_elem_ptr, *hfontlist_elem_ptr; fd.lf = *plf; - memcpy(&fd.matrix, pxf, sizeof(FMAT2)); + fd.matrix = *pmat; fd.can_use_bitmap = can_use_bitmap; calc_hash(&fd); @@ -3240,6 +3240,7 @@ GdiFont *WineEngCreateFontInstance(DC *dc, HFONT hfont) LOGFONTW lf; CHARSETINFO csi; HFONTLIST *hflist; + FMAT2 dcmat; FontSubst *psub = NULL; EnterCriticalSection( &freetype_cs ); @@ -3269,13 +3270,21 @@ GdiFont *WineEngCreateFontInstance(DC *dc, HFONT hfont) lf.lfWeight, lf.lfPitchAndFamily, lf.lfCharSet, lf.lfOrientation, lf.lfEscapement); - TRACE("DC transform %f %f %f %f %f %f\n", - dc->xformWorld2Vport.eM11, dc->xformWorld2Vport.eM12, - dc->xformWorld2Vport.eM21, dc->xformWorld2Vport.eM22, - dc->xformWorld2Vport.eDx, dc->xformWorld2Vport.eDy); + if(dc->GraphicsMode == GM_ADVANCED) + memcpy(&dcmat, &dc->xformWorld2Vport, sizeof(FMAT2)); + else + { + /* Windows 3.1 compatibility mode GM_COMPATIBLE has only limited + font scaling abilities. */ + dcmat.eM11 = dcmat.eM22 = fabs(dc->xformWorld2Vport.eM22); + dcmat.eM21 = dcmat.eM12 = 0; + } + + TRACE("DC transform %f %f %f %f\n", dcmat.eM11, dcmat.eM12, + dcmat.eM21, dcmat.eM22); /* check the cache first */ - if((ret = find_in_cache(hfont, &lf, &dc->xformWorld2Vport, can_use_bitmap)) != NULL) { + if((ret = find_in_cache(hfont, &lf, &dcmat, can_use_bitmap)) != NULL) { TRACE("returning cached gdiFont(%p) for hFont %p\n", ret, hfont); LeaveCriticalSection( &freetype_cs ); return ret; @@ -3297,7 +3306,7 @@ GdiFont *WineEngCreateFontInstance(DC *dc, HFONT hfont) ret = alloc_font(); - memcpy(&ret->font_desc.matrix, &dc->xformWorld2Vport, sizeof(FMAT2)); + ret->font_desc.matrix = dcmat; ret->font_desc.lf = lf; ret->font_desc.can_use_bitmap = can_use_bitmap; calc_hash(&ret->font_desc); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 8769b2f..d143949 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -453,6 +453,25 @@ static void test_outline_font(void) ok(gm.gmCellIncY == 0, "incY %d != 0\n", gm.gmCellIncY); SelectObject(hdc, old_hfont); + SetMapMode(hdc, MM_ANISOTROPIC); + /* test restrictions of compatibility mode GM_COMPATIBLE */ + /* part 1: rescaling only X should not change font scaling on screen. + So compressing the X axis by 2 is not done, and this + appears as X scaling of 2 that no one requested. */ + SetWindowExtEx(hdc, 100, 100, NULL); + SetViewportExtEx(hdc, 50, 100, NULL); + test_font_metrics(hdc, hfont, lf.lfHeight, lf.lfWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 2, 1); + + /* part 2: rescaling only Y should change font scaling. + As also X is scaled by a factor of 2, but this is not + requested by the DC transformation, we get a scaling factor + of 2 in the X coordinate. */ + SetViewportExtEx(hdc, 100, 200, NULL); + test_font_metrics(hdc, hfont, lf.lfHeight, lf.lfWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 2, 1); + + /* restore scaling */ + SetMapMode(hdc, MM_TEXT); + if (!SetGraphicsMode(hdc, GM_ADVANCED)) { DeleteObject(hfont);

1 0

Dylan Smith : richedit: Implemented paragraph selection.
by Alexandre Julliard July 8, 2008

July 8, 2008

Module: wine Branch: master Commit: 7c352b96389112d8947e1196cb25825d2a4a2acd URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c352b96389112d8947e1196c… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Jul 7 11:03:59 2008 -0400 richedit: Implemented paragraph selection. --- dlls/riched20/caret.c | 101 ++++++++++++++++++++++++++++++---------------- dlls/riched20/editor.h | 2 +- dlls/riched20/editstr.h | 3 +- 3 files changed, 69 insertions(+), 37 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 2504cdb..0be4cf5 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -744,11 +744,54 @@ ME_MoveCursorWords(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) void -ME_SelectWord(ME_TextEditor *editor) +ME_SelectByType(ME_TextEditor *editor, ME_SelectionType selectionType) { - ME_MoveCursorWords(editor, &editor->pCursors[1], +1); - editor->pCursors[0] = editor->pCursors[1]; - ME_MoveCursorWords(editor, &editor->pCursors[0], -1); + /* pCursor[0] will be the start of the selection + * pCursor[1] is the other end of the selection range + * pCursor[2] and [3] are the selection anchors that are backed up + * so they are kept when the selection changes for drag selection. + */ + + editor->nSelectionType = selectionType; + switch(selectionType) + { + case stPosition: + break; + case stWord: + ME_MoveCursorWords(editor, &editor->pCursors[1], +1); + editor->pCursors[0] = editor->pCursors[1]; + ME_MoveCursorWords(editor, &editor->pCursors[0], -1); + break; + case stLine: + case stParagraph: + { + ME_DisplayItem *pItem; + ME_DIType fwdSearchType, backSearchType; + if (selectionType == stParagraph) { + backSearchType = diParagraph; + fwdSearchType = diParagraphOrEnd; + } else { + backSearchType = diStartRow; + fwdSearchType = diStartRowOrParagraphOrEnd; + } + pItem = ME_FindItemBack(editor->pCursors[0].pRun, backSearchType); + editor->pCursors[0].pRun = ME_FindItemFwd(pItem, diRun); + editor->pCursors[0].nOffset = 0; + + pItem = ME_FindItemFwd(editor->pCursors[0].pRun, fwdSearchType); + assert(pItem); + if (pItem->type == diTextEnd) + editor->pCursors[1].pRun = ME_FindItemBack(pItem, diRun); + else + editor->pCursors[1].pRun = ME_FindItemFwd(pItem, diRun); + editor->pCursors[1].nOffset = 0; + break; + } + default: assert(0); + } + /* Store the anchor positions for extending the selection. */ + editor->pCursors[2] = editor->pCursors[0]; + editor->pCursors[3] = editor->pCursors[1]; } @@ -900,8 +943,9 @@ static void ME_ExtendAnchorSelection(ME_TextEditor *editor) else { ME_DisplayItem *pItem; - pItem = ME_FindItemBack(editor->pCursors[0].pRun, - diStartRowOrParagraph); + ME_DIType searchType = ((editor->nSelectionType == stLine) ? + diStartRowOrParagraph:diParagraph); + pItem = ME_FindItemBack(editor->pCursors[0].pRun, searchType); editor->pCursors[0].pRun = ME_FindItemFwd(pItem, diRun); editor->pCursors[0].nOffset = 0; } @@ -915,8 +959,9 @@ static void ME_ExtendAnchorSelection(ME_TextEditor *editor) else { ME_DisplayItem *pItem; - pItem = ME_FindItemFwd(editor->pCursors[1].pRun, - diStartRowOrParagraphOrEnd); + ME_DIType searchType = ((editor->nSelectionType == stLine) ? + diStartRowOrParagraphOrEnd:diParagraphOrEnd); + pItem = ME_FindItemFwd(editor->pCursors[1].pRun, searchType); if (pItem->type == diTextEnd) editor->pCursors[1].pRun = ME_FindItemBack(pItem, diRun); else @@ -930,6 +975,7 @@ void ME_LButtonDown(ME_TextEditor *editor, int x, int y, int clickNum) { ME_Cursor tmp_cursor; int is_selection = 0; + BOOL is_shift; editor->nUDArrowX = -1; @@ -937,23 +983,22 @@ void ME_LButtonDown(ME_TextEditor *editor, int x, int y, int clickNum) tmp_cursor = editor->pCursors[0]; is_selection = ME_IsSelection(editor); + is_shift = GetKeyState(VK_SHIFT) < 0; ME_FindPixelPos(editor, x, y, &editor->pCursors[0], &editor->bCaretAtEnd); - if (x >= editor->selofs || GetKeyState(VK_SHIFT) < 0) + if (x >= editor->selofs || is_shift) { if (clickNum > 1) { - editor->nSelectionType = stWord; editor->pCursors[1] = editor->pCursors[0]; - ME_SelectWord(editor); - /* Store the anchor positions for extending the selection. */ - editor->pCursors[2] = editor->pCursors[0]; - editor->pCursors[3] = editor->pCursors[1]; + if (x >= editor->selofs) + ME_SelectByType(editor, stWord); + else + ME_SelectByType(editor, stParagraph); } - else if (GetKeyState(VK_SHIFT)>=0) + else if (!is_shift) { - /* Shift is not down */ editor->nSelectionType = stPosition; editor->pCursors[1] = editor->pCursors[0]; } @@ -969,25 +1014,11 @@ void ME_LButtonDown(ME_TextEditor *editor, int x, int y, int clickNum) } else { - ME_DisplayItem *pItem; - - editor->nSelectionType = stLine; - /* Set pCursors[0] to beginning of line */ - /* Set pCursors[1] to end of line */ - pItem = ME_FindItemFwd(editor->pCursors[0].pRun, diStartRowOrParagraphOrEnd); - assert(pItem); - if (pItem->type == diTextEnd) - editor->pCursors[1].pRun = ME_FindItemBack(pItem, diRun); - else - editor->pCursors[1].pRun = ME_FindItemFwd(pItem, diRun); - editor->pCursors[1].nOffset = 0; - /* pCursor[0] is the position where the cursor will be drawn, - * pCursor[1] is the other end of the selection range - * pCursor[2] and [3] are the selection anchors that are backed up - * so they are kept when the selection changes for drag line selection. - */ - editor->pCursors[2] = editor->pCursors[0]; - editor->pCursors[3] = editor->pCursors[1]; + if (clickNum < 2) { + ME_SelectByType(editor, stLine); + } else { + ME_SelectByType(editor, stParagraph); + } } ME_InvalidateSelection(editor); HideCaret(editor->hWnd); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index a23fb8b..76f61a2 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -176,7 +176,7 @@ void ME_SetDefaultCharFormat(ME_TextEditor *editor, CHARFORMAT2W *mod); /* caret.c */ int ME_SetSelection(ME_TextEditor *editor, int from, int to); -void ME_SelectWord(ME_TextEditor *editor); +void ME_SelectByType(ME_TextEditor *editor, ME_SelectionType selectionType); void ME_HideCaret(ME_TextEditor *ed); void ME_ShowCaret(ME_TextEditor *ed); void ME_MoveCaret(ME_TextEditor *ed); diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 5668b04..40e1b70 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -247,7 +247,8 @@ typedef enum { typedef enum { stPosition = 0, stWord, - stLine + stLine, + stParagraph } ME_SelectionType; typedef struct tagME_FontTableItem {

1 0

Dylan Smith : richedit: Fixed drag and shift selection for words and lines.
by Alexandre Julliard July 8, 2008

July 8, 2008

Module: wine Branch: master Commit: abefc28fe7f27c16a6a2693b4210a2499191b8f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abefc28fe7f27c16a6a2693b4… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Jul 7 11:03:53 2008 -0400 richedit: Fixed drag and shift selection for words and lines. Previously word drag and shift selection was not implemented. Line drag selection was working, but shift selection wasn't. --- dlls/riched20/caret.c | 160 +++++++++++++++++++++++++++++++---------------- dlls/riched20/editor.c | 17 ++++- dlls/riched20/editstr.h | 9 +++- 3 files changed, 128 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=abefc28fe7f27c16a6a26…

1 0

Alexander Nicolaysen Sørnes : winhlp32: Update Norwegian Bokmål translation.
by Alexandre Julliard July 8, 2008

July 8, 2008

Module: wine Branch: master Commit: 8a3f21f0b165d44bee06aa511cdcb706db4eea31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a3f21f0b165d44bee06aa511… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jul 6 17:47:00 2008 +0200 winhlp32: Update Norwegian Bokmål translation. --- programs/winhlp32/No.rc | 65 +++++++++++++++++++++++++++++++--------------- 1 files changed, 44 insertions(+), 21 deletions(-) diff --git a/programs/winhlp32/No.rc b/programs/winhlp32/No.rc index a0c5806..2301c7c 100644 --- a/programs/winhlp32/No.rc +++ b/programs/winhlp32/No.rc @@ -26,41 +26,41 @@ MAIN_MENU MENU LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL MENUITEM "&�pne", MNID_FILE_OPEN MENUITEM SEPARATOR MENUITEM "Skriv &ut", MNID_FILE_PRINT - MENUITEM "Opp&sett av skriveren...", MNID_FILE_SETUP + MENUITEM "Opp&sett av skriveren ...", MNID_FILE_SETUP MENUITEM SEPARATOR MENUITEM "&Avslutt", MNID_FILE_EXIT } POPUP "R&ediger" { - MENUITEM "&Kopier...", MNID_EDIT_COPYDLG + MENUITEM "&Kopier ...", MNID_EDIT_COPYDLG MENUITEM SEPARATOR - MENUITEM "K&ommenter...", MNID_EDIT_ANNOTATE + MENUITEM "K&ommenter ...", MNID_EDIT_ANNOTATE } POPUP "&Bokmerke" { - MENUITEM "&Definer...", MNID_BKMK_DEFINE + MENUITEM "&Definer ...", MNID_BKMK_DEFINE } - POPUP "&Options" { - POPUP "Help always visible" + POPUP "&Innstillinger" { + POPUP "Synlighet" BEGIN - MENUITEM "Default", MNID_OPTS_HELP_DEFAULT - MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE - MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + MENUITEM "Standard", MNID_OPTS_HELP_DEFAULT + MENUITEM "Synlig", MNID_OPTS_HELP_VISIBLE + MENUITEM "Ikke synlig", MNID_OPTS_HELP_NONVISIBLE END - MENUITEM "History", MNID_OPTS_HISTORY - POPUP "Fonts" + MENUITEM "Historikk", MNID_OPTS_HISTORY + POPUP "Skriftst�rrelse" BEGIN - MENUITEM "Small", MNID_OPTS_FONTS_SMALL + MENUITEM "Liten", MNID_OPTS_FONTS_SMALL MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL - MENUITEM "Large", MNID_OPTS_FONTS_LARGE + MENUITEM "Stor", MNID_OPTS_FONTS_LARGE END - MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + MENUITEM "Bruk systemfarger", MNID_OPTS_SYSTEM_COLORS } POPUP "&Hjelp" { MENUITEM "&Hjelp til Hjelp", MNID_HELP_HELPON MENUITEM "All&tid �verst", MNID_HELP_HELPTOP MENUITEM SEPARATOR - MENUITEM "&Informasjon...", MNID_HELP_ABOUT + MENUITEM "&Informasjon ...", MNID_HELP_ABOUT #ifdef WINELIB - MENUITEM "&Om WINE", MNID_HELP_WINE + MENUITEM "&Om Wine", MNID_HELP_WINE #endif } } @@ -83,13 +83,36 @@ STID_WHERROR, "FEIL" STID_WARNING, "ADVARSEL" STID_INFO, "Informasjon" STID_NOT_IMPLEMENTED, "Ikke implementert" -STID_HLPFILE_ERROR_s, "Feil ved lesing av hjelpefilen '%s'" +STID_HLPFILE_ERROR_s, "Klarte ikke lese hjelpefilen �%s�" STID_INDEX, "&Innhold" -STID_CONTENTS, "Summary" +STID_CONTENTS, "&Oppsummering" STID_BACK, "Til&bake" STID_ALL_FILES, "Alle filer (*.*)" STID_HELP_FILES_HLP, "Hjelp-filer (*.hlp)" -STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" -STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" -STID_PSH_INDEX, "Help topics: " +STID_FILE_NOT_FOUND_s "Klarte ikke finne �%s�. Vil du finne filen selv?" +STID_NO_RICHEDIT "Klarte ikke finne richedit; avbryter" +STID_PSH_INDEX, "Emner i Hjelp: " } + +CONTEXT_MENU MENU LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL +BEGIN + POPUP "" + BEGIN + MENUITEM "Kommentar ...", MNID_CTXT_ANNOTATE + MENUITEM "Kopier", MNID_CTXT_COPY + MENUITEM "Skriv ut ...", MNID_CTXT_PRINT + POPUP "Skriftst�rrelse" + BEGIN + MENUITEM "Liten", MNID_CTXT_FONTS_SMALL + MENUITEM "Normal", MNID_CTXT_FONTS_NORMAL + MENUITEM "Stor", MNID_CTXT_FONTS_LARGE + END + POPUP "Synlighet" + BEGIN + MENUITEM "Standard", MNID_CTXT_HELP_DEFAULT + MENUITEM "Synlig", MNID_CTXT_HELP_VISIBLE + MENUITEM "Ikke synlig", MNID_CTXT_HELP_NONVISIBLE + END + MENUITEM "Bruk systemfarger", MNID_CTXT_SYSTEM_COLORS + END +END

1 0