[Xfce4-commits] <xfwm4:xfce-4.6> Compute screen size based on each monitor size and layout and avoid using reported size (bug #5795)

[Olivier Fourdan]

Updating branch refs/heads/xfce-4.6
         to 72434672fca43a9ba170533b6b9f681e96962663 (commit)
       from 9bc095506441b1a0fbe89314850dd5f0695d76df (commit)

commit 72434672fca43a9ba170533b6b9f681e96962663
Author: Olivier Fourdan <fourdan at xfce.org>
Date:   Sun Oct 11 11:22:07 2009 +0200

    Compute screen size based on each monitor size and layout and avoid using reported size (bug #5795)

 src/screen.c |    8 +++++++-
 src/screen.h |    1 +
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/src/screen.c b/src/screen.c
index 8d8e869..1ff8543 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -531,6 +531,8 @@ myScreenGetKeyPressed (ScreenInfo *screen_info, XKeyEvent * ev)
 {
     int key, state;
 
+    TRACE ("entering myScreenGetKeyPressed");
+
     state = ev->state & MODIFIER_MASK;
     for (key = 0; key < KEY_COUNT; key++)
     {
@@ -601,6 +603,7 @@ void
 myScreenInvalidateMonitorCache (ScreenInfo *screen_info)
 {
     g_return_if_fail (screen_info != NULL);
+    TRACE ("entering myScreenInvalidateMonitorCache");
 
     screen_info->cache_monitor.x = G_MAXINT;
     screen_info->cache_monitor.y = G_MAXINT;
@@ -622,6 +625,7 @@ myScreenFindMonitorAtPoint (ScreenInfo *screen_info, gint x, gint y, GdkRectangl
     g_return_if_fail (screen_info != NULL);
     g_return_if_fail (rect != NULL);
     g_return_if_fail (GDK_IS_SCREEN (screen_info->gscr));
+    TRACE ("entering myScreenFindMonitorAtPoint");
 
     /* Cache system */
     if ((x >= screen_info->cache_monitor.x) && (x < screen_info->cache_monitor.x + screen_info->cache_monitor.width) &&
@@ -674,6 +678,9 @@ myScreenUpdateFontHeight (ScreenInfo *screen_info)
     PangoLanguage *language;
     GtkWidget *widget;
 
+    g_return_val_if_fail (screen_info != NULL, FALSE);
+    TRACE ("entering myScreenUpdateFontHeight");
+
     widget = myScreenGetGtkWidget (screen_info);
     context = getUIPangoContext (widget);
     desc = getUIPangoFontDesc (widget);
@@ -691,5 +698,4 @@ myScreenUpdateFontHeight (ScreenInfo *screen_info)
     }
 
     return FALSE;
-
 }
diff --git a/src/screen.h b/src/screen.h
index 1a2086f..668c932 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -213,6 +213,7 @@ int                      myScreenGetKeyPressed                  (ScreenInfo *,
 Client                  *myScreenGetClientFromWindow            (ScreenInfo *,
                                                                  Window,
                                                                  unsigned short);
+gboolean                 myScreenComputeSize                    (ScreenInfo *);
 void                     myScreenInvalidateMonitorCache         (ScreenInfo *);
 void                     myScreenFindMonitorAtPoint             (ScreenInfo *,
                                                                  gint,