Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Dorota Czaplejewicz
gtk
Commits
4db086da
Commit
4db086da
authored
Dec 20, 2010
by
Benjamin Otte
Committed by
Matthias Clasen
Dec 21, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
x11: Rename GdkDisplayX11 to GdkX11Display
Also rename all the macros etc.
parent
8e2240f6
Changes
19
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
147 additions
and
147 deletions
+147
-147
gdk/x11/gdkcursor-x11.c
gdk/x11/gdkcursor-x11.c
+3
-3
gdk/x11/gdkdevice-core.c
gdk/x11/gdkdevice-core.c
+2
-2
gdk/x11/gdkdevice-xi2.c
gdk/x11/gdkdevice-xi2.c
+2
-2
gdk/x11/gdkdevicemanager-core.c
gdk/x11/gdkdevicemanager-core.c
+1
-1
gdk/x11/gdkdisplay-x11.c
gdk/x11/gdkdisplay-x11.c
+60
-60
gdk/x11/gdkdisplay-x11.h
gdk/x11/gdkdisplay-x11.h
+9
-9
gdk/x11/gdkdnd-x11.c
gdk/x11/gdkdnd-x11.c
+25
-25
gdk/x11/gdkeventsource.c
gdk/x11/gdkeventsource.c
+2
-2
gdk/x11/gdkgeometry-x11.c
gdk/x11/gdkgeometry-x11.c
+2
-2
gdk/x11/gdkkeys-x11.c
gdk/x11/gdkkeys-x11.c
+6
-6
gdk/x11/gdkprivate-x11.h
gdk/x11/gdkprivate-x11.h
+1
-1
gdk/x11/gdkproperty-x11.c
gdk/x11/gdkproperty-x11.c
+3
-3
gdk/x11/gdkscreen-x11.c
gdk/x11/gdkscreen-x11.c
+6
-6
gdk/x11/gdkwindow-x11.c
gdk/x11/gdkwindow-x11.c
+15
-15
gdk/x11/gdkx11display.h
gdk/x11/gdkx11display.h
+1
-1
gdk/x11/gdkxid.c
gdk/x11/gdkxid.c
+3
-3
gtk/gtkplug.c
gtk/gtkplug.c
+2
-2
gtk/gtkselection.c
gtk/gtkselection.c
+2
-2
gtk/gtksocket.c
gtk/gtksocket.c
+2
-2
No files found.
gdk/x11/gdkcursor-x11.c
View file @
4db086da
...
@@ -146,7 +146,7 @@ find_in_cache (GdkDisplay *display,
...
@@ -146,7 +146,7 @@ find_in_cache (GdkDisplay *display,
return
NULL
;
return
NULL
;
}
}
/* Called by gdk_display_
x11_
finalize to flush any cached cursors
/* Called by gdk_
x11_
display_finalize to flush any cached cursors
* for a dead display.
* for a dead display.
*/
*/
void
void
...
@@ -397,7 +397,7 @@ _gdk_x11_cursor_update_theme (GdkCursor *cursor)
...
@@ -397,7 +397,7 @@ _gdk_x11_cursor_update_theme (GdkCursor *cursor)
GdkX11Display
*
display_x11
;
GdkX11Display
*
display_x11
;
private
=
(
GdkX11Cursor
*
)
cursor
;
private
=
(
GdkX11Cursor
*
)
cursor
;
display_x11
=
GDK_DISPLAY
_X11
(
gdk_cursor_get_display
(
cursor
));
display_x11
=
GDK_
X11_
DISPLAY
(
gdk_cursor_get_display
(
cursor
));
xdisplay
=
GDK_DISPLAY_XDISPLAY
(
display_x11
);
xdisplay
=
GDK_DISPLAY_XDISPLAY
(
display_x11
);
if
(
!
display_x11
->
have_xfixes
)
if
(
!
display_x11
->
have_xfixes
)
...
@@ -476,7 +476,7 @@ gdk_x11_display_set_cursor_theme (GdkDisplay *display,
...
@@ -476,7 +476,7 @@ gdk_x11_display_set_cursor_theme (GdkDisplay *display,
g_return_if_fail
(
GDK_IS_DISPLAY
(
display
));
g_return_if_fail
(
GDK_IS_DISPLAY
(
display
));
display_x11
=
GDK_DISPLAY
_X11
(
display
);
display_x11
=
GDK_
X11_
DISPLAY
(
display
);
xdisplay
=
GDK_DISPLAY_XDISPLAY
(
display
);
xdisplay
=
GDK_DISPLAY_XDISPLAY
(
display
);
old_theme
=
XcursorGetTheme
(
xdisplay
);
old_theme
=
XcursorGetTheme
(
xdisplay
);
...
...
gdk/x11/gdkdevice-core.c
View file @
4db086da
...
@@ -247,7 +247,7 @@ gdk_device_core_query_state (GdkDevice *device,
...
@@ -247,7 +247,7 @@ gdk_device_core_query_state (GdkDevice *device,
display
=
gdk_window_get_display
(
window
);
display
=
gdk_window_get_display
(
window
);
default_screen
=
gdk_display_get_default_screen
(
display
);
default_screen
=
gdk_display_get_default_screen
(
display
);
if
(
G_LIKELY
(
GDK_DISPLAY
_X11
(
display
)
->
trusted_client
))
if
(
G_LIKELY
(
GDK_
X11_
DISPLAY
(
display
)
->
trusted_client
))
{
{
if
(
!
XQueryPointer
(
GDK_WINDOW_XDISPLAY
(
window
),
if
(
!
XQueryPointer
(
GDK_WINDOW_XDISPLAY
(
window
),
GDK_WINDOW_XID
(
window
),
GDK_WINDOW_XID
(
window
),
...
@@ -437,7 +437,7 @@ gdk_device_core_window_at_position (GdkDevice *device,
...
@@ -437,7 +437,7 @@ gdk_device_core_window_at_position (GdkDevice *device,
xdisplay
=
GDK_SCREEN_XDISPLAY
(
screen
);
xdisplay
=
GDK_SCREEN_XDISPLAY
(
screen
);
xwindow
=
GDK_SCREEN_XROOTWIN
(
screen
);
xwindow
=
GDK_SCREEN_XROOTWIN
(
screen
);
if
(
G_LIKELY
(
GDK_DISPLAY
_X11
(
display
)
->
trusted_client
))
if
(
G_LIKELY
(
GDK_
X11_
DISPLAY
(
display
)
->
trusted_client
))
{
{
XQueryPointer
(
xdisplay
,
xwindow
,
XQueryPointer
(
xdisplay
,
xwindow
,
&
root
,
&
child
,
&
root
,
&
child
,
...
...
gdk/x11/gdkdevice-xi2.c
View file @
4db086da
...
@@ -310,7 +310,7 @@ gdk_device_xi2_query_state (GdkDevice *device,
...
@@ -310,7 +310,7 @@ gdk_device_xi2_query_state (GdkDevice *device,
display
=
gdk_window_get_display
(
window
);
display
=
gdk_window_get_display
(
window
);
default_screen
=
gdk_display_get_default_screen
(
display
);
default_screen
=
gdk_display_get_default_screen
(
display
);
if
(
G_LIKELY
(
GDK_DISPLAY
_X11
(
display
)
->
trusted_client
))
if
(
G_LIKELY
(
GDK_
X11_
DISPLAY
(
display
)
->
trusted_client
))
{
{
if
(
!
XIQueryPointer
(
GDK_WINDOW_XDISPLAY
(
window
),
if
(
!
XIQueryPointer
(
GDK_WINDOW_XDISPLAY
(
window
),
priv
->
device_id
,
priv
->
device_id
,
...
@@ -481,7 +481,7 @@ gdk_device_xi2_window_at_position (GdkDevice *device,
...
@@ -481,7 +481,7 @@ gdk_device_xi2_window_at_position (GdkDevice *device,
xdisplay
=
GDK_SCREEN_XDISPLAY
(
screen
);
xdisplay
=
GDK_SCREEN_XDISPLAY
(
screen
);
xwindow
=
GDK_SCREEN_XROOTWIN
(
screen
);
xwindow
=
GDK_SCREEN_XROOTWIN
(
screen
);
if
(
G_LIKELY
(
GDK_DISPLAY
_X11
(
display
)
->
trusted_client
))
if
(
G_LIKELY
(
GDK_
X11_
DISPLAY
(
display
)
->
trusted_client
))
{
{
XIQueryPointer
(
xdisplay
,
XIQueryPointer
(
xdisplay
,
priv
->
device_id
,
priv
->
device_id
,
...
...
gdk/x11/gdkdevicemanager-core.c
View file @
4db086da
...
@@ -417,7 +417,7 @@ gdk_device_manager_core_translate_event (GdkEventTranslator *translator,
...
@@ -417,7 +417,7 @@ gdk_device_manager_core_translate_event (GdkEventTranslator *translator,
GdkWindowImplX11
*
window_impl
=
NULL
;
GdkWindowImplX11
*
window_impl
=
NULL
;
gboolean
return_val
;
gboolean
return_val
;
GdkToplevelX11
*
toplevel
=
NULL
;
GdkToplevelX11
*
toplevel
=
NULL
;
GdkX11Display
*
display_x11
=
GDK_DISPLAY
_X11
(
display
);
GdkX11Display
*
display_x11
=
GDK_
X11_
DISPLAY
(
display
);
device_manager
=
GDK_DEVICE_MANAGER_CORE
(
translator
);
device_manager
=
GDK_DEVICE_MANAGER_CORE
(
translator
);
return_val
=
FALSE
;
return_val
=
FALSE
;
...
...
gdk/x11/gdkdisplay-x11.c
View file @
4db086da
...
@@ -88,12 +88,12 @@ struct _GdkErrorTrap
...
@@ -88,12 +88,12 @@ struct _GdkErrorTrap
int
error_code
;
int
error_code
;
};
};
static
void
gdk_display_
x11_
dispose
(
GObject
*
object
);
static
void
gdk_
x11_
display_dispose
(
GObject
*
object
);
static
void
gdk_display_
x11_
finalize
(
GObject
*
object
);
static
void
gdk_
x11_
display_finalize
(
GObject
*
object
);
static
void
gdk_display_
x11_
event_translator_init
(
GdkEventTranslatorIface
*
iface
);
static
void
gdk_
x11_
display_event_translator_init
(
GdkEventTranslatorIface
*
iface
);
static
gboolean
gdk_display_
x11_
translate_event
(
GdkEventTranslator
*
translator
,
static
gboolean
gdk_
x11_
display_translate_event
(
GdkEventTranslator
*
translator
,
GdkDisplay
*
display
,
GdkDisplay
*
display
,
GdkEvent
*
event
,
GdkEvent
*
event
,
XEvent
*
xevent
);
XEvent
*
xevent
);
...
@@ -160,22 +160,22 @@ static const char *const precache_atoms[] = {
...
@@ -160,22 +160,22 @@ static const char *const precache_atoms[] = {
static
char
*
gdk_sm_client_id
;
static
char
*
gdk_sm_client_id
;
G_DEFINE_TYPE_WITH_CODE
(
GdkX11Display
,
_gdk_display
_x11
,
GDK_TYPE_DISPLAY
,
G_DEFINE_TYPE_WITH_CODE
(
GdkX11Display
,
_gdk_
x11_
display
,
GDK_TYPE_DISPLAY
,
G_IMPLEMENT_INTERFACE
(
GDK_TYPE_EVENT_TRANSLATOR
,
G_IMPLEMENT_INTERFACE
(
GDK_TYPE_EVENT_TRANSLATOR
,
gdk_display_
x11_
event_translator_init
))
gdk_
x11_
display_event_translator_init
))
static
void
static
void
_gdk_display_
x11_
init
(
GdkX11Display
*
display
)
_gdk_
x11_
display_init
(
GdkX11Display
*
display
)
{
{
_gdk_x11_display_manager_add_display
(
gdk_display_manager_get
(),
_gdk_x11_display_manager_add_display
(
gdk_display_manager_get
(),
GDK_DISPLAY
(
display
));
GDK_DISPLAY
(
display
));
}
}
static
void
static
void
gdk_display_
x11_
event_translator_init
(
GdkEventTranslatorIface
*
iface
)
gdk_
x11_
display_event_translator_init
(
GdkEventTranslatorIface
*
iface
)
{
{
iface
->
translate_event
=
gdk_display_
x11_
translate_event
;
iface
->
translate_event
=
gdk_
x11_
display_translate_event
;
}
}
static
void
static
void
...
@@ -373,7 +373,7 @@ get_event_window (GdkEventTranslator *translator,
...
@@ -373,7 +373,7 @@ get_event_window (GdkEventTranslator *translator,
}
}
static
gboolean
static
gboolean
gdk_display_
x11_
translate_event
(
GdkEventTranslator
*
translator
,
gdk_
x11_
display_translate_event
(
GdkEventTranslator
*
translator
,
GdkDisplay
*
display
,
GdkDisplay
*
display
,
GdkEvent
*
event
,
GdkEvent
*
event
,
XEvent
*
xevent
)
XEvent
*
xevent
)
...
@@ -383,7 +383,7 @@ gdk_display_x11_translate_event (GdkEventTranslator *translator,
...
@@ -383,7 +383,7 @@ gdk_display_x11_translate_event (GdkEventTranslator *translator,
GdkScreen
*
screen
=
NULL
;
GdkScreen
*
screen
=
NULL
;
GdkScreenX11
*
screen_x11
=
NULL
;
GdkScreenX11
*
screen_x11
=
NULL
;
GdkToplevelX11
*
toplevel
=
NULL
;
GdkToplevelX11
*
toplevel
=
NULL
;
GdkX11Display
*
display_x11
=
GDK_DISPLAY
_X11
(
display
);
GdkX11Display
*
display_x11
=
GDK_
X11_
DISPLAY
(
display
);
gboolean
return_val
;
gboolean
return_val
;
Window
xwindow
=
None
;
Window
xwindow
=
None
;
...
@@ -1077,7 +1077,7 @@ gdk_wm_protocols_filter (GdkXEvent *xev,
...
@@ -1077,7 +1077,7 @@ gdk_wm_protocols_filter (GdkXEvent *xev,
return
GDK_FILTER_REMOVE
;
return
GDK_FILTER_REMOVE
;
}
}
else
if
(
atom
==
gdk_x11_get_xatom_by_name_for_display
(
display
,
"_NET_WM_SYNC_REQUEST"
)
&&
else
if
(
atom
==
gdk_x11_get_xatom_by_name_for_display
(
display
,
"_NET_WM_SYNC_REQUEST"
)
&&
GDK_DISPLAY
_X11
(
display
)
->
use_sync
)
GDK_
X11_
DISPLAY
(
display
)
->
use_sync
)
{
{
GdkToplevelX11
*
toplevel
=
_gdk_x11_window_get_toplevel
(
event
->
any
.
window
);
GdkToplevelX11
*
toplevel
=
_gdk_x11_window_get_toplevel
(
event
->
any
.
window
);
if
(
toplevel
)
if
(
toplevel
)
...
@@ -1100,7 +1100,7 @@ gdk_event_init (GdkDisplay *display)
...
@@ -1100,7 +1100,7 @@ gdk_event_init (GdkDisplay *display)
GdkX11Display
*
display_x11
;
GdkX11Display
*
display_x11
;
GdkDeviceManager
*
device_manager
;
GdkDeviceManager
*
device_manager
;
display_x11
=
GDK_DISPLAY
_X11
(
display
);
display_x11
=
GDK_
X11_
DISPLAY
(
display
);
display_x11
->
event_source
=
gdk_x11_event_source_new
(
display
);
display_x11
->
event_source
=
gdk_x11_event_source_new
(
display
);
gdk_x11_event_source_add_translator
((
GdkEventSource
*
)
display_x11
->
event_source
,
gdk_x11_event_source_add_translator
((
GdkEventSource
*
)
display_x11
->
event_source
,
...
@@ -1124,7 +1124,7 @@ gdk_x11_display_init_input (GdkDisplay *display)
...
@@ -1124,7 +1124,7 @@ gdk_x11_display_init_input (GdkDisplay *display)
GdkDevice
*
device
;
GdkDevice
*
device
;
GList
*
list
,
*
l
;
GList
*
list
,
*
l
;
display_x11
=
GDK_DISPLAY
_X11
(
display
);
display_x11
=
GDK_
X11_
DISPLAY
(
display
);
device_manager
=
gdk_display_get_device_manager
(
display
);
device_manager
=
gdk_display_get_device_manager
(
display
);
/* For backwards compatibility, just add
/* For backwards compatibility, just add
...
@@ -1172,7 +1172,7 @@ static void
...
@@ -1172,7 +1172,7 @@ static void
set_sm_client_id
(
GdkDisplay
*
display
,
set_sm_client_id
(
GdkDisplay
*
display
,
const
gchar
*
sm_client_id
)
const
gchar
*
sm_client_id
)
{
{
GdkX11Display
*
display_x11
=
GDK_DISPLAY
_X11
(
display
);
GdkX11Display
*
display_x11
=
GDK_
X11_
DISPLAY
(
display
);
if
(
gdk_display_is_closed
(
display
))
if
(
gdk_display_is_closed
(
display
))
return
;
return
;
...
@@ -1218,8 +1218,8 @@ _gdk_x11_display_open (const gchar *display_name)
...
@@ -1218,8 +1218,8 @@ _gdk_x11_display_open (const gchar *display_name)
if
(
!
xdisplay
)
if
(
!
xdisplay
)
return
NULL
;
return
NULL
;
display
=
g_object_new
(
GDK_TYPE_DISPLAY
_X11
,
NULL
);
display
=
g_object_new
(
GDK_TYPE_
X11_
DISPLAY
,
NULL
);
display_x11
=
GDK_DISPLAY
_X11
(
display
);
display_x11
=
GDK_
X11_
DISPLAY
(
display
);
display_x11
->
xdisplay
=
xdisplay
;
display_x11
->
xdisplay
=
xdisplay
;
...
@@ -1542,28 +1542,28 @@ gdk_internal_connection_watch (Display *display,
...
@@ -1542,28 +1542,28 @@ gdk_internal_connection_watch (Display *display,
static
G_CONST_RETURN
gchar
*
static
G_CONST_RETURN
gchar
*
gdk_x11_display_get_name
(
GdkDisplay
*
display
)
gdk_x11_display_get_name
(
GdkDisplay
*
display
)
{
{
return
(
gchar
*
)
DisplayString
(
GDK_DISPLAY
_X11
(
display
)
->
xdisplay
);
return
(
gchar
*
)
DisplayString
(
GDK_
X11_
DISPLAY
(
display
)
->
xdisplay
);
}
}
static
gint
static
gint
gdk_x11_display_get_n_screens
(
GdkDisplay
*
display
)
gdk_x11_display_get_n_screens
(
GdkDisplay
*
display
)
{
{
return
ScreenCount
(
GDK_DISPLAY
_X11
(
display
)
->
xdisplay
);
return
ScreenCount
(
GDK_
X11_
DISPLAY
(
display
)
->
xdisplay
);
}
}
static
GdkScreen
*
static
GdkScreen
*
gdk_x11_display_get_screen
(
GdkDisplay
*
display
,
gdk_x11_display_get_screen
(
GdkDisplay
*
display
,
gint
screen_num
)
gint
screen_num
)
{
{
g_return_val_if_fail
(
ScreenCount
(
GDK_DISPLAY
_X11
(
display
)
->
xdisplay
)
>
screen_num
,
NULL
);
g_return_val_if_fail
(
ScreenCount
(
GDK_
X11_
DISPLAY
(
display
)
->
xdisplay
)
>
screen_num
,
NULL
);
return
GDK_DISPLAY
_X11
(
display
)
->
screens
[
screen_num
];
return
GDK_
X11_
DISPLAY
(
display
)
->
screens
[
screen_num
];
}
}
static
GdkScreen
*
static
GdkScreen
*
gdk_x11_display_get_default_screen
(
GdkDisplay
*
display
)
gdk_x11_display_get_default_screen
(
GdkDisplay
*
display
)
{
{
return
GDK_DISPLAY
_X11
(
display
)
->
default_screen
;
return
GDK_
X11_
DISPLAY
(
display
)
->
default_screen
;
}
}
gboolean
gboolean
...
@@ -1573,7 +1573,7 @@ _gdk_x11_display_is_root_window (GdkDisplay *display,
...
@@ -1573,7 +1573,7 @@ _gdk_x11_display_is_root_window (GdkDisplay *display,
GdkX11Display
*
display_x11
;
GdkX11Display
*
display_x11
;
gint
i
;
gint
i
;
display_x11
=
GDK_DISPLAY
_X11
(
display
);
display_x11
=
GDK_
X11_
DISPLAY
(
display
);
for
(
i
=
0
;
i
<
ScreenCount
(
display_x11
->
xdisplay
);
i
++
)
for
(
i
=
0
;
i
<
ScreenCount
(
display_x11
->
xdisplay
);
i
++
)
{
{
...
@@ -1661,7 +1661,7 @@ gdk_x11_display_get_default_group (GdkDisplay *display)
...
@@ -1661,7 +1661,7 @@ gdk_x11_display_get_default_group (GdkDisplay *display)
{
{
g_return_val_if_fail
(
GDK_IS_DISPLAY
(
display
),
NULL
);
g_return_val_if_fail
(
GDK_IS_DISPLAY
(
display
),
NULL
);
return
GDK_DISPLAY
_X11
(
display
)
->
leader_gdk_window
;
return
GDK_
X11_
DISPLAY
(
display
)
->
leader_gdk_window
;
}
}
/**
/**
...
@@ -1682,7 +1682,7 @@ gdk_x11_display_grab (GdkDisplay *display)
...
@@ -1682,7 +1682,7 @@ gdk_x11_display_grab (GdkDisplay *display)
g_return_if_fail
(
GDK_IS_DISPLAY
(
display
));
g_return_if_fail
(
GDK_IS_DISPLAY
(
display
));
display_x11
=
GDK_DISPLAY
_X11
(
display
);
display_x11
=
GDK_
X11_
DISPLAY
(
display
);
if
(
display_x11
->
grab_count
==
0
)
if
(
display_x11
->
grab_count
==
0
)
XGrabServer
(
display_x11
->
xdisplay
);
XGrabServer
(
display_x11
->
xdisplay
);
...
@@ -1705,7 +1705,7 @@ gdk_x11_display_ungrab (GdkDisplay *display)
...
@@ -1705,7 +1705,7 @@ gdk_x11_display_ungrab (GdkDisplay *display)
g_return_if_fail
(
GDK_IS_DISPLAY
(
display
));
g_return_if_fail
(
GDK_IS_DISPLAY
(
display
));
display_x11
=
GDK_DISPLAY
_X11
(
display
);;
display_x11
=
GDK_
X11_
DISPLAY
(
display
);;
g_return_if_fail
(
display_x11
->
grab_count
>
0
);
g_return_if_fail
(
display_x11
->
grab_count
>
0
);
display_x11
->
grab_count
--
;
display_x11
->
grab_count
--
;
...
@@ -1717,10 +1717,10 @@ gdk_x11_display_ungrab (GdkDisplay *display)
...
@@ -1717,10 +1717,10 @@ gdk_x11_display_ungrab (GdkDisplay *display)
}
}
static
void
static
void
gdk_display_
x11_
dispose
(
GObject
*
object
)
gdk_
x11_
display_dispose
(
GObject
*
object
)
{
{
GdkDisplay
*
display
=
GDK_DISPLAY
(
object
);
GdkDisplay
*
display
=
GDK_DISPLAY
(
object
);
GdkX11Display
*
display_x11
=
GDK_DISPLAY
_X11
(
object
);
GdkX11Display
*
display_x11
=
GDK_
X11_
DISPLAY
(
object
);
gint
i
;
gint
i
;
_gdk_x11_display_manager_remove_display
(
gdk_display_manager_get
(),
display
);
_gdk_x11_display_manager_remove_display
(
gdk_display_manager_get
(),
display
);
...
@@ -1737,13 +1737,13 @@ gdk_display_x11_dispose (GObject *object)
...
@@ -1737,13 +1737,13 @@ gdk_display_x11_dispose (GObject *object)
display_x11
->
event_source
=
NULL
;
display_x11
->
event_source
=
NULL
;
}
}
G_OBJECT_CLASS
(
_gdk_display_
x11_
parent_class
)
->
dispose
(
object
);
G_OBJECT_CLASS
(
_gdk_
x11_
display_parent_class
)
->
dispose
(
object
);
}
}
static
void
static
void
gdk_display_
x11_
finalize
(
GObject
*
object
)
gdk_
x11_
display_finalize
(
GObject
*
object
)
{
{
GdkX11Display
*
display_x11
=
GDK_DISPLAY
_X11
(
object
);
GdkX11Display
*
display_x11
=
GDK_
X11_
DISPLAY
(
object
);
gint
i
;
gint
i
;
/* Keymap */
/* Keymap */
...
@@ -1810,7 +1810,7 @@ gdk_display_x11_finalize (GObject *object)
...
@@ -1810,7 +1810,7 @@ gdk_display_x11_finalize (GObject *object)
g_slice_free
(
GdkErrorTrap
,
trap
);
g_slice_free
(
GdkErrorTrap
,
trap
);
}
}
G_OBJECT_CLASS
(
_gdk_display_
x11_
parent_class
)
->
finalize
(
object
);
G_OBJECT_CLASS
(
_gdk_
x11_
display_parent_class
)
->
finalize
(
object
);
}
}
/**
/**
...
@@ -1863,7 +1863,7 @@ _gdk_x11_display_screen_for_xrootwin (GdkDisplay *display,
...
@@ -1863,7 +1863,7 @@ _gdk_x11_display_screen_for_xrootwin (GdkDisplay *display,
{
{
gint
i
;
gint
i
;
for
(
i
=
0
;
i
<
ScreenCount
(
GDK_DISPLAY
_X11
(
display
)
->
xdisplay
);
i
++
)
for
(
i
=
0
;
i
<
ScreenCount
(
GDK_
X11_
DISPLAY
(
display
)
->
xdisplay
);
i
++
)
{
{
GdkScreen
*
screen
=
gdk_display_get_screen
(
display
,
i
);
GdkScreen
*
screen
=
gdk_display_get_screen
(
display
,
i
);
if
(
GDK_SCREEN_XROOTWIN
(
screen
)
==
xrootwin
)
if
(
GDK_SCREEN_XROOTWIN
(
screen
)
==
xrootwin
)
...
@@ -1886,13 +1886,13 @@ Display *
...
@@ -1886,13 +1886,13 @@ Display *
gdk_x11_display_get_xdisplay
(
GdkDisplay
*
display
)
gdk_x11_display_get_xdisplay
(
GdkDisplay
*
display
)
{
{
g_return_val_if_fail
(
GDK_IS_DISPLAY
(
display
),
NULL
);
g_return_val_if_fail
(
GDK_IS_DISPLAY
(
display
),
NULL
);
return
GDK_DISPLAY
_X11
(
display
)
->
xdisplay
;
return
GDK_
X11_
DISPLAY
(
display
)
->
xdisplay
;
}
}
void
void
_gdk_x11_display_make_default
(
GdkDisplay
*
display
)
_gdk_x11_display_make_default
(
GdkDisplay
*
display
)
{
{
GdkX11Display
*
display_x11
=
GDK_DISPLAY
_X11
(
display
);
GdkX11Display
*
display_x11
=
GDK_
X11_
DISPLAY
(
display
);
const
gchar
*
startup_id
;
const
gchar
*
startup_id
;
g_free
(
display_x11
->
startup_notification_id
);
g_free
(
display_x11
->
startup_notification_id
);
...
@@ -1928,7 +1928,7 @@ broadcast_xmessage (GdkDisplay *display,
...
@@ -1928,7 +1928,7 @@ broadcast_xmessage (GdkDisplay *display,
Atom
type_atom_begin
;
Atom
type_atom_begin
;
Window
xwindow
;
Window
xwindow
;
if
(
!
G_LIKELY
(
GDK_DISPLAY
_X11
(
display
)
->
trusted_client
))
if
(
!
G_LIKELY
(
GDK_
X11_
DISPLAY
(
display
)
->
trusted_client
))
return
;
return
;
{
{
...
@@ -2076,7 +2076,7 @@ gdk_x11_display_notify_startup_complete (GdkDisplay *display,
...
@@ -2076,7 +2076,7 @@ gdk_x11_display_notify_startup_complete (GdkDisplay *display,
{
{
if
(
startup_id
==
NULL
)
if
(
startup_id
==
NULL
)
{
{
startup_id
=
GDK_DISPLAY
_X11
(
display
)
->
startup_notification_id
;
startup_id
=
GDK_
X11_
DISPLAY
(
display
)
->
startup_notification_id
;
if
(
startup_id
==
NULL
)
if
(
startup_id
==
NULL
)
return
;
return
;
}
}
...
@@ -2089,7 +2089,7 @@ gdk_x11_display_notify_startup_complete (GdkDisplay *display,
...
@@ -2089,7 +2089,7 @@ gdk_x11_display_notify_startup_complete (GdkDisplay *display,
static
gboolean
static
gboolean
gdk_x11_display_supports_selection_notification
(
GdkDisplay
*
display
)
gdk_x11_display_supports_selection_notification
(
GdkDisplay
*
display
)
{
{
GdkX11Display
*
display_x11
=
GDK_DISPLAY
_X11
(
display
);
GdkX11Display
*
display_x11
=
GDK_
X11_
DISPLAY
(
display
);
return
display_x11
->
have_xfixes
;
return
display_x11
->
have_xfixes
;
}
}
...
@@ -2100,7 +2100,7 @@ gdk_x11_display_request_selection_notification (GdkDisplay *display,
...
@@ -2100,7 +2100,7 @@ gdk_x11_display_request_selection_notification (GdkDisplay *display,
{
{
#ifdef HAVE_XFIXES
#ifdef HAVE_XFIXES
GdkX11Display
*
display_x11
=
GDK_DISPLAY
_X11
(
display
);
GdkX11Display
*
display_x11
=
GDK_
X11_
DISPLAY
(
display
);
Atom
atom
;
Atom
atom
;
if
(
display_x11
->
have_xfixes
)
if
(
display_x11
->
have_xfixes
)
...
@@ -2127,7 +2127,7 @@ gdk_x11_display_supports_clipboard_persistence (GdkDisplay *display)
...
@@ -2127,7 +2127,7 @@ gdk_x11_display_supports_clipboard_persistence (GdkDisplay *display)
/* It might make sense to cache this */
/* It might make sense to cache this */
clipboard_manager
=
gdk_x11_get_xatom_by_name_for_display
(
display
,
"CLIPBOARD_MANAGER"
);
clipboard_manager
=
gdk_x11_get_xatom_by_name_for_display
(
display
,
"CLIPBOARD_MANAGER"
);
return
XGetSelectionOwner
(
GDK_DISPLAY
_X11
(
display
)
->
xdisplay
,
clipboard_manager
)
!=
None
;
return
XGetSelectionOwner
(
GDK_
X11_
DISPLAY
(
display
)
->
xdisplay
,
clipboard_manager
)
!=
None
;
}
}
static
void
static
void
...
@@ -2137,7 +2137,7 @@ gdk_x11_display_store_clipboard (GdkDisplay *display,
...
@@ -2137,7 +2137,7 @@ gdk_x11_display_store_clipboard (GdkDisplay *display,
const
GdkAtom
*
targets
,
const
GdkAtom
*
targets
,
gint
n_targets
)
gint
n_targets
)
{
{
GdkX11Display
*
display_x11
=
GDK_DISPLAY
_X11
(
display
);
GdkX11Display
*
display_x11
=
GDK_
X11_
DISPLAY
(
display
);
Atom
clipboard_manager
,
save_targets
;
Atom
clipboard_manager
,
save_targets
;
g_return_if_fail
(
GDK_WINDOW_IS_X11
(
clipboard_window
));
g_return_if_fail
(
GDK_WINDOW_IS_X11
(
clipboard_window
));
...
@@ -2193,19 +2193,19 @@ gdk_x11_display_store_clipboard (GdkDisplay *display,
...
@@ -2193,19 +2193,19 @@ gdk_x11_display_store_clipboard (GdkDisplay *display,
guint32
guint32
gdk_x11_display_get_user_time
(
GdkDisplay
*
display
)
gdk_x11_display_get_user_time
(
GdkDisplay
*
display
)
{
{
return
GDK_DISPLAY
_X11
(
display
)
->
user_time
;
return
GDK_
X11_
DISPLAY
(
display
)
->
user_time
;
}
}
static
gboolean
static
gboolean
gdk_x11_display_supports_shapes
(
GdkDisplay
*
display
)
gdk_x11_display_supports_shapes
(
GdkDisplay
*
display
)
{
{
return
GDK_DISPLAY
_X11
(
display
)
->
have_shapes
;
return
GDK_
X11_
DISPLAY
(
display
)
->
have_shapes
;
}
}
static
gboolean
static
gboolean
gdk_x11_display_supports_input_shapes
(
GdkDisplay
*
display
)
gdk_x11_display_supports_input_shapes
(
GdkDisplay
*
display
)
{
{
return
GDK_DISPLAY
_X11
(
display
)
->
have_input_shapes
;
return
GDK_
X11_
DISPLAY
(
display
)
->
have_input_shapes
;
}
}
...
@@ -2222,7 +2222,7 @@ gdk_x11_display_supports_input_shapes (GdkDisplay *display)
...
@@ -2222,7 +2222,7 @@ gdk_x11_display_supports_input_shapes (GdkDisplay *display)
G_CONST_RETURN
gchar
*
G_CONST_RETURN
gchar
*
gdk_x11_display_get_startup_notification_id
(
GdkDisplay
*
display
)
gdk_x11_display_get_startup_notification_id
(
GdkDisplay
*
display
)
{
{
return
GDK_DISPLAY
_X11
(
display
)
->
startup_notification_id
;
return
GDK_
X11_
DISPLAY
(
display
)
->
startup_notification_id
;
}
}
/**
/**
...
@@ -2254,7 +2254,7 @@ gdk_x11_display_set_startup_notification_id (GdkDisplay *display,
...
@@ -2254,7 +2254,7 @@ gdk_x11_display_set_startup_notification_id (GdkDisplay *display,
GdkX11Display
*
display_x11
;
GdkX11Display
*
display_x11
;
gchar
*
time_str
;
gchar
*
time_str
;
display_x11
=
GDK_DISPLAY
_X11
(
display
);
display_x11
=
GDK_
X11_
DISPLAY
(
display
);
g_free
(
display_x11
->
startup_notification_id
);
g_free
(
display_x11
->
startup_notification_id
);
display_x11
->
startup_notification_id
=
g_strdup
(
startup_id
);
display_x11
->
startup_notification_id
=
g_strdup
(
startup_id
);
...
@@ -2291,7 +2291,7 @@ gdk_x11_display_set_startup_notification_id (GdkDisplay *display,
...
@@ -2291,7 +2291,7 @@ gdk_x11_display_set_startup_notification_id (GdkDisplay *display,
static
gboolean
static
gboolean
gdk_x11_display_supports_composite
(
GdkDisplay
*
display
)
gdk_x11_display_supports_composite
(
GdkDisplay
*
display
)
{
{
GdkX11Display
*
x11_display
=
GDK_DISPLAY
_X11
(
display
);
GdkX11Display
*
x11_display
=
GDK_
X11_
DISPLAY
(
display
);
return
x11_display
->
have_xcomposite
&&
return
x11_display
->
have_xcomposite
&&
x11_display
->
have_xdamage
&&
x11_display
->
have_xdamage
&&
...
@@ -2303,7 +2303,7 @@ gdk_x11_display_list_devices (GdkDisplay *display)
...
@@ -2303,7 +2303,7 @@ gdk_x11_display_list_devices (GdkDisplay *display)
{