Changeset 241

Timestamp:

Sep 2, 2007, 2:25:00 PM (14 years ago)

Author:

Eugene Romanenko

Message:

fullscreen: exit with Esc, hide mouse

Location:

trunk/Lucide/SOURCE/gui

Files:

• docViewer.cpp (modified) (9 diffs)
• docViewer.h (modified) (2 diffs)

trunk/Lucide/SOURCE/gui/docViewer.cpp

@@ -63 +63 @@
 #define PAGEBACK_COLOR  0xFFFFFFL
 #define VERT_SPACE      2
+#define NO_MOUSE_TIMER  1
 
 // DocumentViewer constructor
@@ -106 +107 @@
     drawPS = false;
     // fullscreen
-    fullscreen = false;
+    fullscreen     = false;
+    secondsNoMouse = 0;
+    mouseHidden    = false;
+    xLastPos       = 0;
+    yLastPos       = 0;
     // asynch draw
     abortAsynch = false;
@@ -145 +150 @@
 
     drawThreadId = _beginthread( drawthread, NULL, 262144, this );
+    WinStartTimer( hab, hWndDoc, NO_MOUSE_TIMER, 1000 );
 }
 
@@ -286 +292 @@
 
     DosReleaseMutexSem( todrawAccess );
-    
+
     WinInvalidateRect( hWndDocFrame, NULL, TRUE );
 }
@@ -434 +440 @@
     WinSendMsg( hWndDocFrame, WM_UPDATEFRAME,
                 MPFROMLONG( FCF_VERTSCROLL | FCF_HORZSCROLL | FCF_SIZEBORDER ), MPVOID );
+
+    if ( mouseHidden ) {
+        WinShowPointer( HWND_DESKTOP, TRUE );
+        mouseHidden = false;
+    }
 }
 
@@ -1587 +1598 @@
 BOOL DocumentViewer::wmMouseMove( HWND hwnd, SHORT xpos, SHORT ypos )
 {
+    if ( ( xpos != xLastPos ) || ( ypos != yLastPos ) ) // only if mouse really moved
+    {
+        secondsNoMouse = 0;
+        if ( fullscreen && mouseHidden )
+        {
+            WinShowPointer( HWND_DESKTOP, TRUE );
+            mouseHidden = false;
+        }
+    }
+    xLastPos = xpos;
+    yLastPos = ypos;
+
     if ( zoomMode )
     {
@@ -1890 +1913 @@
     }
 
+    // Esc && fullscreen
+    if ( fullscreen && ( fsflags & KC_VIRTUALKEY ) && ( usvk == VK_ESC ) ) {
+        Lucide::toggleFullscreen();
+        return TRUE;
+    }
+
     // +
     if ( ( fsflags & KC_CHAR ) && !( fsflags & KC_KEYUP ) && ( usch == '+' ) ) {
@@ -2019 +2048 @@
 }
 
+// handles WM_TIMER
+void DocumentViewer::wmTimer( USHORT idTimer )
+{
+    if ( idTimer == NO_MOUSE_TIMER )
+    {
+        secondsNoMouse++;
+
+        if ( fullscreen && !mouseHidden && ( secondsNoMouse > 3 ) )
+        {
+            WinShowPointer( HWND_DESKTOP, FALSE );
+            mouseHidden = true;
+        }
+    }
+}
+
 
 // static, window procedure
@@ -2105 +2149 @@
             }
             break;
+
+        case WM_TIMER:
+            _this->wmTimer( SHORT1FROMMP( mp1 ) );
+            break;
     }
 

trunk/Lucide/SOURCE/gui/docViewer.h

@@ -107 +107 @@
         BOOL wmClick( HWND hwnd, SHORT xpos, SHORT ypos );
         BOOL wmChar( HWND hwnd, MPARAM mp1, MPARAM mp2 );
+                void wmTimer( USHORT idTimer );
         void winPosToDocPos( PPOINTL startpoint, PPOINTL endpoint, LuRectangle *r );
         void winPosToDocPos( PageDrawArea *pda, LuRectangle *r );
@@ -165 +166 @@
         // fullscreen
         bool fullscreen;
+        long secondsNoMouse;
+        bool mouseHidden;
+        SHORT xLastPos;
+        SHORT yLastPos;
         PgLayout pglSave;
         double zoomSave;