Changeset 103929 in webkit

Timestamp:

Jan 3, 2012 1:17:04 AM (12 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] Use gdk_screen_get_monitor_workarea() when available for screenAvailableRect()
​https://bugs.webkit.org/show_bug.cgi?id=75435

Reviewed by Martin Robinson.

Source/WebCore:

• platform/gtk/GtkVersioning.c:

(getScreenCurrentDesktop):
(getScreenWorkArea):
(gdk_screen_get_monitor_workarea): Implement it when GTK+ < 3.3.6.

• platform/gtk/GtkVersioning.h:
• platform/gtk/PlatformScreenGtk.cpp:

(WebCore::screenAvailableRect): Use
gdk_screen_get_monitor_workarea() instead of our own
implementation.

Source/WebKit/gtk:

• GNUmakefile.am: Make sure unit tests link to X11.

Tools:

• GNUmakefile.am: Make sure DRT links to X11.
• WebKitTestRunner/GNUmakefile.am: Make sure WTR links to X11.

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/gtk/GtkVersioning.c (modified) (2 diffs)
• Source/WebCore/platform/gtk/GtkVersioning.h (modified) (1 diff)
• Source/WebCore/platform/gtk/PlatformScreenGtk.cpp (modified) (3 diffs)
• Source/WebKit/gtk/ChangeLog (modified) (1 diff)
• Source/WebKit/gtk/GNUmakefile.am (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/GNUmakefile.am (modified) (1 diff)
• Tools/WebKitTestRunner/GNUmakefile.am (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-03  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Use gdk_screen_get_monitor_workarea() when available for screenAvailableRect()
+        https://bugs.webkit.org/show_bug.cgi?id=75435
+
+        Reviewed by Martin Robinson.
+
+        * platform/gtk/GtkVersioning.c:
+        (getScreenCurrentDesktop):
+        (getScreenWorkArea):
+        (gdk_screen_get_monitor_workarea): Implement it when GTK+ < 3.3.6.
+        * platform/gtk/GtkVersioning.h:
+        * platform/gtk/PlatformScreenGtk.cpp:
+        (WebCore::screenAvailableRect): Use
+        gdk_screen_get_monitor_workarea() instead of our own
+        implementation.
+
 2012-01-02  Kentaro Hara  <haraken@chromium.org>
 

trunk/Source/WebCore/platform/gtk/GtkVersioning.c

@@ -22 +22 @@
 
 #include <gtk/gtk.h>
+
+#ifdef GDK_WINDOWING_X11
+#include <X11/Xatom.h>
+#include <gdk/gdkx.h>
+#endif
 
 #if !GTK_CHECK_VERSION(2, 14, 0)
@@ -304 +309 @@
 #endif // GTK_CHECK_VERSION(2, 22, 0)
 
+#if !GTK_CHECK_VERSION(3, 3, 6)
+#ifdef GDK_WINDOWING_X11
+static int getScreenCurrentDesktop(GdkScreen *screen)
+{
+    Display *display = GDK_DISPLAY_XDISPLAY(gdk_screen_get_display(screen));
+    Window rootWindow = XRootWindow(display, GDK_SCREEN_XNUMBER(screen));
+    Atom currentDesktop = XInternAtom(display, "_NET_CURRENT_DESKTOP", True);
+
+    Atom type;
+    int format;
+    unsigned long itemsCount, bytesAfter;
+    unsigned char *returnedData = NULL;
+    XGetWindowProperty(display, rootWindow, currentDesktop, 0, G_MAXLONG, False, XA_CARDINAL,
+                       &type, &format, &itemsCount, &bytesAfter, &returnedData);
+
+    int workspace = 0;
+    if (type == XA_CARDINAL && format == 32 && itemsCount > 0)
+        workspace = (int)returnedData[0];
+
+    if (returnedData)
+        XFree(returnedData);
+
+    return workspace;
+}
+
+static void getScreenWorkArea(GdkScreen *screen, GdkRectangle *area)
+{
+    Display *display = GDK_DISPLAY_XDISPLAY(gdk_screen_get_display(screen));
+    Atom workArea = XInternAtom(display, "_NET_WORKAREA", True);
+
+    /* Defaults in case of error. */
+    area->x = 0;
+    area->y = 0;
+    area->width = gdk_screen_get_width(screen);
+    area->height = gdk_screen_get_height(screen);
+
+    if (workArea == None)
+        return;
+
+    Window rootWindow = XRootWindow(display, GDK_SCREEN_XNUMBER(screen));
+    Atom type;
+    int format;
+    unsigned long itemsCount, bytesAfter;
+    unsigned char *returnedData = 0;
+    int result = XGetWindowProperty(display, rootWindow, workArea, 0, 4 * 32 /* Max length */, False, AnyPropertyType,
+                                    &type, &format, &itemsCount, &bytesAfter, &returnedData);
+    if (result != Success || type == None || !format || bytesAfter || itemsCount % 4)
+        return;
+
+    int desktop = getScreenCurrentDesktop(screen);
+    long *workAreas = (long *)returnedData;
+    area->x = workAreas[desktop * 4];
+    area->y = workAreas[desktop * 4 + 1];
+    area->width = workAreas[desktop * 4 + 2];
+    area->height = workAreas[desktop * 4 + 3];
+
+    XFree(returnedData);
+}
+#endif // GDK_WINDOWING_X11
+
+void gdk_screen_get_monitor_workarea(GdkScreen *screen, int monitor, GdkRectangle *area)
+{
+    gdk_screen_get_monitor_geometry(screen, monitor, area);
+
+#ifdef GDK_WINDOWING_X11
+    GdkRectangle workArea;
+    getScreenWorkArea(screen, &workArea);
+    gdk_rectangle_intersect(&workArea, area, area);
+#endif
+}
+#endif // GTK_CHECK_VERSION(3, 3, 6)

trunk/Source/WebCore/platform/gtk/GtkVersioning.h

@@ -118 +118 @@
 #endif
 
+#if !GTK_CHECK_VERSION(3, 3, 6)
+void gdk_screen_get_monitor_workarea(GdkScreen *, int monitor, GdkRectangle *area);
+#endif
+
 G_END_DECLS
 

trunk/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp

@@ -39 +39 @@
 
 #include <gtk/gtk.h>
-
-#if PLATFORM(X11)
-#include <gdk/gdkx.h>
-#include <X11/Xatom.h>
-#endif
 
 namespace WebCore {
@@ -135 +130 @@
         return FloatRect();
 
-#if PLATFORM(X11)
     GtkWidget* container = GTK_WIDGET(widget->root()->hostWindow()->platformPageClient());
     if (container && !gtk_widget_get_realized(container))
@@ -144 +138 @@
         return FloatRect();
 
-    GdkWindow* rootWindow = gdk_screen_get_root_window(screen);
-    GdkDisplay* display = gdk_window_get_display(rootWindow);
-    Atom xproperty = gdk_x11_get_xatom_by_name_for_display(display, "_NET_WORKAREA");
+    gint monitor = container ? gdk_screen_get_monitor_at_window(screen, gtk_widget_get_window(container)) : 0;
 
-    Atom retType;
-    int retFormat;
-    long *workAreaPos = NULL;
-    unsigned long retNItems;
-    unsigned long retAfter;
-    int xRes = XGetWindowProperty(GDK_DISPLAY_XDISPLAY(display), GDK_WINDOW_XWINDOW(rootWindow), xproperty,
-        0, 4, FALSE, XA_CARDINAL, &retType, &retFormat, &retNItems, &retAfter, (guchar**)&workAreaPos);
+    GdkRectangle workArea;
+    gdk_screen_get_monitor_workarea(screen, monitor, &workArea);
 
-    FloatRect rect;
-    if (xRes == Success && workAreaPos != NULL && retType == XA_CARDINAL && retNItems == 4 && retFormat == 32) {
-        rect = FloatRect(workAreaPos[0], workAreaPos[1], workAreaPos[2], workAreaPos[3]);
-        // rect contains the available space in the whole screen not just in the monitor
-        // containing the widget, so we intersect it with the monitor rectangle.
-        rect.intersect(screenRect(widget));
-    } else
-        rect = screenRect(widget);
+    return FloatRect(workArea.x, workArea.y, workArea.width, workArea.height);
 
-    if (workAreaPos)
-        XFree(workAreaPos);
-
-    return rect;
-#else
-    return screenRect(widget);
-#endif
 }
 

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2012-01-03  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Use gdk_screen_get_monitor_workarea() when available for screenAvailableRect()
+        https://bugs.webkit.org/show_bug.cgi?id=75435
+
+        Reviewed by Martin Robinson.
+
+        * GNUmakefile.am: Make sure unit tests link to X11.
+
 2011-12-20  Yuta Kitamura  <yutak@chromium.org>
 

trunk/Source/WebKit/gtk/GNUmakefile.am

@@ -421 +421 @@
         $(GLIB_CFLAGS) \
         $(GTK_CFLAGS) \
-        $(LIBSOUP_CFLAGS)
+        $(LIBSOUP_CFLAGS) \
+        $(XRENDER_LIBS) \
+        $(XT_LIBS)
 
 webkit_tests_ldadd = \

trunk/Tools/ChangeLog

@@ +1 @@
+2012-01-03  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Use gdk_screen_get_monitor_workarea() when available for screenAvailableRect()
+        https://bugs.webkit.org/show_bug.cgi?id=75435
+
+        Reviewed by Martin Robinson.
+
+        * GNUmakefile.am: Make sure DRT links to X11.
+        * WebKitTestRunner/GNUmakefile.am: Make sure WTR links to X11.
+
 2011-12-04  Philippe Normand  <pnormand@igalia.com>
 

trunk/Tools/GNUmakefile.am

@@ -159 +159 @@
         $(LIBSOUP_LIBS) \
         $(FREETYPE_LIBS) \
-        $(WINMM_LIBS)
+        $(WINMM_LIBS) \
+        $(XRENDER_LIBS) \
+        $(XT_LIBS)
 
 Programs_DumpRenderTree_LDFLAGS = \

trunk/Tools/WebKitTestRunner/GNUmakefile.am

@@ -52 +52 @@
         $(LIBSOUP_LIBS) \
         $(FREETYPE_LIBS) \
-        $(WINMM_LIBS)
+        $(WINMM_LIBS) \
+        $(XRENDER_LIBS) \
+        $(XT_LIBS)
 
 Programs_WebKitTestRunner_LDFLAGS = \