brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move send_icccm_message to window-x11

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-03-20 16:07:23 -04:00
parent 46b4d6c0f0
commit 852589897e
3 changed files with 39 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/window-private.h
View File

@ -612,12 +612,6 @@ void meta_window_get_geometry (MetaWindow *window,
void meta_window_update_unfocused_button_grabs (MetaWindow *window); void meta_window_update_unfocused_button_grabs (MetaWindow *window);
/* Sends a client message */
void meta_window_send_icccm_message (MetaWindow *window,
Atom atom,
guint32 timestamp);
void meta_window_move_resize_request(MetaWindow *window, void meta_window_move_resize_request(MetaWindow *window,
guint value_mask, guint value_mask,
int gravity, int gravity,

36
src/core/window.c
View File

@ -5362,42 +5362,6 @@ meta_window_lower (MetaWindow *window)
meta_stack_lower (window->screen->stack, window); meta_stack_lower (window->screen->stack, window);
} }
void
meta_window_send_icccm_message (MetaWindow *window,
Atom atom,
guint32 timestamp)
{
/* This comment and code are from twm, copyright
* Open Group, Evans & Sutherland, etc.
*/
/*
* ICCCM Client Messages - Section 4.2.8 of the ICCCM dictates that all
* client messages will have the following form:
*
* event type ClientMessage
* message type _XA_WM_PROTOCOLS
* window tmp->w
* format 32
* data[0] message atom
* data[1] time stamp
*/
XClientMessageEvent ev;
ev.type = ClientMessage;
ev.window = window->xwindow;
ev.message_type = window->display->atom_WM_PROTOCOLS;
ev.format = 32;
ev.data.l[0] = atom;
ev.data.l[1] = timestamp;
meta_error_trap_push (window->display);
XSendEvent (window->display->xdisplay,
window->xwindow, False, 0, (XEvent*) &ev);
meta_error_trap_pop (window->display);
}
void void
meta_window_move_resize_request (MetaWindow *window, meta_window_move_resize_request (MetaWindow *window,
guint value_mask, guint value_mask,

46
src/x11/window-x11.c
View File

@ -59,6 +59,42 @@ meta_window_x11_init (MetaWindowX11 *window_x11)
window_x11->priv = meta_window_x11_get_instance_private (window_x11); window_x11->priv = meta_window_x11_get_instance_private (window_x11);
} }
static void
send_icccm_message (MetaWindow *window,
Atom atom,
guint32 timestamp)
{
/* This comment and code are from twm, copyright
* Open Group, Evans & Sutherland, etc.
*/
/*
* ICCCM Client Messages - Section 4.2.8 of the ICCCM dictates that all
* client messages will have the following form:
*
* event type ClientMessage
* message type _XA_WM_PROTOCOLS
* window tmp->w
* format 32
* data[0] message atom
* data[1] time stamp
*/
XClientMessageEvent ev;
ev.type = ClientMessage;
ev.window = window->xwindow;
ev.message_type = window->display->atom_WM_PROTOCOLS;
ev.format = 32;
ev.data.l[0] = atom;
ev.data.l[1] = timestamp;
meta_error_trap_push (window->display);
XSendEvent (window->display->xdisplay,
window->xwindow, False, 0, (XEvent*) &ev);
meta_error_trap_pop (window->display);
}
static Window static Window
read_client_leader (MetaDisplay *display, read_client_leader (MetaDisplay *display,
Window xwindow) Window xwindow)
@ -328,9 +364,7 @@ meta_window_x11_ping (MetaWindow *window,
{ {
MetaDisplay *display = window->display; MetaDisplay *display = window->display;
meta_window_send_icccm_message (window, send_icccm_message (window, display->atom__NET_WM_PING, serial);
display->atom__NET_WM_PING,
serial);
} }
static void static void
@ -343,9 +377,7 @@ meta_window_x11_delete (MetaWindow *window,
meta_topic (META_DEBUG_WINDOW_OPS, meta_topic (META_DEBUG_WINDOW_OPS,
"Deleting %s with delete_window request\n", "Deleting %s with delete_window request\n",
window->desc); window->desc);
meta_window_send_icccm_message (window, send_icccm_message (window, window->display->atom_WM_DELETE_WINDOW, timestamp);
window->display->atom_WM_DELETE_WINDOW,
timestamp);
} }
else else
{ {
@ -395,7 +427,7 @@ request_take_focus (MetaWindow *window,
meta_topic (META_DEBUG_FOCUS, "WM_TAKE_FOCUS(%s, %u)\n", meta_topic (META_DEBUG_FOCUS, "WM_TAKE_FOCUS(%s, %u)\n",
window->desc, timestamp); window->desc, timestamp);
meta_window_send_icccm_message (window, display->atom_WM_TAKE_FOCUS, timestamp); send_icccm_message (window, display->atom_WM_TAKE_FOCUS, timestamp);
} }
static void static void