[fltk.commit] [Library] r8205 - branches/branch-1.3/src

[fltk-dev]

Author: matt
Date: 2011-01-06 17:12:04 -0800 (Thu, 06 Jan 2011)
New Revision: 8205
Log:
DPI fixes for MSWindows GDI

Modified:
   branches/branch-1.3/src/Fl_win32.cxx
   branches/branch-1.3/src/screen_xywh.cxx

Modified: branches/branch-1.3/src/Fl_win32.cxx
===================================================================
--- branches/branch-1.3/src/Fl_win32.cxx        2011-01-07 01:01:04 UTC (rev 
8204)
+++ branches/branch-1.3/src/Fl_win32.cxx        2011-01-07 01:12:04 UTC (rev 
8205)
@@ -1068,8 +1068,12 @@
        }
       }
     } 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 @@
     }
     // 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: {

Modified: branches/branch-1.3/src/screen_xywh.cxx
===================================================================
--- branches/branch-1.3/src/screen_xywh.cxx     2011-01-07 01:01:04 UTC (rev 
8204)
+++ branches/branch-1.3/src/screen_xywh.cxx     2011-01-07 01:12:04 UTC (rev 
8205)
@@ -76,7 +76,7 @@
         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 @@
       // 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 @@
           fl_edm(0, 0, screen_cb, 0);
           return;
         }
-      }
+//      }
     }
   }
 

_______________________________________________
fltk-commit mailing list
fltk-commit@easysw.com
http://lists.easysw.com/mailman/listinfo/fltk-commit