AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

x11: Remove screen-specific macros

Browse Source
This commit is contained in:
Benjamin Otte 2017-11-01 20:51:14 +01:00
parent b6e0c9392a
commit bcced800ea
3 changed files with 2 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/reference/gdk/gdk4-sections.txt
View File

@ -909,9 +909,6 @@ gdk_drag_context_get_type
GDK_ROOT_WINDOW GDK_ROOT_WINDOW
GDK_WINDOW_XID GDK_WINDOW_XID
GDK_DISPLAY_XDISPLAY GDK_DISPLAY_XDISPLAY
GDK_SCREEN_XDISPLAY
GDK_SCREEN_XNUMBER
GDK_SCREEN_XSCREEN
GDK_CURSOR_XCURSOR GDK_CURSOR_XCURSOR
GDK_CURSOR_XDISPLAY GDK_CURSOR_XDISPLAY
GDK_POINTER_TO_XID GDK_POINTER_TO_XID

6
gdk/x11/gdkscreen-x11.c
View File

@ -180,7 +180,7 @@ get_current_desktop (GdkScreen *screen)
return workspace; return workspace;
display = GDK_DISPLAY_XDISPLAY (gdk_screen_get_display (screen)); display = GDK_DISPLAY_XDISPLAY (gdk_screen_get_display (screen));
win = XRootWindow (display, GDK_SCREEN_XNUMBER (screen)); win = XRootWindow (display, gdk_x11_screen_get_screen_number (screen));
current_desktop = XInternAtom (display, "_NET_CURRENT_DESKTOP", True); current_desktop = XInternAtom (display, "_NET_CURRENT_DESKTOP", True);
@ -217,12 +217,10 @@ gdk_x11_screen_get_work_area (GdkScreen *screen,
guchar *ret_workarea = NULL; guchar *ret_workarea = NULL;
long *workareas; long *workareas;
int result; int result;
int disp_screen;
int desktop; int desktop;
Display *display; Display *display;
display = GDK_DISPLAY_XDISPLAY (gdk_screen_get_display (screen)); display = GDK_DISPLAY_XDISPLAY (gdk_screen_get_display (screen));
disp_screen = GDK_SCREEN_XNUMBER (screen);
root_window = gdk_display_get_root_window (gdk_screen_get_display (screen)); root_window = gdk_display_get_root_window (gdk_screen_get_display (screen));
workarea = XInternAtom (display, "_NET_WORKAREA", True); workarea = XInternAtom (display, "_NET_WORKAREA", True);
@ -239,7 +237,7 @@ gdk_x11_screen_get_work_area (GdkScreen *screen,
if (workarea == None) if (workarea == None)
return; return;
win = XRootWindow (display, disp_screen); win = XRootWindow (display, gdk_x11_screen_get_screen_number (screen));
result = XGetWindowProperty (display, result = XGetWindowProperty (display,
win, win,
workarea, workarea,

30
gdk/x11/gdkx11screen.h
View File

@ -64,36 +64,6 @@ const char* gdk_x11_screen_get_window_manager_name (GdkScreen *screen);
GDK_AVAILABLE_IN_ALL GDK_AVAILABLE_IN_ALL
gint gdk_x11_get_default_screen (void); gint gdk_x11_get_default_screen (void);
/**
* GDK_SCREEN_XDISPLAY:
* @screen: a #GdkScreen
*
* Returns the display of a X11 #GdkScreen.
*
* Returns: an Xlib Display*.
*/
#define GDK_SCREEN_XDISPLAY(screen) (gdk_x11_display_get_xdisplay (gdk_screen_get_display (screen)))
/**
* GDK_SCREEN_XSCREEN:
* @screen: a #GdkScreen
*
* Returns the screen of a X11 #GdkScreen.
*
* Returns: an Xlib Screen*
*/
#define GDK_SCREEN_XSCREEN(screen) (gdk_x11_screen_get_xscreen (screen))
/**
* GDK_SCREEN_XNUMBER:
* @screen: a #GdkScreen
*
* Returns the index of a X11 #GdkScreen.
*
* Returns: the position of @screen among the screens of its display
*/
#define GDK_SCREEN_XNUMBER(screen) (gdk_x11_screen_get_screen_number (screen))
GDK_AVAILABLE_IN_ALL GDK_AVAILABLE_IN_ALL
gboolean gdk_x11_screen_supports_net_wm_hint (GdkScreen *screen, gboolean gdk_x11_screen_supports_net_wm_hint (GdkScreen *screen,
GdkAtom property); GdkAtom property);