context_dest_xid = context->dest_window ?
(private->drop_xid ?
private->drop_xid :
- GDK_DRAWABLE_XID (context->dest_window)) :
+ GDK_WINDOW_XID (context->dest_window)) :
None;
if ((!context->is_source == !is_source) &&
((source_xid == None) || (context->source_window &&
- (GDK_DRAWABLE_XID (context->source_window) == source_xid))) &&
+ (GDK_WINDOW_XID (context->source_window) == source_xid))) &&
((dest_xid == None) || (context_dest_xid == dest_xid)))
return context;
info.selection_atom = private->motif_selection;
- XChangeProperty (GDK_DRAWABLE_XDISPLAY (context->source_window),
- GDK_DRAWABLE_XID (context->source_window),
+ XChangeProperty (GDK_WINDOW_XDISPLAY (context->source_window),
+ GDK_WINDOW_XID (context->source_window),
private->motif_selection,
gdk_x11_get_xatom_by_name_for_display (display, "_MOTIF_DRAG_INITIATOR_INFO"),
8, PropModeReplace,
xev.xclient.type = ClientMessage;
xev.xclient.message_type = gdk_x11_get_xatom_by_name_for_display (display, "_MOTIF_DRAG_AND_DROP_MESSAGE");
xev.xclient.format = 8;
- xev.xclient.window = GDK_DRAWABLE_XID (context->dest_window);
+ xev.xclient.window = GDK_WINDOW_XID (context->dest_window);
MOTIF_XCLIENT_BYTE (&xev, 0) = XmTOP_LEVEL_ENTER;
MOTIF_XCLIENT_BYTE (&xev, 1) = local_byte_order;
MOTIF_XCLIENT_SHORT (&xev, 1) = 0;
MOTIF_XCLIENT_LONG (&xev, 1) = time;
- MOTIF_XCLIENT_LONG (&xev, 2) = GDK_DRAWABLE_XID (context->source_window);
+ MOTIF_XCLIENT_LONG (&xev, 2) = GDK_WINDOW_XID (context->source_window);
if (!private->motif_targets_set)
motif_set_targets (context);
MOTIF_XCLIENT_LONG (&xev, 4) = 0;
if (!_gdk_send_xevent (display,
- GDK_DRAWABLE_XID (context->dest_window),
+ GDK_WINDOW_XID (context->dest_window),
FALSE, 0, &xev))
GDK_NOTE (DND,
g_message ("Send event to %lx failed",
- GDK_DRAWABLE_XID (context->dest_window)));
+ GDK_WINDOW_XID (context->dest_window)));
}
static void
xev.xclient.type = ClientMessage;
xev.xclient.message_type = gdk_x11_get_xatom_by_name_for_display (display, "_MOTIF_DRAG_AND_DROP_MESSAGE");
xev.xclient.format = 8;
- xev.xclient.window = GDK_DRAWABLE_XID (context->dest_window);
+ xev.xclient.window = GDK_WINDOW_XID (context->dest_window);
MOTIF_XCLIENT_BYTE (&xev, 0) = XmTOP_LEVEL_LEAVE;
MOTIF_XCLIENT_BYTE (&xev, 1) = local_byte_order;
MOTIF_XCLIENT_LONG (&xev, 4) = 0;
if (!_gdk_send_xevent (display,
- GDK_DRAWABLE_XID (context->dest_window),
+ GDK_WINDOW_XID (context->dest_window),
FALSE, 0, &xev))
GDK_NOTE (DND,
g_message ("Send event to %lx failed",
- GDK_DRAWABLE_XID (context->dest_window)));
+ GDK_WINDOW_XID (context->dest_window)));
}
static gboolean
xev.xclient.type = ClientMessage;
xev.xclient.message_type = gdk_x11_get_xatom_by_name_for_display (display, "_MOTIF_DRAG_AND_DROP_MESSAGE");
xev.xclient.format = 8;
- xev.xclient.window = GDK_DRAWABLE_XID (context->dest_window);
+ xev.xclient.window = GDK_WINDOW_XID (context->dest_window);
MOTIF_XCLIENT_BYTE (&xev, 1) = local_byte_order;
MOTIF_XCLIENT_SHORT (&xev, 1) = motif_dnd_get_flags (context);
}
if (!_gdk_send_xevent (display,
- GDK_DRAWABLE_XID (context->dest_window),
+ GDK_WINDOW_XID (context->dest_window),
FALSE, 0, &xev))
GDK_NOTE (DND,
g_message ("Send event to %lx failed",
- GDK_DRAWABLE_XID (context->dest_window)));
+ GDK_WINDOW_XID (context->dest_window)));
return retval;
}
xev.xclient.type = ClientMessage;
xev.xclient.message_type = gdk_x11_get_xatom_by_name_for_display (display, "_MOTIF_DRAG_AND_DROP_MESSAGE");
xev.xclient.format = 8;
- xev.xclient.window = GDK_DRAWABLE_XID (context->dest_window);
+ xev.xclient.window = GDK_WINDOW_XID (context->dest_window);
MOTIF_XCLIENT_BYTE (&xev, 0) = XmDROP_START;
MOTIF_XCLIENT_BYTE (&xev, 1) = local_byte_order;
MOTIF_XCLIENT_SHORT (&xev, 5) = private->last_y;
MOTIF_XCLIENT_LONG (&xev, 3) = private->motif_selection;
- MOTIF_XCLIENT_LONG (&xev, 4) = GDK_DRAWABLE_XID (context->source_window);
+ MOTIF_XCLIENT_LONG (&xev, 4) = GDK_WINDOW_XID (context->source_window);
if (!_gdk_send_xevent (display,
- GDK_DRAWABLE_XID (context->dest_window),
+ GDK_WINDOW_XID (context->dest_window),
FALSE, 0, &xev))
GDK_NOTE (DND,
g_message ("Send event to %lx failed",
- GDK_DRAWABLE_XID (context->dest_window)));
+ GDK_WINDOW_XID (context->dest_window)));
}
/* Target Side */
if (!display)
return GDK_FILTER_REMOVE;
- context = gdk_drag_context_find (display, TRUE, GDK_DRAWABLE_XID (event->any.window), None);
+ context = gdk_drag_context_find (display, TRUE, GDK_WINDOW_XID (event->any.window), None);
if (context)
{
i++;
}
- XChangeProperty (GDK_DRAWABLE_XDISPLAY (context->source_window),
- GDK_DRAWABLE_XID (context->source_window),
+ XChangeProperty (GDK_WINDOW_XDISPLAY (context->source_window),
+ GDK_WINDOW_XID (context->source_window),
gdk_x11_get_xatom_by_name_for_display (display, "XdndTypeList"),
XA_ATOM, 32, PropModeReplace,
(guchar *)atomlist, n_atoms);
}
}
- XChangeProperty (GDK_DRAWABLE_XDISPLAY (context->source_window),
- GDK_DRAWABLE_XID (context->source_window),
+ XChangeProperty (GDK_WINDOW_XDISPLAY (context->source_window),
+ GDK_WINDOW_XID (context->source_window),
gdk_x11_get_xatom_by_name_for_display (display, "XdndActionList"),
XA_ATOM, 32, PropModeReplace,
(guchar *)atomlist, n_atoms);
xev.xclient.format = 32;
xev.xclient.window = private->drop_xid ?
private->drop_xid :
- GDK_DRAWABLE_XID (context->dest_window);
- xev.xclient.data.l[0] = GDK_DRAWABLE_XID (context->source_window);
+ GDK_WINDOW_XID (context->dest_window);
+ xev.xclient.data.l[0] = GDK_WINDOW_XID (context->source_window);
xev.xclient.data.l[1] = (private->version << 24); /* version */
xev.xclient.data.l[2] = 0;
xev.xclient.data.l[3] = 0;
GDK_NOTE(DND,
g_message ("Sending enter source window %#lx XDND protocol version %d\n",
- GDK_DRAWABLE_XID (context->source_window), private->version));
+ GDK_WINDOW_XID (context->source_window), private->version));
if (g_list_length (context->targets) > 3)
{
if (!private->xdnd_targets_set)
{
GDK_NOTE (DND,
g_message ("Send event to %lx failed",
- GDK_DRAWABLE_XID (context->dest_window)));
+ GDK_WINDOW_XID (context->dest_window)));
g_object_unref (context->dest_window);
context->dest_window = NULL;
}
xev.xclient.format = 32;
xev.xclient.window = private->drop_xid ?
private->drop_xid :
- GDK_DRAWABLE_XID (context->dest_window);
- xev.xclient.data.l[0] = GDK_DRAWABLE_XID (context->source_window);
+ GDK_WINDOW_XID (context->dest_window);
+ xev.xclient.data.l[0] = GDK_WINDOW_XID (context->source_window);
xev.xclient.data.l[1] = 0;
xev.xclient.data.l[2] = 0;
xev.xclient.data.l[3] = 0;
{
GDK_NOTE (DND,
g_message ("Send event to %lx failed",
- GDK_DRAWABLE_XID (context->dest_window)));
+ GDK_WINDOW_XID (context->dest_window)));
g_object_unref (context->dest_window);
context->dest_window = NULL;
}
xev.xclient.format = 32;
xev.xclient.window = private->drop_xid ?
private->drop_xid :
- GDK_DRAWABLE_XID (context->dest_window);
- xev.xclient.data.l[0] = GDK_DRAWABLE_XID (context->source_window);
+ GDK_WINDOW_XID (context->dest_window);
+ xev.xclient.data.l[0] = GDK_WINDOW_XID (context->source_window);
xev.xclient.data.l[1] = 0;
xev.xclient.data.l[2] = time;
xev.xclient.data.l[3] = 0;
{
GDK_NOTE (DND,
g_message ("Send event to %lx failed",
- GDK_DRAWABLE_XID (context->dest_window)));
+ GDK_WINDOW_XID (context->dest_window)));
g_object_unref (context->dest_window);
context->dest_window = NULL;
}
xev.xclient.format = 32;
xev.xclient.window = private->drop_xid ?
private->drop_xid :
- GDK_DRAWABLE_XID (context->dest_window);
- xev.xclient.data.l[0] = GDK_DRAWABLE_XID (context->source_window);
+ GDK_WINDOW_XID (context->dest_window);
+ xev.xclient.data.l[0] = GDK_WINDOW_XID (context->source_window);
xev.xclient.data.l[1] = 0;
xev.xclient.data.l[2] = (x_root << 16) | y_root;
xev.xclient.data.l[3] = time;
{
GDK_NOTE (DND,
g_message ("Send event to %lx failed",
- GDK_DRAWABLE_XID (context->dest_window)));
+ GDK_WINDOW_XID (context->dest_window)));
g_object_unref (context->dest_window);
context->dest_window = NULL;
}
gdk_error_trap_push ();
if (XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display),
- GDK_DRAWABLE_XID (context->source_window),
+ GDK_WINDOW_XID (context->source_window),
gdk_x11_get_xatom_by_name_for_display (display, "XdndActionList"),
0, 65536,
False, XA_ATOM, &type, &format, &nitems,
GdkDragContext *source_context;
source_context = gdk_drag_context_find (display, TRUE,
- GDK_DRAWABLE_XID (context->source_window),
- GDK_DRAWABLE_XID (context->dest_window));
+ GDK_WINDOW_XID (context->source_window),
+ GDK_WINDOW_XID (context->dest_window));
if (source_context)
{
if (get_types)
{
gdk_error_trap_push ();
- XGetWindowProperty (GDK_DRAWABLE_XDISPLAY (event->any.window),
+ XGetWindowProperty (GDK_WINDOW_XDISPLAY (event->any.window),
source_window,
gdk_x11_get_xatom_by_name_for_display (display, "XdndTypeList"),
0, 65536,
if ((display_x11->current_dest_drag != NULL) &&
(display_x11->current_dest_drag->protocol == GDK_DRAG_PROTO_XDND) &&
- (GDK_DRAWABLE_XID (display_x11->current_dest_drag->source_window) == source_window))
+ (GDK_WINDOW_XID (display_x11->current_dest_drag->source_window) == source_window))
{
event->dnd.type = GDK_DRAG_LEAVE;
/* Pass ownership of context to the event */
if ((display_x11->current_dest_drag != NULL) &&
(display_x11->current_dest_drag->protocol == GDK_DRAG_PROTO_XDND) &&
- (GDK_DRAWABLE_XID (display_x11->current_dest_drag->source_window) == source_window))
+ (GDK_WINDOW_XID (display_x11->current_dest_drag->source_window) == source_window))
{
event->dnd.type = GDK_DRAG_MOTION;
event->dnd.context = display_x11->current_dest_drag;
if ((display_x11->current_dest_drag != NULL) &&
(display_x11->current_dest_drag->protocol == GDK_DRAG_PROTO_XDND) &&
- (GDK_DRAWABLE_XID (display_x11->current_dest_drag->source_window) == source_window))
+ (GDK_WINDOW_XID (display_x11->current_dest_drag->source_window) == source_window))
{
GdkDragContextPrivateX11 *private;
private = PRIVATE_DATA (display_x11->current_dest_drag);
dest = get_client_window_at_coords (window_cache,
drag_window && GDK_WINDOW_IS_X11 (drag_window) ?
- GDK_DRAWABLE_XID (drag_window) : None,
+ GDK_WINDOW_XID (drag_window) : None,
x_root, y_root);
if (private->dest_xid != dest)
GdkDisplay *display = GDK_WINDOW_DISPLAY (dest_window);
xdnd_check_dest (display,
- GDK_DRAWABLE_XID (dest_window),
+ GDK_WINDOW_XID (dest_window),
&private->version);
}
}
GdkDragContext *dest_context;
dest_context = gdk_drag_context_find (display, FALSE,
- GDK_DRAWABLE_XID (context->source_window),
- GDK_DRAWABLE_XID (dest_window));
+ GDK_WINDOW_XID (context->source_window),
+ GDK_WINDOW_XID (dest_window));
if (dest_context)
{
xev.xclient.message_type = gdk_x11_get_xatom_by_name_for_display (display,
"_MOTIF_DRAG_AND_DROP_MESSAGE");
xev.xclient.format = 8;
- xev.xclient.window = GDK_DRAWABLE_XID (context->source_window);
+ xev.xclient.window = GDK_WINDOW_XID (context->source_window);
if (private->drag_status == GDK_DRAG_STATUS_ACTION_WAIT)
{
MOTIF_XCLIENT_LONG (&xev, 4) = 0;
if (!_gdk_send_xevent (display,
- GDK_DRAWABLE_XID (context->source_window),
+ GDK_WINDOW_XID (context->source_window),
FALSE, 0, &xev))
GDK_NOTE (DND,
g_message ("Send event to %lx failed",
- GDK_DRAWABLE_XID (context->source_window)));
+ GDK_WINDOW_XID (context->source_window)));
}
else if (context->protocol == GDK_DRAG_PROTO_XDND)
{
xev.xclient.type = ClientMessage;
xev.xclient.message_type = gdk_x11_get_xatom_by_name_for_display (display, "XdndStatus");
xev.xclient.format = 32;
- xev.xclient.window = GDK_DRAWABLE_XID (context->source_window);
+ xev.xclient.window = GDK_WINDOW_XID (context->source_window);
- xev.xclient.data.l[0] = GDK_DRAWABLE_XID (context->dest_window);
+ xev.xclient.data.l[0] = GDK_WINDOW_XID (context->dest_window);
xev.xclient.data.l[1] = (action != 0) ? (2 | 1) : 0;
xev.xclient.data.l[2] = 0;
xev.xclient.data.l[3] = 0;
FALSE, &xev))
GDK_NOTE (DND,
g_message ("Send event to %lx failed",
- GDK_DRAWABLE_XID (context->source_window)));
+ GDK_WINDOW_XID (context->source_window)));
}
private->old_action = action;
MOTIF_XCLIENT_LONG (&xev, 4) = 0;
_gdk_send_xevent (display,
- GDK_DRAWABLE_XID (context->source_window),
+ GDK_WINDOW_XID (context->source_window),
FALSE, 0, &xev);
}
}
xev.xclient.type = ClientMessage;
xev.xclient.message_type = gdk_x11_get_xatom_by_name_for_display (display, "XdndFinished");
xev.xclient.format = 32;
- xev.xclient.window = GDK_DRAWABLE_XID (context->source_window);
+ xev.xclient.window = GDK_WINDOW_XID (context->source_window);
- xev.xclient.data.l[0] = GDK_DRAWABLE_XID (context->dest_window);
+ xev.xclient.data.l[0] = GDK_WINDOW_XID (context->dest_window);
if (success)
{
xev.xclient.data.l[1] = 1;
FALSE, &xev))
GDK_NOTE (DND,
g_message ("Send event to %lx failed",
- GDK_DRAWABLE_XID (context->source_window)));
+ GDK_WINDOW_XID (context->source_window)));
}
}
info.num_drop_sites = 0;
info.total_size = sizeof(info);
- XChangeProperty (GDK_DISPLAY_XDISPLAY (display), GDK_DRAWABLE_XID (window),
+ XChangeProperty (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XID (window),
motif_drag_receiver_info_atom,
motif_drag_receiver_info_atom,
8, PropModeReplace,
/* The property needs to be of type XA_ATOM, not XA_INTEGER. Blech */
XChangeProperty (GDK_DISPLAY_XDISPLAY (display),
- GDK_DRAWABLE_XID (window),
+ GDK_WINDOW_XID (window),
gdk_x11_get_xatom_by_name_for_display (display, "XdndAware"),
XA_ATOM, 32, PropModeReplace,
(guchar *)&xdnd_version, 1);