changeset 3190:b7964247065d

[RT-24720] - (minor) webrev fixes update
author Assaf Yavani
date Sun, 14 Apr 2013 12:50:51 +0300
parents a2f771ac7797
children a93a052b538f
files glass/glass-lib-lens/src/LensCommon.h glass/glass-lib-lens/src/wm/LensWindowManager.c glass/glass-lib-lens/src/wm/screen/fbdevScreen.c
diffstat 3 files changed, 15 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/glass/glass-lib-lens/src/LensCommon.h	Sun Apr 14 12:49:54 2013 +0300
+++ b/glass/glass-lib-lens/src/LensCommon.h	Sun Apr 14 12:50:51 2013 +0300
@@ -883,13 +883,13 @@
  *              be changed to value within bounds
  * @param height [IN/OUT] the requested height of a window. Will
  *              be changed to value within bounds
- * @return JNI_TRUE means values are valid, JNI_FAILED means 
+ * @return JNI_TRUE means values are valid, JNI_FALSE means 
  *         values are not valid and have been updated.
  * 
  */
 jboolean glass_window_check_bounds(NativeWindow window,
-                                     int *width,
-                                     int *height);
+                                   int *width,
+                                   int *height);
 
 /**
  * Maximize / Restore window
--- a/glass/glass-lib-lens/src/wm/LensWindowManager.c	Sun Apr 14 12:49:54 2013 +0300
+++ b/glass/glass-lib-lens/src/wm/LensWindowManager.c	Sun Apr 14 12:50:51 2013 +0300
@@ -300,13 +300,12 @@
     }
 
     /**
-    * Window's max size can be limmited, so try to extend the 
-    * window to the buttom right corner of the scren from the 
-    * current x,y coordinates. If the window will be extended 
-    * beyond the screen boundries, push the window towards the top 
-    * left corner of the screen. 
-    * If no limits applied to the window it will capture the entire 
-    * screen. 
+    * Window's max size can be limited, so try to extend the window 
+    * to the buttom right corner of the screen from the current x,y 
+    * coordinates. If the window will be extended beyond the screen 
+    * boundaries, push the window towards the top left corner of the
+    * screen. If no limits applied to the window it will capture the 
+    * entire screen. 
     */
 
     //cache current window bounds for restoration
@@ -543,7 +542,7 @@
         lens_wm_unsetFocusedWidow(env, window);        
     } else {
         if (!window->owner) {
-            //window become visible, grant him the focus if not a pop-up
+            //window become visible, grant it the focus if not a pop-up
             lens_wm_setFocusedWindow(env, window);
         }
 
@@ -673,7 +672,7 @@
 
 /**
  * This functions will check if the given window is grabbed and
- * ungrab it if necessary note, may also be called from mouse 
+ * ungrab it if necessary. Note: may also be called from mouse 
  * handling 
  */
 void glass_window_ungrabFocus(JNIEnv *env, NativeWindow window) {
@@ -832,7 +831,7 @@
                    view, window->id, window);
 
     /**
-    * animateis currently stubbed to false in WindowStage.java, 
+    * animate is currently stubbed to false in WindowStage.java, 
     * which is the only caller for this API. Ignoring it for now 
     */
 
@@ -887,7 +886,7 @@
 
     NativeWindow w = glass_window_list_getTail();
     while (w) {
-        GLASS_LOG_FINER("Window %d[%p] isVisible=%s, state=%s",
+        GLASS_LOG_FINEST("Window %d[%p] isVisible=%s, state=%s",
                        w->id, w,
                        w->isVisible?"true" : "false",
                        lens_window_getNativeStateName(w->state));
--- a/glass/glass-lib-lens/src/wm/screen/fbdevScreen.c	Sun Apr 14 12:49:54 2013 +0300
+++ b/glass/glass-lib-lens/src/wm/screen/fbdevScreen.c	Sun Apr 14 12:50:51 2013 +0300
@@ -220,8 +220,8 @@
 NativeScreen lens_screen_initialize(JNIEnv *env) {
     int fbFileHandle;
     struct fb_var_screeninfo screenInfo;
-    GLASS_LOG_FINE("open(%s, O_RDWR)", FB_DEVICE);
-    fbFileHandle = open(FB_DEVICE, O_RDWR);
+    GLASS_LOG_FINE("open(%s, O_RDONLY)", FB_DEVICE);
+    fbFileHandle = open(FB_DEVICE, O_RDONLY);
     if (fbFileHandle < 0) {
         GLASS_LOG_SEVERE("Cannot open framebuffer (%s)", strerror(errno));
         return NULL;