diff --git a/src/core/core.c b/src/core/core.c index e42947eb3..40c0b619f 100644 --- a/src/core/core.c +++ b/src/core/core.c @@ -106,9 +106,6 @@ meta_core_get (Display *xdisplay, case META_CORE_GET_CLIENT_HEIGHT: *((gint*)answer) = window->rect.height; break; - case META_CORE_GET_CLIENT_XWINDOW: - *((Window*)answer) = window->xwindow; - break; case META_CORE_GET_FRAME_FLAGS: *((MetaFrameFlags*)answer) = meta_frame_get_flags (window->frame); break; @@ -121,21 +118,6 @@ meta_core_get (Display *xdisplay, case META_CORE_GET_ICON: *((GdkPixbuf**)answer) = window->icon; break; - case META_CORE_GET_X: - meta_window_get_position (window, (int*)answer, NULL); - break; - case META_CORE_GET_Y: - meta_window_get_position (window, NULL, (int*)answer); - break; - case META_CORE_GET_FRAME_WORKSPACE: - *((gint*)answer) = meta_window_get_net_wm_desktop (window); - break; - case META_CORE_GET_FRAME_X: - *((gint*)answer) = window->frame->rect.x; - break; - case META_CORE_GET_FRAME_Y: - *((gint*)answer) = window->frame->rect.y; - break; case META_CORE_GET_FRAME_WIDTH: *((gint*)answer) = window->frame->rect.width; break; @@ -145,12 +127,6 @@ meta_core_get (Display *xdisplay, case META_CORE_GET_THEME_VARIANT: *((char**)answer) = window->gtk_theme_variant; break; - case META_CORE_GET_SCREEN_WIDTH: - *((gint*)answer) = window->screen->rect.width; - break; - case META_CORE_GET_SCREEN_HEIGHT: - *((gint*)answer) = window->screen->rect.height; - break; default: meta_warning("Unknown window information request: %d\n", request); diff --git a/src/core/core.h b/src/core/core.h index 97a48815a..6490e0aa0 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -33,21 +33,13 @@ typedef enum META_CORE_WINDOW_HAS_FRAME, META_CORE_GET_CLIENT_WIDTH, META_CORE_GET_CLIENT_HEIGHT, - META_CORE_GET_CLIENT_XWINDOW, META_CORE_GET_FRAME_FLAGS, META_CORE_GET_FRAME_TYPE, META_CORE_GET_MINI_ICON, META_CORE_GET_ICON, - META_CORE_GET_X, - META_CORE_GET_Y, - META_CORE_GET_FRAME_WORKSPACE, - META_CORE_GET_FRAME_X, - META_CORE_GET_FRAME_Y, META_CORE_GET_FRAME_WIDTH, META_CORE_GET_FRAME_HEIGHT, META_CORE_GET_THEME_VARIANT, - META_CORE_GET_SCREEN_WIDTH, - META_CORE_GET_SCREEN_HEIGHT, } MetaCoreGetType; /* General information function about the given window. Pass in a sequence of @@ -56,8 +48,8 @@ typedef enum * For example: * * meta_core_get (my_display, my_window, - * META_CORE_GET_X, &x, - * META_CORE_GET_Y, &y, + * META_CORE_GET_FRAME_WIDTH, &width, + * META_CORE_GET_FRAME_HEIGHT, &height, * META_CORE_GET_END); * * If the window doesn't have a frame, this will raise a meta_bug. To suppress