diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2011-01-07 01:12:04 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2011-01-07 01:12:04 +0000 |
| commit | 308c6bc3077da11f2727d059e8bc5776b43138ce (patch) | |
| tree | 60f513db3550642331a4d33f887c384f1a6ea20c | |
| parent | 7dc05cb20ee92e38b3d1fbd88664e572d73a8d54 (diff) | |
DPI fixes for MSWindows GDI
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8205 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | src/Fl_win32.cxx | 14 | ||||
| -rw-r--r-- | src/screen_xywh.cxx | 6 |
2 files changed, 14 insertions, 6 deletions
diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx index bba615ad0..272aad33c 100644 --- a/src/Fl_win32.cxx +++ b/src/Fl_win32.cxx @@ -1068,8 +1068,12 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar } } } else if ((lParam & (1<<31))==0){ - buffer[0] = 0; - Fl::e_length = 0; + //buffer[0] = 0; + //Fl::e_length = 0; + xchar u = (xchar) wParam; +// Fl::e_length = fl_unicode2utf(&u, 1, buffer); + Fl::e_length = fl_utf8fromwc(buffer, 1024, &u, 1); + buffer[Fl::e_length] = 0; } Fl::e_text = buffer; if (lParam & (1<<31)) { // key up events. @@ -1078,7 +1082,11 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar } // for (int i = lParam&0xff; i--;) while (window->parent()) window = window->window(); - if (Fl::handle(FL_KEYBOARD,window)) return 0; + if (Fl::handle(FL_KEYBOARD,window)) { + if (uMsg==WM_DEADCHAR || uMsg==WM_SYSDEADCHAR) + Fl::compose_state = 1; + return 0; + } break;} case WM_MOUSEWHEEL: { diff --git a/src/screen_xywh.cxx b/src/screen_xywh.cxx index e7c48c22d..d8cd96a5e 100644 --- a/src/screen_xywh.cxx +++ b/src/screen_xywh.cxx @@ -76,7 +76,7 @@ static BOOL CALLBACK screen_cb(HMONITOR mon, HDC, LPRECT r, LPARAM) { dpi[num_screens][0] = (float)GetDeviceCaps(screen, LOGPIXELSX); dpi[num_screens][1] = (float)GetDeviceCaps(screen, LOGPIXELSY); } - ReleaseDC(); + ReleaseDC(0L, screen); } num_screens ++; @@ -97,7 +97,7 @@ static void screen_init() { // We do have EnumDisplayMonitors, so lets find out how many monitors... num_screens = GetSystemMetrics(SM_CMONITORS); - if (num_screens > 1) { +// if (num_screens > 1) { // If there is more than 1 monitor, enumerate them... fl_gmi = (fl_gmi_func)GetProcAddress(hMod, "GetMonitorInfoA"); @@ -109,7 +109,7 @@ static void screen_init() { fl_edm(0, 0, screen_cb, 0); return; } - } +// } } } |