September 2007 - Wine-commits

Alexander Nicolaysen Sørnes : wordpad: Allow changing font effects in the choose font dialog.
by Alexandre Julliard 13 Sep '07

13 Sep '07

Module: wine Branch: master Commit: f6cc0086feab23e355e4895119a220732df8e259 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6cc0086feab23e355e489511… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Aug 26 18:37:08 2007 +0200 wordpad: Allow changing font effects in the choose font dialog. --- programs/wordpad/wordpad.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 968f8d5..55485ec 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -800,7 +800,7 @@ static void dialog_choose_font(void) cf.lStructSize = sizeof(cf); cf.hwndOwner = hMainWnd; cf.lpLogFont = &lf; - cf.Flags = CF_SCREENFONTS | CF_NOSCRIPTSEL | CF_INITTOLOGFONTSTRUCT; + cf.Flags = CF_SCREENFONTS | CF_NOSCRIPTSEL | CF_INITTOLOGFONTSTRUCT | CF_EFFECTS; ZeroMemory(&fmt, sizeof(fmt)); fmt.cbSize = sizeof(fmt); @@ -809,19 +809,28 @@ static void dialog_choose_font(void) lstrcpyW(cf.lpLogFont->lfFaceName, fmt.szFaceName); cf.lpLogFont->lfItalic = (fmt.dwEffects & CFE_ITALIC) ? TRUE : FALSE; cf.lpLogFont->lfWeight = (fmt.dwEffects & CFE_BOLD) ? FW_BOLD : FW_NORMAL; + cf.lpLogFont->lfUnderline = (fmt.dwEffects & CFE_UNDERLINE) ? TRUE : FALSE; + cf.lpLogFont->lfStrikeOut = (fmt.dwEffects & CFE_STRIKEOUT) ? TRUE : FALSE; cf.lpLogFont->lfHeight = -MulDiv(fmt.yHeight / 20, GetDeviceCaps(hDC, LOGPIXELSY), 72); + cf.rgbColors = fmt.crTextColor; if(ChooseFontW(&cf)) { ZeroMemory(&fmt, sizeof(fmt)); fmt.cbSize = sizeof(fmt); - fmt.dwMask = CFM_BOLD | CFM_ITALIC | CFM_SIZE; + fmt.dwMask = CFM_BOLD | CFM_ITALIC | CFM_SIZE | CFM_UNDERLINE | CFM_STRIKEOUT | CFM_COLOR; fmt.yHeight = cf.iPointSize * 2; if(cf.nFontType & BOLD_FONTTYPE) fmt.dwEffects |= CFE_BOLD; if(cf.nFontType & ITALIC_FONTTYPE) fmt.dwEffects |= CFE_ITALIC; + if(cf.lpLogFont->lfUnderline == TRUE) + fmt.dwEffects |= CFE_UNDERLINE; + if(cf.lpLogFont->lfStrikeOut == TRUE) + fmt.dwEffects |= CFE_STRIKEOUT; + + fmt.crTextColor = cf.rgbColors; SendMessageW(hEditorWnd, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&fmt); set_font(cf.lpLogFont->lfFaceName);

1 0

Alexander Nicolaysen Sørnes : wordpad: More error handling for printing/print preview.
by Alexandre Julliard 13 Sep '07

13 Sep '07

Module: wine Branch: master Commit: 93dc2338b227577a343bff120ee4fae0fc4af9d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93dc2338b227577a343bff120… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Sep 7 23:40:53 2007 +0200 wordpad: More error handling for printing/print preview. --- programs/wordpad/wordpad.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 55485ec..b85e0ab 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -1302,7 +1302,8 @@ static int get_num_pages(FORMATRANGE fr) page++; fr.chrg.cpMin = SendMessageW(hEditorWnd, EM_FORMATRANGE, TRUE, (LPARAM)&fr); - } while(fr.chrg.cpMin < fr.chrg.cpMax); + } + while(fr.chrg.cpMin && fr.chrg.cpMin < fr.chrg.cpMax); return page; } @@ -1376,7 +1377,7 @@ static void print(LPPRINTDLGW pd) if((pd->Flags & PD_PAGENUMS) && (printedPages > (pd->nToPage - pd->nFromPage))) break; } - while(fr.chrg.cpMin < fr.chrg.cpMax); + while(fr.chrg.cpMin && fr.chrg.cpMin < fr.chrg.cpMax); EndDoc(fr.hdc); SendMessageW(hEditorWnd, EM_FORMATRANGE, FALSE, 0);

1 0

Alexander Nicolaysen Sørnes : wordpad: Remove RB_SIZETORECT call.
by Alexandre Julliard 13 Sep '07

13 Sep '07

Module: wine Branch: master Commit: b3162df54a05310fb602d7c256ecf57d9ada4877 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3162df54a05310fb602d7c25… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sat Sep 8 20:53:30 2007 +0200 wordpad: Remove RB_SIZETORECT call. --- programs/wordpad/wordpad.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index b85e0ab..1dbc9e2 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -3110,11 +3110,6 @@ static LRESULT OnSize( HWND hWnd, WPARAM wParam, LPARAM lParam ) rebarRows--; rebarHeight = rebarRows ? SendMessageW(hwndReBar, RB_GETBARHEIGHT, 0, 0) : 0; - - rc.top = rc.left = 0; - rc.bottom = rebarHeight; - rc.right = LOWORD(lParam); - SendMessageW(hwndReBar, RB_SIZETORECT, 0, (LPARAM)&rc); } if (hwndEditor) {

1 0

Alexander Nicolaysen Sørnes : wordpad: Resize rebar control on window resize.
by Alexandre Julliard 13 Sep '07

13 Sep '07

Module: wine Branch: master Commit: 0397146d72e0d4eb6aec2099b96cf21d6e45182b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0397146d72e0d4eb6aec2099b… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sat Sep 8 21:36:50 2007 +0200 wordpad: Resize rebar control on window resize. --- programs/wordpad/resource.h | 1 + programs/wordpad/wordpad.c | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/resource.h b/programs/wordpad/resource.h index b08ec85..2c2cc98 100644 --- a/programs/wordpad/resource.h +++ b/programs/wordpad/resource.h @@ -90,6 +90,7 @@ #define BANDID_PREVIEW_BTN2 7 #define BANDID_PREVIEW_BTN3 8 #define BANDID_PREVIEW_BTN4 9 +#define BANDID_PREVIEW_BUFFER 10 #define ID_WORDWRAP_NONE 0 #define ID_WORDWRAP_WINDOW 1 diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 1dbc9e2..8e77614 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -1483,13 +1483,25 @@ static void preview_bar_show(BOOL show) if(show) { + REBARBANDINFOW rb; + AddTextButton(hReBar, STRING_PREVIEW_PRINT, ID_PRINT, BANDID_PREVIEW_BTN1); AddTextButton(hReBar, STRING_PREVIEW_NEXTPAGE, ID_PREVIEW_NEXTPAGE, BANDID_PREVIEW_BTN2); AddTextButton(hReBar, STRING_PREVIEW_PREVPAGE, ID_PREVIEW_PREVPAGE, BANDID_PREVIEW_BTN3); AddTextButton(hReBar, STRING_PREVIEW_CLOSE, ID_FILE_EXIT, BANDID_PREVIEW_BTN4); + + rb.cbSize = sizeof(rb); + rb.fMask = RBBIM_SIZE | RBBIM_CHILDSIZE | RBBIM_STYLE | RBBIM_CHILD | RBBIM_IDEALSIZE | RBBIM_ID; + rb.fStyle = RBBS_NOGRIPPER | RBBS_VARIABLEHEIGHT; + rb.cyChild = rb.cyMinChild = 22; + rb.cx = rb.cxMinChild = 90; + rb.cxIdeal = 100; + rb.wID = BANDID_PREVIEW_BUFFER; + + SendMessageW(hReBar, RB_INSERTBAND, -1, (LPARAM)&rb); } else { - for(i = 0; i < PREVIEW_BUTTONS; i++) + for(i = 0; i <= PREVIEW_BUTTONS; i++) SendMessageW(hReBar, RB_DELETEBAND, SendMessageW(hReBar, RB_IDTOINDEX, BANDID_PREVIEW_BTN1+i, 0), 0); } } @@ -3110,6 +3122,8 @@ static LRESULT OnSize( HWND hWnd, WPARAM wParam, LPARAM lParam ) rebarRows--; rebarHeight = rebarRows ? SendMessageW(hwndReBar, RB_GETBARHEIGHT, 0, 0) : 0; + + MoveWindow(hwndReBar, 0, 0, LOWORD(lParam), rebarHeight, TRUE); } if (hwndEditor) {

1 0

Alexander Nicolaysen Sørnes : wordpad: Clean up font effects toggling code.
by Alexandre Julliard 13 Sep '07

13 Sep '07

Module: wine Branch: master Commit: 8710108b24a4b8267be85101b25265f5603a1726 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8710108b24a4b8267be85101b… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sat Sep 8 20:23:26 2007 +0200 wordpad: Clean up font effects toggling code. --- programs/wordpad/wordpad.c | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 8e77614..4eb7b0f 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -2798,18 +2798,26 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) case ID_FORMAT_UNDERLINE: { CHARFORMAT2W fmt; - int mask = CFM_BOLD; - if (LOWORD(wParam) == ID_FORMAT_ITALIC) mask = CFM_ITALIC; - if (LOWORD(wParam) == ID_FORMAT_UNDERLINE) mask = CFM_UNDERLINE; + int effects = CFE_BOLD; ZeroMemory(&fmt, sizeof(fmt)); fmt.cbSize = sizeof(fmt); SendMessageW(hwndEditor, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&fmt); - if (!(fmt.dwMask&mask)) - fmt.dwEffects |= mask; - else - fmt.dwEffects ^= mask; - fmt.dwMask = mask; + + fmt.dwMask = CFM_BOLD; + + if (LOWORD(wParam) == ID_FORMAT_ITALIC) + { + effects = CFE_ITALIC; + fmt.dwMask = CFM_ITALIC; + } else if (LOWORD(wParam) == ID_FORMAT_UNDERLINE) + { + effects = CFE_UNDERLINE; + fmt.dwMask = CFM_UNDERLINE; + } + + fmt.dwEffects ^= effects; + SendMessageW(hwndEditor, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&fmt); break; }

1 0

Alexander Nicolaysen Sørnes : wordpad: Prevent white flickering on window resize.
by Alexandre Julliard 13 Sep '07

13 Sep '07

Module: wine Branch: master Commit: 7226f88f55c9803a96f6342e97c81aa9d465997d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7226f88f55c9803a96f6342e9… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Sep 11 16:11:48 2007 +0200 wordpad: Prevent white flickering on window resize. --- programs/wordpad/wordpad.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 4eb7b0f..431e9d7 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -3247,7 +3247,7 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar RegisterClassW(&wc); rc = registry_read_winrect(); - hMainWnd = CreateWindowExW(0, wszMainWndClass, wszAppTitle, WS_OVERLAPPEDWINDOW, + hMainWnd = CreateWindowExW(0, wszMainWndClass, wszAppTitle, WS_CLIPCHILDREN|WS_OVERLAPPEDWINDOW, rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top, NULL, NULL, hInstance, NULL); ShowWindow(hMainWnd, SW_SHOWDEFAULT);

1 0

Alexander Nicolaysen Sørnes : wordpad: Add font list.
by Alexandre Julliard 13 Sep '07

13 Sep '07

Module: wine Branch: master Commit: 72fdadbd18e5a0283cdc597c8c2c6bda1e962619 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72fdadbd18e5a0283cdc597c8… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Aug 24 15:46:09 2007 +0200 wordpad: Add font list. --- programs/wordpad/resource.h | 10 ++- programs/wordpad/wordpad.c | 129 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 132 insertions(+), 7 deletions(-) diff --git a/programs/wordpad/resource.h b/programs/wordpad/resource.h index 9eaf97e..6556817 100644 --- a/programs/wordpad/resource.h +++ b/programs/wordpad/resource.h @@ -79,11 +79,12 @@ #define BANDID_FORMATBAR 3 #define BANDID_RULER 0 #define BANDID_STATUSBAR 1 +#define BANDID_FONTLIST 4 -#define BANDID_PREVIEW_BTN1 4 -#define BANDID_PREVIEW_BTN2 5 -#define BANDID_PREVIEW_BTN3 6 -#define BANDID_PREVIEW_BTN4 7 +#define BANDID_PREVIEW_BTN1 5 +#define BANDID_PREVIEW_BTN2 6 +#define BANDID_PREVIEW_BTN3 7 +#define BANDID_PREVIEW_BTN4 8 #define ID_WORDWRAP_NONE 0 #define ID_WORDWRAP_WINDOW 1 @@ -122,6 +123,7 @@ #define IDC_PARA_FIRST 2010 #define IDC_PARA_ALIGN 2011 #define IDC_TABSTOPS 2012 +#define IDC_FONTLIST 2013 #define IDD_DATETIME 2100 #define IDD_NEWFILE 2101 diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index c4ad871..3f2096e 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -570,6 +570,24 @@ static BOOL number_from_string(LPCWSTR string, float *num, BOOL units) } } +static void update_font_list(void) +{ + HWND hReBar = GetDlgItem(hMainWnd, IDC_REBAR); + HWND hFontList = GetDlgItem(hReBar, IDC_FONTLIST); + HWND hFontListEdit = (HWND)SendMessageW(hFontList, CBEM_GETEDITCONTROL, 0, 0); + WCHAR fontName[MAX_STRING_LEN]; + CHARFORMAT2W fmt; + + ZeroMemory(&fmt, sizeof(fmt)); + fmt.cbSize = sizeof(fmt); + + SendMessageW(hEditorWnd, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&fmt); + SendMessageW(hFontListEdit, WM_GETTEXT, MAX_PATH, (LPARAM)fontName); + + if(lstrcmpW(fontName, fmt.szFaceName)) + SendMessageW(hFontListEdit, WM_SETTEXT, 0, (LPARAM)fmt.szFaceName); +} + static void clear_formatting(void) { PARAFORMAT2 pf; @@ -606,6 +624,20 @@ static WPARAM fileformat_flags(int format) return flags[format]; } +static void set_font(LPCWSTR wszFaceName) +{ + CHARFORMAT2W fmt; + + ZeroMemory(&fmt, sizeof(fmt)); + + fmt.cbSize = sizeof(fmt); + fmt.dwMask = CFM_FACE; + + lstrcpyW(fmt.szFaceName, wszFaceName); + + SendMessageW(hEditorWnd, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&fmt); +} + static void set_default_font(void) { static const WCHAR richTextFont[] = {'T','i','m','e','s',' ','N','e','w',' ', @@ -630,6 +662,60 @@ static void set_default_font(void) SendMessageW(hEditorWnd, EM_SETCHARFORMAT, SCF_DEFAULT, (LPARAM)&fmt); } +static void add_font(LPWSTR fontName, HWND hListWnd) +{ + COMBOBOXEXITEMW cbItem; + WCHAR buffer[MAX_PATH]; + + cbItem.mask = CBEIF_TEXT; + cbItem.pszText = buffer; + cbItem.cchTextMax = MAX_STRING_LEN; + cbItem.iItem = 0; + + while(SendMessageW(hListWnd, CBEM_GETITEMW, 0, (LPARAM)&cbItem)) + { + if(lstrcmpiW(cbItem.pszText, fontName) <= 0) + cbItem.iItem++; + else + break; + } + cbItem.pszText = fontName; + SendMessageW(hListWnd, CBEM_INSERTITEMW, 0, (LPARAM)&cbItem); +} + +int CALLBACK enum_font_proc(const LOGFONTW *lpelfe, const TEXTMETRICW *lpntme, + DWORD FontType, LPARAM lParam) +{ + HWND hListWnd = (HWND) lParam; + + if(SendMessageW(hListWnd, CB_FINDSTRINGEXACT, -1, (LPARAM)lpelfe->lfFaceName) == CB_ERR) + { + add_font((LPWSTR)lpelfe->lfFaceName, hListWnd); + } + + return 1; +} + +static void populate_font_list(HWND hListWnd) +{ + HDC hdc = GetDC(hMainWnd); + LOGFONTW fontinfo; + HWND hListEditWnd = (HWND)SendMessageW(hListWnd, CBEM_GETEDITCONTROL, 0, 0); + CHARFORMAT2W fmt; + + fontinfo.lfCharSet = DEFAULT_CHARSET; + *fontinfo.lfFaceName = '\0'; + fontinfo.lfPitchAndFamily = 0; + + EnumFontFamiliesExW(hdc, &fontinfo, enum_font_proc, + (LPARAM)hListWnd, 0); + + ZeroMemory(&fmt, sizeof(fmt)); + fmt.cbSize = sizeof(fmt); + SendMessageW(hEditorWnd, EM_GETCHARFORMAT, SCF_DEFAULT, (LPARAM)&fmt); + SendMessageW(hListEditWnd, WM_SETTEXT, 0, (LPARAM)fmt.szFaceName); +} + static void update_window(void) { RECT rect; @@ -666,7 +752,7 @@ static void set_toolbar_state(int bandId, BOOL show) if(bandId == BANDID_TOOLBAR) { REBARBANDINFOW rbbinfo; - int index = SendMessageW(hwndReBar, RB_IDTOINDEX, BANDID_FORMATBAR, 0); + int index = SendMessageW(hwndReBar, RB_IDTOINDEX, BANDID_FONTLIST, 0); rbbinfo.cbSize = sizeof(rbbinfo); rbbinfo.fMask = RBBIM_STYLE; @@ -696,6 +782,7 @@ static void set_statusbar_state(BOOL show) static void set_bar_states(void) { set_toolbar_state(BANDID_TOOLBAR, is_bar_visible(BANDID_TOOLBAR)); + set_toolbar_state(BANDID_FONTLIST, is_bar_visible(BANDID_FORMATBAR)); set_toolbar_state(BANDID_FORMATBAR, is_bar_visible(BANDID_FORMATBAR)); set_statusbar_state(is_bar_visible(BANDID_STATUSBAR)); @@ -849,6 +936,7 @@ static void DoOpenFile(LPCWSTR szOpenFileName) lstrcpyW(wszFileName, szOpenFileName); SendMessageW(hEditorWnd, EM_SETMODIFY, FALSE, 0); registry_set_filelist(szOpenFileName); + update_font_list(); } static void DoSaveFile(LPCWSTR wszSaveFileName, WPARAM format) @@ -2136,7 +2224,7 @@ static int context_menu(LPARAM lParam) static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam) { - HWND hToolBarWnd, hFormatBarWnd, hReBarWnd; + HWND hToolBarWnd, hFormatBarWnd, hReBarWnd, hFontListWnd; HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hWnd, GWLP_HINSTANCE); HANDLE hDLL; TBADDBITMAP ab; @@ -2198,6 +2286,16 @@ static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam) SendMessageW(hReBarWnd, RB_INSERTBAND, -1, (LPARAM)&rbb); + hFontListWnd = CreateWindowExW(0, WC_COMBOBOXEXW, NULL, + WS_BORDER | WS_VISIBLE | WS_CHILD | CBS_DROPDOWN | CBS_SORT, + 0, 0, 200, 150, hReBarWnd, (HMENU)IDC_FONTLIST, hInstance, NULL); + + rbb.hwndChild = hFontListWnd; + rbb.cx = 200; + rbb.wID = BANDID_FONTLIST; + + SendMessageW(hReBarWnd, RB_INSERTBAND, -1, (LPARAM)&rbb); + hFormatBarWnd = CreateToolbarEx(hReBarWnd, CCS_NOPARENTALIGN | CCS_NOMOVEY | WS_VISIBLE | TBSTYLE_TOOLTIPS | TBSTYLE_BUTTON, IDC_FORMATBAR, 7, hInstance, IDB_FORMATBAR, NULL, 0, 16, 16, 16, 16, sizeof(TBBUTTON)); @@ -2216,6 +2314,7 @@ static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam) rbb.hwndChild = hFormatBarWnd; rbb.wID = BANDID_FORMATBAR; + rbb.fStyle ^= RBBS_BREAK; SendMessageW(hReBarWnd, RB_INSERTBAND, -1, (LPARAM)&rbb); @@ -2243,6 +2342,7 @@ static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam) set_default_font(); + populate_font_list(hFontListWnd); DoLoadStrings(); SendMessageW(hEditorWnd, EM_SETMODIFY, FALSE, 0); @@ -2311,7 +2411,26 @@ static LRESULT OnUser( HWND hWnd, WPARAM wParam, LPARAM lParam) static LRESULT OnNotify( HWND hWnd, WPARAM wParam, LPARAM lParam) { HWND hwndEditor = GetDlgItem(hWnd, IDC_EDITOR); + HWND hwndReBar = GetDlgItem(hWnd, IDC_REBAR); NMHDR *pHdr = (NMHDR *)lParam; + HWND hwndFontList = GetDlgItem(hwndReBar, IDC_FONTLIST); + + if (pHdr->hwndFrom == hwndFontList) + { + if (pHdr->code == CBEN_ENDEDITW) + { + CHARFORMAT2W format; + NMCBEENDEDIT *endEdit = (NMCBEENDEDIT *)lParam; + + ZeroMemory(&format, sizeof(format)); + format.cbSize = sizeof(format); + SendMessageW(hwndEditor, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&format); + + if(lstrcmpW(format.szFaceName, (LPWSTR)endEdit->szText)) + set_font((LPCWSTR)endEdit->szText); + } + return 0; + } if (pHdr->hwndFrom != hwndEditor) return 0; @@ -2321,6 +2440,8 @@ static LRESULT OnNotify( HWND hWnd, WPARAM wParam, LPARAM lParam) SELCHANGE *pSC = (SELCHANGE *)lParam; char buf[128]; + update_font_list(); + sprintf( buf,"selection = %d..%d, line count=%ld", pSC->chrg.cpMin, pSC->chrg.cpMax, SendMessage(hwndEditor, EM_GETLINECOUNT, 0, 0)); @@ -2369,6 +2490,7 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) SendMessageW(hEditorWnd, EM_SETMODIFY, FALSE, 0); set_fileformat(ret); + update_font_list(); } } } @@ -2628,6 +2750,7 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) break; case ID_TOGGLE_FORMATBAR: + set_toolbar_state(BANDID_FONTLIST, !is_bar_visible(BANDID_FORMATBAR)); set_toolbar_state(BANDID_FORMATBAR, !is_bar_visible(BANDID_FORMATBAR)); update_window(); break; @@ -2861,7 +2984,7 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdParagraph, int res) { - INITCOMMONCONTROLSEX classes = {8, ICC_BAR_CLASSES|ICC_COOL_CLASSES}; + INITCOMMONCONTROLSEX classes = {8, ICC_BAR_CLASSES|ICC_COOL_CLASSES|ICC_USEREX_CLASSES}; HACCEL hAccel; WNDCLASSW wc; MSG msg;

1 0

Alexander Nicolaysen Sørnes : wordpad: Add font size list.
by Alexandre Julliard 13 Sep '07

13 Sep '07

Module: wine Branch: master Commit: 58b09f02277cc8b90d7e80ef5c6ab3d5296e79d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58b09f02277cc8b90d7e80ef5… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Aug 24 19:45:54 2007 +0200 wordpad: Add font size list. --- programs/wordpad/resource.h | 11 ++- programs/wordpad/wordpad.c | 150 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 150 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=58b09f02277cc8b90d7e8…

1 0

Alexander Nicolaysen Sørnes : wordpad: Add font dialog.
by Alexandre Julliard 13 Sep '07

13 Sep '07

Module: wine Branch: master Commit: 4c3980da73530e60aa2b7b0556c75f8fe5346c48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c3980da73530e60aa2b7b055… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sat Aug 25 16:54:02 2007 +0200 wordpad: Add font dialog. --- programs/wordpad/De.rc | 1 + programs/wordpad/En.rc | 1 + programs/wordpad/Fr.rc | 1 + programs/wordpad/Hu.rc | 1 + programs/wordpad/Ko.rc | 1 + programs/wordpad/Nl.rc | 1 + programs/wordpad/No.rc | 1 + programs/wordpad/Pl.rc | 1 + programs/wordpad/Ru.rc | 1 + programs/wordpad/Tr.rc | 1 + programs/wordpad/resource.h | 2 + programs/wordpad/wordpad.c | 50 ++++++++++++++++++++++++++++++++++++++++++- 12 files changed, 61 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/De.rc b/programs/wordpad/De.rc index 6478c64..809864e 100644 --- a/programs/wordpad/De.rc +++ b/programs/wordpad/De.rc @@ -73,6 +73,7 @@ BEGIN END POPUP "F&ormat" BEGIN + MENUITEM "&Font . . .", ID_FONTSETTINGS MENUITEM "&Bullet points" ID_BULLET MENUITEM "&Paragraph . . ." ID_PARAFORMAT MENUITEM "&Tabs . . ." ID_TABSTOPS diff --git a/programs/wordpad/En.rc b/programs/wordpad/En.rc index 4eaa2da..3c06dda 100644 --- a/programs/wordpad/En.rc +++ b/programs/wordpad/En.rc @@ -73,6 +73,7 @@ BEGIN END POPUP "F&ormat" BEGIN + MENUITEM "&Font . . .", ID_FONTSETTINGS MENUITEM "&Bullet points" ID_BULLET MENUITEM "&Paragraph . . ." ID_PARAFORMAT MENUITEM "&Tabs . . ." ID_TABSTOPS diff --git a/programs/wordpad/Fr.rc b/programs/wordpad/Fr.rc index d69ce86..bde211d 100644 --- a/programs/wordpad/Fr.rc +++ b/programs/wordpad/Fr.rc @@ -73,6 +73,7 @@ BEGIN END POPUP "Forma&t" BEGIN + MENUITEM "&Font . . .", ID_FONTSETTINGS MENUITEM "&Bullet points" ID_BULLET MENUITEM "&Paragraph . . ." ID_PARAFORMAT MENUITEM "&Tabs . . ." ID_TABSTOPS diff --git a/programs/wordpad/Hu.rc b/programs/wordpad/Hu.rc index a6bdccc..2840495 100644 --- a/programs/wordpad/Hu.rc +++ b/programs/wordpad/Hu.rc @@ -73,6 +73,7 @@ BEGIN END POPUP "F&orm�tum" BEGIN + MENUITEM "&Font . . .", ID_FONTSETTINGS MENUITEM "&Bullet points" ID_BULLET MENUITEM "&Paragraph . . ." ID_PARAFORMAT MENUITEM "&Tabs . . ." ID_TABSTOPS diff --git a/programs/wordpad/Ko.rc b/programs/wordpad/Ko.rc index 6ee98fd..fac4733 100644 --- a/programs/wordpad/Ko.rc +++ b/programs/wordpad/Ko.rc @@ -75,6 +75,7 @@ BEGIN POPUP "��(&O)" BEGIN MENUITEM " �� (&U)" ID_BULLET + MENUITEM "&Font . . .", ID_FONTSETTINGS MENUITEM "&Paragraph . . ." ID_PARAFORMAT MENUITEM "&Tabs . . ." ID_TABSTOPS POPUP "��(&B)" diff --git a/programs/wordpad/Nl.rc b/programs/wordpad/Nl.rc index bc34cf3..73dc641 100644 --- a/programs/wordpad/Nl.rc +++ b/programs/wordpad/Nl.rc @@ -73,6 +73,7 @@ BEGIN END POPUP "&Opmaak" BEGIN + MENUITEM "&Font . . .", ID_FONTSETTINGS MENUITEM "&Bullet points" ID_BULLET MENUITEM "&Paragraph . . ." ID_PARAFORMAT MENUITEM "&Tabs . . ." ID_TABSTOPS diff --git a/programs/wordpad/No.rc b/programs/wordpad/No.rc index ad16960..3bf663d 100644 --- a/programs/wordpad/No.rc +++ b/programs/wordpad/No.rc @@ -73,6 +73,7 @@ BEGIN END POPUP "F&ormat" BEGIN + MENUITEM "&Skrift . . .", ID_FONTSETTINGS MENUITEM "&Punktmerking" ID_BULLET MENUITEM "&Avsnitt . . ." ID_PARAFORMAT MENUITEM "&Tabulatorer . . ." ID_TABSTOPS diff --git a/programs/wordpad/Pl.rc b/programs/wordpad/Pl.rc index 54e1d3a..f212fc3 100644 --- a/programs/wordpad/Pl.rc +++ b/programs/wordpad/Pl.rc @@ -74,6 +74,7 @@ BEGIN END POPUP "F&ormat" BEGIN + MENUITEM "&Font . . .", ID_FONTSETTINGS MENUITEM "&Bullet points" ID_BULLET MENUITEM "&Paragraph . . ." ID_PARAFORMAT MENUITEM "Tab&s . . ." ID_TABSTOPS diff --git a/programs/wordpad/Ru.rc b/programs/wordpad/Ru.rc index e6d6ae9..daceaf8 100644 --- a/programs/wordpad/Ru.rc +++ b/programs/wordpad/Ru.rc @@ -72,6 +72,7 @@ BEGIN END POPUP "��&��" BEGIN + MENUITEM "&Font . . .", ID_FONTSETTINGS MENUITEM "B&ullet points" ID_BULLET MENUITEM "&Paragraph . . ." ID_PARAFORMAT MENUITEM "&Tabs . . ." ID_TABSTOPS diff --git a/programs/wordpad/Tr.rc b/programs/wordpad/Tr.rc index 9a3013d..b748666 100644 --- a/programs/wordpad/Tr.rc +++ b/programs/wordpad/Tr.rc @@ -76,6 +76,7 @@ BEGIN END POPUP "&Bi�im" BEGIN + MENUITEM "&Font . . .", ID_FONTSETTINGS MENUITEM "&Bullet points" ID_BULLET MENUITEM "&Paragraph . . ." ID_PARAFORMAT MENUITEM "&Tabs . . ." ID_TABSTOPS diff --git a/programs/wordpad/resource.h b/programs/wordpad/resource.h index c1a9935..8c33d38 100644 --- a/programs/wordpad/resource.h +++ b/programs/wordpad/resource.h @@ -63,6 +63,8 @@ #define ID_EDIT_CLEAR 1313 #define ID_BULLET 1314 +#define ID_FONTSETTINGS 1315 + #define ID_FORMAT_BOLD 1400 #define ID_FORMAT_ITALIC 1401 #define ID_FORMAT_UNDERLINE 1402 diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 82dd40a..99bf120 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -719,6 +719,8 @@ static void set_font(LPCWSTR wszFaceName) { HWND hReBarWnd = GetDlgItem(hMainWnd, IDC_REBAR); HWND hSizeListWnd = GetDlgItem(hReBarWnd, IDC_SIZELIST); + HWND hFontListWnd = GetDlgItem(hReBarWnd, IDC_FONTLIST); + HWND hFontListEditWnd = (HWND)SendMessageW(hFontListWnd, CBEM_GETEDITCONTROL, 0, 0); CHARFORMAT2W fmt; ZeroMemory(&fmt, sizeof(fmt)); @@ -731,6 +733,8 @@ static void set_font(LPCWSTR wszFaceName) SendMessageW(hEditorWnd, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&fmt); populate_size_list(hSizeListWnd); + + SendMessageW(hFontListEditWnd, WM_SETTEXT, 0, (LPARAM)(LPWSTR)wszFaceName); } static void set_default_font(void) @@ -785,8 +789,48 @@ static void add_font(LPWSTR fontName, DWORD fontType, HWND hListWnd, NEWTEXTMETR SendMessageW(hListWnd, CBEM_INSERTITEMW, 0, (LPARAM)&cbItem); } +static void dialog_choose_font(void) +{ + CHOOSEFONTW cf; + LOGFONTW lf; + CHARFORMAT2W fmt; + HDC hDC = GetDC(hMainWnd); + + ZeroMemory(&cf, sizeof(cf)); + cf.lStructSize = sizeof(cf); + cf.hwndOwner = hMainWnd; + cf.lpLogFont = &lf; + cf.Flags = CF_SCREENFONTS | CF_NOSCRIPTSEL | CF_INITTOLOGFONTSTRUCT; + + ZeroMemory(&fmt, sizeof(fmt)); + fmt.cbSize = sizeof(fmt); + + SendMessageW(hEditorWnd, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&fmt); + lstrcpyW(cf.lpLogFont->lfFaceName, fmt.szFaceName); + cf.lpLogFont->lfItalic = (fmt.dwEffects & CFE_ITALIC) ? TRUE : FALSE; + cf.lpLogFont->lfWeight = (fmt.dwEffects & CFE_BOLD) ? FW_BOLD : FW_NORMAL; + cf.lpLogFont->lfHeight = -MulDiv(fmt.yHeight / 20, GetDeviceCaps(hDC, LOGPIXELSY), 72); + + if(ChooseFontW(&cf)) + { + ZeroMemory(&fmt, sizeof(fmt)); + fmt.cbSize = sizeof(fmt); + fmt.dwMask = CFM_BOLD | CFM_ITALIC | CFM_SIZE; + fmt.yHeight = cf.iPointSize * 2; + + if(cf.nFontType & BOLD_FONTTYPE) + fmt.dwEffects |= CFE_BOLD; + if(cf.nFontType & ITALIC_FONTTYPE) + fmt.dwEffects |= CFE_ITALIC; + + SendMessageW(hEditorWnd, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&fmt); + set_font(cf.lpLogFont->lfFaceName); + } +} + + int CALLBACK enum_font_proc(const LOGFONTW *lpelfe, const TEXTMETRICW *lpntme, - DWORD FontType, LPARAM lParam) + DWORD FontType, LPARAM lParam) { HWND hListWnd = (HWND) lParam; @@ -2670,6 +2714,10 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) handle_findmsg(&findreplace); break; + case ID_FONTSETTINGS: + dialog_choose_font(); + break; + case ID_PRINT: dialog_print(); break;

1 0

Alexander Nicolaysen Sørnes : wordpad: Set icon according to format.
by Alexandre Julliard 13 Sep '07

13 Sep '07

Module: wine Branch: master Commit: 917fc5fd482b402de5d85f923074edb77dedcd72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=917fc5fd482b402de5d85f923… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sat Aug 25 20:41:30 2007 +0200 wordpad: Set icon according to format. --- .gitignore | 3 + programs/wordpad/Makefile.in | 5 +- programs/wordpad/resource.h | 3 + programs/wordpad/rsrc.rc | 436 ++++++++++++++++++++++++++++++++++++++++++ programs/wordpad/wordpad.c | 10 + 5 files changed, 456 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=917fc5fd482b402de5d85…

1 0